From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 5 Jan 2018 21:47:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~349
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a4c67cdab1e5bfcb50c666e32e561c0b5cc35851?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/master'
---

a4c67cdab1e5bfcb50c666e32e561c0b5cc35851
diff --combined utils/update.php
index bb77e430,2fc3dba2..e3555488
--- a/utils/update.php
+++ b/utils/update.php
@@@ -39,7 -39,6 +39,7 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -131,25 -130,25 +131,25 @@@ $bUseOSMApi = isset($aResult['import-fr
  $sContentURL = '';
  if (isset($aResult['import-node']) && $aResult['import-node']) {
      if ($bUseOSMApi) {
-         $sContentURL = 'http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node'];
+         $sContentURL = 'https://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node'];
      } else {
-         $sContentURL = 'http://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;';
+         $sContentURL = 'https://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;';
      }
  }
  
  if (isset($aResult['import-way']) && $aResult['import-way']) {
      if ($bUseOSMApi) {
-         $sContentURL = 'http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full';
+         $sContentURL = 'https://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full';
      } else {
-         $sContentURL = 'http://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
+         $sContentURL = 'https://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
      }
  }
  
  if (isset($aResult['import-relation']) && $aResult['import-relation']) {
      if ($bUseOSMApi) {
-         $sContentURLsModifyXMLstr = 'http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full';
+         $sContentURLsModifyXMLstr = 'https://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full';
      } else {
-         $sContentURL = 'http://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;';
+         $sContentURL = 'https://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;';
      }
  }
  
@@@ -252,7 -251,7 +252,7 @@@ if ($aResult['index']) 
  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://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n");
+         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");
      }
  
      $sImportFile = CONST_InstallPath.'/osmosischange.osc';