X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..b27926fd4d96e0bcb0471543e4f29c14752f43e2:/website/reverse.php?ds=sidebyside diff --git a/website/reverse.php b/website/reverse.php index 8864ab64..026fa85b 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -9,21 +9,18 @@ require_once(CONST_BasePath.'/lib/ReverseGeocode.php'); require_once(CONST_BasePath.'/lib/output.php'); ini_set('memory_limit', '200M'); -$oParams = new ParameterParser(); +$oParams = new Nominatim\ParameterParser(); $bAsGeoJSON = $oParams->getBool('polygon_geojson'); $bAsKML = $oParams->getBool('polygon_kml'); $bAsSVG = $oParams->getBool('polygon_svg'); $bAsText = $oParams->getBool('polygon_text'); -if ((($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0) - + ($bAsText?1:0)) > CONST_PolygonOutput_MaximumTypes) -{ - if (CONST_PolygonOutput_MaximumTypes) - { + +$iWantedTypes = ($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0) + ($bAsText?1:0); +if ($iWantedTypes > CONST_PolygonOutput_MaximumTypes) { + if (CONST_PolygonOutput_MaximumTypes) { userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option"); - } - else - { + } else { userError("Polygon output is disabled"); } } @@ -42,7 +39,7 @@ $oDB =& getDB(); $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder); -$oPlaceLookup = new PlaceLookup($oDB); +$oPlaceLookup = new Nominatim\PlaceLookup($oDB); $oPlaceLookup->setLanguagePreference($aLangPrefOrder); $oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true)); $oPlaceLookup->setIncludeExtraTags($oParams->getBool('extratags', false)); @@ -52,28 +49,26 @@ $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R')); $iOsmId = $oParams->getInt('osm_id', -1); $fLat = $oParams->getFloat('lat'); $fLon = $oParams->getFloat('lon'); -if ($sOsmType && $iOsmId > 0) -{ +$iZoom = $oParams->getInt('zoom'); +if ($sOsmType && $iOsmId > 0) { $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId); -} -else if ($fLat !== false && $fLon !== false) -{ - $oReverseGeocode = new ReverseGeocode($oDB); - $oReverseGeocode->setZoom($oParams->getInt('zoom', 18)); +} elseif ($fLat !== false && $fLon !== false) { + $oReverseGeocode = new Nominatim\ReverseGeocode($oDB); + $oReverseGeocode->setZoom($iZoom !== false ? $iZoom : 18); $aLookup = $oReverseGeocode->lookup($fLat, $fLon); if (CONST_Debug) var_dump($aLookup); - $aPlace = $oPlaceLookup->lookup((int)$aLookup['place_id'], - $aLookup['type'], $aLookup['fraction']); -} -else if ($sOutputFormat != 'html') -{ + $aPlace = $oPlaceLookup->lookup( + (int)$aLookup['place_id'], + $aLookup['type'], + $aLookup['fraction'] + ); +} elseif ($sOutputFormat != 'html') { userError("Need coordinates or OSM object to lookup."); } -if ($aPlace) -{ +if (isset($aPlace)) { $oPlaceLookup->setIncludePolygonAsPoints(false); $oPlaceLookup->setIncludePolygonAsText($bAsText); $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON); @@ -82,25 +77,27 @@ if ($aPlace) $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold); $fRadius = $fDiameter = getResultDiameter($aPlace); - $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], - $aPlace['lon'], $aPlace['lat'], - $fRadius); - - if ($aOutlineResult) - { + $aOutlineResult = $oPlaceLookup->getOutlines( + $aPlace['place_id'], + $aPlace['lon'], + $aPlace['lat'], + $fRadius + ); + + if ($aOutlineResult) { $aPlace = array_merge($aPlace, $aOutlineResult); } +} else { + $aPlace = []; } -if (CONST_Debug) -{ +if (CONST_Debug) { var_dump($aPlace); exit; } -if ($sOutputFormat=='html') -{ +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;