Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 9c50db71dc08f5b0e3e25bfc0188dfb4c074531e..f82696c215c6217d17237d05383158433c91bdd4 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -46,7 +46,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;
 /*
        // Lock to prevent multiple copies running
@@ -115,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);
 
@@ -226,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)
@@ -344,6 +351,7 @@
 
        if ($aResult['index'])
        {
+               if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
                passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
        }
 
@@ -353,8 +361,13 @@
                $sOsmosisCMD = CONST_Osmosis_Binary;
                $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;
-               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
+               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 ';
                }
@@ -372,7 +385,30 @@
 //                     {
                                if (!file_exists($sImportFile))
                                {
-                                       // Use osmosis to download the file
+                                       // First check if there are new updates published (except for minutelies - there's always new diffs to process)
+                                       if ( CONST_Replication_Update_Interval > 60 )
+                                       {
+
+                                               unset($aReplicationLag);
+                                               exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
+                                               while ($iErrorLevel == 1 || $aReplicationLag[0] < 1)
+                                               {
+                                                       if ($iErrorLevel)
+                                                       {
+                                                               echo "Error: $iErrorLevel. ";
+                                                               echo "Re-trying: ".$sCMDCheckReplicationLag." in ".CONST_Replication_Recheck_Interval." secs\n";
+                                                       }
+                                                       else
+                                                       {
+                                                               echo ".";
+                                                       }
+                                                       sleep(CONST_Replication_Recheck_Interval);
+                                                       unset($aReplicationLag);
+                                                       exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
+                                               }
+                                               // There are new replication files - use osmosis to download the file
+                                               echo "\nReplication Delay is ".$aReplicationLag[0]."\n";
+                                       }
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);
@@ -414,7 +450,16 @@
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file
-                       $sThisIndexCmd = $sCMDIndex;
+                       if (!isset($aResult['index-instances']))
+                       {
+                               if (getLoadAverage() < 15)
+                                       $iIndexInstances = 2;
+                               else
+                                       $iIndexInstances = 1;
+                       } else
+                               $iIndexInstances = $aResult['index-instances'];
+
+                       $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
 
                        if (!$aResult['no-npi'])
                        {
@@ -483,8 +528,16 @@
                        echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n";
                        if (!$aResult['import-osmosis-all']) exit;
 
-                       echo "Sleeping ".max(0,60-$fDuration)." seconds\n";
-                       sleep(max(0,60-$fDuration));
+                       if ( CONST_Replication_Update_Interval > 60 )
+                       {
+                               $iSleep = round(CONST_Replication_Update_Interval*0.8);
+                       }
+                       else
+                       {
+                               $iSleep = max(0,CONST_Replication_Update_Interval-$fDuration);
+                       }
+                       echo "Sleeping $iSleep seconds\n";
+                       sleep($iSleep);
                }
 
        }