From 87519de8abbd26955661d5c075149dc3e94b797e Mon Sep 17 00:00:00 2001 From: Frederik Ramm Date: Thu, 16 May 2013 09:11:19 +0200 Subject: [PATCH] fix indentation --- settings/settings.php | 2 +- utils/setup.php | 8 ++++---- utils/update.php | 24 ++++++++++++------------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/settings/settings.php b/settings/settings.php index dbd9bf93..fc6ee8de 100644 --- a/settings/settings.php +++ b/settings/settings.php @@ -17,7 +17,7 @@ @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql'); @define('CONST_Osmosis_Binary', '/usr/bin/osmosis'); - // osm2pgsql settings + // osm2pgsql settings @define('CONST_Osm2pgsql_Flatnode_File', null); // Replication settings diff --git a/utils/setup.php b/utils/setup.php index c0bf0a39..081efd0d 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -155,10 +155,10 @@ fail("osm2pgsql not found in '$osm2pgsql'"); } - if (!is_null(CONST_Osm2pgsql_Flatnode_File)) - { - $osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; - } + if (!is_null(CONST_Osm2pgsql_Flatnode_File)) + { + $osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; + } $osm2pgsql .= ' -lsc -O gazetteer --hstore'; $osm2pgsql .= ' -C '.$iCacheMemory; $osm2pgsql .= ' -P '.$aDSNInfo['port']; diff --git a/utils/update.php b/utils/update.php index edfc53c1..d38de598 100755 --- a/utils/update.php +++ b/utils/update.php @@ -115,10 +115,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; - } + if (!is_null(CONST_Osm2pgsql_Flatnode_File)) + { + $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; + } echo $sCMD."\n"; exec($sCMD, $sJunk, $iErrorLevel); @@ -230,10 +230,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; - } + if (!is_null(CONST_Osm2pgsql_Flatnode_File)) + { + $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; + } echo $sCMD."\n"; exec($sCMD, $sJunk, $iErrorLevel); if ($iErrorLevel) @@ -363,10 +363,10 @@ $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; - } + 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']; if (!$aResult['no-npi']) { $sCMDIndex .= '-F '; -- 2.39.5