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

[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 584e27cff7b7484730ddebf60a20092c9143ead4..28c605f76ae6e177236ba5a1af5ec3e5fd69c2e6 100644 (file)
--- a/lib-php/template/address-geocodejson.php
+++ b/lib-php/template/address-geocodejson.php
@@ -36,7 +36,10 @@ 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']['osm_key'] = $aPlace['class'];
+    $aFilteredPlaces['properties']['geocoding']['osm_value'] = $aPlace['type'];
+
+    $aFilteredPlaces['properties']['geocoding']['type'] = addressRankToGeocodeJsonType($aPlace['rank_address']);

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


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