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 75f69e1563c2a96cc8d27dddfb205a226680dcf8..5eddfa3e2410a262d74d02655e4f4537bdf0bfdc 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -1,45 +1,87 @@
 <?php
-       header("content-type: text/xml; charset=UTF-8");
-       header("Access-Control-Allow-Origin: *");
-
-       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 (!sizeof($aPlace))
-       {
-               if ($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'].'"';
-               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'].'"';
-               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']).'"';
-               echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
-
-        if ($bShowAddressDetails) {
-                       echo "<addressparts>";
-                       foreach($aAddress as $sKey => $sValue)
-                       {
-                               $sKey = str_replace(' ','_',$sKey);
-                               echo "<$sKey>";
-                               echo htmlspecialchars($sValue);
-                               echo "</$sKey>";
-                       }
-                       echo "</addressparts>";
+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['aAddress'])) {
+        echo '<addressparts>';
+        foreach ($aPlace['aAddress'] as $sKey => $sValue) {
+            $sKey = str_replace(' ', '_', $sKey);
+            echo "<$sKey>";
+            echo htmlspecialchars($sValue);
+            echo "</$sKey>";
         }
-       }
-       
-       echo "</reversegeocode>";
+        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>';