X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3abbeb5f081c648a6f2fe0213663627ad6b37198..b42939a3249e73027516eb6e79a9f1f8c642ff95:/lib/template/address-xml.php?ds=sidebyside

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 185601ad..9eeb3b77 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -1,45 +1,45 @@
-<?php
-	header("content-type: text/xml; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
-
-	echo "<";
-	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
-	echo ">\n";
-
-	echo "<reversegeocode";
-	echo " timestamp='".date(DATE_RFC822)."'";
-	echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";
-	echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
-	echo ">\n";
-
-	if (!sizeof($aPlace))
-	{
-		if ($sError)
-			echo "<error>$sError</error>";
-		else
-			echo "<error>Unable to geocode</error>";
-	}
-	else
-	{
-		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'].'"';
-		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) {
-			echo "<addressparts>";
-			foreach($aAddress as $sKey => $sValue)
-			{
-				$sKey = str_replace(' ','_',$sKey);
-				echo "<$sKey>";
-				echo htmlspecialchars($sValue);
-				echo "</$sKey>";
-			}
-			echo "</addressparts>";
-        }
-	}
-	
-	echo "</reversegeocode>";
+<?php
+	header("content-type: text/xml; charset=UTF-8");
+
+	echo "<";
+	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
+	echo ">\n";
+
+	echo "<reversegeocode";
+	echo " timestamp='".date(DATE_RFC822)."'";
+	echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
+	echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
+	echo ">\n";
+
+	if (!sizeof($aPlace))
+	{
+		if (isset($sError))
+			echo "<error>$sError</error>";
+		else
+			echo "<error>Unable to geocode</error>";
+	}
+	else
+	{
+		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':'')));
+		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) {
+			echo "<addressparts>";
+			foreach($aPlace['aAddress'] as $sKey => $sValue)
+			{
+				$sKey = str_replace(' ','_',$sKey);
+				echo "<$sKey>";
+				echo htmlspecialchars($sValue);
+				echo "</$sKey>";
+			}
+			echo "</addressparts>";
+		}
+	}
+
+	echo "</reversegeocode>";