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..1c2a04dd84028df86bfa3126ef3b2d647a7863a8 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -40,7 +40,7 @@
 
                $aPlace['category'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];
 
                $aPlace['category'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];

-               if ($aPointDetails['icon'])
+               if (isset($aPointDetails['icon']))

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


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

                 }
 
                $aFilteredPlaces[] = $aPlace;
                 }
 
                $aFilteredPlaces[] = $aPlace;