From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 10 Jan 2019 19:37:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~297
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3c0df661654432a34ad562f80fc0bc66cfb9de0c?hp=-c

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

3c0df661654432a34ad562f80fc0bc66cfb9de0c
diff --combined utils/update.php
index d8d3efd9,3086a70b..7cf96d90
--- a/utils/update.php
+++ b/utils/update.php
@@@ -48,7 -48,6 +48,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');
@@@ -64,7 -63,7 +64,7 @@@ if ($iCacheMemory + 500 > getTotalMemor
      $iCacheMemory = getCacheMemoryMB();
      echo "WARNING: resetting cache memory to $iCacheMemory\n";
  }
- $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+ $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -S '.CONST_Import_Style.' -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
  if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
      $sOsm2pgsqlCmd .= ' -U ' . $aDSNInfo['username'];
  }