keep spatial filter if same spatial unit remains

KomMonitor · Apr 24, 2023 · e8ceb36 · e8ceb36
1 parent 129a45a
commit e8ceb36
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/...orUserInterface/kommonitorControls/kommonitorDataSetup/kommonitor-data-setup.component.js b/...orUserInterface/kommonitorControls/kommonitorDataSetup/kommonitor-data-setup.component.js
@@ -699,6 +699,8 @@ angular
 
 								$scope.onChangeSelectedIndicator = async function(recenterMap){
 
+									$rootScope.$broadcast("onChangeSelectedIndicator");
+
 									if(kommonitorDataExchangeService.selectedIndicator){
 
 										$scope.loadingData = true;

diff --git a/...ommonitorUserInterface/kommonitorControls/kommonitorFilter/kommonitor-filter.component.js b/...ommonitorUserInterface/kommonitorControls/kommonitorFilter/kommonitor-filter.component.js
@@ -40,6 +40,7 @@ angular
 							$scope.selectedSpatialUnitForFilter;
 							$scope.higherSpatialUnits = undefined;
 							$scope.higherSpatialUnitFilterFeatureGeoJSON;
+							$scope.reappliedFilter = false;
 
 							$scope.selectionByFeatureSpatialFilterDuallistOptions = {
 								title: {label: 'Gebiete', helpMessage: 'help'},
@@ -77,8 +78,24 @@ angular
 
 							$scope.inputNotValid = false;
 
-							$scope.$on("replaceIndicatorAsGeoJSON", function (event, indicatorMetadataAndGeoJSON, spatialUnitName, date, justRestyling, isCustomComputation) {
+							$scope.$on("onChangeSelectedIndicator", function(event){
+								$scope.reappliedFilter = false;
+							});
+
+							$scope.$on("indicatortMapDisplayFinished", function(){
+								// trigger the continous display of current filter									
+								if(! $scope.reappliedFilter){
+									$scope.reappliedFilter = true;
+									if ($scope.showSelectionByFeatureSpatialFilter){
+										$scope.onSelectionByFeatureSpatialFilterSelectBtnPressed();
+									}
+									if ($scope.showManualSelectionSpatialFilter){
+										$scope.onManualSelectionBySelectedMapFeaturesBtnPressed();
+									}										
+								}	
+							});
 
+							$scope.$on("replaceIndicatorAsGeoJSON", function (event, indicatorMetadataAndGeoJSON, spatialUnitName, date, justRestyling, isCustomComputation) {
 
 								$scope.setupSpatialUnitFilter(indicatorMetadataAndGeoJSON, spatialUnitName, date);
 
@@ -89,7 +106,9 @@ angular
 									$scope.previouslySelectedSpatialUnit = kommonitorDataExchangeService.selectedSpatialUnit;
 								}
 
-								if($scope.previouslySelectedIndicator.indicatorId != indicatorMetadataAndGeoJSON.indicatorId || $scope.previouslySelectedSpatialUnit.spatialUnitLevel != spatialUnitName){
+								// if($scope.previouslySelectedIndicator.indicatorId != indicatorMetadataAndGeoJSON.indicatorId || $scope.previouslySelectedSpatialUnit.spatialUnitLevel != spatialUnitName){
+								if($scope.previouslySelectedSpatialUnit.spatialUnitLevel != spatialUnitName){
+									// reset filter component
 									if ($scope.showSelectionByFeatureSpatialFilter)
 										$scope.updateSelectableAreas("byFeature");
 										kommonitorFilterHelperService.clearFilteredFeatures();

diff --git a/app/components/kommonitorUserInterface/kommonitorMap/kommonitor-map.component.js b/app/components/kommonitorUserInterface/kommonitorMap/kommonitor-map.component.js
@@ -3069,7 +3069,8 @@ angular.module('kommonitorMap').component(
             $scope.showOutlierInfoAlert = true;
           }
 
-          $rootScope.$broadcast("updateDiagrams", $scope.currentIndicatorMetadataAndGeoJSON, kommonitorDataExchangeService.selectedSpatialUnit.spatialUnitLevel, kommonitorDataExchangeService.selectedSpatialUnit.spatialUnitId, date, $scope.defaultBrew, $scope.gtMeasureOfValueBrew, $scope.ltMeasureOfValueBrew, $scope.dynamicIncreaseBrew, $scope.dynamicDecreaseBrew, kommonitorDataExchangeService.isMeasureOfValueChecked, kommonitorDataExchangeService.measureOfValue, justRestyling);
+          $rootScope.$broadcast("updateDiagrams", $scope.currentIndicatorMetadataAndGeoJSON, kommonitorDataExchangeService.selectedSpatialUnit.spatialUnitLevel, kommonitorDataExchangeService.selectedSpatialUnit.spatialUnitId, date, $scope.defaultBrew, $scope.gtMeasureOfValueBrew, $scope.ltMeasureOfValueBrew, $scope.dynamicIncreaseBrew, $scope.dynamicDecreaseBrew, kommonitorDataExchangeService.isMeasureOfValueChecked, kommonitorDataExchangeService.measureOfValue, justRestyling);          
+          $rootScope.$broadcast("indicatortMapDisplayFinished");
 
           $scope.map.invalidateSize(true);
         });