Merge pull request Leaflet#507 from wandergis/master

fixed bug when use with layercontrol
jacobsvante · May 20, 2016 · 096d404 · 096d404
2 parents 3e1e215 + 6e8af49
commit 096d404
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/examples/full.html b/examples/full.html
@@ -48,9 +48,14 @@
 		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
 			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
 			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
-			map = new L.Map('map', {layers: [osm], center: new L.LatLng(51.505, -0.04), zoom: 13}),
+			map = new L.Map('map', {center: new L.LatLng(51.505, -0.04), zoom: 13}),
 			drawnItems = L.featureGroup().addTo(map);
-
+		L.control.layers({
+		 'osm':osm.addTo(map),
+		 "google": L.tileLayer('http://www.google.cn/maps/vt?lyrs=s@189&gl=cn&x={x}&y={y}&z={z}', {
+                attribution: 'google'
+            })
+		}, {'drawlayer':drawnItems}, { position: 'topleft', collapsed: false }).addTo(map);
 		map.addControl(new L.Control.Draw({
 			edit: {
 				featureGroup: drawnItems,

diff --git a/src/draw/handler/Draw.Polyline.js b/src/draw/handler/Draw.Polyline.js
@@ -300,7 +300,7 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 	},
 
 	_updateGuide: function (newPos) {
-		var markerCount = this._markers.length;
+		var markerCount = this._markers ? this._markers.length : 0;
 
 		if (markerCount > 0) {
 			newPos = newPos || this._map.latLngToLayerPoint(this._currentLatLng);