X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0213643ebcba068561691bfbe366fed075d0d3d1..170426b294955909bf2d56c1ea7bb07b89896675:/lib/template/address-xml.php?ds=inline
diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 0747844a..a17da738 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -1,44 +1,87 @@
\n";
-
- echo "\n";
-
- if (!sizeof($aPlace))
- {
- if (isset($sError))
- echo "$sError";
- else
- echo "Unable to geocode";
- }
- else
- {
- echo "".htmlspecialchars($aPlace['langaddress'])."";
-
- if ($bShowAddressDetails) {
- echo "";
- foreach($aPlace['aAddress'] as $sKey => $sValue)
- {
- $sKey = str_replace(' ','_',$sKey);
- echo "<$sKey>";
- echo htmlspecialchars($sValue);
- echo "$sKey>";
- }
- echo "";
- }
- }
-
- echo "";
+header('content-type: text/xml; charset=UTF-8');
+
+echo '<';
+echo '?xml version="1.0" encoding="UTF-8" ?';
+echo ">\n";
+
+echo '\n";
+
+if (empty($aPlace)) {
+ if (isset($sError))
+ echo "$sError";
+ else echo 'Unable to geocode';
+} else {
+ echo ''.htmlspecialchars($aPlace['langaddress']).'';
+
+ if (isset($aPlace['address'])) {
+ echo '';
+ foreach ($aPlace['address']->getAddressNames() as $sKey => $sValue) {
+ $sKey = str_replace(' ', '_', $sKey);
+ echo "<$sKey>";
+ echo htmlspecialchars($sValue);
+ echo "$sKey>";
+ }
+ echo '';
+ }
+
+ if (isset($aPlace['sExtraTags'])) {
+ echo '';
+ foreach ($aPlace['sExtraTags'] as $sKey => $sValue) {
+ echo '';
+ }
+ echo '';
+ }
+
+ if (isset($aPlace['sNameDetails'])) {
+ echo '';
+ foreach ($aPlace['sNameDetails'] as $sKey => $sValue) {
+ echo '';
+ echo htmlspecialchars($sValue);
+ echo '';
+ }
+ echo '';
+ }
+
+ if (isset($aPlace['askml'])) {
+ echo "\n";
+ echo $aPlace['askml'];
+ echo '';
+ }
+}
+
+echo '';