Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 5217f7348f58714f0061ddfcdb711842ba299987..d1603fa1e1752f68b55544ea44150dc96bf294a5 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');
 
        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');
 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 


@@ -69,6 +57,7 @@
                $aPlace = null;
        }
 
                $aPlace = null;
        }
 

+       logEnd($oDB, $hLog, sizeof($aPlace)?1:0);

 
        if (CONST_Debug)
        {
 
        if (CONST_Debug)
        {


@@ -76,4 +65,6 @@
                exit;
        }
 
                exit;
        }
 

+       $sTileURL = CONST_Map_Tile_URL;
+       $sTileAttribution = CONST_Map_Tile_Attribution;

        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');