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 dc9f054855354e10ec556a301403978950f35752..a17da738215b0ee0c354aa239750df4698f3999e 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -1,41 +1,87 @@
-<?php\r
-       header("content-type: text/xml; charset=UTF-8");\r
-       header("Access-Control-Allow-Origin: *");\r
-\r
-       echo "<";\r
-       echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";\r
-       echo ">\n";\r
-\r
-       echo "<reversegeocode";\r
-       echo " timestamp='".date(DATE_RFC822)."'";\r
-       echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";\r
-       echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";\r
-       echo ">\n";\r
-\r
-       if (!sizeof($aPlace))\r
-       {\r
-               if ($sError)\r
-                       echo "<error>$sError</error>";\r
-               else\r
-                       echo "<error>Unable to geocode</error>";\r
-       }\r
-       else\r
-       {\r
-               echo "<result";\r
-               if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';\r
-               if ($aPlace['osm_type'] && $aPlace['osm_id']) echo ' osm_type="'.($aPlace['osm_type']=='N'?'node':($aPlace['osm_type']=='W'?'way':'relation')).'"'.' osm_id="'.$aPlace['osm_id'].'"';\r
-               if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';\r
-               echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";\r
-\r
-               echo "<addressparts>";\r
-               foreach($aAddress as $sKey => $sValue)\r
-               {\r
-                       $sKey = str_replace(' ','_',$sKey);\r
-                       echo "<$sKey>";\r
-                       echo htmlspecialchars($sValue);\r
-                       echo "</$sKey>";\r
-               }\r
-               echo "</addressparts>";\r
-       }\r
-       \r
-       echo "</reversegeocode>";\r
+<?php
+header('content-type: text/xml; charset=UTF-8');
+
+echo '<';
+echo '?xml version="1.0" encoding="UTF-8" ?';
+echo ">\n";
+
+echo '<reversegeocode';
+echo " timestamp='".date(DATE_RFC822)."'";
+echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
+echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
+echo ">\n";
+
+if (empty($aPlace)) {
+    if (isset($sError))
+        echo "<error>$sError</error>";
+    else echo '<error>Unable to geocode</error>';
+} else {
+    echo '<result';
+    if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
+    $sOSMType = formatOSMType($aPlace['osm_type']);
+    if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
+    if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
+    if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
+    if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
+    if (isset($aPlace['aBoundingBox'])) {
+        echo ' boundingbox="';
+        echo join(',', $aPlace['aBoundingBox']);
+        echo '"';
+    }
+
+    if (isset($aPlace['asgeojson'])) {
+        echo ' geojson=\'';
+        echo $aPlace['asgeojson'];
+        echo '\'';
+    }
+
+    if (isset($aPlace['assvg'])) {
+        echo ' geosvg=\'';
+        echo $aPlace['assvg'];
+        echo '\'';
+    }
+
+    if (isset($aPlace['astext'])) {
+        echo ' geotext=\'';
+        echo $aPlace['astext'];
+        echo '\'';
+    }
+    echo '>'.htmlspecialchars($aPlace['langaddress']).'</result>';
+
+    if (isset($aPlace['address'])) {
+        echo '<addressparts>';
+        foreach ($aPlace['address']->getAddressNames() as $sKey => $sValue) {
+            $sKey = str_replace(' ', '_', $sKey);
+            echo "<$sKey>";
+            echo htmlspecialchars($sValue);
+            echo "</$sKey>";
+        }
+        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>';
+    }
+
+    if (isset($aPlace['askml'])) {
+        echo "\n<geokml>";
+        echo $aPlace['askml'];
+        echo '</geokml>';
+    }
+}
+
+echo '</reversegeocode>';