X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b86d5c6a42624708af4e57121caf5cc02241544f..051998dd80b0def50058266b7adbdf2e971032eb:/lib/template/address-xml.php

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index fcd90b85..a3369d34 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-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\" ?";
@@ -23,15 +22,52 @@
 	{
 		echo "<result";
 		if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
-		if ($aPlace['osm_type'] && $aPlace['osm_id']) echo ' osm_type="'.($aPlace['osm_type']=='N'?'node':($aPlace['osm_type']=='W'?'way':'relation')).'"'.' osm_id="'.$aPlace['osm_id'].'"';
+		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':
+		($aPlace['osm_type'] == 'T'?'tiger':($aPlace['osm_type'] == 'I'?'interpolation':'')))));
+		if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
 		if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
 		if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
 		if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
+		if (isset($aPlace['aBoundingBox']))
+		{
+			echo ' boundingbox="';
+			echo join(',', $aPlace['aBoundingBox']);
+			echo '"';
+
+			if ($bAsPoints && isset($aPlace['aPolyPoints']))
+			{
+				echo ' polygonpoints=\'';
+				echo json_encode($aPlace['aPolyPoints']);
+				echo '\'';
+			}
+		}
+
+		if (isset($aPlace['asgeojson']))
+		{
+			echo ' geojson=\'';
+			echo $aPlace['asgeojson'];
+			echo '\'';
+		}
+
+		if (isset($aPlace['assvg']))
+		{
+			echo ' geosvg=\'';
+			echo $aPlace['assvg'];
+			echo '\'';
+		}
+
+		if (isset($aPlace['astext']))
+		{
+			echo ' geotext=\'';
+			echo $aPlace['astext'];
+			echo '\'';
+		}
 		echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
-        if ($bShowAddressDetails) {
+		if (isset($aPlace['aAddress']))
+		{
 			echo "<addressparts>";
-			foreach($aAddress as $sKey => $sValue)
+			foreach($aPlace['aAddress'] as $sKey => $sValue)
 			{
 				$sKey = str_replace(' ','_',$sKey);
 				echo "<$sKey>";
@@ -39,7 +75,37 @@
 				echo "</$sKey>";
 			}
 			echo "</addressparts>";
-        }
+		}
+
+		if (isset($aPlace['sExtraTags']))
+		{
+			echo "<extratags>";
+			foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
+			{
+				echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+			}
+			echo "</extratags>";
+		}
+
+		if (isset($aPlace['sNameDetails']))
+		{
+			echo "<namedetails>";
+			foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
+			{
+				echo '<name desc="'.htmlspecialchars($sKey).'">';
+				echo htmlspecialchars($sValue);
+				echo "</name>";
+			}
+			echo "</namedetails>";
+		}
+
+		if (isset($aPlace['askml']))
+		{
+			echo "\n<geokml>";
+			echo $aPlace['askml'];
+			echo "</geokml>";
+		}
+
 	}
-	
+
 	echo "</reversegeocode>";