Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 3d011b39c4d65708d59e484da5571a739f36cbf7..5ac8e9dd37425d440ab6362dff35ab07a2e98d62 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,87 +1,128 @@
-<?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 "<searchresults";\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($sQuery, ENT_QUOTES)."'";\r
-       if ($sViewBox) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";\r
-       echo " polygon='".($bShowPolygons?'true':'false')."'";\r
-       if (sizeof($aExcludePlaceIDs))\r
-       {\r
-               echo " exclude_place_ids='".htmlspecialchars(join(',',$aExcludePlaceIDs))."'";\r
-       }\r
-       if ($sMoreURL)\r
-       {\r
-               echo " more_url='".htmlspecialchars($sMoreURL)."'";\r
-       }\r
-       echo ">\n";\r
-\r
-       foreach($aSearchResults as $iResNum => $aResult)\r
-       {\r
-               echo "<place place_id='".$aResult['place_id']."'";\r
-               $sOSMType = ($aResult['osm_type'] == 'N'?'node':($aResult['osm_type'] == 'W'?'way':($aResult['osm_type'] == 'R'?'relation':'')));\r
-               if ($sOSMType)\r
-               {\r
-                       echo " osm_type='$sOSMType'";\r
-                       echo " osm_id='".$aResult['osm_id']."'";\r
-               }\r
-\r
-               if (isset($aResult['aBoundingBox']))\r
-               {\r
-                       echo ' boundingbox="';\r
-                       echo $aResult['aBoundingBox'][0];\r
-                       echo ','.$aResult['aBoundingBox'][1];\r
-                       echo ','.$aResult['aBoundingBox'][2];\r
-                       echo ','.$aResult['aBoundingBox'][3];\r
-                       echo '"';\r
-\r
-                       if ($bShowPolygons)\r
-                       {\r
-                               echo ' polygonpoints=\'';\r
-                               echo javascript_renderData($aResult['aPolyPoints']);\r
-                               echo '\'';\r
-                       }\r
-               }\r
-\r
-               if (isset($aResult['zoom']))\r
-               {\r
-                       echo " zoom='".$aResult['zoom']."'";\r
-               }\r
-\r
-               echo " lat='".$aResult['lat']."'";\r
-               echo " lon='".$aResult['lon']."'";\r
-               echo " display_name='".htmlspecialchars($aResult['name'], ENT_QUOTES)."'";\r
-\r
-               echo " class='".htmlspecialchars($aResult['class'])."'";\r
-               echo " type='".htmlspecialchars($aResult['type'])."'";\r
-               if ($aResult['icon'])\r
-               {\r
-                       echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";\r
-               }\r
-\r
-               if (isset($aResult['address']))\r
-               {\r
-                       echo ">";\r
-                       foreach($aResult['address'] as $sKey => $sValue)\r
-                       {\r
-                               $sKey = str_replace(' ','_',$sKey);\r
-                               echo "<$sKey>";\r
-                               echo htmlspecialchars($sValue);\r
-                               echo "</$sKey>";\r
-                       }\r
-\r
-                       echo "</place>";\r
-               }\r
-               else\r
-               {\r
-                       echo "/>";\r
-               }\r
-       }\r
-       \r
-       echo "</searchresults>";\r
+<?php
+header('content-type: text/xml; charset=UTF-8');
+
+echo '<';
+echo '?xml version="1.0" encoding="UTF-8" ?';
+echo ">\n";
+
+echo '<';
+echo (isset($sXmlRootTag)?$sXmlRootTag:'searchresults');
+echo " timestamp='".date(DATE_RFC822)."'";
+echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
+echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
+if (isset($aMoreParams['viewbox'])) echo " viewbox='".htmlspecialchars($aMoreParams['viewbox'], ENT_QUOTES)."'";
+if (isset($aMoreParams['exclude_place_ids'])) {
+    echo " exclude_place_ids='".htmlspecialchars($aMoreParams['exclude_place_ids'])."'";
+}
+echo " more_url='".htmlspecialchars($sMoreURL)."'";
+echo ">\n";
+
+foreach ($aSearchResults as $iResNum => $aResult) {
+    echo "<place place_id='".$aResult['place_id']."'";
+    $sOSMType = formatOSMType($aResult['osm_type']);
+    if ($sOSMType) {
+        echo " osm_type='$sOSMType'";
+        echo " osm_id='".$aResult['osm_id']."'";
+    }
+    echo " place_rank='".$aResult['rank_search']."'";
+    echo " address_rank='".$aResult['rank_address']."'";
+
+    if (isset($aResult['aBoundingBox'])) {
+        echo ' boundingbox="';
+        echo join(',', $aResult['aBoundingBox']);
+        echo '"';
+    }
+
+    if (isset($aResult['asgeojson'])) {
+        echo ' geojson=\'';
+        echo $aResult['asgeojson'];
+        echo '\'';
+    }
+
+    if (isset($aResult['assvg'])) {
+        echo ' geosvg=\'';
+        echo $aResult['assvg'];
+        echo '\'';
+    }
+
+    if (isset($aResult['astext'])) {
+        echo ' geotext=\'';
+        echo $aResult['astext'];
+        echo '\'';
+    }
+
+    if (isset($aResult['zoom'])) {
+        echo " zoom='".$aResult['zoom']."'";
+    }
+
+    echo " lat='".$aResult['lat']."'";
+    echo " lon='".$aResult['lon']."'";
+    echo " display_name='".htmlspecialchars($aResult['name'], ENT_QUOTES)."'";
+
+    echo " class='".htmlspecialchars($aResult['class'])."'";
+    echo " type='".htmlspecialchars($aResult['type'], ENT_QUOTES)."'";
+    echo " importance='".htmlspecialchars($aResult['importance'])."'";
+    if (isset($aResult['icon']) && $aResult['icon']) {
+        echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
+    }
+
+    $bHasDelim = false;
+
+    if (isset($aResult['askml'])) {
+        if (!$bHasDelim) {
+            $bHasDelim = true;
+            echo '>';
+        }
+        echo "\n<geokml>";
+        echo $aResult['askml'];
+        echo '</geokml>';
+    }
+
+    if (isset($aResult['sExtraTags'])) {
+        if (!$bHasDelim) {
+            $bHasDelim = true;
+            echo '>';
+        }
+        echo "\n<extratags>";
+        foreach ($aResult['sExtraTags'] as $sKey => $sValue) {
+            echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+        }
+        echo '</extratags>';
+    }
+
+    if (isset($aResult['sNameDetails'])) {
+        if (!$bHasDelim) {
+            $bHasDelim = true;
+            echo '>';
+        }
+        echo "\n<namedetails>";
+        foreach ($aResult['sNameDetails'] as $sKey => $sValue) {
+            echo '<name desc="'.htmlspecialchars($sKey).'">';
+            echo htmlspecialchars($sValue);
+            echo '</name>';
+        }
+        echo '</namedetails>';
+    }
+
+    if (isset($aResult['address'])) {
+        if (!$bHasDelim) {
+            $bHasDelim = true;
+            echo '>';
+        }
+        echo "\n";
+        foreach ($aResult['address']->getAddressNames() as $sKey => $sValue) {
+            $sKey = str_replace(' ', '_', $sKey);
+            echo "<$sKey>";
+            echo htmlspecialchars($sValue);
+            echo "</$sKey>";
+        }
+    }
+
+    if ($bHasDelim) {
+        echo '</place>';
+    } else {
+        echo '/>';
+    }
+}
+
+echo '</' . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . '>';