Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/template/search-batch-json.php b/lib-php/template/search-batch-json.php
index c4bc29cb1df4c0d8160003a698c46340cc2020a2..430237a294a5d33782323fab3d789f5932730436 100644 (file)
--- a/lib-php/template/search-batch-json.php
+++ b/lib-php/template/search-batch-json.php
@@ -1,11 +1,21 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 $aOutput = array();
 $aOutput['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';
 $aOutput['batch'] = array();
 
 foreach ($aBatchResults as $aSearchResults) {
 
 $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();
+    if (!$aSearchResults) {
+        $aSearchResults = array();
+    }

     $aFilteredPlaces = array();
     foreach ($aSearchResults as $iResNum => $aPointDetails) {
         $aPlace = array(
     $aFilteredPlaces = array();
     foreach ($aSearchResults as $iResNum => $aPointDetails) {
         $aPlace = array(


@@ -50,7 +60,7 @@ foreach ($aBatchResults as $aSearchResults) {
         }
 
         if (isset($aPointDetails['asgeojson'])) {
         }
 
         if (isset($aPointDetails['asgeojson'])) {

-            $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+            $aPlace['geojson'] = json_decode($aPointDetails['asgeojson'], true);

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