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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 671edde4..251388b5 100644
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -7,26 +7,22 @@
 				'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']))
 		{
@@ -40,7 +36,10 @@
 
 		$aPlace['category'] = $aPointDetails['class'];
 		$aPlace['type'] = $aPointDetails['type'];
-		if ($aPointDetails['icon'])
+
+		$aPlace['importance'] = $aPointDetails['importance'];
+
+		if (isset($aPointDetails['icon']))
 		{
 			$aPlace['icon'] = $aPointDetails['icon'];
 		}
@@ -48,29 +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($aResult['asgeojson']))
-                {
-			$aPlace['geojson'] = json_decode($aResult['asgeojson']);
-                }
+		if (isset($aPointDetails['assvg']))
+		{
+			$aPlace['svg'] = $aPointDetails['assvg'];
+		}
 
-                if (isset($aResult['assvg']))
-                {
-			$aPlace['svg'] = $aResult['assvg'];
-                }
+		if (isset($aPointDetails['astext']))
+		{
+			$aPlace['geotext'] = $aPointDetails['astext'];
+		}
 
-                if (isset($aResult['astext']))
-                {
-                        $aPlace['geotext'] = $aResult['astext'];
-                }
+		if (isset($aPointDetails['askml']))
+		{
+			$aPlace['geokml'] = $aPointDetails['askml'];
+		}
 
-                if (isset($aResult['askml']))
-                {
-                        $aPlace['geokml'] = $aResult['askml'];
-                }
+		if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+		if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
 
 		$aFilteredPlaces[] = $aPlace;
 	}
 
-	javascript_renderData($aFilteredPlaces, array('geojson'));
+	javascript_renderData($aFilteredPlaces);