Merge pull request #3509 from lonvia/deprecations

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

diff --git a/lib-php/template/search-geojson.php b/lib-php/template/search-geojson.php
index 0847fba411b6713d2ea33fae56a42a2a7a8f4f82..7665700dff47b08995f517432a74de506521fdfc 100644 (file)
--- a/lib-php/template/search-geojson.php
+++ b/lib-php/template/search-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();
 foreach ($aSearchResults as $iResNum => $aPointDetails) {
 
 $aFilteredPlaces = array();
 foreach ($aSearchResults as $iResNum => $aPointDetails) {


@@ -8,7 +16,7 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
                                 'place_id'=>$aPointDetails['place_id'],
                                )
               );
                                 'place_id'=>$aPointDetails['place_id'],
                                )
               );

-    
+

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


@@ -46,7 +54,7 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
     }
 
     if (isset($aPointDetails['asgeojson'])) {
     }
 
     if (isset($aPointDetails['asgeojson'])) {

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

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


@@ -58,8 +66,12 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
     }
 
 
     }
 
 

-    if (isset($aPointDetails['sExtraTags'])) $aPlace['properties']['extratags'] = $aPointDetails['sExtraTags'];
-    if (isset($aPointDetails['sNameDetails'])) $aPlace['properties']['namedetails'] = $aPointDetails['sNameDetails'];
+    if (isset($aPointDetails['sExtraTags'])) {
+        $aPlace['properties']['extratags'] = $aPointDetails['sExtraTags'];
+    }
+    if (isset($aPointDetails['sNameDetails'])) {
+        $aPlace['properties']['namedetails'] = $aPointDetails['sNameDetails'];
+    }

 
     $aFilteredPlaces[] = $aPlace;
 }
 
     $aFilteredPlaces[] = $aPlace;
 }