Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 5eddfa3e2410a262d74d02655e4f4537bdf0bfdc..a17da738215b0ee0c354aa239750df4698f3999e 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -48,9 +48,9 @@ if (empty($aPlace)) {
     }
     echo '>'.htmlspecialchars($aPlace['langaddress']).'</result>';
 
     }
     echo '>'.htmlspecialchars($aPlace['langaddress']).'</result>';
 

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

         echo '<addressparts>';
         echo '<addressparts>';

-        foreach ($aPlace['aAddress'] as $sKey => $sValue) {
+        foreach ($aPlace['address']->getAddressNames() as $sKey => $sValue) {

             $sKey = str_replace(' ', '_', $sKey);
             echo "<$sKey>";
             echo htmlspecialchars($sValue);
             $sKey = str_replace(' ', '_', $sKey);
             echo "<$sKey>";
             echo htmlspecialchars($sValue);