X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b955883a5bff28acbc6c5c62254cf6d479d8c111..21c590416854b1245866b96772fde61050c0e01a:/website/reverse.php?ds=sidebyside

diff --git a/website/reverse.php b/website/reverse.php
index ed877899..d1603fa1 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -11,43 +11,60 @@
 
 	// Format for output
 	$sOutputFormat = 'xml';
-	if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
+	if (isset($_GET['format']) && ( $_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
 	{
 		$sOutputFormat = $_GET['format'];
 	}
 
-	// Show address breakdown
-	$bShowAddressDetails = true;
-	if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
-
 	// Preferred language
 	$aLangPrefOrder = getPreferredLanguages();
 
 	$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
+
 	if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
 	{
-		$oPlaceLookup = new PlaceLookup($oDB);
-		$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
-		$oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
-		$oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);
-
-		$aPlace = $oPlaceLookup->lookup();
-
-		//if (!$iPlaceID) $sError = 'OSM ID Not Found';
+		$aLookup = array('osm_type' => $_GET['osm_type'], 'osm_id' => $_GET['osm_id']);
 	}
-	else
+	else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon']))
 	{
 		$oReverseGeocode = new ReverseGeocode($oDB);
 		$oReverseGeocode->setLanguagePreference($aLangPrefOrder);
-		$oReverseGeocode->setIncludeAddressDetails($bShowAddressDetails);
 
 		$oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']);
 		$oReverseGeocode->setZoom(@$_GET['zoom']);
 
-		$aPlace = $oReverseGeocode->lookup();
+		$aLookup = $oReverseGeocode->lookup();
+		if (CONST_Debug) var_dump($aLookup);
+	}
+	else
+	{
+		$aLookup = null;
+	}
+
+	if ($aLookup)
+	{
+		$oPlaceLookup = new PlaceLookup($oDB);
+		$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+		$oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
+		$oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
+		$oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
+
+		$aPlace = $oPlaceLookup->lookupPlace($aLookup);
 	}
+	else
+	{
+		$aPlace = null;
+	}
+
+	logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
 
-	if (CONST_Debug) exit;
+	if (CONST_Debug)
+	{
+		var_dump($aPlace);
+		exit;
+	}
 
+	$sTileURL = CONST_Map_Tile_URL;
+	$sTileAttribution = CONST_Map_Tile_Attribution;
 	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');