leaflet-js 0.7.9 → 0.8.dev2

data/lib/leaflet.draw/spec/spec.hintrc.js

@@ -0,0 +1,25 @@
+{
+        "browser": true,
+        "node": true,
+        "predef": ["define", "L", "expect", "describe", "it", "sinon", "happen", "beforeEach", "afterEach"],
+        "strict": false,
+        "bitwise": true,
+        "camelcase": true,
+        "curly": true,
+        "eqeqeq": true,
+        "forin": false,
+        "immed": true,
+        "latedef": true,
+        "newcap": true,
+        "noarg": true,
+        "noempty": true,
+        "nonew": true,
+        "undef": true,
+        // "unused": true,
+        // "quotmark": "single",
+        "indent": 4,
+        "trailing": true,
+        "white": true,
+        "smarttabs": true
+        // "maxlen": 120
+}

data/lib/leaflet.draw/spec/suites/DrawControlSpec.js

@@ -0,0 +1,14 @@
+describe("Control.Draw", function () {
+	var map, control, container;
+
+	beforeEach(function () {
+		map = L.map(document.createElement('div'));
+		control = new L.Control.Draw({});
+		map.addControl(control);
+		container = control.getContainer();
+	});
+
+	it("exists", function () {
+		expect(container.innerHTML).to.be.ok();
+	});
+});

data/lib/leaflet.draw/spec/suites/GeometryUtilSpec.js

@@ -0,0 +1,25 @@
+describe("L.GeometryUtil", function () {
+	var map, control, container;
+
+	it("geodesicArea", function () {
+		expect(L.GeometryUtil.geodesicArea([
+			{ lat: 0,  lng: 0 },
+			{ lat: 0,  lng: 10 },
+			{ lat: 10, lng: 10 },
+			{ lat: 10, lng: 0 },
+			{ lat: 0,  lng: 0 }
+		])).to.eql(1232921098571.292);
+	});
+
+	describe("readableDistance", function () {
+		it("metric", function () {
+			expect(L.GeometryUtil.readableDistance(1000, true)).to.eql('1000 m');
+			expect(L.GeometryUtil.readableDistance(1500, true)).to.eql('1.50 km');
+		});
+
+		it("imperial", function () {
+			expect(L.GeometryUtil.readableDistance(1609.3488537961)).to.eql('1760 yd');
+			expect(L.GeometryUtil.readableDistance(1610.3488537961)).to.eql('1.00 miles');
+		});
+	});
+});

data/lib/leaflet.draw/spec/suites/LatLngUtilSpec.js

@@ -0,0 +1,11 @@
+describe("L.LatLngUtil", function () {
+	it("cloneLatLngs", function () {
+		var latLngs = [{ lat: 0, lng: 0 }],
+			clone = L.LatLngUtil.cloneLatLngs(latLngs);
+
+		expect(clone[0].lat).to.eql(latLngs[0].lat);
+
+		clone[0].lat = 10;
+		expect(latLngs[0].lat).to.eql(0);
+	});
+});

data/lib/leaflet.draw/spec/suites/SpecHelper.js

@@ -0,0 +1,28 @@
+if (!Array.prototype.map) {
+	Array.prototype.map = function (fun /*, thisp */) {
+		"use strict";
+
+		if (this === void 0 || this === null) {
+			throw new TypeError();
+		}
+
+		var t = Object(this),
+			// jshint bitwise: false
+			len = t.length >>> 0;
+
+		if (typeof fun !== 'function') {
+			throw new TypeError();
+		}
+
+		var res = new Array(len),
+			thisp = arguments[1];
+
+		for (var i = 0; i < len; i++) {
+			if (i in t) {
+				res[i] = fun.call(thisp, t[i], i, t);
+			}
+		}
+
+		return res;
+	};
+}

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

