Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index dbf158e5d67f1b2a0a5e4e12a7fd749ce0275a9a..095aaa2ef578fd28a9fd0ec15c19f9f54c7cbbaa 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -15,6 +15,8 @@
 
                array('import-osmosis', '', 0, 1, 0, 0, 'bool', 'Import using osmosis'),
                array('import-osmosis-all', '', 0, 1, 0, 0, 'bool', 'Import using osmosis forever'),
 
                array('import-osmosis', '', 0, 1, 0, 0, 'bool', 'Import using osmosis'),
                array('import-osmosis-all', '', 0, 1, 0, 0, 'bool', 'Import using osmosis forever'),

+               array('no-npi', '', 0, 1, 0, 0, 'bool', 'Do not write npi index files'),
+               array('no-index', '', 0, 1, 0, 0, 'bool', 'Do not index the new data'),

 
                array('import-npi-all', '', 0, 1, 0, 0, 'bool', 'Import npi pre-indexed files'),
 
 
                array('import-npi-all', '', 0, 1, 0, 0, 'bool', 'Import npi pre-indexed files'),
 


@@ -28,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-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'),
 
                array('index', '', 0, 1, 0, 0, 'bool', 'Index'),
                array('index-rank', '', 0, 1, 1, 1, 'int', 'Rank to start indexing from'),


@@ -44,6 +47,7 @@
        }
 
        if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
        }
 
        if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;

+       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)


@@ -63,8 +67,12 @@
        // Assume osm2pgsql is in the folder above
        $sBasePath = dirname(dirname(__FILE__));
 
        // Assume osm2pgsql is in the folder above
        $sBasePath = dirname(dirname(__FILE__));
 

+       date_default_timezone_set('Etc/UTC');
+

        $oDB =& getDB();
 
        $oDB =& getDB();
 

+       $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
+

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


@@ -93,7 +101,7 @@
                {
                        // import diff directly (e.g. from osmosis --rri)
                        $sNextFile = $aResult['import-diff'];
                {
                        // import diff directly (e.g. from osmosis --rri)
                        $sNextFile = $aResult['import-diff'];

-                       if (!file_exists($nextFile))
+                       if (!file_exists($sNextFile))

                        {
                                echo "Cannot open $nextFile\n";
                                exit;
                        {
                                echo "Cannot open $nextFile\n";
                                exit;


@@ -103,10 +111,10 @@
                }
 
                // Missing file is not an error - it might not be created yet
                }
 
                // Missing file is not an error - it might not be created yet

-               if (($aResult['import-hourly'] || $aResult['import-daily']) && file_exists($sNextFile))
+               if (($aResult['import-hourly'] || $aResult['import-daily'] || isset($aResult['import-diff'])) && file_exists($sNextFile))

                {
                        // Import the file
                {
                        // Import the file

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

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


@@ -125,61 +133,104 @@
                }
        }
 
                }
        }
 

-       $sModifyXML = false;
+       $bModifyXML = false;
+       $sModifyXMLstr = '';
+       $bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-main-api'];

        if (isset($aResult['import-file']) && $aResult['import-file'])
        {
        if (isset($aResult['import-file']) && $aResult['import-file'])
        {

-               $sModifyXML = file_get_contents($aResult['import-file']);
+               $bModifyXML = true;

        }
        if (isset($aResult['import-node']) && $aResult['import-node'])
        {
        }
        if (isset($aResult['import-node']) && $aResult['import-node'])
        {

-               $sModifyXML = file_get_contents('http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']);
+               $bModifyXML = true;
+               if ($bUseOSMApi)
+               {
+                       $sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']);
+               }
+               else
+               {
+                       $sModifyXMLstr = file_get_contents('http://overpass.osm.rambler.ru/cgi/interpreter?data=node('.$aResult['import-node'].');out%20meta;');
+               }

        }
        if (isset($aResult['import-way']) && $aResult['import-way'])
        {
        }
        if (isset($aResult['import-way']) && $aResult['import-way'])
        {

-               $sModifyXML = file_get_contents('http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full');
+               $bModifyXML = true;
+               if ($bUseOSMApi)
+               {
+                       $sCmd = 'http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full';
+               }
+               else
+               {
+                       $sCmd = 'http://overpass.osm.rambler.ru/cgi/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
+               }
+               $sModifyXMLstr = file_get_contents($sCmd);

        }
        if (isset($aResult['import-relation']) && $aResult['import-relation'])
        {
        }
        if (isset($aResult['import-relation']) && $aResult['import-relation'])
        {

-               $sModifyXML = file_get_contents('http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full');
+               $bModifyXML = true;
+               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.osm.rambler.ru/cgi/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;');
+               }

        }
        }

