From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 29 Aug 2015 11:16:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~435
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5b767a2cc8cbec9df0743d8bb959456fa24a2380?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php
---

5b767a2cc8cbec9df0743d8bb959456fa24a2380
diff --combined utils/setup.php
index be422949,782665d7..0ecf5e6d
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -200,8 -200,8 +200,8 @@@
  			$osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
  		if (CONST_Tablespace_Place_Index)
  			$osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
- 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
+ 		$osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
 -		$osm2pgsql .= ' -C '.$iCacheMemory;
 +		$osm2pgsql .= ' -C 25000';
  		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);
@@@ -548,7 -548,7 +548,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 a561aaa3,13790450..9ce0f334
--- a/utils/update.php
+++ b/utils/update.php
@@@ -47,6 -47,7 +47,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;
  
  /*
@@@ -82,7 -83,7 +82,7 @@@
  		$iCacheMemory = getCacheMemoryMB();
  		echo "WARNING: resetting cache memory to $iCacheMemory\n";
  	}
- 	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+ 	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
  	if (!is_null(CONST_Osm2pgsql_Flatnode_File))
  	{
  		$sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
@@@ -356,7 -357,6 +356,7 @@@
  
  	if ($aResult['index'])
  	{
 +		if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
  		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
  	}
  
@@@ -374,7 -374,7 +374,7 @@@
  		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
  		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
  		$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
 -		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
 +		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
  		if (!$aResult['no-npi']) {
  			$sCMDIndex .= '-F ';
  		}
@@@ -459,16 -459,7 +459,16 @@@
  			$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
  
  			// Index file
 -			$sThisIndexCmd = $sCMDIndex;
 +			if (!isset($aResult['index-instances']))
 +			{
 +				if (getLoadAverage() < 24)
 +					$iIndexInstances = 2;
 +				else
 +					$iIndexInstances = 1;
 +			} else
 +				$iIndexInstances = $aResult['index-instances'];
 +
 +			$sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
  			$fCMDStartTime = time();
  
  			if (!$aResult['no-npi'])