Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index ca823d3cdf60d1be6d1da3cfa4ae4e2dc1e06dfa..1f6e0aad1114f9acbd14e5baf210ef8cc4e792a9 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -6,19 +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;
-               }
-       }
-
-
        $bAsPoints = false;
        $bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
        $bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
@@ -104,17 +91,14 @@
                $fRadius = $fDiameter = getResultDiameter($aPlace);
                $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'],$aPlace['lon'],$aPlace['lat'],$fRadius);
 
-               foreach($aOutlineResult as $k => $v)
-               {
-                       $aPlace[$k] = $v;
-               }
-
+               $aPlace = array_merge($aPlace, $aOutlineResult);
        }
        else
        {
                $aPlace = null;
        }
 
+       logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
 
        if (CONST_Debug)
        {