nakarte

commit 08ba52f68d8e905c6d8013e7fee718e63ad2ae6e
parent 6b54dba28098ab924e444d48f44a2285d497654a
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Mon, 27 Mar 2017 00:25:10 +0300

clicks when drawing line and measuring azimuth do not trigger wikimapia and canvasmarkers

Diffstat:
M
src/lib/leaflet.control.azimuth/index.js
 | 
1
+
M
src/lib/leaflet.layer.canvasMarkers/index.js
 | 
3
+++
M
src/lib/leaflet.layer.wikimapia/index.js
 | 
3
+++
M
src/lib/leaflet.polyline-edit/index.js
 | 
2
++

4 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/lib/leaflet.control.azimuth/index.js b/src/lib/leaflet.control.azimuth/index.js
@@ -139,6 +139,7 @@ L.Control.Azimuth = L.Control.extend({
                 L.DomUtil.removeClass(this._map._container, 'azimuth-control-active');
                 this._map.off('click', this.onMapClick, this);
             }
+            this._map.clickLocked = enabled;
             this._enabled(!!enabled);
         },
 
diff --git a/src/lib/leaflet.layer.canvasMarkers/index.js b/src/lib/leaflet.layer.canvasMarkers/index.js
@@ -387,6 +387,9 @@ L.Layer.CanvasMarkers = L.GridLayer.extend({
         },
 
         onClick: function(e) {
+            if (this._map.clickLocked) {
+                return;
+            }
             const marker = this.findMarkerFromMouseEvent(e);
             if (marker) {
                 L.extend(e, {marker: marker});
diff --git a/src/lib/leaflet.layer.wikimapia/index.js b/src/lib/leaflet.layer.wikimapia/index.js
@@ -187,6 +187,9 @@ L.Wikimapia = L.GridLayer.extend({
         },
 
         onClick: function(e) {
+            if (this._map.clickLocked) {
+                return;
+            }
             const place = this.getPlaceAtMousePos(e);
             if (place) {
                 const url = `http://wikimapia.org/${place.id}/ru/`;
diff --git a/src/lib/leaflet.polyline-edit/index.js b/src/lib/leaflet.polyline-edit/index.js
@@ -125,6 +125,7 @@ L.Polyline.EditMixin = {
 
         this._map.on('mousemove', this.onMouseMoveFollowEndNode, this);
         L.DomUtil.addClass(this._map._container, 'leaflet-line-drawing');
+        this._map.clickLocked = true;
     },
 
 
@@ -138,6 +139,7 @@ L.Polyline.EditMixin = {
         this.fire('nodeschanged');
         this._drawingDirection = 0;
         L.DomUtil.removeClass(this._map._container, 'leaflet-line-drawing');
+        this._map.clickLocked = false;
 
     },