X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fb76671ab9fbe6e6f40b53d8cdd4250820f79a92..1d847f77f4e22a8738bc098fdabca7bccd8e5928:/lib/template/search-json.php

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 57586fb9..6108aca4 100644
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,80 +1,73 @@
 <?php
-	header("content-type: application/json; charset=UTF-8");
-
-	$aFilteredPlaces = array();
-	foreach($aSearchResults as $iResNum => $aPointDetails)
-	{
-		$aPlace = array(
-				'place_id'=>$aPointDetails['place_id'],
-				'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':'')));
-		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['aPolyPoints']) && $bShowPolygons)
-			{
-				$aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
-			}
-                }
-
-		if (isset($aPointDetails['zoom']))
-		{
-			$aPlace['zoom'] = $aPointDetails['zoom'];
-		}
-
-		$aPlace['lat'] = $aPointDetails['lat'];
-		$aPlace['lon'] = $aPointDetails['lon'];
-		$aPlace['display_name'] = $aPointDetails['name'];
-
-		$aPlace['class'] = $aPointDetails['class'];
-		$aPlace['type'] = $aPointDetails['type'];
-
-		$aPlace['importance'] = $aPointDetails['importance'];
-
-		if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
-		{
-			$aPlace['icon'] = $aPointDetails['icon'];
-		}
-
-		if (isset($aPointDetails['address']))
-		{
-			$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'];
-		}
-
-		$aFilteredPlaces[] = $aPlace;
-	}
-
-	javascript_renderData($aFilteredPlaces);
+
+$aFilteredPlaces = array();
+foreach ($aSearchResults as $iResNum => $aPointDetails) {
+    $aPlace = array(
+               'place_id'=>$aPointDetails['place_id'],
+               'licence'=>'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+              );
+    
+    $sOSMType = formatOSMType($aPointDetails['osm_type']);
+    if ($sOSMType) {
+        $aPlace['osm_type'] = $sOSMType;
+        $aPlace['osm_id'] = $aPointDetails['osm_id'];
+    }
+
+    if (isset($aPointDetails['aBoundingBox'])) {
+        $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
+
+        if (isset($aPointDetails['aPolyPoints'])) {
+            $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
+        }
+    }
+
+    if (isset($aPointDetails['zoom'])) {
+        $aPlace['zoom'] = $aPointDetails['zoom'];
+    }
+
+    $aPlace['lat'] = $aPointDetails['lat'];
+    $aPlace['lon'] = $aPointDetails['lon'];
+
+    $aPlace['display_name'] = $aPointDetails['name'];
+
+    if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') {
+        $aPlace['place_rank'] = $aPointDetails['rank_search'];
+        $aPlace['category'] = $aPointDetails['class'];
+    } else {
+        $aPlace['class'] = $aPointDetails['class'];
+    }
+    $aPlace['type'] = $aPointDetails['type'];
+
+    $aPlace['importance'] = $aPointDetails['importance'];
+
+    if (isset($aPointDetails['icon']) && $aPointDetails['icon']) {
+        $aPlace['icon'] = $aPointDetails['icon'];
+    }
+
+    if (isset($aPointDetails['address'])) {
+        $aPlace['address'] = $aPointDetails['address']->getAddressNames();
+    }
+
+    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;
+}
+
+javascript_renderData($aFilteredPlaces);