X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..e9e54ec8046cf74d6d6f1c1ae04ca746aa3fefc2:/lib/template/search-batch-json.php

diff --git a/lib/template/search-batch-json.php b/lib/template/search-batch-json.php
index 9fa83e2a..c4bc29cb 100644
--- a/lib/template/search-batch-json.php
+++ b/lib/template/search-batch-json.php
@@ -1,42 +1,33 @@
 <?php
 
 $aOutput = array();
-$aOutput['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+$aOutput['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';
 $aOutput['batch'] = array();
 
-foreach($aBatchResults as $aSearchResults)
-{
+foreach ($aBatchResults as $aSearchResults) {
     if (!$aSearchResults) $aSearchResults = array();
     $aFilteredPlaces = array();
-    foreach($aSearchResults as $iResNum => $aPointDetails)
-    {
+    foreach ($aSearchResults as $iResNum => $aPointDetails) {
         $aPlace = array(
-                    'place_id'=>$aPointDetails['place_id'],
-                );
+                   'place_id'=>$aPointDetails['place_id'],
+                  );
 
         $sOSMType = formatOSMType($aPointDetails['osm_type']);
-        if ($sOSMType)
-        {
+        if ($sOSMType) {
             $aPlace['osm_type'] = $sOSMType;
             $aPlace['osm_id'] = $aPointDetails['osm_id'];
         }
 
-        if (isset($aPointDetails['aBoundingBox']))
-        {
+        if (isset($aPointDetails['aBoundingBox'])) {
             $aPlace['boundingbox'] = array(
-                $aPointDetails['aBoundingBox'][0],
-                $aPointDetails['aBoundingBox'][1],
-                $aPointDetails['aBoundingBox'][2],
-                $aPointDetails['aBoundingBox'][3]);
-
-            if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
-            {
-                $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
-            }
+                                      $aPointDetails['aBoundingBox'][0],
+                                      $aPointDetails['aBoundingBox'][1],
+                                      $aPointDetails['aBoundingBox'][2],
+                $aPointDetails['aBoundingBox'][3]
+                                     );
         }
 
-        if (isset($aPointDetails['zoom']))
-        {
+        if (isset($aPointDetails['zoom'])) {
             $aPlace['zoom'] = $aPointDetails['zoom'];
         }
 
@@ -50,33 +41,27 @@ foreach($aBatchResults as $aSearchResults)
 
         $aPlace['importance'] = $aPointDetails['importance'];
 
-        if (isset($aPointDetails['icon']))
-        {
+        if (isset($aPointDetails['icon'])) {
             $aPlace['icon'] = $aPointDetails['icon'];
         }
 
-        if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
-        {
-            $aPlace['address'] = $aPointDetails['address'];
+        if (isset($aPointDetails['address'])) {
+            $aPlace['address'] = $aPointDetails['address']->getAddressNames();
         }
 
-        if (isset($aPointDetails['asgeojson']))
-        {
+        if (isset($aPointDetails['asgeojson'])) {
             $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
         }
 
-        if (isset($aPointDetails['assvg']))
-        {
+        if (isset($aPointDetails['assvg'])) {
             $aPlace['svg'] = $aPointDetails['assvg'];
         }
 
-        if (isset($aPointDetails['astext']))
-        {
+        if (isset($aPointDetails['astext'])) {
             $aPlace['geotext'] = $aPointDetails['astext'];
         }
 
-        if (isset($aPointDetails['askml']))
-        {
+        if (isset($aPointDetails['askml'])) {
             $aPlace['geokml'] = $aPointDetails['askml'];
         }