X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4d0693ea69f15660c7fd931c4bce7b648b97ff0f..92095c9247ebfeb08ea1bcaebbae66ee406ce426:/lib/template/search-jsonv2.php

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index cb09baa4..251388b5 100644
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -1,35 +1,28 @@
 <?php
-	header("Content-Type: application/json; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
-
 	$aFilteredPlaces = array();
 	foreach($aSearchResults as $iResNum => $aPointDetails)
 	{
 		$aPlace = array(
 				'place_id'=>$aPointDetails['place_id'],
-				'licence'=>"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
+				'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
 			);
 
-		$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
+		$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':($aPointDetails['osm_type'] == 'T'?'tiger':($aPointDetails['osm_type'] == 'I'?'interpolation':'')))));
 		if ($sOSMType)
 		{
 			$aPlace['osm_type'] = $sOSMType;
 			$aPlace['osm_id'] = $aPointDetails['osm_id'];
 		}
 
-                if (isset($aPointDetails['aBoundingBox']))
-                {
-			$aPlace['boundingbox'] = array(
-				$aPointDetails['aBoundingBox'][0],
-				$aPointDetails['aBoundingBox'][1],
-				$aPointDetails['aBoundingBox'][2],
-				$aPointDetails['aBoundingBox'][3]);
+		if (isset($aPointDetails['aBoundingBox']))
+		{
+			$aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
 
 			if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
 			{
 				$aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
 			}
-                }
+		}
 
 		if (isset($aPointDetails['zoom']))
 		{
@@ -39,10 +32,14 @@
 		$aPlace['lat'] = $aPointDetails['lat'];
 		$aPlace['lon'] = $aPointDetails['lon'];
 		$aPlace['display_name'] = $aPointDetails['name'];
+		$aPlace['place_rank'] = $aPointDetails['rank_search'];
 
 		$aPlace['category'] = $aPointDetails['class'];
 		$aPlace['type'] = $aPointDetails['type'];
-		if ($aPointDetails['icon'])
+
+		$aPlace['importance'] = $aPointDetails['importance'];
+
+		if (isset($aPointDetails['icon']))
 		{
 			$aPlace['icon'] = $aPointDetails['icon'];
 		}
@@ -50,16 +47,32 @@
 		if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
 		{
 			$aPlace['address'] = $aPointDetails['address'];
-                }
+		}
+
+		if (isset($aPointDetails['asgeojson']))
+		{
+			$aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+		}
+
+		if (isset($aPointDetails['assvg']))
+		{
+			$aPlace['svg'] = $aPointDetails['assvg'];
+		}
+
+		if (isset($aPointDetails['astext']))
+		{
+			$aPlace['geotext'] = $aPointDetails['astext'];
+		}
+
+		if (isset($aPointDetails['askml']))
+		{
+			$aPlace['geokml'] = $aPointDetails['askml'];
+		}
+
+		if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+		if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
 
 		$aFilteredPlaces[] = $aPlace;
 	}
 
-	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);