X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e90087a063698139beb087f24c068ce04171e8bf..21c590416854b1245866b96772fde61050c0e01a:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index abc33a09..d1603fa1 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -6,24 +6,12 @@
 	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');
 
 	// Format for output
 	$sOutputFormat = 'xml';
-	if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
+	if (isset($_GET['format']) && ( $_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
 	{
 		$sOutputFormat = $_GET['format'];
 	}
@@ -69,6 +57,7 @@
 		$aPlace = null;
 	}
 
+	logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
 
 	if (CONST_Debug)
 	{
@@ -76,4 +65,6 @@
 		exit;
 	}
 
+	$sTileURL = CONST_Map_Tile_URL;
+	$sTileAttribution = CONST_Map_Tile_Attribution;
 	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');