drawing state is now synced with drawing button state

geoman-io · Feb 20, 2016 · 81cd053 · 81cd053
1 parent bd189d1
commit 81cd053
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -1,8 +1,7 @@
 var map2 = L.map('example2').setView([51.505, -0.09], 13);
 
 map2.on('pm:create', function(newPoly) {
-    alert('pm:create event fired');
-    console.log(newPoly);
+    alert('pm:create event fired');    
 });
 
 L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {

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];
@@ -189,6 +196,8 @@ L.PM.Draw.Poly = {
             self.disable();
         };
 
+        this._map.fireEvent('pm:drawstart');
+
     },
     disable: function() {
 
@@ -198,6 +207,8 @@ L.PM.Draw.Poly = {
 
         this._map.removeLayer(this._layerGroup);
 
+        this._map.fireEvent('pm:drawend');
+
     },
     _createPolygonPoint: function(e) {
 

diff --git a/dist/leaflet.pm.min.js b/dist/leaflet.pm.min.js
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.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];