Merge remote-tracking branch 'lonvia/address-importance'

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index fa801ac497585ddfda7d7e9a7e0d2b5a16dd35fd..126f78662df64970a3acc6c120599637fdaf975d 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['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'];
 
                $aPlace['category'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];

-               if ($aPointDetails['icon'])
+
+               $aPlace['importance'] = $aPointDetails['importance'];
+
+               if (isset($aPointDetails['icon']))

                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }


@@ -50,7 +53,27 @@
                        $aPlace['address'] = $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;
        }
 
                $aFilteredPlaces[] = $aPlace;
        }
 

-       javascript_renderData($aFilteredPlaces);
+       javascript_renderData($aFilteredPlaces, array('geojson'));