Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-batch-json.php b/lib/template/search-batch-json.php
index 513f3c2b8833a8ea6a20617aa9e961ca47ea6ea2..c4bc29cb1df4c0d8160003a698c46340cc2020a2 100644 (file)
--- a/lib/template/search-batch-json.php
+++ b/lib/template/search-batch-json.php
@@ -25,10 +25,6 @@ foreach ($aBatchResults as $aSearchResults) {
                                       $aPointDetails['aBoundingBox'][2],
                 $aPointDetails['aBoundingBox'][3]
                                      );
                                       $aPointDetails['aBoundingBox'][2],
                 $aPointDetails['aBoundingBox'][3]
                                      );

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

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


@@ -49,8 +45,8 @@ foreach ($aBatchResults as $aSearchResults) {
             $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'])) {