safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

fix PHP warnings when reverse search was called without parameters

Browse Source 
... or empty results
This commit is contained in:
marc tobias
2016-11-17 22:55:05 +01:00
committed by Sarah Hoffmann
parent cfb0f3f94c
commit b27926fd4d
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/reverse.php
View File

@@ -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 = [];
}
@@ -94,7 +97,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;