Merge pull request #2564 from WikiWatershed/cpc/fix-search-and-select

Allow boundary selection after HUC search
WikiWatershed · Dec 21, 2017 · b83bdb8 · b83bdb8
2 parents 2d4ca15 + f593965
commit b83bdb8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js
@@ -236,6 +236,8 @@ var DrawWindow = Marionette.LayoutView.extend({
         this.rwdTaskModel.reset();
         this.model.reset();
 
+        App.map.set('selectedGeocoderArea', null);
+
         utils.cancelDrawing(App.getLeafletMap());
 
         // RWD typically does not clear the AoI generated, even if it

diff --git a/src/mmw/js/src/geocode/views.js b/src/mmw/js/src/geocode/views.js
@@ -92,6 +92,10 @@ var SearchBoxView = Marionette.LayoutView.extend({
         'click @ui.selectButton': 'validateShapeAndGoToAnalyze'
     },
 
+    initialize: function() {
+        this.listenTo(App.map, 'change:selectedGeocoderArea', this.resetIfSelectedAreaIsCleared);
+    },
+
     modelEvents: {
         'change:query change:selectedSuggestion': 'render'
     },
@@ -263,6 +267,12 @@ var SearchBoxView = Marionette.LayoutView.extend({
         App.map.set('selectedGeocoderArea', null);
     },
 
+    resetIfSelectedAreaIsCleared: function(model, selectedGeocoderArea) {
+        if (!selectedGeocoderArea) {
+            this.reset();
+        }
+    },
+
     dismissAction: function() {
         this.reset();
         this.setStateDefault();