update osm2pgsql

Needs now an explicit switch to avoid propagating changes from
nodes to ways to relations.

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index fd31f0fe4143b834b2fbf63d693ad2f08b17eefc..f16c9e60cc3a22bcc713046cade8b791a5fc9136 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -201,6 +201,8 @@ class SetupFunctions
         $oCmd->addParams('--output', 'gazetteer');
         $oCmd->addParams('--hstore');
         $oCmd->addParams('--number-processes', 1);
+        $oCmd->addParams('--with-forward-dependencies', 'false');
+        $oCmd->addParams('--log-progress', 'true');
         $oCmd->addParams('--cache', $this->iCacheMemory);
         $oCmd->addParams('--port', $this->aDSNInfo['port']);
 

diff --git a/osm2pgsql b/osm2pgsql
index 94a5060353179f4cf3e92aa622a2aa5d1afa6fee..8e9704f2d155172b7c5885c67892c27ac7521c5c 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 94a5060353179f4cf3e92aa622a2aa5d1afa6fee
+Subproject commit 8e9704f2d155172b7c5885c67892c27ac7521c5c

diff --git a/utils/update.php b/utils/update.php
index 7e90016c3c01018cae76afe02231f8976d2f3565..135bf19361e0e54c8694de19be422ea48cd8e652 100644 (file)
--- a/utils/update.php
+++ b/utils/update.php
@@ -70,6 +70,8 @@ $oOsm2pgsqlCmd = (new \Nominatim\Shell(CONST_Osm2pgsql_Binary))
                  ->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')