From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 8 Feb 2016 19:42:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~432
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/21c590416854b1245866b96772fde61050c0e01a?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'
---

21c590416854b1245866b96772fde61050c0e01a
diff --combined settings/settings.php
index 3deda462,04ffe162..765849e7
--- a/settings/settings.php
+++ b/settings/settings.php
@@@ -78,21 -78,21 +78,23 @@@
  
  	// Website settings
  	@define('CONST_NoAccessControl', true);
 -	@define('CONST_ClosedForIndexing', false);
 -	@define('CONST_ClosedForIndexingExceptionIPs', '');
  	@define('CONST_BlockedIPs', '');
 +	@define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
 +	@define('CONST_WhitelistedIPs', '');
 +	@define('CONST_BlockedUserAgents', '');
 +	@define('CONST_BlockReverseMaxLoad', 15);
  	@define('CONST_BulkUserIPs', '');
  	@define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
  
 -	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 +	@define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
  	@define('CONST_Tile_Default', 'Mapnik');
  
  	@define('CONST_Default_Language', false);
  	@define('CONST_Default_Lat', 20.0);
  	@define('CONST_Default_Lon', 0.0);
  	@define('CONST_Default_Zoom', 2);
+ 	@define('CONST_Map_Tile_URL', 'http://{s}.tile.osm.org/{z}/{x}/{y}.png');
+ 	@define('CONST_Map_Tile_Attribution', ''); // Set if tile source isn't osm.org
  
  	@define('CONST_Search_AreaPolygons_Enabled', true);
  	@define('CONST_Search_AreaPolygons', true);
@@@ -116,3 -116,5 +118,5 @@@
  	@define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
  	@define('CONST_Log_File_SearchLog', '');
  	@define('CONST_Log_File_ReverseLog', '');
+ 
+ 
diff --combined website/reverse.php
index daf0a72d,e2dfaef8..d1603fa1
--- a/website/reverse.php
+++ b/website/reverse.php
@@@ -6,6 -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');
  
@@@ -57,7 -69,6 +57,7 @@@
  		$aPlace = null;
  	}
  
 +	logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
  	if (CONST_Debug)
  	{
@@@ -65,4 -76,6 +65,6 @@@
  		exit;
  	}
  
+ 	$sTileURL = CONST_Map_Tile_URL;
+ 	$sTileAttribution = CONST_Map_Tile_Attribution;
  	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');