X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/92095c9247ebfeb08ea1bcaebbae66ee406ce426..b14bc75dc4a0ca44485599d8ab4cf1c5781098e2:/lib/template/address-xml.php

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index a3369d34..2bfcffbf 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -22,8 +22,7 @@
 	{
 		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':
-		($aPlace['osm_type'] == 'T'?'tiger':($aPlace['osm_type'] == 'I'?'interpolation':'')))));
+		$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']).'"';
@@ -33,13 +32,6 @@
 			echo ' boundingbox="';
 			echo join(',', $aPlace['aBoundingBox']);
 			echo '"';
-
-			if ($bAsPoints && isset($aPlace['aPolyPoints']))
-			{
-				echo ' polygonpoints=\'';
-				echo json_encode($aPlace['aPolyPoints']);
-				echo '\'';
-			}
 		}
 
 		if (isset($aPlace['asgeojson']))