Merge pull request #21 from codeofsumit/develop

Bug Fixes
geoman-io · Feb 21, 2016 · 42ee15a · 42ee15a
2 parents 41304c0 + 81cd053
commit 42ee15a
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 9 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -1,5 +1,9 @@
 var map2 = L.map('example2').setView([51.505, -0.09], 13);
 
+map2.on('pm:create', function(newPoly) {
+    alert('pm:create event fired');    
+});
+
 L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
     attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
 }).addTo(map2);

diff --git a/dist/leaflet.pm.js b/dist/leaflet.pm.js
@@ -57,9 +57,16 @@ L.PM = L.PM || {
 
         var myButton = new L.Control.PMButton(drawPolyButton).addTo(map);
 
-        map.on('pm:create', function() {
-            // fire button click to toggle / disable
-            myButton._clicked();
+        map.on('pm:drawstart', function() {
+            if(!myButton.toggled()) {
+                myButton._clicked();
+            }
+        });
+
+        map.on('pm:drawend', function() {
+            if(myButton.toggled()) {
+                myButton._clicked();
+            }
         });
 
         return [myButton];
@@ -141,7 +148,6 @@ L.Control.PMButton = L.Control.extend({
         image.setAttribute('src', button.iconUrl);
 
         L.DomEvent
-            .addListener(newButton, 'click', L.DomEvent.stop)
             .addListener(newButton, 'click', button.onClick, this)
             .addListener(newButton, 'click', this._clicked, this)
             .addListener(newButton, 'click', button.afterClick, this);
@@ -190,6 +196,8 @@ L.PM.Draw.Poly = {
             self.disable();
         };
 
+        this._map.fireEvent('pm:drawstart');
+
     },
     disable: function() {
 
@@ -199,6 +207,8 @@ L.PM.Draw.Poly = {
 
         this._map.removeLayer(this._layerGroup);
 
+        this._map.fireEvent('pm:drawend');
+
     },
     _createPolygonPoint: function(e) {
 
@@ -255,6 +265,8 @@ L.PM.Edit.Poly = L.Class.extend({
 
     enable: function() {
 
+        var self = this;
+
         if(!this.enabled()) {
             this._enabled = true;
 
@@ -266,6 +278,10 @@ L.PM.Edit.Poly = L.Class.extend({
             }
 
             this._poly._map.addLayer(this._markerGroup);
+
+            this._poly.on('remove', function() {
+                self.disable();
+            });
         }
 
     },

diff --git a/dist/leaflet.pm.min.js b/dist/leaflet.pm.min.js
diff --git a/src/js/L.Controls.js b/src/js/L.Controls.js
@@ -70,7 +70,6 @@ L.Control.PMButton = L.Control.extend({
         image.setAttribute('src', button.iconUrl);
 
         L.DomEvent
-            .addListener(newButton, 'click', L.DomEvent.stop)
             .addListener(newButton, 'click', button.onClick, this)
             .addListener(newButton, 'click', this._clicked, this)
             .addListener(newButton, 'click', button.afterClick, this);

diff --git a/src/js/L.PM.Draw.Poly.js b/src/js/L.PM.Draw.Poly.js
@@ -20,6 +20,8 @@ L.PM.Draw.Poly = {
             self.disable();
         };
 
+        this._map.fireEvent('pm:drawstart');
+
     },
     disable: function() {
 
@@ -29,6 +31,8 @@ L.PM.Draw.Poly = {
 
         this._map.removeLayer(this._layerGroup);
 
+        this._map.fireEvent('pm:drawend');
+
     },
     _createPolygonPoint: function(e) {
 

diff --git a/src/js/L.PM.Edit.Poly.js b/src/js/L.PM.Edit.Poly.js
@@ -15,6 +15,8 @@ L.PM.Edit.Poly = L.Class.extend({
 
     enable: function() {
 
+        var self = this;
+
         if(!this.enabled()) {
             this._enabled = true;
 
@@ -26,6 +28,10 @@ L.PM.Edit.Poly = L.Class.extend({
             }
 
             this._poly._map.addLayer(this._markerGroup);
+
+            this._poly.on('remove', function() {
+                self.disable();
+            });
         }
 
     },

diff --git a/src/js/L.PM.js b/src/js/L.PM.js
@@ -57,9 +57,16 @@ L.PM = L.PM || {
 
         var myButton = new L.Control.PMButton(drawPolyButton).addTo(map);
 
-        map.on('pm:create', function() {
-            // fire button click to toggle / disable
-            myButton._clicked();
+        map.on('pm:drawstart', function() {
+            if(!myButton.toggled()) {
+                myButton._clicked();
+            }
+        });
+
+        map.on('pm:drawend', function() {
+            if(myButton.toggled()) {
+                myButton._clicked();
+            }
         });
 
         return [myButton];