X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4f75f4cb6e468a8de282a81615e7c720e154c8b4..441cd27a5327c28dff3a771b73fbe83a4fbeadb4:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 0e0f2ff8..a7261802 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,113 +1,88 @@
 <?php
-	@define('CONST_ConnectionBucket_PageType', 'Reverse');
-
-	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-	require_once(CONST_BasePath.'/lib/init-website.php');
-	require_once(CONST_BasePath.'/lib/log.php');
-	require_once(CONST_BasePath.'/lib/PlaceLookup.php');
-	require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
-	require_once(CONST_BasePath.'/lib/output.php');
-
-	$bAsGeoJSON = getParamBool('polygon_geojson');
-	$bAsKML = getParamBool('polygon_kml');
-	$bAsSVG = getParamBool('polygon_svg');
-	$bAsText = getParamBool('polygon_text');
-	if ((($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0)
-		+ ($bAsText?1:0)) > CONST_PolygonOutput_MaximumTypes)
-	{
-		if (CONST_PolygonOutput_MaximumTypes)
-		{
-			userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
-		}
-		else
-		{
-			userError("Polygon output is disabled");
-		}
-		exit;
-	}
-
-
-	// Polygon simplification threshold (optional)
-	$fThreshold = getParamFloat('polygon_threshold', 0.0);
-
-
-	$oDB =& getDB();
-	ini_set('memory_limit', '200M');
-
-	// Format for output
-	$sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'xml');
-
-	// Preferred language
-	$aLangPrefOrder = getPreferredLanguages();
-
-	$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
-
-
-	$sOsmType = getParamSet('osm_type', array('N', 'W', 'R'));
-	$iOsmId = getParamInt('osm_id', -1);
-	$fLat = getParamFloat('lat');
-	$fLon = getParamFloat('lon');
-	if ($sOsmType && $iOsmId > 0)
-	{
-		$aLookup = array('osm_type' => $sOsmType, 'osm_id' => $iOsmId);
-	}
-	else if ($fLat !== false && $fLon !==false)
-	{
-		$oReverseGeocode = new ReverseGeocode($oDB);
-		$oReverseGeocode->setLanguagePreference($aLangPrefOrder);
-
-		$oReverseGeocode->setLatLon($fLat, $fLon);
-		$oReverseGeocode->setZoom(getParamInt('zoom', 18));
-
-		$aLookup = $oReverseGeocode->lookup();
-		if (CONST_Debug) var_dump($aLookup);
-	}
-	else if ($sOutputFormat != 'html')
-	{
-		userError("Need coordinates or OSM object to lookup.");
-	}
-
-	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);
-
-		$oPlaceLookup->setIncludePolygonAsPoints(false);
-		$oPlaceLookup->setIncludePolygonAsText($bAsText);
-		$oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
-		$oPlaceLookup->setIncludePolygonAsKML($bAsKML);
-		$oPlaceLookup->setIncludePolygonAsSVG($bAsSVG);
-		$oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
-
-		$fRadius = $fDiameter = getResultDiameter($aPlace);
-		$aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius);
-
-		if ($aOutlineResult)
-		{
-			$aPlace = array_merge($aPlace, $aOutlineResult);
-		}
-	}
-	else
-	{
-		$aPlace = null;
-	}
-
-
-	if (CONST_Debug)
-	{
-		var_dump($aPlace);
-		exit;
-	}
-
-	if ($sOutputFormat=='html')
-	{
-		$sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
-		$sTileURL = CONST_Map_Tile_URL;
-		$sTileAttribution = CONST_Map_Tile_Attribution;
-	}
-	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
+@define('CONST_ConnectionBucket_PageType', 'Reverse');
+
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/lib/init-website.php');
+require_once(CONST_BasePath.'/lib/log.php');
+require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
+require_once(CONST_BasePath.'/lib/output.php');
+ini_set('memory_limit', '200M');
+
+$oParams = new Nominatim\ParameterParser();
+
+// Format for output
+$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');
+
+// Preferred language
+$aLangPrefOrder = $oParams->getPreferredLanguages();
+
+$oDB =& getDB();
+
+$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
+
+$oPlaceLookup = new Nominatim\PlaceLookup($oDB);
+$oPlaceLookup->loadParamArray($oParams);
+$oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));
+
+$sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
+$iOsmId = $oParams->getInt('osm_id', -1);
+$fLat = $oParams->getFloat('lat');
+$fLon = $oParams->getFloat('lon');
+$iZoom = $oParams->getInt('zoom', 18);
+
+if ($sOsmType && $iOsmId > 0) {
+    $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);
+} elseif ($fLat !== false && $fLon !== false) {
+    $oReverseGeocode = new Nominatim\ReverseGeocode($oDB);
+    $oReverseGeocode->setZoom($iZoom);
+
+    $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
+    if (CONST_Debug) var_dump($oLookup);
+
+    if ($oLookup) {
+        $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));
+        if (!empty($aPlaces)) {
+            $aPlace = reset($aPlaces);
+        }
+    }
+} elseif ($sOutputFormat != 'html') {
+    userError('Need coordinates or OSM object to lookup.');
+}
+
+if (isset($aPlace)) {
+    $aOutlineResult = $oPlaceLookup->getOutlines(
+        $aPlace['place_id'],
+        $aPlace['lon'],
+        $aPlace['lat'],
+        Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
+        $fLat,
+        $fLon
+    );
+
+    if ($aOutlineResult) {
+        $aPlace = array_merge($aPlace, $aOutlineResult);
+    }
+} else {
+    $aPlace = array();
+}
+
+
+if (CONST_Debug) {
+    var_dump($aPlace);
+    exit;
+}
+
+if ($sOutputFormat == 'html') {
+    $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
+    $sTileURL = CONST_Map_Tile_URL;
+    $sTileAttribution = CONST_Map_Tile_Attribution;
+} elseif ($sOutputFormat == 'geocodejson') {
+    $sQuery = $fLat.','.$fLon;
+    if (isset($aPlace['place_id'])) {
+        $fDistance = chksql($oDB->getOne('SELECT ST_Distance(ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326), centroid) FROM placex where place_id='.$aPlace['place_id']));
+    }
+}
+
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
+include(CONST_BasePath.'/lib/template/address-'.$sOutputTemplate.'.php');