Merge pull request #2772 from kianmeng/fix-typos

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

diff --git a/lib-php/template/address-geocodejson.php b/lib-php/template/address-geocodejson.php
index 927f3861778b40c56947927d705a82f9f5527210..d54aef4005b26f843d890641f68e74aac5774bd7 100644 (file)
--- a/lib-php/template/address-geocodejson.php
+++ b/lib-php/template/address-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.
+ */

 
 // https://github.com/geocoders/geocodejson-spec/
 
 
 // https://github.com/geocoders/geocodejson-spec/
 


@@ -28,7 +36,7 @@ if (empty($aPlace)) {
         $aFilteredPlaces['properties']['geocoding']['osm_id'] = $aPlace['osm_id'];
     }
 
         $aFilteredPlaces['properties']['geocoding']['osm_id'] = $aPlace['osm_id'];
     }
 

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

 
     $aFilteredPlaces['properties']['geocoding']['accuracy'] = (int) $fDistance;
 
 
     $aFilteredPlaces['properties']['geocoding']['accuracy'] = (int) $fDistance;
 


@@ -48,7 +56,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',