From 7cafec07504a9350bdfc8d8089029bf7a68b6dca Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 9 Jul 2022 09:10:21 +0200
Subject: [PATCH] decode_json() always create arrays instead of objects

---
 lib-php/PlaceLookup.php                  | 4 ++--
 lib-php/template/address-geocodejson.php | 2 +-
 lib-php/template/address-geojson.php     | 2 +-
 lib-php/template/address-json.php        | 2 +-
 lib-php/template/details-json.php        | 2 +-
 lib-php/template/search-batch-json.php   | 2 +-
 lib-php/template/search-geocodejson.php  | 2 +-
 lib-php/template/search-geojson.php      | 2 +-
 lib-php/template/search-json.php         | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib-php/PlaceLookup.php b/lib-php/PlaceLookup.php
index 715f1ced..33156537 100644
--- a/lib-php/PlaceLookup.php
+++ b/lib-php/PlaceLookup.php
@@ -445,7 +445,7 @@ class PlaceLookup
 
             if ($this->bExtraTags) {
                 if ($aPlace['extra']) {
-                    $aPlace['sExtraTags'] = json_decode($aPlace['extra']);
+                    $aPlace['sExtraTags'] = json_decode($aPlace['extra'], true);
                 } else {
                     $aPlace['sExtraTags'] = (object) array();
                 }
@@ -482,7 +482,7 @@ class PlaceLookup
             return (object) array();
         }
 
-        $aFullNames = json_decode($sNames);
+        $aFullNames = json_decode($sNames, true);
         $aNames = array();
 
         foreach ($aFullNames as $sKey => $sValue) {
diff --git a/lib-php/template/address-geocodejson.php b/lib-php/template/address-geocodejson.php
index 8a0a6289..d54aef40 100644
--- a/lib-php/template/address-geocodejson.php
+++ b/lib-php/template/address-geocodejson.php
@@ -56,7 +56,7 @@ if (empty($aPlace)) {
     }
 
     if (isset($aPlace['asgeojson'])) {
-        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson']);
+        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson'], true);
     } else {
         $aFilteredPlaces['geometry'] = array(
                                         'type' => 'Point',
diff --git a/lib-php/template/address-geojson.php b/lib-php/template/address-geojson.php
index 206b959f..dc3c3832 100644
--- a/lib-php/template/address-geojson.php
+++ b/lib-php/template/address-geojson.php
@@ -65,7 +65,7 @@ if (empty($aPlace)) {
     }
 
     if (isset($aPlace['asgeojson'])) {
-        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson']);
+        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson'], true);
     } else {
         $aFilteredPlaces['geometry'] = array(
                                         'type' => 'Point',
diff --git a/lib-php/template/address-json.php b/lib-php/template/address-json.php
index 1a429acb..0766eaf4 100644
--- a/lib-php/template/address-json.php
+++ b/lib-php/template/address-json.php
@@ -63,7 +63,7 @@ if (empty($aPlace)) {
     }
 
     if (isset($aPlace['asgeojson'])) {
-        $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
+        $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson'], true);
     }
 
     if (isset($aPlace['assvg'])) {
diff --git a/lib-php/template/details-json.php b/lib-php/template/details-json.php
index 68a0ce25..ae80a85b 100644
--- a/lib-php/template/details-json.php
+++ b/lib-php/template/details-json.php
@@ -48,7 +48,7 @@ $aPlaceDetails['centroid'] = array(
                               'coordinates' => array( (float) $aPointDetails['lon'], (float) $aPointDetails['lat'] )
                              );
 
-$aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson']);
+$aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson'], true);
 
 $funcMapAddressLine = function ($aFull) {
     return array(
diff --git a/lib-php/template/search-batch-json.php b/lib-php/template/search-batch-json.php
index cbf25c87..430237a2 100644
--- a/lib-php/template/search-batch-json.php
+++ b/lib-php/template/search-batch-json.php
@@ -60,7 +60,7 @@ foreach ($aBatchResults as $aSearchResults) {
         }
 
         if (isset($aPointDetails['asgeojson'])) {
-            $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+            $aPlace['geojson'] = json_decode($aPointDetails['asgeojson'], true);
         }
 
         if (isset($aPointDetails['assvg'])) {
diff --git a/lib-php/template/search-geocodejson.php b/lib-php/template/search-geocodejson.php
index 5439e3cf..bba41a0d 100644
--- a/lib-php/template/search-geocodejson.php
+++ b/lib-php/template/search-geocodejson.php
@@ -46,7 +46,7 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
     }
 
     if (isset($aPointDetails['asgeojson'])) {
-        $aPlace['geometry'] = json_decode($aPointDetails['asgeojson']);
+        $aPlace['geometry'] = json_decode($aPointDetails['asgeojson'], true);
     } else {
         $aPlace['geometry'] = array(
                                'type' => 'Point',
diff --git a/lib-php/template/search-geojson.php b/lib-php/template/search-geojson.php
index f517142f..7665700d 100644
--- a/lib-php/template/search-geojson.php
+++ b/lib-php/template/search-geojson.php
@@ -54,7 +54,7 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
     }
 
     if (isset($aPointDetails['asgeojson'])) {
-        $aPlace['geometry'] = json_decode($aPointDetails['asgeojson']);
+        $aPlace['geometry'] = json_decode($aPointDetails['asgeojson'], true);
     } else {
         $aPlace['geometry'] = array(
                                'type' => 'Point',
diff --git a/lib-php/template/search-json.php b/lib-php/template/search-json.php
index 3f9e0a57..5fb13020 100644
--- a/lib-php/template/search-json.php
+++ b/lib-php/template/search-json.php
@@ -53,7 +53,7 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
     }
 
     if (isset($aPointDetails['asgeojson'])) {
-        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson'], true);
     }
 
     if (isset($aPointDetails['assvg'])) {
-- 
2.39.5