From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 20 May 2013 08:51:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~610
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f476dd61ac30d7248e0b729aa1fcd8d414088ad9?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php
	utils/update.php
---

f476dd61ac30d7248e0b729aa1fcd8d414088ad9
diff --combined settings/settings.php
index cdc28a3f,fc6ee8de..4e9d71f0
--- a/settings/settings.php
+++ b/settings/settings.php
@@@ -17,6 -17,9 +17,9 @@@
  	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
  	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
  
+ 	// osm2pgsql settings
+ 	@define('CONST_Osm2pgsql_Flatnode_File', null);
+ 
  	// Replication settings
  	@define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
  	@define('CONST_Replication_MaxInterval', '3600');
@@@ -48,14 -51,12 +51,14 @@@
  
  	// 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_Website_BaseURL', 'http://'.php_uname('n').'/');
 +	@define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
  	@define('CONST_Tile_Default', 'Mapnik');
  
  	@define('CONST_Default_Language', false);
diff --combined utils/setup.php
index 6b0a5b37,081efd0d..80c139f7
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -154,9 -154,13 +154,14 @@@
  			echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
  			fail("osm2pgsql not found in '$osm2pgsql'");
  		}
+ 
+ 		if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+ 		{
+ 			$osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+ 		}
 +		$osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
  		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -		$osm2pgsql .= ' -C '.$iCacheMemory;
 +		$osm2pgsql .= ' -C 16000';
  		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);
@@@ -481,7 -485,7 +486,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) ";
diff --combined utils/update.php
index e8972f1d,d38de598..f82696c2
--- a/utils/update.php
+++ b/utils/update.php
@@@ -46,6 -46,7 +46,6 @@@
  		showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
  	}
  
 -	if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
  	if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  /*
  	// Lock to prevent multiple copies running
@@@ -114,6 -115,10 +114,10 @@@
  		{
  			// Import the file
  			$sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sNextFile;
+ 			if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+ 			{
+ 				$sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+ 			}
  			echo $sCMD."\n";
  			exec($sCMD, $sJunk, $iErrorLevel);
  
@@@ -225,6 -230,10 +229,10 @@@
  
  		// import generated change file
  		$sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sTemporaryFile;
+ 		if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+ 		{
+ 			$sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+ 		}
  		echo $sCMD."\n";
  		exec($sCMD, $sJunk, $iErrorLevel);
  		if ($iErrorLevel)
@@@ -343,7 -352,6 +351,7 @@@
  
  	if ($aResult['index'])
  	{
 +		if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
  		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
  	}
  
@@@ -355,7 -363,11 +363,11 @@@
  		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
  		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
  		$sCMDImport = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sImportFile;
+ 		if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+ 		{
+ 			$sCMDImport .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+ 		}
 -		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
 +		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
  		if (!$aResult['no-npi']) {
  			$sCMDIndex .= '-F ';
  		}
@@@ -438,16 -450,7 +450,16 @@@
  			$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
  
  			// Index file
 -			$sThisIndexCmd = $sCMDIndex;
 +			if (!isset($aResult['index-instances']))
 +			{
 +				if (getLoadAverage() < 15)
 +					$iIndexInstances = 2;
 +				else
 +					$iIndexInstances = 1;
 +			} else
 +				$iIndexInstances = $aResult['index-instances'];
 +
 +			$sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
  
  			if (!$aResult['no-npi'])
  			{