Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-geojson.php b/lib/template/address-geojson.php
index 8ef5713bedbe75e155dad3cc81863350b9c5448d..089a86b683273bb9c147af66d6f34bee0ce872dd 100644 (file)
--- a/lib/template/address-geojson.php
+++ b/lib/template/address-geojson.php
@@ -33,7 +33,9 @@ if (empty($aPlace)) {
 
     $aFilteredPlaces['properties']['display_name'] = $aPlace['langaddress'];
 
 
     $aFilteredPlaces['properties']['display_name'] = $aPlace['langaddress'];
 

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

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