-       if ($sModifyXML)
+       if ($bModifyXML)

        {
        {

-               // Hack into a modify request
-               $sModifyXML = str_replace('<osm version="0.6" generator="OpenStreetMap server">',
-                       '<osmChange version="0.6" generator="OpenStreetMap server"><modify>', $sModifyXML);
-               $sModifyXML = str_replace('</osm>', '</modify></osmChange>', $sModifyXML);
-
-               // Outputing this is too verbose
-               if ($aResult['verbose'] && false) var_dump($sModifyXML);
-
-               $sDatabaseName = 'nominatim';
-               $aSpec = array(
-                       0 => array("pipe", "r"),  // stdin
-                       1 => array("pipe", "w"),  // stdout
-                       2 => array("pipe", "w") // stderr
-               );
-               $aPipes = array();
-               $sCMD = $sBasePath.'/osm2pgsql/osm2pgsql -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' -';
-               echo $sCMD."\n";
-               $hProc = proc_open($sCMD, $aSpec, $aPipes);
-               if (!is_resource($hProc))
+               // derive change from normal osm file with osmosis
+               $sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc';
+               if (isset($aResult['import-file']) && $aResult['import-file'])

                {
                {

-                       echo "$sBasePath/osm2pgsql failed\n";
-                       exit;   
+                       $sCMD = CONST_Osmosis_Binary.' --read-xml \''.$aResult['import-file'].'\' --read-empty --derive-change --write-xml-change '.$sTemporaryFile;
+                       echo $sCMD."\n";
+                       exec($sCMD, $sJunk, $iErrorLevel);
+                       if ($iErrorLevel)
+                       {
+                               echo "Error converting osm to osc, osmosis returned: $iErrorLevel\n";
+                               exit;
+                       }

                }
                }

-               fwrite($aPipes[0], $sModifyXML);
-               fclose($aPipes[0]);
-               $sOut = stream_get_contents($aPipes[1]);
-               if ($aResult['verbose']) echo $sOut;
-               fclose($aPipes[1]);
-               $sErrors = stream_get_contents($aPipes[2]);
-               if ($aResult['verbose']) echo $sErrors;
-               fclose($aPipes[2]);
-               if ($iError = proc_close($hProc))
+               else
+               {
+                       $aSpec = array(
+                               0 => array("pipe", "r"),  // stdin
+                               1 => array("pipe", "w"),  // stdout
+                               2 => array("pipe", "w") // stderr
+                       );
+                       $sCMD = CONST_Osmosis_Binary.' --read-xml - --read-empty --derive-change --write-xml-change '.$sTemporaryFile;
+                       echo $sCMD."\n";
+                       $hProc = proc_open($sCMD, $aSpec, $aPipes);
+                       if (!is_resource($hProc))
+                       {
+                               echo "Error converting osm to osc, osmosis failed\n";
+                               exit;
+                       }
+                       fwrite($aPipes[0], $sModifyXMLstr);
+                       fclose($aPipes[0]);
+                       $sOut = stream_get_contents($aPipes[1]);
+                       if ($aResult['verbose']) echo $sOut;
+                       fclose($aPipes[1]);
+                       $sErrors = stream_get_contents($aPipes[2]);
+                       if ($aResult['verbose']) echo $sErrors;
+                       fclose($aPipes[2]);
+                       if ($iError = proc_close($hProc))
+                       {
+                               echo "Error converting osm to osc, osmosis returned: $iError\n";
+                               echo $sOut;
+                               echo $sErrors;
+                               exit;
+                       }
+               }
+
+               // import generated change file
+               $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sTemporaryFile;
+               echo $sCMD."\n";
+               exec($sCMD, $sJunk, $iErrorLevel);
+               if ($iErrorLevel)

                {
                {

-                       echo "osm2pgsql existed with error level $iError\n";
-                       echo $sOut;
-                       echo $sErrors;
+                       echo "osm2pgsql exited with error level $iErrorLevel\n";

                        exit;
                }
        }
                        exit;
                }
        }