@@ -13,27 +13,27 @@ L.Control.Draw = L.Control.extend({
 
 		L.Control.prototype.initialize.call(this, options);
 
-		var toolbar;
+		var id, toolbar;
 
 		this._toolbars = {};
 
 		// Initialize toolbars
 		if (L.DrawToolbar && this.options.draw) {
 			toolbar = new L.DrawToolbar(this.options.draw);
-
-			this._toolbars[L.DrawToolbar.TYPE] = toolbar;
+			id = L.stamp(toolbar);
+			this._toolbars[id] = toolbar;
 
 			// Listen for when toolbar is enabled
-			this._toolbars[L.DrawToolbar.TYPE].on('enable', this._toolbarEnabled, this);
+			this._toolbars[id].on('enable', this._toolbarEnabled, this);
 		}
 
 		if (L.EditToolbar && this.options.edit) {
 			toolbar = new L.EditToolbar(this.options.edit);
-
-			this._toolbars[L.EditToolbar.TYPE] = toolbar;
+			id = L.stamp(toolbar);
+			this._toolbars[id] = toolbar;
 
 			// Listen for when toolbar is enabled
-			this._toolbars[L.EditToolbar.TYPE].on('enable', this._toolbarEnabled, this);
+			this._toolbars[id].on('enable', this._toolbarEnabled, this);
 		}
 	},
 
@@ -81,10 +81,10 @@ L.Control.Draw = L.Control.extend({
 	},
 
 	_toolbarEnabled: function (e) {
-		var enabledToolbar = e.target;
+		var id = '' + L.stamp(e.target);
 
 		for (var toolbarId in this._toolbars) {
-			if (this._toolbars[toolbarId] !== enabledToolbar) {
+			if (this._toolbars.hasOwnProperty(toolbarId) && toolbarId !== id) {
 				this._toolbars[toolbarId].disable();
 			}
 		}

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

@@ -27,8 +27,7 @@ L.drawLocal = {
 			circle: {
 				tooltip: {
 					start: 'Click and drag to draw circle.'
-				},
-				radius: 'Radius'
+				}
 			},
 			marker: {
 				tooltip: {

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

@@ -1,9 +1,5 @@
 L.DrawToolbar = L.Toolbar.extend({
 
-	statics: {
-		TYPE: 'draw'
-	},
-
 	options: {
 		polyline: {},
 		polygon: {},

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

@@ -56,7 +56,7 @@ L.Draw.Circle = L.Draw.SimpleShape.extend({
 
 			this._tooltip.updateContent({
 				text: this._endLabelText,
-				subtext: showRadius ? L.drawLocal.draw.handlers.circle.radius + ': ' + L.GeometryUtil.readableDistance(radius, useMetric) : ''
+				subtext: showRadius ? 'Radius: ' + L.GeometryUtil.readableDistance(radius, useMetric) : ''
 			});
 		}
 	}

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

@@ -19,11 +19,11 @@ L.Draw.Feature = L.Handler.extend({
 	enable: function () {
 		if (this._enabled) { return; }
 
-		L.Handler.prototype.enable.call(this);
-
 		this.fire('enabled', { handler: this.type });
 
 		this._map.fire('draw:drawstart', { layerType: this.type });
+
+		L.Handler.prototype.enable.call(this);
 	},
 
 	disable: function () {

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

@@ -13,8 +13,7 @@ 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) {
@@ -38,22 +37,5 @@ 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/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.SimpleShape.js

@@ -56,12 +56,6 @@ 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;
@@ -76,7 +70,7 @@ L.Draw.SimpleShape = L.Draw.Feature.extend({
 
 		this._tooltip.updatePosition(latlng);
 		if (this._isDrawing) {
-			this._tooltip.updateContent(this._getTooltipText());
+			this._tooltip.updateContent({ text: this._endLabelText });
 			this._drawShape(latlng);
 		}
 	},

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

@@ -3,10 +3,6 @@
 });*/
 
 L.EditToolbar = L.Toolbar.extend({
-	statics: {
-		TYPE: 'edit'
-	},
-
 	options: {
 		edit: {
 			selectedPathOptions: {
@@ -16,10 +12,7 @@ L.EditToolbar = L.Toolbar.extend({
 
 				fill: true,
 				fillColor: '#fe57a1',
-				fillOpacity: 0.1,
-
-				// Whether to user the existing layers color
-				maintainColor: false
+				fillOpacity: 0.1
 			}
 		},
 		remove: {},
@@ -32,7 +25,7 @@ L.EditToolbar = L.Toolbar.extend({
 			if (typeof options.edit.selectedPathOptions === 'undefined') {
 				options.edit.selectedPathOptions = this.options.edit.selectedPathOptions;
 			}
-			options.edit.selectedPathOptions = L.extend({}, this.options.edit.selectedPathOptions, options.edit.selectedPathOptions);
+			options.edit = L.extend({}, this.options.edit, options.edit);
 		}
 
 		if (options.remove) {

data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/handler/Edit.Poly.js

@@ -18,14 +18,6 @@ L.Edit.Poly = L.Handler.extend({
 	},
 
 	addHooks: function () {
-		var poly = this._poly;
-
-		if (!(poly instanceof L.Polygon)) {
-			poly.options.editing.fill = false;
-		}
-
-		poly.setStyle(poly.options.editing);
-
 		if (this._poly._map) {
 			if (!this._markerGroup) {
 				this._initMarkers();
@@ -35,12 +27,8 @@ L.Edit.Poly = L.Handler.extend({
 	},
 
 	removeHooks: function () {
-		var poly = this._poly;
-
-		poly.setStyle(poly.options.original);
-
-		if (poly._map) {
-			poly._map.removeLayer(this._markerGroup);
+		if (this._poly._map) {
+			this._poly._map.removeLayer(this._markerGroup);
 			delete this._markerGroup;
 			delete this._markers;
 		}

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

@@ -18,12 +18,8 @@ L.Edit.SimpleShape = L.Handler.extend({
 	},
 
 	addHooks: function () {
-		var shape = this._shape;
-
-		shape.setStyle(shape.options.editing);
-
-		if (shape._map) {
-			this._map = shape._map;
+		if (this._shape._map) {
+			this._map = this._shape._map;
 
 			if (!this._markerGroup) {
 				this._initMarkers();
@@ -33,11 +29,7 @@ L.Edit.SimpleShape = L.Handler.extend({
 	},
 
 	removeHooks: function () {
-		var shape = this._shape;
-
-		shape.setStyle(shape.options.original);
-
-		if (shape._map) {
+		if (this._shape._map) {
 			this._unbindMarker(this._moveMarker);
 
 			for (var i = 0, l = this._resizeMarkers.length; i < l; i++) {

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

@@ -57,7 +57,7 @@ L.EditToolbar.Delete = L.Handler.extend({
 			map.getContainer().focus();
 
 			this._deletableLayers.eachLayer(this._enableLayerDelete, this);
-			this._deletedLayers = new L.LayerGroup();
+			this._deletedLayers = new L.layerGroup();
 
 			this._tooltip = new L.Tooltip(this._map);
 			this._tooltip.updateContent({ text: L.drawLocal.edit.handlers.remove.tooltip.text });
@@ -82,7 +82,6 @@ L.EditToolbar.Delete = L.Handler.extend({
 		// Iterate of the deleted layers and add them back into the featureGroup
 		this._deletedLayers.eachLayer(function (layer) {
 			this._deletableLayers.addLayer(layer);
-			layer.fire('revert-deleted', { layer: layer });
 		}, this);
 	},
 
@@ -111,8 +110,6 @@ L.EditToolbar.Delete = L.Handler.extend({
 		this._deletableLayers.removeLayer(layer);
 
 		this._deletedLayers.addLayer(layer);
-
-		layer.fire('deleted');
 	},
 
 	_onMouseMove: function (e) {

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

@@ -8,7 +8,8 @@ L.EditToolbar.Edit = L.Handler.extend({
 	initialize: function (map, options) {
 		L.Handler.prototype.initialize.call(this, map);
 
-		L.setOptions(this, options);
+		// Set options to the default unless already set
+		this._selectedPathOptions = options.selectedPathOptions;
 
 		// Store the selectable layer group for ease of access
 		this._featureGroup = options.featureGroup;
@@ -134,43 +135,108 @@ L.EditToolbar.Edit = L.Handler.extend({
 			} else if (layer instanceof L.Marker) { // Marker
 				layer.setLatLng(this._uneditedLayerProps[id].latlng);
 			}
+		}
+	},
+
+	_toggleMarkerHighlight: function (marker) {
+		if (!marker._icon) {
+			return;
+		}
+		// This is quite naughty, but I don't see another way of doing it. (short of setting a new icon)
+		var icon = marker._icon;
+
+		icon.style.display = 'none';
+
+		if (L.DomUtil.hasClass(icon, 'leaflet-edit-marker-selected')) {
+			L.DomUtil.removeClass(icon, 'leaflet-edit-marker-selected');
+			// Offset as the border will make the icon move.
+			this._offsetMarker(icon, -4);
 
-			layer.fire('revert-edited', { layer: layer });
+		} else {
+			L.DomUtil.addClass(icon, 'leaflet-edit-marker-selected');
+			// Offset as the border will make the icon move.
+			this._offsetMarker(icon, 4);
 		}
+
+		icon.style.display = '';
+	},
+
+	_offsetMarker: function (icon, offset) {
+		var iconMarginTop = parseInt(icon.style.marginTop, 10) - offset,
+			iconMarginLeft = parseInt(icon.style.marginLeft, 10) - offset;
+
+		icon.style.marginTop = iconMarginTop + 'px';
+		icon.style.marginLeft = iconMarginLeft + 'px';
 	},
 
 	_enableLayerEdit: function (e) {
 		var layer = e.layer || e.target || e,
+			isMarker = layer instanceof L.Marker,
 			pathOptions;
 
+		// Don't do anything if this layer is a marker but doesn't have an icon. Markers
+		// should usually have icons. If using Leaflet.draw with Leafler.markercluster there
+		// is a chance that a marker doesn't.
+		if (isMarker && !layer._icon) {
+			return;
+		}
+
 		// Back up this layer (if haven't before)
 		this._backupLayer(layer);
 
-		// Set different style for editing mode
-		if (this.options.selectedPathOptions) {
-			pathOptions = L.Util.extend({}, this.options.selectedPathOptions);
+		// Update layer style so appears editable
+		if (this._selectedPathOptions) {
+			pathOptions = L.Util.extend({}, this._selectedPathOptions);
 
-			// Use the existing color of the layer
-			if (pathOptions.maintainColor) {
-				pathOptions.color = layer.options.color;
-				pathOptions.fillColor = layer.options.fillColor;
-			}
+			if (isMarker) {
+				this._toggleMarkerHighlight(layer);
+			} else {
+				layer.options.previousOptions = L.Util.extend({ dashArray: null }, layer.options);
+
+				// Make sure that Polylines are not filled
+				if (!(layer instanceof L.Circle) && !(layer instanceof L.Polygon) && !(layer instanceof L.Rectangle)) {
+					pathOptions.fill = false;
+				}
 
-			layer.options.original = L.extend({}, layer.options);
-			layer.options.editing = pathOptions;
+				layer.setStyle(pathOptions);
+			}
 		}
 
-		layer.editing.enable();
+		if (isMarker) {
+			layer.dragging.enable();
+			layer.on('dragend', this._onMarkerDragEnd);
+		} else {
+			layer.editing.enable();
+		}
 	},
 
 	_disableLayerEdit: function (e) {
 		var layer = e.layer || e.target || e;
-
 		layer.edited = false;
-		layer.editing.disable();
 
-		delete layer.options.editing;
-		delete layer.options.original;
+		// Reset layer styles to that of before select
+		if (this._selectedPathOptions) {
+			if (layer instanceof L.Marker) {
+				this._toggleMarkerHighlight(layer);
+			} else {
+				// reset the layer style to what is was before being selected
+				layer.setStyle(layer.options.previousOptions);
+				// remove the cached options for the layer object
+				delete layer.options.previousOptions;
+			}
+		}
+
+		if (layer instanceof L.Marker) {
+			layer.dragging.disable();
+			layer.off('dragend', this._onMarkerDragEnd, this);
+		} else {
+			layer.editing.disable();
+		}
+	},
+
+	_onMarkerDragEnd: function (e) {
+		var layer = e.target;
+		layer.edited = true;
 	},
 
 	_onMouseMove: function (e) {