Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 93abb6017308b485c7634bc9a89fe1d670a07f03..691d6a749f8e32f09932b3c75be72b99f2172a07 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -2,55 +2,61 @@
 
 $aFilteredPlaces = array();
 
 
 $aFilteredPlaces = array();
 

-if (!sizeof($aPlace))
-{
+if (empty($aPlace)) {

     if (isset($sError))
         $aFilteredPlaces['error'] = $sError;
     if (isset($sError))
         $aFilteredPlaces['error'] = $sError;

-    else
-        $aFilteredPlaces['error'] = 'Unable to geocode';
-}
-else
-{
+    else $aFilteredPlaces['error'] = 'Unable to geocode';
+} else {

     if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
     if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];

-    $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright";
+    $aFilteredPlaces['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';

     $sOSMType = formatOSMType($aPlace['osm_type']);
     $sOSMType = formatOSMType($aPlace['osm_type']);

-    if ($sOSMType)
-    {
+    if ($sOSMType) {

         $aFilteredPlaces['osm_type'] = $sOSMType;
         $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
     }
     if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
     if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
         $aFilteredPlaces['osm_type'] = $sOSMType;
         $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
     }
     if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
     if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];

+
+    if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') {
+        $aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
+
+        $aFilteredPlaces['category'] = $aPlace['class'];
+        $aFilteredPlaces['type'] = $aPlace['type'];
+
+        $aFilteredPlaces['importance'] = $aPlace['importance'];
+
+        $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+
+        $aFilteredPlaces['name'] = $aPlace['placename'];
+    }
+

     $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
     $aFilteredPlaces['display_name'] = $aPlace['langaddress'];

-    if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+
+    if (isset($aPlace['address'])) {
+        $aFilteredPlaces['address'] = $aPlace['address']->getAddressNames();
+    }

     if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
     if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
 
     if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
     if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
 

-    if (isset($aPlace['aBoundingBox']))
-    {
+    if (isset($aPlace['aBoundingBox'])) {

         $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
     }
 
         $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
     }
 

-    if (isset($aPlace['asgeojson']))
-    {
+    if (isset($aPlace['asgeojson'])) {

         $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
     }
 
         $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
     }
 

-    if (isset($aPlace['assvg']))
-    {
+    if (isset($aPlace['assvg'])) {

         $aFilteredPlaces['svg'] = $aPlace['assvg'];
     }
 
         $aFilteredPlaces['svg'] = $aPlace['assvg'];
     }
 

-    if (isset($aPlace['astext']))
-    {
+    if (isset($aPlace['astext'])) {

         $aFilteredPlaces['geotext'] = $aPlace['astext'];
     }
 
         $aFilteredPlaces['geotext'] = $aPlace['astext'];
     }
 

-    if (isset($aPlace['askml']))
-    {
+    if (isset($aPlace['askml'])) {

         $aFilteredPlaces['geokml'] = $aPlace['askml'];
     }
 }
 
 javascript_renderData($aFilteredPlaces);
         $aFilteredPlaces['geokml'] = $aPlace['askml'];
     }
 }
 
 javascript_renderData($aFilteredPlaces);

-