X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7239687e5b7fab3c48a567cfee811fc8e9d1f2e8..f5718ed909f1ff93d238f2c3fac2429a420efbfa:/lib/template/search-xml.php?ds=inline
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 6e48be4c..f67ba33b 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,88 +1,134 @@
-\n";
-
- echo "\n";
-
- foreach($aSearchResults as $iResNum => $aResult)
- {
- echo "";
- foreach($aResult['address'] as $sKey => $sValue)
- {
- $sKey = str_replace(' ','_',$sKey);
- echo "<$sKey>";
- echo htmlspecialchars($sValue);
- echo "$sKey>";
- }
-
- echo "";
- }
- else
- {
- echo "/>";
- }
- }
-
- 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)."'";
+echo " polygon='".(isset($aMoreParams['polygon'])?'true':'false')."'";
+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 "';
+ }
+ echo "\n";
+ echo $aResult['askml'];
+ echo '';
+ }
+
+ if (isset($aResult['sExtraTags'])) {
+ if (!$bHasDelim) {
+ $bHasDelim = true;
+ echo '>';
+ }
+ echo "\n";
+ foreach ($aResult['sExtraTags'] as $sKey => $sValue) {
+ echo '';
+ }
+ echo '';
+ }
+
+ if (isset($aResult['sNameDetails'])) {
+ if (!$bHasDelim) {
+ $bHasDelim = true;
+ echo '>';
+ }
+ echo "\n";
+ foreach ($aResult['sNameDetails'] as $sKey => $sValue) {
+ echo '';
+ echo htmlspecialchars($sValue);
+ echo '';
+ }
+ echo '';
+ }
+
+ 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 '';
+ } else {
+ echo '/>';
+ }
+}
+
+echo '' . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . '>';