X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9c0ca064b833ad39eac8ffc2447331d732d1a7d0..54126633f6078ebb86b53c614fcb243039e839fb:/lib/template/address-xml.php?ds=sidebyside

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 75f69e15..9eeb3b77 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\" ?";
@@ -14,7 +13,7 @@
 
 	if (!sizeof($aPlace))
 	{
-		if ($sError)
+		if (isset($sError))
 			echo "<error>$sError</error>";
 		else
 			echo "<error>Unable to geocode</error>";
@@ -23,15 +22,16 @@
 	{
 		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':'')));
+		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']).'"';
 		echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
-        if ($bShowAddressDetails) {
+		if ($bShowAddressDetails) {
 			echo "<addressparts>";
-			foreach($aAddress as $sKey => $sValue)
+			foreach($aPlace['aAddress'] as $sKey => $sValue)
 			{
 				$sKey = str_replace(' ','_',$sKey);
 				echo "<$sKey>";
@@ -39,7 +39,7 @@
 				echo "</$sKey>";
 			}
 			echo "</addressparts>";
-        }
+		}
 	}
-	
+
 	echo "</reversegeocode>";