Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index e8972f1d26f4d3cefa962667459966d38f548050..d3c2bc73c89836bd2b778e1cfe20a9544879bf06 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -26,6 +26,7 @@
 
                array('import-file', '', 0, 1, 1, 1, 'realpath', 'Re-import data from an OSM file'),
                array('import-diff', '', 0, 1, 1, 1, 'realpath', 'Import a diff (osc) file from local file system'),
 
                array('import-file', '', 0, 1, 1, 1, 'realpath', 'Re-import data from an OSM file'),
                array('import-diff', '', 0, 1, 1, 1, 'realpath', 'Import a diff (osc) file from local file system'),

+               array('osm2pgsql-cache', '', 0, 1, 1, 1, 'int', 'Cache size used by osm2pgsql'),

 
                array('import-node', '', 0, 1, 1, 1, 'int', 'Re-import node'),
                array('import-way', '', 0, 1, 1, 1, 'int', 'Re-import way'),
 
                array('import-node', '', 0, 1, 1, 1, 'int', 'Re-import node'),
                array('import-way', '', 0, 1, 1, 1, 'int', 'Re-import way'),


@@ -47,6 +48,7 @@
        }
 
        if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
        }
 
        if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;

+

 /*
        // Lock to prevent multiple copies running
        if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)
 /*
        // Lock to prevent multiple copies running
        if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)


@@ -72,6 +74,20 @@
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
 
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
 

+       // cache memory to be used by osm2pgsql, should not be more than the available memory
+       $iCacheMemory = (isset($aResult['osm2pgsql-cache'])?$aResult['osm2pgsql-cache']:2000);
+       if ($iCacheMemory + 500 > getTotalMemoryMB())
+       {
+               $iCacheMemory = getCacheMemoryMB();
+               echo "WARNING: resetting cache memory to $iCacheMemory\n";
+       }
+       $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'];
+       if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+       {
+               $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+       }
+
+

        $bFirst = true;
        $bContinue = $aResult['import-all'];
        while ($bContinue || $bFirst)
        $bFirst = true;
        $bContinue = $aResult['import-all'];
        while ($bContinue || $bFirst)


@@ -102,7 +118,7 @@
                        $sNextFile = $aResult['import-diff'];
                        if (!file_exists($sNextFile))
                        {
                        $sNextFile = $aResult['import-diff'];
                        if (!file_exists($sNextFile))
                        {

-                               echo "Cannot open $nextFile\n";
+                               echo "Cannot open $sNextFile\n";

                                exit;
                        }
                        // Don't update the import status - we don't know what this file contains
                                exit;
                        }
                        // Don't update the import status - we don't know what this file contains


@@ -113,7 +129,7 @@
                if (($aResult['import-hourly'] || $aResult['import-daily'] || isset($aResult['import-diff'])) && file_exists($sNextFile))
                {
                        // Import the file
                if (($aResult['import-hourly'] || $aResult['import-daily'] || isset($aResult['import-diff'])) && file_exists($sNextFile))
                {
                        // Import the file

-                       $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sNextFile;
+                       $sCMD = $sOsm2pgsqlCmd.' '.$sNextFile;

                        echo $sCMD."\n";
                        exec($sCMD, $sJunk, $iErrorLevel);
 
                        echo $sCMD."\n";
                        exec($sCMD, $sJunk, $iErrorLevel);
 


@@ -224,7 +240,7 @@
                }
 
                // import generated change file
                }
 
                // import generated change file

-               $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sTemporaryFile;
+               $sCMD = $sOsm2pgsqlCmd.' '.$sTemporaryFile;

                echo $sCMD."\n";
                exec($sCMD, $sJunk, $iErrorLevel);
                if ($iErrorLevel)
                echo $sCMD."\n";
                exec($sCMD, $sJunk, $iErrorLevel);
                if ($iErrorLevel)


@@ -354,7 +370,7 @@
                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
                $sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';
                $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;
+               $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;

                $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';


@@ -379,7 +395,7 @@
 
                                                unset($aReplicationLag);
                                                exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
 
                                                unset($aReplicationLag);
                                                exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 

-                                               while ($iErrorLevel == 1 || $aReplicationLag[0] < 1)
+                                               while ($iErrorLevel > 0 || $aReplicationLag[0] < 1)

                                                {
                                                        if ($iErrorLevel)
                                                        {
                                                {
                                                        if ($iErrorLevel)
                                                        {


@@ -400,7 +416,7 @@
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);

-                                       while ($iErrorLevel == 1)
+                                       while ($iErrorLevel > 0)

                                        {
                                                echo "Error: $iErrorLevel\n";
                                                sleep(60);
                                        {
                                                echo "Error: $iErrorLevel\n";
                                                sleep(60);