X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0dd10c3fff9896ca23b884a7ec7a97002065d083..797c2d1e74a14d8d52d963f1efad9be53fca5f5f:/lib/template/search-json.php

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 4b3b279d..d3dc00f3 100644
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -8,27 +8,23 @@
 				'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':'')));
+        
+		$sOSMType = formatOSMType($aPointDetails['osm_type']);
 		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']))
 		{
@@ -41,6 +37,9 @@
 
 		$aPlace['class'] = $aPointDetails['class'];
 		$aPlace['type'] = $aPointDetails['type'];
+
+		$aPlace['importance'] = $aPointDetails['importance'];
+
 		if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
 		{
 			$aPlace['icon'] = $aPointDetails['icon'];
@@ -49,28 +48,31 @@
 		if (isset($aPointDetails['address']))
 		{
 			$aPlace['address'] = $aPointDetails['address'];
-                }
+		}
 
-                if (isset($aResult['asgeojson']))
-                {
-                        $aPlace['geojson'] = json_decode($aResult['asgeojson']);
-                }
+		if (isset($aPointDetails['asgeojson']))
+		{
+			$aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+		}
 
-                if (isset($aResult['assvg']))
-                {
-                        $aPlace['svg'] = $aResult['assvg'];
-                }
+		if (isset($aPointDetails['assvg']))
+		{
+			$aPlace['svg'] = $aPointDetails['assvg'];
+		}
 
-                if (isset($aResult['astext']))
-                {
-                        $aPlace['geotext'] = $aResult['astext'];
-                }
+		if (isset($aPointDetails['astext']))
+		{
+			$aPlace['geotext'] = $aPointDetails['astext'];
+		}
 
-		if (isset($aResult['askml']))
+		if (isset($aPointDetails['askml']))
 		{
-			$aPlace['geokml'] = $aResult['askml'];
+			$aPlace['geokml'] = $aPointDetails['askml'];
 		}
 
+		if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+		if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+
 		$aFilteredPlaces[] = $aPlace;
 	}