X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/550578b35919aaa6186966d844fea711570f89e1..eda837a9e5dae51fbe39fbbde3c7f415af5b2a1c:/lib/template/search-xml.php?ds=sidebyside
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index b15c9a2e..6a382ebf 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,88 +1,161 @@
-\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 ($sViewBox) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
+ echo " polygon='".($bShowPolygons?'true':'false')."'";
+ if (sizeof($aExcludePlaceIDs))
+ {
+ echo " exclude_place_ids='".htmlspecialchars(join(',',$aExcludePlaceIDs))."'";
+ }
+ if ($sMoreURL)
+ {
+ 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'] as $sKey => $sValue)
+ {
+ $sKey = str_replace(' ','_',$sKey);
+ echo "<$sKey>";
+ echo htmlspecialchars($sValue);
+ echo "$sKey>";
+ }
+ }
+
+ if ($bHasDelim)
+ {
+ echo "";
+ }
+ else
+ {
+ echo "/>";
+ }
+ }
+
+ echo "" . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . ">";