replace database settings with dotenv variant

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

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 5eddfa3e2410a262d74d02655e4f4537bdf0bfdc..ab0bc72cbab623cbe62ff13d217ba6325b0deaf3 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -28,6 +28,9 @@ if (empty($aPlace)) {
         echo join(',', $aPlace['aBoundingBox']);
         echo '"';
     }
         echo join(',', $aPlace['aBoundingBox']);
         echo '"';
     }

+    echo " place_rank='".$aPlace['rank_search']."'";
+    echo " address_rank='".$aPlace['rank_address']."'";
+

 
     if (isset($aPlace['asgeojson'])) {
         echo ' geojson=\'';
 
     if (isset($aPlace['asgeojson'])) {
         echo ' geojson=\'';


@@ -48,9 +51,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);