X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c7c23fb4aeaa6cb21200d46b936ddbdc3adc292e..a46c739ffb1801c83a86b4776c70a3e9cb0440c6:/utils/update.php?ds=sidebyside diff --git a/utils/update.php b/utils/update.php index e8972f1d..f82696c2 100755 --- a/utils/update.php +++ b/utils/update.php @@ -114,6 +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 +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) @@ -355,6 +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; + } $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database']; if (!$aResult['no-npi']) { $sCMDIndex .= '-F ';