Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index d91c8a7685e77e1e2b3d54ad3a6b459248b0bcc7..7b9338d5c03f43fcbfc0a2c578925e88cd59ae5e 100644 (file)
--- a/utils/update.php
+++ b/utils/update.php
@@ -83,6 +83,12 @@ if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
 }
 
 $sIndexCmd = CONST_BasePath.'/nominatim/nominatim.py';
+if (!$aResult['quiet']) {
+    $sIndexCmd .= ' -v';
+}
+if ($aResult['verbose']) {
+    $sIndexCmd .= ' -v';
+}
 
 if ($aResult['init-updates']) {
     // sanity check that the replication URL is correct
@@ -349,7 +355,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     //
     if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
         fail('Error: Update interval too low for download.geofabrik.de. ' .
-             "Please check install documentation (http://nominatim.org/release-docs/latest/Import-and-Update#setting-up-the-update-process)\n");
+             "Please check install documentation (https://nominatim.org/release-docs/latest/admin/Import-and-Update#setting-up-the-update-process)\n");
     }
 
     $sImportFile = CONST_InstallPath.'/osmosischange.osc';