X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2eccb0e69dd4e443ec534fb9baa374b76ee7e57f..21c590416854b1245866b96772fde61050c0e01a:/lib/template/address-xml.php?ds=sidebyside

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index d6061e3d..39d9a147 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -1,43 +1,68 @@
-<?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>";
-
-		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 (isset($aPlace['aAddress']))
+		{
+			echo "<addressparts>";
+			foreach($aPlace['aAddress'] as $sKey => $sValue)
+			{
+				$sKey = str_replace(' ','_',$sKey);
+				echo "<$sKey>";
+				echo htmlspecialchars($sValue);
+				echo "</$sKey>";
+			}
+			echo "</addressparts>";
+		}
+
+		if (isset($aPlace['sExtraTags']))
+		{
+			echo "<extratags>";
+			foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
+			{
+				echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+			}
+			echo "</extratags>";
+		}
+
+		if (isset($aPlace['sNameDetails']))
+		{
+			echo "<namedetails>";
+			foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
+			{
+				echo '<name desc="'.htmlspecialchars($sKey).'">';
+				echo htmlspecialchars($sValue);
+				echo "</name>";
+			}
+			echo "</namedetails>";
+		}
+	}
+
+	echo "</reversegeocode>";