X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e90087a063698139beb087f24c068ce04171e8bf..10c5d7f6f6f6ea321fea870e1ec984fa5e4af135:/lib/template/address-xml.php?ds=sidebyside

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 39d9a147..2bfcffbf 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -22,11 +22,38 @@
 	{
 		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 = formatOSMType($aPlace['osm_type']);
 		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 (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']))
@@ -63,6 +90,14 @@
 			}
 			echo "</namedetails>";
 		}
+
+		if (isset($aPlace['askml']))
+		{
+			echo "\n<geokml>";
+			echo $aPlace['askml'];
+			echo "</geokml>";
+		}
+
 	}
 
 	echo "</reversegeocode>";