decode_json() always create arrays instead of objects

diff --git a/lib-php/PlaceLookup.php b/lib-php/PlaceLookup.php
index 715f1ced3daab48dbd95b374465f44ff6e93d050..33156537459b87019ba3fe269d1d07a3f58d8032 100644 (file)
--- 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 8a0a6289a9697a9a3a5c84ecb95c3224875ad02e..d54aef4005b26f843d890641f68e74aac5774bd7 100644 (file)
--- 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 206b959f2261a1b329ef3279a01afb205f6a0111..dc3c3832af7ce09fc32be88df4d5ab9d02256d4b 100644 (file)
--- 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 1a429acb3a2d44e730b300604c43b7f614879da9..0766eaf4a992a643501dfa7dde2f3ea5ca1bacb0 100644 (file)
--- 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 68a0ce25b82d285a5cd75aeef043a831b335d82a..ae80a85b262a205b108c5d58526a920213200b61 100644 (file)
--- 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 cbf25c874f1e4b5bcb2f3cc3680c375844bb8dd8..430237a294a5d33782323fab3d789f5932730436 100644 (file)
--- 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 5439e3cfe532e61140a3293701d8a1a5c6517926..bba41a0d2210532c30afe3f7c0e34ddde0b4df68 100644 (file)
--- 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 f517142f861b9848dd9797761b4a8a388e1b1e1c..7665700dff47b08995f517432a74de506521fdfc 100644 (file)
--- 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 3f9e0a571d9928bc1a0fbdc298c90a1134537fc3..5fb1302080ac4ced5cebb5523a1257755b04ccbe 100644 (file)
--- 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'])) {