Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index d3c2bc73c89836bd2b778e1cfe20a9544879bf06..270850f93b4cec6197db67f4c326b28d4f9ff3c0 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -365,6 +365,12 @@
 
        if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
        {
+
+               if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
+                       echo "Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n";
+                       exit;
+               }
+
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
                $sOsmosisCMD = CONST_Osmosis_Binary;
                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';
@@ -534,7 +540,7 @@
 
                        if ( CONST_Replication_Update_Interval > 60 )
                        {
-                               $iSleep = round(CONST_Replication_Update_Interval*0.8);
+                               $iSleep = max(0,(strtotime($sBatchEnd)+CONST_Replication_Update_Interval-time()));
                        }
                        else
                        {