Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 30817c04025114210eb49e0649d6bf123d07ca68..4b896d08a6de136207a8e878ff8c2ac73f7e711d 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -15,10 +15,6 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
 
     if (isset($aPointDetails['aBoundingBox'])) {
         $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
 
     if (isset($aPointDetails['aBoundingBox'])) {
         $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];

-
-        if (isset($aPointDetails['aPolyPoints'])) {
-            $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
-        }

     }
 
     if (isset($aPointDetails['zoom'])) {
     }
 
     if (isset($aPointDetails['zoom'])) {


@@ -44,8 +40,8 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
         $aPlace['icon'] = $aPointDetails['icon'];
     }
 
         $aPlace['icon'] = $aPointDetails['icon'];
     }
 

-    if (isset($aPointDetails['address']) && !empty($aPointDetails['address'])) {
-        $aPlace['address'] = $aPointDetails['address'];
+    if (isset($aPointDetails['address'])) {
+        $aPlace['address'] = $aPointDetails['address']->getAddressNames();

     }
 
     if (isset($aPointDetails['asgeojson'])) {
     }
 
     if (isset($aPointDetails['asgeojson'])) {