X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/348a3082c926bc6f8d9a2b5ba9341a9bae338ab6..1d4dcd914fd277aebf242037064612224f4dde54:/website/lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index 9d0cea4c..5fc6c309 100755
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -7,18 +7,6 @@
 	require_once(CONST_BasePath.'/lib/PlaceLookup.php');
 	require_once(CONST_BasePath.'/lib/output.php');
 
-	if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
-	{
-		$fLoadAvg = getLoadAverage();
-		if ($fLoadAvg > 2) sleep(60);
-		if ($fLoadAvg > 4) sleep(120);
-		if ($fLoadAvg > 6)
-		{
-			userError("Bulk User: Temporary block due to high server load");
-			exit;
-		}
-	}
-
 	$oDB =& getDB();
 	ini_set('memory_limit', '200M');
 
@@ -56,8 +44,7 @@
 		if ( $iId > 0 && ($sType == 'N' || $sType == 'W' || $sType == 'R') )
 		{
 			$aCleanedQueryParts[] = $sType . $iId;
-			$oPlaceLookup->setOSMID($sType, $iId);
-			$oPlace = $oPlaceLookup->lookup();
+			$oPlace = $oPlaceLookup->lookupOSMID($sType, $iId);
 			if ($oPlace){
 				// we want to use the search-* output templates, so we need to fill
 				// $aSearchResults and slightly change the (reverse search) oPlace