Update Leaflet plugins (EditinOSM, search, providers, contextmenu, markercluster)

Author: xbgmsharp

leaflet/Leaflet.EditInOSM.css

@@ -12,7 +12,7 @@
     display: block;
 }
 .leaflet-control-edit-in-osm .leaflet-control-edit-in-osm-toggle {
-    background-image: url("images/edit-in-osm.png");
+    background-image: url("./edit-in-osm.png");
 }
 .leaflet-control-edit-in-osm .osm-editor + .osm-editor {
     border-left: 1px solid black;

leaflet/Leaflet.EditInOSM.js

@@ -39,7 +39,7 @@
 
         _Editors = {
             Id: function (config) {
-                var url = 'http://openstreetmap.us/iD/release/#map=',
+                var url = 'https://www.openstreetmap.org/edit?editor=id#map=',
                     displayName = "iD",
                     buildUrl = function (map) {
                         return this.url + [
@@ -152,9 +152,9 @@
 
             // setup widget from string or object
             if (widgetSmallName === "multibutton") {
-                this.options.widget = new _Widgets.MultiButton();
+                this.options.widget = new _Widgets.MultiButton(this.options.widgetOptions);
             } else if (widgetSmallName === "attributionbox") {
-                this.options.widget = new _Widgets.AttributionBox();
+                this.options.widget = new _Widgets.AttributionBox(this.options.widgetOptions);
             }
 
             // setup editors from strings or objects

leaflet/leaflet-providers.js

@@ -30,7 +30,7 @@
 					options: L.Util.extend({}, provider.options, variant.options)
 				};
 			} else if (typeof provider.url === 'function') {
-				provider.url = provider.url(parts.splice(1).join('.'));
+				provider.url = provider.url(parts.splice(1, parts.length - 1).join('.'));
 			}
 
 			// replace attribution placeholders with their values from toplevel provider attribution,
@@ -456,7 +456,7 @@
 					    i = 0;
 
 					while (i < len) {
-						if (typeof base[i] === 'string') {
+						if (typeof overlay[i] === 'string') {
 							out[labelFormatter(overlay[i])] = L.tileLayer.provider(overlay[i]);
 						}
 						i++;

leaflet/leaflet-search.min.css

@@ -1,5 +1,5 @@
 /* 
- * Leaflet Search Control v1.4.7 - 2014-01-04 
+ * Leaflet Search Control v1.4.7 - 2014-02-07 
  * 
  * Copyright 2014 Stefano Cudini 
  * stefano.cudini@gmail.com 

leaflet/leaflet-search.min.js

@@ -1,5 +1,5 @@
 /* 
- * Leaflet Search Control v1.4.7 - 2014-01-04 
+ * Leaflet Search Control v1.4.7 - 2014-02-07 
  * 
  * Copyright 2014 Stefano Cudini 
  * stefano.cudini@gmail.com 

leaflet/leaflet-search.mobile.min.css

@@ -1,5 +1,5 @@
 /* 
- * Leaflet Search Control v1.4.7 - 2014-01-04 
+ * Leaflet Search Control v1.4.7 - 2014-02-07 
  * 
  * Copyright 2014 Stefano Cudini 
  * stefano.cudini@gmail.com 
@@ -44,7 +44,7 @@
 	margin:3px 0 3px 3px;
 }
 .leaflet-control-search.search-load .search-input {
-	background: url('images/loader.gif') no-repeat center right #fff;
+	background: url('../images/loader.gif') no-repeat center right #fff;
 }
 .leaflet-control-search.search-load .search-cancel {
 	visibility:hidden;
@@ -56,7 +56,7 @@
 	position:absolute;
 	right:22px;
 	margin:3px 0;
-	background: url('images/search-icon.png') no-repeat 0 -46px;
+	background: url('../images/search-icon.png') no-repeat 0 -46px;
 	text-decoration:none;
 	filter: alpha(opacity=80);
 	opacity: 0.8;		
@@ -80,11 +80,11 @@
 	float:left;
 	width:26px;
 	height:26px;	
-	background: url('images/search-icon.png') no-repeat 2px 2px;
+	background: url('../images/search-icon.png') no-repeat 2px 2px;
 	border-radius:4px;
 }
 .leaflet-control-search .search-button:hover {
-	background: url('images/search-icon.png') no-repeat 2px -22px;
+	background: url('../images/search-icon.png') no-repeat 2px -22px;
 }
 .leaflet-control-search .search-tooltip {
 	position:absolute;

leaflet/leaflet-search.mobile.src.css

@@ -1,5 +1,5 @@
 /* 
- * Leaflet Search Control v1.4.7 - 2014-01-04 
+ * Leaflet Search Control v1.4.7 - 2014-02-07 
  * 
  * Copyright 2014 Stefano Cudini 
  * stefano.cudini@gmail.com 
@@ -14,7 +14,6 @@
  * git@github.com:stefanocudini/leaflet-search.git 
  * 
  */
-
 (function() {
 
 L.Control.Search = L.Control.extend({
@@ -91,7 +90,7 @@ L.Control.Search = L.Control.extend({
 		 map.on({
 		// 		'layeradd': this._onLayerAddRemove,
 		// 		'layerremove': this._onLayerAddRemove
-		     'resize':this._handleAutoresize()
+		     'resize': this._handleAutoresize
 		 	}, this);
 		return this._container;
 	},

leaflet/leaflet-search.src.css

@@ -1,7 +1,3 @@
-/*
-	Leaflet.contextmenu, a context menu for Leaflet.
-	(c) 2013, Adam Ratcliffe, GeoSmart Maps Limited
-*/
 L.Map.mergeOptions({
 	contextmenuItems: []
 });
@@ -167,7 +163,7 @@ L.Map.ContextMenu = L.Handler.extend({
 		var itemCls = L.Map.ContextMenu.BASE_CLS + '-item', 
 		    cls = options.disabled ? (itemCls + ' ' + itemCls + '-disabled') : itemCls,
 		    el = this._insertElementAt('a', cls, container, index),
-		    callback = this._createEventHandler(el, options.callback, options.context),
+		    callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect),
 		    html = '';
 
 		if (options.icon) {
@@ -232,18 +228,24 @@ L.Map.ContextMenu = L.Handler.extend({
 		};
 	},
 
-	_createEventHandler: function (el, func, context) {
+	_createEventHandler: function (el, func, context, hideOnSelect) {
 		var me = this,
 		    map = this._map,
-		    disabledCls = L.Map.ContextMenu.BASE_CLS + '-item-disabled';
+		    disabledCls = L.Map.ContextMenu.BASE_CLS + '-item-disabled',
+		    hideOnSelect = (hideOnSelect !== undefined) ? hideOnSelect : true;
 
 		return function (e) {
 			if (L.DomUtil.hasClass(el, disabledCls)) {
 				return;
 			}
+			
+			if (hideOnSelect) {
+				me._hide();			
+			}
 
-			me._hide();			
-			func.call(context || map, me._showLocation);			
+			if (func) {
+				func.call(context || map, me._showLocation);			
+			}
 
 			me._map.fire('contextmenu:select', {
 				contextmenu: me,