X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a44e21de49d397d8fb6d860a03f1cde711be59c0..e591269fd8c357b922f2809d21f726a2469788b3:/lib/template/search-xml.php

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 0521de0e..693330bb 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,6 +1,5 @@
 <?php
 	header("content-type: text/xml; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
 
 	echo "<";
 	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
@@ -8,9 +7,9 @@
 
 	echo "<searchresults";
 	echo " timestamp='".date(DATE_RFC822)."'";
-	echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";
+	echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 	echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
-	if (isset($sViewBox)) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
+	if ($sViewBox) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
 	echo " polygon='".($bShowPolygons?'true':'false')."'";
 	if (sizeof($aExcludePlaceIDs))
 	{
@@ -45,11 +44,32 @@
 			if ($bShowPolygons && isset($aResult['aPolyPoints']))
 			{
 				echo ' polygonpoints=\'';
-				echo javascript_renderData($aResult['aPolyPoints']);
+				echo json_encode($aResult['aPolyPoints']);
 				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']."'";
@@ -60,15 +80,28 @@
 		echo " display_name='".htmlspecialchars($aResult['name'], ENT_QUOTES)."'";
 
 		echo " class='".htmlspecialchars($aResult['class'])."'";
-		echo " type='".htmlspecialchars($aResult['type'])."'";
-		if ($aResult['icon'])
+		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)."'";
 		}
 
-		if (isset($aResult['address']))
+		if (isset($aResult['address']) || isset($aResult['askml']))
 		{
 			echo ">";
+		}
+
+		if (isset($aResult['askml']))
+		{
+			echo "\n<geokml>";
+			echo $aResult['askml'];
+			echo "</geokml>";
+		}
+
+		if (isset($aResult['address']))
+		{
+			echo "\n";
 			foreach($aResult['address'] as $sKey => $sValue)
 			{
 				$sKey = str_replace(' ','_',$sKey);
@@ -76,7 +109,10 @@
 				echo htmlspecialchars($sValue);
 				echo "</$sKey>";
 			}
+		}
 
+		if (isset($aResult['address']) || isset($aResult['askml']))
+		{
 			echo "</place>";
 		}
 		else