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 cea8774549cef955eb4c91a783cdccbb835f692c..4f0d024ff4b7bf40afd141c97081d5f8d386b174 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -2,7 +2,7 @@
 
 $aFilteredPlaces = array();
 
-if (!sizeof($aPlace)) {
+if (empty($aPlace)) {
     if (isset($sError))
         $aFilteredPlaces['error'] = $sError;
     else $aFilteredPlaces['error'] = 'Unable to geocode';
@@ -16,7 +16,22 @@ if (!sizeof($aPlace)) {
     }
     if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
     if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
+
+    if ($sOutputFormat == 'jsonv2') {
+        $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'];
+
     if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
     if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
     if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];