X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/550578b35919aaa6186966d844fea711570f89e1..04d5d12ecd31afcbbc631b6c0997417f68586b52:/lib/template/search-xml.php?ds=inline

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index b15c9a2e..693330bb 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,88 +1,124 @@
-<?php
-	header("content-type: text/xml; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
-
-	echo "<";
-	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
-	echo ">\n";
-
-	echo "<searchresults";
-	echo " timestamp='".date(DATE_RFC822)."'";
-	echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";
-	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 "<place place_id='".$aResult['place_id']."'";
-		$sOSMType = ($aResult['osm_type'] == 'N'?'node':($aResult['osm_type'] == 'W'?'way':($aResult['osm_type'] == 'R'?'relation':'')));
-		if ($sOSMType)
-		{
-			echo " osm_type='$sOSMType'";
-			echo " osm_id='".$aResult['osm_id']."'";
-		}
-		echo " place_rank='".$aResult['rank_search']."'";
-
-		if (isset($aResult['aBoundingBox']))
-		{
-			echo ' boundingbox="';
-			echo $aResult['aBoundingBox'][0];
-			echo ','.$aResult['aBoundingBox'][1];
-			echo ','.$aResult['aBoundingBox'][2];
-			echo ','.$aResult['aBoundingBox'][3];
-			echo '"';
-
-			if ($bShowPolygons)
-			{
-				echo ' polygonpoints=\'';
-				echo javascript_renderData($aResult['aPolyPoints']);
-				echo '\'';
-			}
-		}
-
-		if (isset($aResult['zoom']))
-		{
-			echo " zoom='".$aResult['zoom']."'";
-		}
-
-		echo " lat='".$aResult['lat']."'";
-		echo " lon='".$aResult['lon']."'";
-		echo " display_name='".htmlspecialchars($aResult['name'], ENT_QUOTES)."'";
-
-		echo " class='".htmlspecialchars($aResult['class'])."'";
-		echo " type='".htmlspecialchars($aResult['type'])."'";
-		if ($aResult['icon'])
-		{
-			echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
-		}
-
-		if (isset($aResult['address']))
-		{
-			echo ">";
-			foreach($aResult['address'] as $sKey => $sValue)
-			{
-				$sKey = str_replace(' ','_',$sKey);
-				echo "<$sKey>";
-				echo htmlspecialchars($sValue);
-				echo "</$sKey>";
-			}
-
-			echo "</place>";
-		}
-		else
-		{
-			echo "/>";
-		}
-	}
-	
-	echo "</searchresults>";
+<?php
+	header("content-type: text/xml; charset=UTF-8");
+
+	echo "<";
+	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
+	echo ">\n";
+
+	echo "<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 "<place place_id='".$aResult['place_id']."'";
+		$sOSMType = ($aResult['osm_type'] == 'N'?'node':($aResult['osm_type'] == 'W'?'way':($aResult['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType)
+		{
+			echo " osm_type='$sOSMType'";
+			echo " osm_id='".$aResult['osm_id']."'";
+		}
+		echo " place_rank='".$aResult['rank_search']."'";
+
+		if (isset($aResult['aBoundingBox']))
+		{
+			echo ' boundingbox="';
+			echo $aResult['aBoundingBox'][0];
+			echo ','.$aResult['aBoundingBox'][1];
+			echo ','.$aResult['aBoundingBox'][2];
+			echo ','.$aResult['aBoundingBox'][3];
+			echo '"';
+
+			if ($bShowPolygons && isset($aResult['aPolyPoints']))
+			{
+				echo ' polygonpoints=\'';
+				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']."'";
+		}
+
+		echo " lat='".$aResult['lat']."'";
+		echo " lon='".$aResult['lon']."'";
+		echo " display_name='".htmlspecialchars($aResult['name'], ENT_QUOTES)."'";
+
+		echo " class='".htmlspecialchars($aResult['class'])."'";
+		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']) || 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);
+				echo "<$sKey>";
+				echo htmlspecialchars($sValue);
+				echo "</$sKey>";
+			}
+		}
+
+		if (isset($aResult['address']) || isset($aResult['askml']))
+		{
+			echo "</place>";
+		}
+		else
+		{
+			echo "/>";
+		}
+	}
+	
+	echo "</searchresults>";