Add MapQuest API, Add Esri.WorldImagery, Remove cloudmap #113

Author: xbgmsharp

admin/admin_config.php

@@ -44,9 +44,9 @@
     'mapnikhot'     => 'OpenStreetMap HOT',
     'mapquest'      => 'MapQuestOpen',
     'mapquestaerial'=> 'MapQuestOpen Aerial',
-    'cloudmade'     => 'Cloudmade',
     'toner'         => 'Stamen Toner',
     'custom'        => 'Own tile (custom style)',
+    'esri'          => 'Esri.WorldImagery',
 );
 
 // Available zoom value

admin/admin_config.tpl

@@ -216,6 +216,7 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
 				<small>Check out <a href="http://leaflet-extras.github.io/leaflet-providers/preview/" target="_blank">this example</a> with half a hundred different layers to choose from.</small>
 			</li>
 			<div id="custom-tile-toggle" style="visibility:hidden; width:0px; height:0px; display:none;">
+				<fieldset>
 				<li>
 					<label>{'CUSTOMBASELAYER'|@translate} : </label>
 					<input type="text" value="{$map.custombaselayer}" name="osm_custombaselayer" id="osm_custombaselayer" size="40"/>
@@ -226,6 +227,16 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
 					<input type="text" value="{$map.custombaselayerurl}" name="osm_custombaselayerurl" id="osm_custombaselayerurl" onchange="tile_toggle(this)" size="40"/>
 					<br/><small>{'CUSTOMBASELAYERURL_DESC'|@translate}</small>
 				</li>
+				</fieldset>
+			</div>
+			<div id="mapquest-tile-toggle" style="visibility:hidden; width:0px; height:0px; display:none;">
+				<fieldset>
+				<li>
+					<label>{'MAPQUEST_APIKEY'|@translate} : </label>
+					<input type="text" value="{$map.mapquest_apikey}" name="osm_mapquest_apikey" id="osm_mapquest_apikey" size="40"/>
+					<br/><small>{'MAPQUEST_APIKEY_DESC'|@translate} Check out <a href="http://www.mapquestapi.com/" target="_blank">MapQuest API</a></small>
+				</li>
+				</fieldset>
 			</div>
 			<li>
 				<label>{'NOWORLDWARP'|@translate} : </label>
@@ -309,14 +320,21 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
 <script type="text/javascript">
 function tile_toggle()
 {
-	var div = document.getElementById("custom-tile-toggle");
+	var div_custom = document.getElementById("custom-tile-toggle");
+	var div_mapquest = document.getElementById("mapquest-tile-toggle");
 	var select = document.getElementById("osm_baselayer").value;
 	//alert(select.selectedIndex);
 	if (select == "custom") // If custom
 	{
-		div.removeAttribute("style");
+		div_custom.removeAttribute("style");
+		div_mapquest.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
+	} else if (select.startsWith("mapquest")) // If mapquest
+	{
+		div_mapquest.removeAttribute("style");
+		div_custom.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
 	} else {
-		div.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
+		div_custom.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
+		div_mapquest.setAttribute("style","visibility:hidden; width:0px; height:0px; display:none;");
 	}
 	tile_preview();
 }
@@ -367,9 +385,9 @@ function tile_preview()
 		'{/literal}{$OSM_PATH}{literal}leaflet/icons/preview_openstreetmap_fr.png',
 		'{/literal}{$OSM_PATH}{literal}leaflet/icons/preview_mapquest.png',
 		'{/literal}{$OSM_PATH}{literal}leaflet/icons/preview_mapquest_aerial.png',
-		'https://a.tile.cloudmade.com/7807cc60c1354628aab5156cfc1d4b3b/997/256/5/15/11.png',
 		'{/literal}{$OSM_PATH}{literal}leaflet/icons/preview_toner.png',
-		custom_url
+		custom_url,
+		'{/literal}{$OSM_PATH}{literal}leaflet/icons/preview_Esri.WorldTopoMap.png'
 	);
 	//alert(baselayer[select.selectedIndex]);
 	var img_elem = document.getElementById("tile_preview");

include/functions_map.php

@@ -40,11 +40,11 @@ function osmcopyright($attrleaflet, $attrimagery, $attrmodule, $bl, $custombasel
         else if($bl == 'mapnikde')	$return .= "Tiles Courtesy of Openstreetmap.de (CC BY-SA)";
         else if($bl == 'blackandwhite')	$return .= "Tiles Courtesy of OSM.org (CC BY-SA)";
         else if($bl == 'mapnikhot')	$return .= 'Tiles Courtesy of &copy; <a href="http://hot.openstreetmap.org/" target="_blank">Humanitarian OpenStreetMap Team</a>';
-        else if($bl == 'cloudmade')	$return .= 'Tiles Courtesy of &copy; <a href="http://cloudmade.com">CloudMade</a> ';
         else if($bl == 'mapquest')	$return .= 'Tiles Courtesy of &copy; <a href="http://www.mapquest.com/">MapQuest</a>';
         else if($bl == 'mapquestaerial')	$return .= 'Tiles Courtesy of <a href="http://www.mapquest.com/">MapQuest</a> &mdash; Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';
         else if($bl == 'toner')		$return .= 'Tiles Courtesy of &copy; <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash;';
         else if($bl == 'custom')	$return .= $custombaselayer;
+        else if($bl == 'esri')		$return .= "Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community";
     }
     // Mandatory by http://www.openstreetmap.org/copyright
     $return .= ' &copy; ';
@@ -305,14 +305,14 @@ function osm_get_js($conf, $local_conf, $js_data)
     // Load baselayerURL
     if     ($baselayer == 'mapnik')     $baselayerurl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
     else if($baselayer == 'mapquest')   $baselayerurl = 'http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png';
-    else if($baselayer == 'cloudmade')  $baselayerurl = 'http://{s}.tile.cloudmade.com/7807cc60c1354628aab5156cfc1d4b3b/997/256/{z}/{x}/{y}.png';
     else if($baselayer == 'mapnikde')   $baselayerurl = 'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png';
     else if($baselayer == 'mapnikfr')   $baselayerurl = 'http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png';
     else if($baselayer == 'blackandwhite')  $baselayerurl = 'http://{s}.www.toolserver.org/tiles/bw-mapnik/{z}/{x}/{y}.png';
     else if($baselayer == 'mapnikhot')  $baselayerurl = 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png';
     else if($baselayer == 'mapquestaerial') $baselayerurl = 'http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png';
     else if($baselayer == 'toner') $baselayerurl = 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.png';
     else if($baselayer == 'custom') $baselayerurl = $custombaselayerurl;
+    else if($baselayer == 'esri') $baselayerurl = 'http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}';
 
     $attribution = osmcopyright($attrleaflet, $attrimagery, $attrmodule, $baselayer, $custombaselayer);