X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d88778a561100db69ad439688698c673a2796bb6..17e2e95b530018c0f090a20dfee2246acc4f4f94:/lib/template/address-json.php?ds=sidebyside

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 3c7327a3..2f077818 100644
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -1,12 +1,9 @@
 <?php
-	header ("Content-Type: application/json; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
-
 	$aFilteredPlaces = array();
 
 	if (!sizeof($aPlace))
 	{
-		if ($sError)
+		if (isset($sError))
 			$aFilteredPlaces['error'] = $sError;
 		else
 			$aFilteredPlaces['error'] = 'Unable to geocode';
@@ -14,7 +11,7 @@
 	else
 	{
 		if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
-		$aFilteredPlaces['licence'] = "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.";
+		$aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
 		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
                 if ($sOSMType)
                 {
@@ -24,16 +21,8 @@
                 if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
                 if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
 		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-		if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aAddress;
-	}
-
-	if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))
-	{
-		echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';
-	}
-	else
-	{
-		echo javascript_renderData($aFilteredPlaces);
+		if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aPlace['aAddress'];
 	}
 
+	javascript_renderData($aFilteredPlaces);