Merge branch 'osm-search:master' into check-database-on-frozen-database

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

diff --git a/lib-php/template/search-geocodejson.php b/lib-php/template/search-geocodejson.php
index 336731a2de6b1ff836ae44222a428c1980aea7c5..bba41a0d2210532c30afe3f7c0e34ddde0b4df68 100644 (file)
--- a/lib-php/template/search-geocodejson.php
+++ b/lib-php/template/search-geocodejson.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) {


@@ -17,8 +25,10 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
         $aPlace['properties']['geocoding']['osm_type'] = $sOSMType;
         $aPlace['properties']['geocoding']['osm_id'] = $aPointDetails['osm_id'];
     }
         $aPlace['properties']['geocoding']['osm_type'] = $sOSMType;
         $aPlace['properties']['geocoding']['osm_id'] = $aPointDetails['osm_id'];
     }

+    $aPlace['properties']['geocoding']['osm_key'] = $aPointDetails['class'];
+    $aPlace['properties']['geocoding']['osm_value'] = $aPointDetails['type'];

 
 

-    $aPlace['properties']['geocoding']['type'] = $aPointDetails['type'];
+    $aPlace['properties']['geocoding']['type'] = addressRankToGeocodeJsonType($aPointDetails['rank_address']);

 
     $aPlace['properties']['geocoding']['label'] = $aPointDetails['langaddress'];
 
 
     $aPlace['properties']['geocoding']['label'] = $aPointDetails['langaddress'];
 


@@ -36,7 +46,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',