Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index ee6a6100c8a4da0e4c6addd6058b0c951f66ecf3..d70a11e9e2a1a0f3639711f9522273a5865bab5a 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -6,18 +6,6 @@
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 
-       if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
-       {
-               $fLoadAvg = getLoadAverage();
-               if ($fLoadAvg > 2) sleep(60);
-               if ($fLoadAvg > 4) sleep(120);
-               if ($fLoadAvg > 6)
-               {
-                       echo "Bulk User: Temporary block due to high server load\n";
-                       exit;
-               }
-       }
-
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 
@@ -45,10 +33,8 @@
                $oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);
 
                $aPlace = $oPlaceLookup->lookup();
-
-               //if (!$iPlaceID) $sError = 'OSM ID Not Found';
        }
-       else
+       else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon']))
        {
                $oReverseGeocode = new ReverseGeocode($oDB);
                $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
@@ -59,6 +45,12 @@
 
                $aPlace = $oReverseGeocode->lookup();
        }
+       else
+       {
+               $aPlace = null;
+       }
+
+       logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
 
        if (CONST_Debug) exit;