Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / template / address-geojson.php

diff --git a/lib-php/template/address-geojson.php b/lib-php/template/address-geojson.php
index 135504d38ab2ec296fdadadf326df7969d02282c..dc3c3832af7ce09fc32be88df4d5ab9d02256d4b 100644 (file)
--- a/lib-php/template/address-geojson.php
+++ b/lib-php/template/address-geojson.php
@@ -1,4 +1,12 @@
 <?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.
+ */

 
 $aFilteredPlaces = array();
 
 
 $aFilteredPlaces = array();
 


@@ -15,7 +23,9 @@ if (empty($aPlace)) {
                         'properties' => array()
                        );
 
                         'properties' => array()
                        );
 

-    if (isset($aPlace['place_id'])) $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
+    if (isset($aPlace['place_id'])) {
+        $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
+    }

     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) {
         $aFilteredPlaces['properties']['osm_type'] = $sOSMType;
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) {
         $aFilteredPlaces['properties']['osm_type'] = $sOSMType;


@@ -55,7 +65,7 @@ if (empty($aPlace)) {
     }
 
     if (isset($aPlace['asgeojson'])) {
     }
 
     if (isset($aPlace['asgeojson'])) {

-        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson']);
+        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson'], true);

     } else {
         $aFilteredPlaces['geometry'] = array(
                                         'type' => 'Point',
     } else {
         $aFilteredPlaces['geometry'] = array(
                                         'type' => 'Point',