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 a3ced45bc35bb46ec3fab5be00f04229a952a507..c4bc29cb1df4c0d8160003a698c46340cc2020a2 100644 (file)
--- a/lib/template/search-batch-json.php
+++ b/lib/template/search-batch-json.php
@@ -1,42 +1,33 @@
 <?php
 
 $aOutput = array();
 <?php
 
 $aOutput = array();

-$aOutput['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright";
+$aOutput['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';

 $aOutput['batch'] = array();
 
 $aOutput['batch'] = array();
 

-foreach($aBatchResults as $aSearchResults)
-{
+foreach ($aBatchResults as $aSearchResults) {

     if (!$aSearchResults) $aSearchResults = array();
     $aFilteredPlaces = array();
     if (!$aSearchResults) $aSearchResults = array();
     $aFilteredPlaces = array();

-    foreach($aSearchResults as $iResNum => $aPointDetails)
-    {
+    foreach ($aSearchResults as $iResNum => $aPointDetails) {

         $aPlace = array(
         $aPlace = array(

-                    'place_id'=>$aPointDetails['place_id'],
-                );
+                   'place_id'=>$aPointDetails['place_id'],
+                  );

 
         $sOSMType = formatOSMType($aPointDetails['osm_type']);
 
         $sOSMType = formatOSMType($aPointDetails['osm_type']);

-        if ($sOSMType)
-        {
+        if ($sOSMType) {

             $aPlace['osm_type'] = $sOSMType;
             $aPlace['osm_id'] = $aPointDetails['osm_id'];
         }
 
             $aPlace['osm_type'] = $sOSMType;
             $aPlace['osm_id'] = $aPointDetails['osm_id'];
         }
 

-        if (isset($aPointDetails['aBoundingBox']))
-        {
+        if (isset($aPointDetails['aBoundingBox'])) {

             $aPlace['boundingbox'] = array(
             $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'];
         }
 
             $aPlace['zoom'] = $aPointDetails['zoom'];
         }
 


@@ -50,33 +41,27 @@ foreach($aBatchResults as $aSearchResults)
 
         $aPlace['importance'] = $aPointDetails['importance'];
 
 
         $aPlace['importance'] = $aPointDetails['importance'];
 

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

             $aPlace['icon'] = $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']);
         }
 
             $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
         }
 

-        if (isset($aPointDetails['assvg']))
-        {
+        if (isset($aPointDetails['assvg'])) {

             $aPlace['svg'] = $aPointDetails['assvg'];
         }
 
             $aPlace['svg'] = $aPointDetails['assvg'];
         }
 

-        if (isset($aPointDetails['astext']))
-        {
+        if (isset($aPointDetails['astext'])) {

             $aPlace['geotext'] = $aPointDetails['astext'];
         }
 
             $aPlace['geotext'] = $aPointDetails['astext'];
         }
 

-        if (isset($aPointDetails['askml']))
-        {
+        if (isset($aPointDetails['askml'])) {

             $aPlace['geokml'] = $aPointDetails['askml'];
         }
 
             $aPlace['geokml'] = $aPointDetails['askml'];
         }