From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 3 Dec 2020 08:42:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~191
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5781e198a72922dcc1c7eeca900285d5aa38c5e4?ds=inline;hp=-c

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

5781e198a72922dcc1c7eeca900285d5aa38c5e4
diff --combined utils/update.php
index 87a5a294,135bf193..6e6a99ab
--- a/utils/update.php
+++ b/utils/update.php
@@@ -47,7 -47,6 +47,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');
@@@ -71,6 -70,8 +71,8 @@@ $oOsm2pgsqlCmd = (new \Nominatim\Shell(
                   ->addParams('--latlong')
                   ->addParams('--append')
                   ->addParams('--slim')
+                  ->addParams('--with-forward-dependencies', 'false')
+                  ->addParams('--log-progress', 'true')
                   ->addParams('--number-processes', 1)
                   ->addParams('--cache', $iCacheMemory)
                   ->addParams('--output', 'gazetteer')