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 b620c63e831a504d9fca78adf4df33fc35b37cf9..691d6a749f8e32f09932b3c75be72b99f2172a07 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -32,7 +32,9 @@ if (empty($aPlace)) {
 
     $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'];