Merge pull request #361 from mtmail/detail-page-big-table2

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 2b8c2c28d2e982e8ebbb0041cf6255345c37d333..e974772023393a39818205bc22abe0201c2207c3 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -36,11 +36,14 @@
                $aPlace['lat'] = $aPointDetails['lat'];
                $aPlace['lon'] = $aPointDetails['lon'];
                $aPlace['display_name'] = $aPointDetails['name'];
-               $aPlace['place_rank'] = $aResult['rank_search'];
+               $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,27 +53,30 @@
                        $aPlace['address'] = $aPointDetails['address'];
                 }
 
-                if (isset($aResult['asgeojson']))
+                if (isset($aPointDetails['asgeojson']))
                 {
-                       $aPlace['geojson'] = json_decode($aResult['asgeojson']);
+                       $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
                 }
 
-                if (isset($aResult['assvg']))
+                if (isset($aPointDetails['assvg']))
                 {
-                       $aPlace['svg'] = $aResult['assvg'];
+                       $aPlace['svg'] = $aPointDetails['assvg'];
                 }
 
-                if (isset($aResult['astext']))
+                if (isset($aPointDetails['astext']))
                 {
-                        $aPlace['geotext'] = $aResult['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;
        }
 
-       javascript_renderData($aFilteredPlaces, array('geojson'));
+       javascript_renderData($aFilteredPlaces);