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 13c619525aa1f9c2618704c0ff2a2a62a074b322..c4bc29cb1df4c0d8160003a698c46340cc2020a2 100644 (file)
--- a/lib/template/search-batch-json.php
+++ b/lib/template/search-batch-json.php
@@ -1,87 +1,73 @@
 <?php
 
 <?php
 

-       $aOutput = array();
-       $aOutput['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
-       $aOutput['batch'] = array();
-
-       foreach($aBatchResults as $aSearchResults)
-       {
-               $aFilteredPlaces = array();
-               foreach($aSearchResults as $iResNum => $aPointDetails)
-               {
-                       $aPlace = array(
-                                       'place_id'=>$aPointDetails['place_id'],
-                                 );
-
-                       $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
-                       if ($sOSMType)
-                       {
-                               $aPlace['osm_type'] = $sOSMType;
-                               $aPlace['osm_id'] = $aPointDetails['osm_id'];
-                       }
-
-                       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'];
-                               }
-                       }
-
-                       if (isset($aPointDetails['zoom']))
-                       {
-                               $aPlace['zoom'] = $aPointDetails['zoom'];
-                       }
-
-                       $aPlace['lat'] = $aPointDetails['lat'];
-                       $aPlace['lon'] = $aPointDetails['lon'];
-                       $aPlace['display_name'] = $aPointDetails['name'];
-                       $aPlace['place_rank'] = $aPointDetails['rank_search'];
-
-                       $aPlace['category'] = $aPointDetails['class'];
-                       $aPlace['type'] = $aPointDetails['type'];
-
-                       $aPlace['importance'] = $aPointDetails['importance'];
-
-                       if (isset($aPointDetails['icon']))
-                       {
-                               $aPlace['icon'] = $aPointDetails['icon'];
-                       }
-
-                       if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
-                       {
-                               $aPlace['address'] = $aPointDetails['address'];
-                       }
-
-                       if (isset($aPointDetails['asgeojson']))
-                       {
-                               $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
-                       }
-
-                       if (isset($aPointDetails['assvg']))
-                       {
-                               $aPlace['svg'] = $aPointDetails['assvg'];
-                       }
-
-                       if (isset($aPointDetails['astext']))
-                       {
-                               $aPlace['geotext'] = $aPointDetails['astext'];
-                       }
-
-                       if (isset($aPointDetails['askml']))
-                       {
-                               $aPlace['geokml'] = $aPointDetails['askml'];
-                       }
-
-                       $aFilteredPlaces[] = $aPlace;
-               }
-               $aOutput['batch'][] = $aFilteredPlaces;
-       }
-
-       javascript_renderData($aOutput, array('geojson'));
+$aOutput = array();
+$aOutput['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';
+$aOutput['batch'] = array();
+
+foreach ($aBatchResults as $aSearchResults) {
+    if (!$aSearchResults) $aSearchResults = array();
+    $aFilteredPlaces = array();
+    foreach ($aSearchResults as $iResNum => $aPointDetails) {
+        $aPlace = array(
+                   'place_id'=>$aPointDetails['place_id'],
+                  );
+
+        $sOSMType = formatOSMType($aPointDetails['osm_type']);
+        if ($sOSMType) {
+            $aPlace['osm_type'] = $sOSMType;
+            $aPlace['osm_id'] = $aPointDetails['osm_id'];
+        }
+
+        if (isset($aPointDetails['aBoundingBox'])) {
+            $aPlace['boundingbox'] = array(
+                                      $aPointDetails['aBoundingBox'][0],
+                                      $aPointDetails['aBoundingBox'][1],
+                                      $aPointDetails['aBoundingBox'][2],
+                $aPointDetails['aBoundingBox'][3]
+                                     );
+        }
+
+        if (isset($aPointDetails['zoom'])) {
+            $aPlace['zoom'] = $aPointDetails['zoom'];
+        }
+
+        $aPlace['lat'] = $aPointDetails['lat'];
+        $aPlace['lon'] = $aPointDetails['lon'];
+        $aPlace['display_name'] = $aPointDetails['name'];
+        $aPlace['place_rank'] = $aPointDetails['rank_search'];
+
+        $aPlace['category'] = $aPointDetails['class'];
+        $aPlace['type'] = $aPointDetails['type'];
+
+        $aPlace['importance'] = $aPointDetails['importance'];
+
+        if (isset($aPointDetails['icon'])) {
+            $aPlace['icon'] = $aPointDetails['icon'];
+        }
+
+        if (isset($aPointDetails['address'])) {
+            $aPlace['address'] = $aPointDetails['address']->getAddressNames();
+        }
+
+        if (isset($aPointDetails['asgeojson'])) {
+            $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+        }
+
+        if (isset($aPointDetails['assvg'])) {
+            $aPlace['svg'] = $aPointDetails['assvg'];
+        }
+
+        if (isset($aPointDetails['astext'])) {
+            $aPlace['geotext'] = $aPointDetails['astext'];
+        }
+
+        if (isset($aPointDetails['askml'])) {
+            $aPlace['geokml'] = $aPointDetails['askml'];
+        }
+
+        $aFilteredPlaces[] = $aPlace;
+    }
+    $aOutput['batch'][] = $aFilteredPlaces;
+}
+
+javascript_renderData($aOutput, array('geojson'));