Merge pull request #6947 from HistoricEngland/6930_NEW_CS_crosshairs_…

…when_editing 6930 Crosshairs code added
archesproject · Jan 6, 2021 · 5612c34 · 5612c34
2 parents b2e8aae + 589420d
commit 5612c34
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/arches/app/media/js/viewmodels/map-editor.js b/arches/app/media/js/viewmodels/map-editor.js
@@ -75,7 +75,12 @@ define([
             if (showSelectLayers) {
                 self.draw.changeMode('simple_select');
                 self.selectedFeatureIds([]);
-            } else if (tool) self.draw.changeMode(tool);
+            } else {
+                if (tool) {
+                    self.draw.changeMode(tool);
+                    self.map().draw_mode = tool;
+                }
+            }
         };
 
         self.geojsonWidgets.forEach(function(widget) {
@@ -385,9 +390,10 @@ define([
             });
             map.on('draw.update', self.updateTiles);
             map.on('draw.delete', self.updateTiles);
-            map.on('draw.modechange', function() {
+            map.on('draw.modechange', function(e) {
                 self.updateTiles();
                 self.setSelectLayersVisibility(false);
+                map.draw_mode = e.mode;
             });
             map.on('draw.selectionchange', function(e) {
                 self.selectedFeatureIds(e.features.map(function(feature) {

diff --git a/arches/app/media/js/viewmodels/map.js b/arches/app/media/js/viewmodels/map.js
@@ -20,7 +20,7 @@ define([
                 }
             };
         };
-        
+
         var x = ko.unwrap(params.x) ? params.x : arches.mapDefaultX;
         var y = ko.unwrap(params.y) ? params.y : arches.mapDefaultY;
         var bounds = ko.unwrap(params.bounds) ? params.bounds : arches.hexBinBounds;
@@ -278,9 +278,20 @@ define([
                         self.isFeatureClickable
                     );
                     if (hoverFeature && hoverFeature.id && style) map.setFeatureState(hoverFeature, { hover: true });
+
                     map.getCanvas().style.cursor = hoverFeature ? 'pointer' : '';
+                    if (self.map().draw_mode) {
+                        var crosshairModes = [
+                            "draw_point",
+                            "draw_line_string",
+                            "draw_polygon",
+                        ];
+                        map.getCanvas().style.cursor = crosshairModes.includes(self.map().draw_mode) ? "crosshair" : "";
+                    }
                 });
 
+                map.draw_mode = null;
+
                 map.on('click', function(e) {
                     if (hoverFeature) {
                         self.onFeatureClick(hoverFeature, e.lngLat);

diff --git a/arches/app/media/js/views/components/search/map-filter.js b/arches/app/media/js/views/components/search/map-filter.js
@@ -246,6 +246,7 @@ define([
                             this.searchByExtent();
                         } else {
                             this.draw.changeMode(selectedDrawTool);
+                            self.map().draw_mode = selectedDrawTool;
                         }
                     }
                 }, this);
@@ -374,6 +375,9 @@ define([
                     self.searchGeometries(e.features);
                     self.updateFilter();
                 });
+                this.map().on("draw.modechange", function (e) {
+                    self.map().draw_mode = e.mode;
+                });
             },
 
             searchByExtent: function() {