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~605
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/f476dd61ac30d7248e0b729aa1fcd8d414088ad9

Merge remote-tracking branch 'upstream/master'

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

f476dd61ac30d7248e0b729aa1fcd8d414088ad9
diff --cc 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);
diff --cc utils/update.php
index e8972f1d,d38de598..f82696c2
--- a/utils/update.php
+++ b/utils/update.php
@@@ -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 ';
  		}