Merge pull request #178 from fg193/master

fix reverse geocoding service (#164)

Author: xbgmsharp

admin/admin_tag.php

@@ -110,15 +110,15 @@
 	$infos = array();
 	foreach ($images as $image)
 	{
-		// Fech reverse location from API
+		// Fetch reverse location from API
 		// http://wiki.openstreetmap.org/wiki/Nominatim
 		// https://nominatim.openstreetmap.org/reverse?format=xml&lat=51.082333&lon=10.366229&zoom=12
 		// https://open.mapquestapi.com/nominatim/v1/reverse.php?format=xml&lat=48.858366666667&lon=2.2942166666667&zoom=12
-		//$osm_url = "https://nominatim.openstreetmap.org/reverse?format=json&addressdetails=1&zoom=12&lat=". $image['latitude'] ."&lon=". $image['longitude'];
+		$osm_url = "https://nominatim.openstreetmap.org/reverse?format=json&addressdetails=1&zoom=12&lat=". $image['latitude'] ."&lon=". $image['longitude'] ."&accept-language=". $sync_options['language'];
 		//  As of Sept 2015 require a API KEY
 		//$osm_url = "https://open.mapquestapi.com/nominatim/v1/reverse.php?format=json&addressdetails=1&zoom=12&lat=". $image['latitude'] ."&lon=". $image['longitude'];
 		//$osm_url = "http://localhost:8443/api/". $image['latitude'] ."/". $image['longitude'];
-		$osm_url = "https://nominatim-xbgmsharp.rhcloud.com/api/". $image['latitude'] ."/". $image['longitude'] ."/". $sync_options['language'];
+		//$osm_url = "https://nominatim-xbgmsharp.rhcloud.com/api/". $image['latitude'] ."/". $image['longitude'] ."/". $sync_options['language'];
 		//print $osm_url ."<br/>";
 
 		// Ensure we do have PHP curl install
@@ -149,11 +149,11 @@
 			);
 			$context = stream_context_create($opts);
 			if (false !== ($json = @file_get_contents($osm_url, flase, $context))) {
- 				// all good
+				// all good
 				//return $json;
 			} else {
 				// error happened
-        			//return false;
+				//return false;
 				$errors[] = "Error fetching reverse data";
 			}
 		}
@@ -166,10 +166,8 @@
 			//print_r($response);
 
 		// If reponse include [address]
-		if (isset($response) and isset($response['success']) and isset($response['success'][0]) and isset($response['success'][0]['result'])
-			and isset($response['success'][0]['result']['address']) and is_array($response['success'][0]['result']['address']))
+		if (isset($response) and isset($response['address']) and is_array($response['address']))
 		{
-			$response['address'] = $response['success'][0]['result']['address'];
 			//print_r($response['address']);
 			//print_r($sync_options);
 			$tag_names = array();

include/functions_map.php

@@ -26,6 +26,7 @@
 
 function osmcopyright($attrleaflet, $attrimagery, $attrmodule, $bl, $custombaselayer)
 {
+    return '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>';
     $return = "";
 
     if ($attrleaflet) $return .= '<a href="http://leafletjs.com/" target="_blank">Leaflet</a> ';
@@ -364,7 +365,7 @@ function osm_get_js($conf, $local_conf, $js_data)
         // we return directly as there is no addressPoints for GPX
         $js .= "\nvar Url = '".$baselayerurl."',
         Attribution = '".$attribution."',
-        TileLayer = new L.TileLayer(Url, {maxZoom: 18, noWrap: ".$nowarp.", attribution: Attribution});\n";
+        TileLayer = new L.TileLayer(Url, {maxZoom: 16, noWrap: ".$nowarp.", attribution: Attribution});\n";
         $js .= "var " . $divname . " = new L.Map('" . $divname . "', {" . $worldcopyjump . ", zoom: ".$zoom.", layers: [TileLayer], contextmenu: " . $local_conf['contextmenu'] . "});\n";
         $js .= $divname . ".attributionControl.setPrefix('');\n";
         $js .= "\nL.control.scale().addTo(" . $divname . ");\n";
@@ -373,13 +374,13 @@ function osm_get_js($conf, $local_conf, $js_data)
         // Create the map and get a new map instance attached and element with $divname
         $js .= "\nvar Url = '".$baselayerurl."',
         Attribution = '".$attribution."',
-        TileLayer = new L.TileLayer(Url, {maxZoom: 18, noWrap: ".$nowarp.", attribution: Attribution}),
+        TileLayer = new L.TileLayer(Url, {maxZoom: 16, noWrap: ".$nowarp.", attribution: Attribution}),
         latlng = new L.LatLng(".$local_conf['center_lat'].", ".$local_conf['center_lng'].");\n";
         $js .= "var " . $divname . " = new L.Map('" . $divname . "', {" . $worldcopyjump . ", center: latlng, ".$editor." zoom: ".$zoom.", layers: [TileLayer], contextmenu: " . $local_conf['contextmenu'] . "});\n";
         $js .= $divname . ".attributionControl.setPrefix('');\n";
         $js .= "var MarkerClusterList=[];\n";
         $js .= "if (typeof L.MarkerClusterGroup === 'function')\n";
-        $js .= "     var markers = new L.MarkerClusterGroup();\n";
+        $js .= "     var markers = new L.MarkerClusterGroup({maxClusterRadius: 30});\n";
     }
 
     if ($local_conf['control'] === true)