From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 27 Jun 2015 10:19:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~448
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/54126633f6078ebb86b53c614fcb243039e839fb?ds=inline;hp=-c

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

54126633f6078ebb86b53c614fcb243039e839fb
diff --combined settings/settings.php
index ccf75f87,48ff7c4e..62892ed5
--- a/settings/settings.php
+++ b/settings/settings.php
@@@ -78,15 -78,13 +78,15 @@@
  
  	// 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);
@@@ -102,6 -100,8 +102,8 @@@
  	@define('CONST_Search_TryDroppedAddressTerms', false);
  	@define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
  
+ 	@define('CONST_Places_Max_ID_count', 50); 
+ 
  	// Set to zero to disable polygon output
  	@define('CONST_PolygonOutput_MaximumTypes', 1);
  
diff --combined utils/setup.php
index 08e3d341,3fad6fe8..3bbe18d4
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -199,7 -199,7 +199,7 @@@
  		if (CONST_Tablespace_Place_Index)
  			$osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
  		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -		$osm2pgsql .= ' -C '.$iCacheMemory;
 +		$osm2pgsql .= ' -C 25000';
  		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);
@@@ -546,7 -546,7 +546,7 @@@
  		$sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,";
  		$sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,";
  		$sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
 -		$sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x";
 +		$sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x";
  		if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
  
  		$sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) ";
@@@ -710,6 -710,7 +710,7 @@@
  		@symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
  		@symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
  		@symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');
+ 		@symlink(CONST_BasePath.'/website/lookup.php', $sTargetDir.'/lookup.php');
  		@symlink(CONST_BasePath.'/website/deletable.php', $sTargetDir.'/deletable.php');
  		@symlink(CONST_BasePath.'/website/polygons.php', $sTargetDir.'/polygons.php');
  		@symlink(CONST_BasePath.'/website/status.php', $sTargetDir.'/status.php');