leaflet-js 0.7.0.4 → 0.7.7

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/draw/handler/Draw.Circle.js

@@ -43,7 +43,6 @@ L.Draw.Circle = L.Draw.SimpleShape.extend({
 
 	_onMouseMove: function (e) {
 		var latlng = e.latlng,
-			metric = this.options.metric,
 			showRadius = this.options.showRadius,
 			useMetric = this.options.metric,
 			radius;
@@ -52,12 +51,12 @@ L.Draw.Circle = L.Draw.SimpleShape.extend({
 		if (this._isDrawing) {
 			this._drawShape(latlng);
 
-			// Get the new radius (rouded to 1 dp)
+			// Get the new radius (rounded to 1 dp)
 			radius = this._shape.getRadius().toFixed(1);
 
 			this._tooltip.updateContent({
 				text: this._endLabelText,
-				subtext: showRadius ? 'Radius: ' + L.GeometryUtil.readableDistance(radius, useMetric) : ''
+				subtext: showRadius ? L.drawLocal.draw.handlers.circle.radius + ': ' + L.GeometryUtil.readableDistance(radius, useMetric) : ''
 			});
 		}
 	}

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/draw/handler/Draw.Feature.js

@@ -31,9 +31,9 @@ L.Draw.Feature = L.Handler.extend({
 
 		L.Handler.prototype.disable.call(this);
 
-		this.fire('disabled', { handler: this.type });
-
 		this._map.fire('draw:drawstop', { layerType: this.type });
+
+		this.fire('disabled', { handler: this.type });
 	},
 
 	addHooks: function () {
@@ -46,7 +46,7 @@ L.Draw.Feature = L.Handler.extend({
 
 			this._tooltip = new L.Tooltip(this._map);
 
-			L.DomEvent.addListener(this._container, 'keyup', this._cancelDrawing, this);
+			L.DomEvent.on(this._container, 'keyup', this._cancelDrawing, this);
 		}
 	},
 
@@ -57,7 +57,7 @@ L.Draw.Feature = L.Handler.extend({
 			this._tooltip.dispose();
 			this._tooltip = null;
 
-			L.DomEvent.removeListener(this._container, 'keyup', this._cancelDrawing);
+			L.DomEvent.off(this._container, 'keyup', this._cancelDrawing, this);
 		}
 	},
 

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/draw/handler/Draw.Polygon.js

@@ -29,7 +29,7 @@ L.Draw.Polygon = L.Draw.Polyline.extend({
 	_updateFinishHandler: function () {
 		var markerCount = this._markers.length;
 
-		// The first marker shold have a click handler to close the polygon
+		// The first marker should have a click handler to close the polygon
 		if (markerCount === 1) {
 			this._markers[0].on('click', this._finishShape, this);
 		}
@@ -76,15 +76,17 @@ L.Draw.Polygon = L.Draw.Polyline.extend({
 		return this._markers.length >= 3;
 	},
 
-	_vertexAdded: function () {
+	_vertexChanged: function (latlng, added) {
+		var latLngs;
+
 		// Check to see if we should show the area
-		if (this.options.allowIntersection || !this.options.showArea) {
-			return;
-		}
+		if (!this.options.allowIntersection && this.options.showArea) {
+			latLngs = this._poly.getLatLngs();
 
-		var latLngs = this._poly.getLatLngs();
+			this._area = L.GeometryUtil.geodesicArea(latLngs);
+		}
 
-		this._area = L.GeometryUtil.geodesicArea(latLngs);
+		L.Draw.Polyline.prototype._vertexChanged.call(this, latlng, added);
 	},
 
 	_cleanUpShape: function () {

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/draw/handler/Draw.Polyline.js

@@ -17,6 +17,7 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 			className: 'leaflet-div-icon leaflet-editing-icon'
 		}),
 		guidelineDistance: 20,
+		maxGuideLineLength: 4000,
 		shapeOptions: {
 			stroke: true,
 			color: '#f06eaa',
@@ -75,11 +76,12 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 			}
 
 			this._mouseMarker
-				.on('click', this._onClick, this)
+				.on('mousedown', this._onMouseDown, this)
 				.addTo(this._map);
 
 			this._map
 				.on('mousemove', this._onMouseMove, this)
+				.on('mouseup', this._onMouseUp, this)
 				.on('zoomend', this._onZoomEnd, this);
 		}
 	},
@@ -99,7 +101,9 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 		this._map.removeLayer(this._poly);
 		delete this._poly;
 
-		this._mouseMarker.off('click', this._onClick, this);
+		this._mouseMarker
+			.off('mousedown', this._onMouseDown, this)
+			.off('mouseup', this._onMouseUp, this);
 		this._map.removeLayer(this._mouseMarker);
 		delete this._mouseMarker;
 
@@ -111,6 +115,46 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 			.off('zoomend', this._onZoomEnd, this);
 	},
 
+	deleteLastVertex: function () {
+		if (this._markers.length <= 1) {
+			return;
+		}
+
+		var lastMarker = this._markers.pop(),
+			poly = this._poly,
+			latlng = this._poly.spliceLatLngs(poly.getLatLngs().length - 1, 1)[0];
+
+		this._markerGroup.removeLayer(lastMarker);
+
+		if (poly.getLatLngs().length < 2) {
+			this._map.removeLayer(poly);
+		}
+
+		this._vertexChanged(latlng, false);
+	},
+
+	addVertex: function (latlng) {
+		var markersLength = this._markers.length;
+
+		if (markersLength > 0 && !this.options.allowIntersection && this._poly.newLatLngIntersects(latlng)) {
+			this._showErrorTooltip();
+			return;
+		}
+		else if (this._errorShown) {
+			this._hideErrorTooltip();
+		}
+
+		this._markers.push(this._createMarker(latlng));
+
+		this._poly.addLatLng(latlng);
+
+		if (this._poly.getLatLngs().length === 2) {
+			this._map.addLayer(this._poly);
+		}
+
+		this._vertexChanged(latlng, true);
+	},
+
 	_finishShape: function () {
 		var intersects = this._poly.newLatLngIntersects(this._poly.getLatLngs()[0], true);
 
@@ -155,35 +199,34 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 		L.DomEvent.preventDefault(e.originalEvent);
 	},
 
-	_onClick: function (e) {
-		var latlng = e.target.getLatLng(),
-			markerCount = this._markers.length;
-
-		if (markerCount > 0 && !this.options.allowIntersection && this._poly.newLatLngIntersects(latlng)) {
-			this._showErrorTooltip();
-			return;
-		}
-		else if (this._errorShown) {
-			this._hideErrorTooltip();
-		}
-
-		this._markers.push(this._createMarker(latlng));
-
-		this._poly.addLatLng(latlng);
-
-		if (this._poly.getLatLngs().length === 2) {
-			this._map.addLayer(this._poly);
-		}
-
+	_vertexChanged: function (latlng, added) {
 		this._updateFinishHandler();
 
-		this._vertexAdded(latlng);
+		this._updateRunningMeasure(latlng, added);
 
 		this._clearGuides();
 
 		this._updateTooltip();
 	},
 
+	_onMouseDown: function (e) {
+		var originalEvent = e.originalEvent;
+		this._mouseDownOrigin = L.point(originalEvent.clientX, originalEvent.clientY);
+	},
+
+	_onMouseUp: function (e) {
+		if (this._mouseDownOrigin) {
+			// We detect clicks within a certain tolerance, otherwise let it
+			// be interpreted as a drag by the map
+			var distance = L.point(e.originalEvent.clientX, e.originalEvent.clientY)
+				.distanceTo(this._mouseDownOrigin);
+			if (Math.abs(distance) < 9 * (window.devicePixelRatio || 1)) {
+				this.addVertex(e.latlng);
+			}
+		}
+		this._mouseDownOrigin = null;
+	},
+
 	_updateFinishHandler: function () {
 		var markerCount = this._markers.length;
 		// The last marker should have a click handler to close the polyline
@@ -237,7 +280,10 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 
 	_drawGuide: function (pointA, pointB) {
 		var length = Math.floor(Math.sqrt(Math.pow((pointB.x - pointA.x), 2) + Math.pow((pointB.y - pointA.y), 2))),
-			i,
+			guidelineDistance = this.options.guidelineDistance,
+			maxGuideLineLength = this.options.maxGuideLineLength,
+			// Only draw a guideline with a max length
+			i = length > maxGuideLineLength ? length - maxGuideLineLength : guidelineDistance,
 			fraction,
 			dashPoint,
 			dash;
@@ -248,7 +294,7 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 		}
 
 		//draw a dash every GuildeLineDistance
-		for (i = this.options.guidelineDistance; i < length; i += this.options.guidelineDistance) {
+		for (; i < length; i += this.options.guidelineDistance) {
 			//work out fraction along line we are
 			fraction = i / length;
 
@@ -286,7 +332,7 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 
 	_getTooltipText: function () {
 		var showLength = this.options.showLength,
-			labelText, distance, distanceStr;
+			labelText, distanceStr;
 
 		if (this._markers.length === 0) {
 			labelText = {
@@ -310,6 +356,20 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 		return labelText;
 	},
 
+	_updateRunningMeasure: function (latlng, added) {
+		var markersLength = this._markers.length,
+			previousMarkerIndex, distance;
+
+		if (this._markers.length === 1) {
+			this._measurementRunningTotal = 0;
+		} else {
+			previousMarkerIndex = markersLength - (added ? 2 : 1);
+			distance = latlng.distanceTo(this._markers[previousMarkerIndex].getLatLng());
+
+			this._measurementRunningTotal += distance * (added ? 1 : -1);
+		}
+	},
+
 	_getMeasurementString: function () {
 		var currentLatLng = this._currentLatLng,
 			previousLatLng = this._markers[this._markers.length - 1].getLatLng(),
@@ -360,16 +420,6 @@ L.Draw.Polyline = L.Draw.Feature.extend({
 		}
 	},
 
-	_vertexAdded: function (latlng) {
-		if (this._markers.length === 1) {
-			this._measurementRunningTotal = 0;
-		}
-		else {
-			this._measurementRunningTotal +=
-				latlng.distanceTo(this._markers[this._markers.length - 2].getLatLng());
-		}
-	},
-
 	_cleanUpShape: function () {
 		if (this._markers.length > 1) {
 			this._markers[this._markers.length - 1].off('click', this._finishShape, this);

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/draw/handler/Draw.Rectangle.js

@@ -13,7 +13,8 @@ L.Draw.Rectangle = L.Draw.SimpleShape.extend({
 			fillColor: null, //same as color by default
 			fillOpacity: 0.2,
 			clickable: true
-		}
+		},
+		metric: true // Whether to use the metric meaurement system or imperial
 	},
 
 	initialize: function (map, options) {
@@ -37,5 +38,22 @@ L.Draw.Rectangle = L.Draw.SimpleShape.extend({
 	_fireCreatedEvent: function () {
 		var rectangle = new L.Rectangle(this._shape.getBounds(), this.options.shapeOptions);
 		L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, rectangle);
+	},
+
+	_getTooltipText: function () {
+		var tooltipText = L.Draw.SimpleShape.prototype._getTooltipText.call(this),
+			shape = this._shape,
+			latLngs, area, subtext;
+
+		if (shape) {
+			latLngs = this._shape.getLatLngs();
+			area = L.GeometryUtil.geodesicArea(latLngs);
+			subtext = L.GeometryUtil.readableArea(area, this.options.metric);
+		}
+
+		return {
+			text: tooltipText.text,
+			subtext: subtext
+		};
 	}
 });

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/draw/handler/Draw.SimpleShape.js

@@ -14,7 +14,12 @@ L.Draw.SimpleShape = L.Draw.Feature.extend({
 	addHooks: function () {
 		L.Draw.Feature.prototype.addHooks.call(this);
 		if (this._map) {
-			this._map.dragging.disable();
+			this._mapDraggable = this._map.dragging.enabled();
+
+			if (this._mapDraggable) {
+				this._map.dragging.disable();
+			}
+
 			//TODO refactor: move cursor to styles
 			this._container.style.cursor = 'crosshair';
 
@@ -29,7 +34,10 @@ L.Draw.SimpleShape = L.Draw.Feature.extend({
 	removeHooks: function () {
 		L.Draw.Feature.prototype.removeHooks.call(this);
 		if (this._map) {
-			this._map.dragging.enable();
+			if (this._mapDraggable) {
+				this._map.dragging.enable();
+			}
+
 			//TODO refactor: move cursor to styles
 			this._container.style.cursor = '';
 
@@ -37,7 +45,7 @@ L.Draw.SimpleShape = L.Draw.Feature.extend({
 				.off('mousedown', this._onMouseDown, this)
 				.off('mousemove', this._onMouseMove, this);
 
-			L.DomEvent.off(document, 'mouseup', this._onMouseUp);
+			L.DomEvent.off(document, 'mouseup', this._onMouseUp, this);
 
 			// If the box element doesn't exist they must not have moved the mouse, so don't need to destroy/return
 			if (this._shape) {
@@ -48,6 +56,12 @@ L.Draw.SimpleShape = L.Draw.Feature.extend({
 		this._isDrawing = false;
 	},
 
+	_getTooltipText: function () {
+		return {
+			text: this._endLabelText
+		};
+	},
+
 	_onMouseDown: function (e) {
 		this._isDrawing = true;
 		this._startLatLng = e.latlng;
@@ -62,7 +76,7 @@ L.Draw.SimpleShape = L.Draw.Feature.extend({
 
 		this._tooltip.updatePosition(latlng);
 		if (this._isDrawing) {
-			this._tooltip.updateContent({ text: this._endLabelText });
+			this._tooltip.updateContent(this._getTooltipText());
 			this._drawShape(latlng);
 		}
 	},

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/edit/EditToolbar.js

@@ -3,6 +3,10 @@
 });*/
 
 L.EditToolbar = L.Toolbar.extend({
+	statics: {
+		TYPE: 'edit'
+	},
+
 	options: {
 		edit: {
 			selectedPathOptions: {
@@ -12,7 +16,10 @@ L.EditToolbar = L.Toolbar.extend({
 
 				fill: true,
 				fillColor: '#fe57a1',
-				fillOpacity: 0.1
+				fillOpacity: 0.1,
+
+				// Whether to user the existing layers color
+				maintainColor: false
 			}
 		},
 		remove: {},
@@ -25,58 +32,42 @@ L.EditToolbar = L.Toolbar.extend({
 			if (typeof options.edit.selectedPathOptions === 'undefined') {
 				options.edit.selectedPathOptions = this.options.edit.selectedPathOptions;
 			}
-			options.edit = L.extend({}, this.options.edit, options.edit);
+			options.edit.selectedPathOptions = L.extend({}, this.options.edit.selectedPathOptions, options.edit.selectedPathOptions);
 		}
 
 		if (options.remove) {
 			options.remove = L.extend({}, this.options.remove, options.remove);
 		}
 
+		this._toolbarClass = 'leaflet-draw-edit';
 		L.Toolbar.prototype.initialize.call(this, options);
 
 		this._selectedFeatureCount = 0;
 	},
 
-	addToolbar: function (map) {
-		var container = L.DomUtil.create('div', 'leaflet-draw-section'),
-			buttonIndex = 0,
-			buttonClassPrefix = 'leaflet-draw-edit',
-			featureGroup = this.options.featureGroup;
-
-		this._toolbarContainer = L.DomUtil.create('div', 'leaflet-draw-toolbar leaflet-bar');
-
-		this._map = map;
-
-		if (this.options.edit) {
-			this._initModeHandler(
-				new L.EditToolbar.Edit(map, {
+	getModeHandlers: function (map) {
+		var featureGroup = this.options.featureGroup;
+		return [
+			{
+				enabled: this.options.edit,
+				handler: new L.EditToolbar.Edit(map, {
 					featureGroup: featureGroup,
 					selectedPathOptions: this.options.edit.selectedPathOptions
 				}),
-				this._toolbarContainer,
-				buttonIndex++,
-				buttonClassPrefix,
-				L.drawLocal.edit.toolbar.buttons.edit
-			);
-		}
-
-		if (this.options.remove) {
-			this._initModeHandler(
-				new L.EditToolbar.Delete(map, {
+				title: L.drawLocal.edit.toolbar.buttons.edit
+			},
+			{
+				enabled: this.options.remove,
+				handler: new L.EditToolbar.Delete(map, {
 					featureGroup: featureGroup
 				}),
-				this._toolbarContainer,
-				buttonIndex++,
-				buttonClassPrefix,
-				L.drawLocal.edit.toolbar.buttons.remove
-			);
-		}
-
-		// Save button index of the last button, -1 as we would have ++ after the last button
-		this._lastButtonIndex = --buttonIndex;
+				title: L.drawLocal.edit.toolbar.buttons.remove
+			}
+		];
+	},
 
-		// Create the actions part of the toolbar
-		this._actionsContainer = this._createActions([
+	getActions: function () {
+		return [
 			{
 				title: L.drawLocal.edit.toolbar.actions.save.title,
 				text: L.drawLocal.edit.toolbar.actions.save.text,
@@ -89,23 +80,23 @@ L.EditToolbar = L.Toolbar.extend({
 				callback: this.disable,
 				context: this
 			}
-		]);
+		];
+	},
 
-		// Add draw and cancel containers to the control container
-		container.appendChild(this._toolbarContainer);
-		container.appendChild(this._actionsContainer);
+	addToolbar: function (map) {
+		var container = L.Toolbar.prototype.addToolbar.call(this, map);
 
 		this._checkDisabled();
 
-		featureGroup.on('layeradd layerremove', this._checkDisabled, this);
+		this.options.featureGroup.on('layeradd layerremove', this._checkDisabled, this);
 
 		return container;
 	},
 
 	removeToolbar: function () {
-		L.Toolbar.prototype.removeToolbar.call(this);
-
 		this.options.featureGroup.off('layeradd layerremove', this._checkDisabled, this);
+
+		L.Toolbar.prototype.removeToolbar.call(this);
 	},
 
 	disable: function () {