X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/932d945b7f897fd18be7d4c2fac3eda3915aa296..00a3e843e3fb4a6fc735a019cdf7a3e38558cad6:/utils/update.php

diff --git a/utils/update.php b/utils/update.php
index eadd3851..f82696c2 100755
--- 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
@@ -67,6 +66,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);
@@ -113,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);
 
@@ -147,7 +152,7 @@
 		}
 		else
 		{
-			$sModifyXMLstr = file_get_contents('http://overpass.osm.rambler.ru/cgi/interpreter?data=node('.$aResult['import-node'].');out%20meta;');
+			$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'])
@@ -159,7 +164,7 @@
 		}
 		else
 		{
-			$sCmd = 'http://overpass.osm.rambler.ru/cgi/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
+			$sCmd = 'http://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
 		}
 		$sModifyXMLstr = file_get_contents($sCmd);
 	}
@@ -172,7 +177,7 @@
 		}
 		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;');
+			$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)
@@ -224,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)
@@ -342,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']);
 	}
 
@@ -351,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 ';
 		}
@@ -370,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);
@@ -412,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'])
 			{
@@ -481,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);
 		}
 
 	}