Update update.php

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 21ac524d3d64cd8a4a5e0ce95c71eae91e5e9be0..d1ded5adb203df0d7031210b241322fac5185d8d 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -30,6 +30,7 @@
                array('import-node', '', 0, 1, 1, 1, 'int', 'Re-import node'),
                array('import-way', '', 0, 1, 1, 1, 'int', 'Re-import way'),
                array('import-relation', '', 0, 1, 1, 1, 'int', 'Re-import relation'),
+               array('import-from-main-api', '', 0, 1, 0, 0, 'bool', 'Use OSM API instead of Overpass to download objects'),
 
                array('index', '', 0, 1, 0, 0, 'bool', 'Index'),
                array('index-rank', '', 0, 1, 1, 1, 'int', 'Rank to start indexing from'),
@@ -66,6 +67,8 @@
        // Assume osm2pgsql is in the folder above
        $sBasePath = dirname(dirname(__FILE__));
 
+       date_default_timezone_set('Etc/UTC');
+
        $oDB =& getDB();
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
@@ -100,7 +103,7 @@
                        $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
@@ -112,6 +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;
+                       }
                        echo $sCMD."\n";
                        exec($sCMD, $sJunk, $iErrorLevel);
 
@@ -132,6 +139,7 @@
 
        $bModifyXML = false;
        $sModifyXMLstr = '';
+       $bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-main-api'];
        if (isset($aResult['import-file']) && $aResult['import-file'])
        {
                $bModifyXML = true;
@@ -139,17 +147,39 @@
        if (isset($aResult['import-node']) && $aResult['import-node'])
        {
                $bModifyXML = true;
-               $sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']);
+               if ($bUseOSMApi)
+               {
+                       $sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']);
+               }
+               else
+               {
+                       $sModifyXMLstr = file_get_contents('http://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;');
+               }
        }
        if (isset($aResult['import-way']) && $aResult['import-way'])
        {
                $bModifyXML = true;
-               $sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full');
+               if ($bUseOSMApi)
+               {
+                       $sCmd = 'http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full';
+               }
+               else
+               {
+                       $sCmd = 'http://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
+               }
+               $sModifyXMLstr = file_get_contents($sCmd);
        }
        if (isset($aResult['import-relation']) && $aResult['import-relation'])
        {
                $bModifyXML = true;
-               $sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full');
+               if ($bUseOSMApi)
+               {
+                       $sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full');
+               }
+               else
+               {
+                       $sModifyXMLstr = file_get_contents('http://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;');
+               }
        }
        if ($bModifyXML)
        {
@@ -200,6 +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;
+               }
                echo $sCMD."\n";
                exec($sCMD, $sJunk, $iErrorLevel);
                if ($iErrorLevel)
@@ -327,7 +361,12 @@
                $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;
+               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 ';
@@ -346,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);
@@ -457,8 +519,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);
                }
 
        }