X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c3233cb9512105d65442a40260cf16d8688d76a5..797c2d1e74a14d8d52d963f1efad9be53fca5f5f:/lib/template/address-jsonv2.php

diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index b6ff1627..d6214176 100644
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.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,31 +11,57 @@
 	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'];
-                }
+		$aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+		$sOSMType = formatOSMType($aPlace['osm_type']);
+		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['category'] = $aPlace['class'];
-                $aFilteredPlaces['type'] = $aPlace['type'];
-                $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+
+		$aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
+
+		$aFilteredPlaces['category'] = $aPlace['class'];
+		$aFilteredPlaces['type'] = $aPlace['type'];
+
+		$aFilteredPlaces['importance'] = $aPlace['importance'];
+
+		$aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
 
 		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-                $aFilteredPlaces['name'] = $aPlace['placename'];
-		$aFilteredPlaces['address'] = $aAddress;
-	}
+		$aFilteredPlaces['name'] = $aPlace['placename'];
 
-	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 (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['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'];
+		}
+
+	}
 
+	javascript_renderData($aFilteredPlaces);