X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/17e2e95b530018c0f090a20dfee2246acc4f4f94..4e99f8a3408d59f5c6bf8d934fda7bb3726f2da2:/lib/template/search-xml.php?ds=inline
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 693330bb..80414fce 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,124 +1,158 @@
\n";
-
- echo "\n";
-
- foreach($aSearchResults as $iResNum => $aResult)
- {
- echo "";
- }
-
- if (isset($aResult['askml']))
- {
- echo "\n";
- echo $aResult['askml'];
- echo "";
- }
-
- if (isset($aResult['address']))
- {
- echo "\n";
- foreach($aResult['address'] as $sKey => $sValue)
- {
- $sKey = str_replace(' ','_',$sKey);
- echo "<$sKey>";
- echo htmlspecialchars($sValue);
- echo "$sKey>";
- }
- }
-
- if (isset($aResult['address']) || isset($aResult['askml']))
- {
- echo "";
- }
- else
- {
- echo "/>";
- }
- }
-
- echo "";
+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)."'";
+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'] as $sKey => $sValue)
+ {
+ $sKey = str_replace(' ','_',$sKey);
+ echo "<$sKey>";
+ echo htmlspecialchars($sValue);
+ echo "$sKey>";
+ }
+ }
+
+ if ($bHasDelim)
+ {
+ echo "";
+ }
+ else
+ {
+ echo "/>";
+ }
+}
+
+echo "" . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . ">";