X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/248fca51627a8989603344e813bf78e3131de4a8..2c6b17f772fec2db0a8a8bac7462efecef92337e:/website/reverse.php?ds=sidebyside diff --git a/website/reverse.php b/website/reverse.php index 56b80a5c..00bcf635 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -49,11 +49,12 @@ $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'); if ($sOsmType && $iOsmId > 0) { $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId); } elseif ($fLat !== false && $fLon !== false) { $oReverseGeocode = new Nominatim\ReverseGeocode($oDB); - $oReverseGeocode->setZoom($oParams->getInt('zoom', 18)); + $oReverseGeocode->setZoom($iZoom !== false ? $iZoom : 18); $aLookup = $oReverseGeocode->lookup($fLat, $fLon); if (CONST_Debug) var_dump($aLookup); @@ -67,7 +68,7 @@ if ($sOsmType && $iOsmId > 0) { userError("Need coordinates or OSM object to lookup."); } -if ($aPlace) { +if (isset($aPlace)) { $oPlaceLookup->setIncludePolygonAsPoints(false); $oPlaceLookup->setIncludePolygonAsText($bAsText); $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON); @@ -86,6 +87,8 @@ if ($aPlace) { if ($aOutlineResult) { $aPlace = array_merge($aPlace, $aOutlineResult); } +} else { + $aPlace = []; } logEnd($oDB, $hLog, sizeof($aPlace)?1:0); @@ -95,7 +98,7 @@ if (CONST_Debug) { 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;