@@ -293,19 +344,20 @@
 
        if ($aResult['index'])
        {
 
        if ($aResult['index'])
        {

-               index($aResult, $sDatabaseDSN);
+               passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);

        }
 
        if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
        {
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
        }
 
        if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
        {
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';

-               $sOsmosisCMD = CONST_BasePath.'/osmosis-0.38/bin/osmosis';
+               $sOsmosisCMD = CONST_Osmosis_Binary;

                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';
                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';

-               $sDatabaseName = 'nominatim';

                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;

-               $sCMDImport = $sBasePath.'/osm2pgsql/osm2pgsql -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' '.$sImportFile;
-               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -t 15 -F ';
-//             $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -t 15 ';
+               $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 (!$aResult['no-npi']) {
+                       $sCMDIndex .= '-F ';
+               }

                while(true)
                {
                        $fStartTime = time();
                while(true)
                {
                        $fStartTime = time();


@@ -357,10 +409,15 @@
 
                                // Archive for debug?
                                unlink($sImportFile);
 
                                // Archive for debug?
                                unlink($sImportFile);

+//                     }

 
 

-                               $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
+                       $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
+
+                       // Index file
+                       $sThisIndexCmd = $sCMDIndex;

 
 

-                               // Index file
+                       if (!$aResult['no-npi'])
+                       {

                                $fCMDStartTime = time();
                                $iFileID = $oDB->getOne('select nextval(\'file\')');
                                if (PEAR::isError($iFileID))
                                $fCMDStartTime = time();
                                $iFileID = $oDB->getOne('select nextval(\'file\')');
                                if (PEAR::isError($iFileID))


@@ -373,11 +430,9 @@
                                $sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
 
                                if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);
                                $sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
 
                                if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);

-                               $sThisIndexCmd = $sCMDIndex;

                                $sThisIndexCmd .= $sFileDir;
                                $sThisIndexCmd .= '/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT);
                                $sThisIndexCmd .= ".npi.out";
                                $sThisIndexCmd .= $sFileDir;
                                $sThisIndexCmd .= '/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT);
                                $sThisIndexCmd .= ".npi.out";

-                               echo "$sThisIndexCmd\n";

 
                                preg_match('#^([0-9]{4})-([0-9]{2})-([0-9]{2})#', $sBatchEnd, $aBatchMatch);
                                $sFileDir = CONST_BasePath.'/export/index/';
 
                                preg_match('#^([0-9]{4})-([0-9]{2})-([0-9]{2})#', $sBatchEnd, $aBatchMatch);
                                $sFileDir = CONST_BasePath.'/export/index/';


@@ -385,7 +440,11 @@
 
                                if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);
                                file_put_contents($sFileDir.'/'.$aBatchMatch[3].'.idx', "$sBatchEnd\t$iFileID\n", FILE_APPEND);
 
                                if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);
                                file_put_contents($sFileDir.'/'.$aBatchMatch[3].'.idx', "$sBatchEnd\t$iFileID\n", FILE_APPEND);

+                       }

 
 

+                       if (!$aResult['no-index'])
+                       {
+                               echo "$sThisIndexCmd\n";

                                exec($sThisIndexCmd, $sJunk, $iErrorLevel);
                                if ($iErrorLevel)
                                {
                                exec($sThisIndexCmd, $sJunk, $iErrorLevel);
                                if ($iErrorLevel)
                                {


@@ -393,38 +452,41 @@
                                        exit;
                                }
 
                                        exit;
                                }
 

-                               $sFileDir = CONST_BasePath.'/export/diff/';
-                               $sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
-                               $sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
-
-                               $sThisIndexCmd = 'bzip2 -z9 '.$sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out";
-                               echo "$sThisIndexCmd\n";
-                               exec($sThisIndexCmd, $sJunk, $iErrorLevel);
-                               if ($iErrorLevel)
+                               if (!$aResult['no-npi'])

                                {
                                {

-                                       echo "Error: $iErrorLevel\n";
-                                       exit;
-                               }
+                                       $sFileDir = CONST_BasePath.'/export/diff/';
+                                       $sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
+                                       $sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
+
+                                       $sThisIndexCmd = 'bzip2 -z9 '.$sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out";
+                                       echo "$sThisIndexCmd\n";
+                                       exec($sThisIndexCmd, $sJunk, $iErrorLevel);
+                                       if ($iErrorLevel)
+                                       {
+                                               echo "Error: $iErrorLevel\n";
+                                               exit;
+                                       }

 
 

-                               rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",
-                                       $sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.bz2");
+                                       rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",
+                                               $sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.bz2");
+                               }
+                       }

 
 

-                               echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
-                               $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','index')";
-                               $oDB->query($sSQL);
+                       echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
+                       $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','index')";
+                       $oDB->query($sSQL);

 
 

-                               $sSQL = "update import_status set lastimportdate = '$sBatchEnd'";
-                               $oDB->query($sSQL);
+                       $sSQL = "update import_status set lastimportdate = '$sBatchEnd'";
+                       $oDB->query($sSQL);

 
 

+                       $fDuration = time() - $fStartTime;
+                       echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n";
+                       if (!$aResult['import-osmosis-all']) exit;

 
 

-                               $fDuration = time() - $fStartTime;
-                               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));
                }
                        echo "Sleeping ".max(0,60-$fDuration)." seconds\n";
                        sleep(max(0,60-$fDuration));
                }

-               
+

        }
 
        if ($aResult['import-npi-all'])
        }
 
        if ($aResult['import-npi-all'])