X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/86ca377b1a1505c7a599746c095bc83156e3997d..7879ad44cd1e36ae1235c3dcdfd9e477491813e4:/lib/template/address-xml.php

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index ba085eea..a3369d34 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -22,11 +22,46 @@
 	{
 		echo "<result";
 		if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
-		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+		$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 (isset($aPlace['aAddress']))
@@ -47,9 +82,7 @@
 			echo "<extratags>";
 			foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
 			{
-				echo '<tag key="'.htmlspecialchars($sKey).'">';
-				echo htmlspecialchars($sValue);
-				echo "</tag>";
+				echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
 			}
 			echo "</extratags>";
 		}
@@ -59,12 +92,20 @@
 			echo "<namedetails>";
 			foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
 			{
-				echo '<name key="'.htmlspecialchars($sKey).'">';
+				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>";