X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/28166c5bb11e3aa3a22e3c5dc13075dbe1b7dc9a..cecbfb8e4c8c3265a9d9222d7dadeb11ebdd034c:/lib/template/search-xml.php
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 5d8b26bc..80091b0a 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,164 +1,161 @@
\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') . ">";
+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 ($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') . ">";