Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / template / search-jsonv2.php

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 671edde4b8fcaafcbf4e3f7bb53fa9fed32bb028..66098d303e69272826030bee08a0f6b30a47156d 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -14,8 +14,8 @@
                        $aPlace['osm_id'] = $aPointDetails['osm_id'];
                }
 
-                if (isset($aPointDetails['aBoundingBox']))
-                {
+               if (isset($aPointDetails['aBoundingBox']))
+               {
                        $aPlace['boundingbox'] = array(
                                $aPointDetails['aBoundingBox'][0],
                                $aPointDetails['aBoundingBox'][1],
@@ -26,7 +26,7 @@
                        {
                                $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
                        }
-                }
+               }
 
                if (isset($aPointDetails['zoom']))
                {
@@ -40,7 +40,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 +51,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);