X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d88778a561100db69ad439688698c673a2796bb6..f0f6fcf256c83176dbcda0d0fd4fec977ea8a0ad:/lib/template/address-json.php

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 3c7327a3..6254357a 100644
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -1,39 +1,63 @@
 <?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';
 	}
 	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.";
-		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
-                if ($sOSMType)
-                {
-                        $aFilteredPlaces['osm_type'] = $sOSMType;
-                        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
-                }
-                if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
-                if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
+		if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+		$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':
+		($aPlace['osm_type'] == 'T'?'tiger':($aPlace['osm_type'] == 'I'?'interpolation':'')))));
+		if ($sOSMType)
+		{
+			$aFilteredPlaces['osm_type'] = $sOSMType;
+			$aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
+		}
+		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($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+		if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+		if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
+
+		if (isset($aPlace['aBoundingBox']))
+		{
+			$aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
+
+			if (isset($aPlace['aPolyPoints']) && $bAsPoints)
+			{
+				$aFilteredPlaces['polygonpoints'] = $aPlace['aPolyPoints'];
+			}
+		}
+
+		if (isset($aPlace['asgeojson']))
+		{
+			$aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
+		}
+
+		if (isset($aPlace['assvg']))
+		{
+			$aFilteredPlaces['svg'] = $aPlace['assvg'];
+		}
+
+		if (isset($aPlace['astext']))
+		{
+			$aFilteredPlaces['geotext'] = $aPlace['astext'];
+		}
+
+		if (isset($aPlace['askml']))
+		{
+			$aFilteredPlaces['geokml'] = $aPlace['askml'];
+		}
+
 
-	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);
 	}
 
+	javascript_renderData($aFilteredPlaces);