Update Leaflet search plugin and Add Leaflet EditinOSM plugin

Author: xbgmsharp

admin/admin_photo.php

@@ -123,11 +123,11 @@
 // Generate Javascript
 // Override configuration due to the use of leaflet-providers.js
 // ----------------------------------------
-$js = "\nvar map = L.map('map', { 'zoomControl': false, }).setView([".$lat.", ".$lon."], ".$zoom.");
+$js = "\nvar map = L.map('map', { 'zoomControl': false, editInOSMControlOptions: { editors: ['id'] }, }).setView([".$lat.", ".$lon."], ".$zoom.");
 
 L.tileLayer('".$baselayerurl."', { maxZoom: 18 }).addTo(map);
 
-map.addControl(L.control.zoom({position: 'topright'}));
+map.addControl(L.control.zoom({position: 'topleft'}));
 
 L.marker([".$lat.", ".$lon."]).addTo(map)
 	.bindPopup('".render_element_name($picture)."').openPopup();

admin/admin_photo.tpl

@@ -1,10 +1,12 @@
 {html_head}
-<link rel="stylesheet" href="{$OSM_PATH}/fontello/css/osm.css" />
+<link rel="stylesheet" href="{$OSM_PATH}fontello/css/osm.css" />
 <link rel="stylesheet" href="{$OSM_PATH}leaflet/leaflet.css" />
-<link rel="stylesheet" href="{$OSM_PATH}leaflet/leaflet-search.css" />
+<link rel="stylesheet" href="{$OSM_PATH}leaflet/leaflet-search.min.css" />
+<link rel="stylesheet" href="{$OSM_PATH}leaflet/Leaflet.EditInOSM.css" />
 <script src="{$OSM_PATH}leaflet/leaflet.js"></script>
-<script src="{$OSM_PATH}leaflet/leaflet-search.js"></script>
+<script src="{$OSM_PATH}leaflet/leaflet-search.min.js"></script>
 <script src="{$OSM_PATH}leaflet/leaflet-providers.js"></script>
+<script src="{$OSM_PATH}leaflet/Leaflet.EditInOSM.js"></script>
 {/html_head}
 
 {html_style}

template/osm-map2.tpl

@@ -6,12 +6,12 @@
 <title>{$GALLERY_TITLE}</title>
 <link rel="stylesheet" href="{$OSM_PATH}fontello/css/osm.css" />
 <link rel="stylesheet" href="{$OSM_PATH}leaflet/leaflet.css" />
-<link rel="stylesheet" href="{$OSM_PATH}leaflet/leaflet-search.css" />
+<link rel="stylesheet" href="{$OSM_PATH}leaflet/leaflet-search.min.css" />
 <link rel="stylesheet" href="{$OSM_PATH}leaflet/MarkerCluster.css" />
 <link rel="stylesheet" href="{$OSM_PATH}leaflet/MarkerCluster.Default.css" />
 <link rel="stylesheet" href="{$OSM_PATH}leaflet/leaflet.contextmenu.css" />
 <script src="{$OSM_PATH}leaflet/leaflet.js"></script>
-<script src="{$OSM_PATH}leaflet/leaflet-search.js"></script>
+<script src="{$OSM_PATH}leaflet/leaflet-search.min.js"></script>
 <script src="{$OSM_PATH}leaflet/leaflet.markercluster.js"></script>
 <script src="{$OSM_PATH}leaflet/leaflet.contextmenu.js"></script>
 {html_style}
@@ -329,6 +329,7 @@ function toggle(arrow)
 		/* Remove any previous thumbnails */
 		removeChildren({parentId:'jcarousel-thumb'});
 
+		/* Update ShowAll link */
 		var root_url = '{/literal}{$MYROOT_URL}{literal}';
 		var myurl = root_url+"osmmap.php?min_lat="+min.lat+"&min_lng="+min.lng+"&max_lat="+max.lat+"&max_lng="+max.lng;
 		//console.log("ShowAll:"+myurl);