X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2eccb0e69dd4e443ec534fb9baa374b76ee7e57f..55ca68671d495ad05559a010ae9884a7e2307be6:/website/reverse.php?ds=sidebyside diff --git a/website/reverse.php b/website/reverse.php index f569ffac..ed7090e2 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -2,7 +2,21 @@ require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(CONST_BasePath.'/lib/log.php'); - $oDB =& getDB(); + if (preg_match(CONST_BlockedUserAgents, $_SERVER["HTTP_USER_AGENT"]) > 0) + { + $fLoadAvg = getLoadAverage(); + if ($fLoadAvg >= CONST_BlockReverseMaxLoad) { + header('HTTP/1.0 403 Forbidden'); + header('Content-type: text/html; charset=utf-8'); + echo "

App temporarily blocked

"; + echo "Your application has been temporarily blocked from the OpenStreetMap Nominatim "; + echo "geolocation service due to high server load."; + echo "\n\n"; + exit; + } + + } + if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false) { @@ -16,10 +30,11 @@ } } + $oDB =& getDB(); ini_set('memory_limit', '200M'); // Format for output - $sOutputFormat = 'xml'; + $sOutputFormat = 'xml'; if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2')) { $sOutputFormat = $_GET['format']; @@ -105,8 +120,7 @@ $iPlaceID = $aPlace['place_id']; if (PEAR::IsError($iPlaceID)) { - var_Dump($sSQL, $iPlaceID); - exit; + failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); } } @@ -118,8 +132,7 @@ $iPlaceID = $oDB->getOne($sSQL); if (PEAR::IsError($iPlaceID)) { - var_Dump($sSQL, $iPlaceID); - exit; + failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); } if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28) @@ -129,8 +142,7 @@ $iPlaceID = $oDB->getOne($sSQL); if (PEAR::IsError($iPlaceID)) { - var_Dump($sSQL, $iPlaceID); - exit; + failInternalError("Could not get larger parent for place.", $sSQL, $iPlaceID); } } if (!$iPlaceID)