utils/update.php: make the process exit with an non-zero error code if the update...

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

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 9eeb3b778a6c5737d76a49ee33cfd3455fa47081..39d9a14792171a0c0d0cd0efc60ff8fa73c7257b 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -29,7 +29,8 @@
                if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
                echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
                if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
                echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 

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

                        echo "<addressparts>";
                        foreach($aPlace['aAddress'] as $sKey => $sValue)
                        {
                        echo "<addressparts>";
                        foreach($aPlace['aAddress'] as $sKey => $sValue)
                        {


@@ -40,6 +41,28 @@
                        }
                        echo "</addressparts>";
                }
                        }
                        echo "</addressparts>";
                }

+
+               if (isset($aPlace['sExtraTags']))
+               {
+                       echo "<extratags>";
+                       foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
+                       {
+                               echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+                       }
+                       echo "</extratags>";
+               }
+
+               if (isset($aPlace['sNameDetails']))
+               {
+                       echo "<namedetails>";
+                       foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
+                       {
+                               echo '<name desc="'.htmlspecialchars($sKey).'">';
+                               echo htmlspecialchars($sValue);
+                               echo "</name>";
+                       }
+                       echo "</namedetails>";
+               }

        }
 
        echo "</reversegeocode>";
        }
 
        echo "</reversegeocode>";