update osm2pgsql (downgrading unnamed places)

Also adds tests for updating unnamed places.

diff --git a/osm2pgsql b/osm2pgsql
index 37967960a82f6846681141b3d5cffaa03c184cb7..90e17f0e8c793487ca39cbf95501cd9c5daa33e2 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 37967960a82f6846681141b3d5cffaa03c184cb7
+Subproject commit 90e17f0e8c793487ca39cbf95501cd9c5daa33e2

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index 02d0982460a3191291d82cdb8fc7998f8c224c6f..b12b648129f236af53b789a85b1cc74c01285960 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -195,6 +195,7 @@ class NominatimEnvironment(object):
         proc = subprocess.Popen(cmd, cwd=self.build_dir,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()
+        outerr = outerr.decode('utf-8').replace('\\n', '\n')
         logger.debug("run_nominatim_script: %s\n%s\n%s" % (cmd, outp, outerr))
         assert (proc.returncode == 0), "Script '%s' failed:\n%s\n%s\n" % (script, outp, outerr)
 

diff --git a/test/bdd/osm2pgsql/update/simple.feature b/test/bdd/osm2pgsql/update/simple.feature
index e8d96d44e3e372733b5abf1247314452d50c0159..072f83fa4e98d4c86a939fa9bfb937cb3b231ebf 100644 (file)
--- a/test/bdd/osm2pgsql/update/simple.feature
+++ b/test/bdd/osm2pgsql/update/simple.feature
@@ -24,3 +24,38 @@ Feature: Update of simple objects by osm2pgsql
           | object     | class   | type       | name |
           | N1:tourism | tourism | hotel      | 'name' : 'foo' |
 
+    Scenario: Downgrading a highway to one that is dropped without name
+        When loading osm data
+          """
+          n100 x0 y0
+          n101 x0.0001 y0.0001
+          w1 Thighway=residential Nn100,n101
+          """
+        Then place contains
+          | object     |
+          | W1:highway |
+        When updating osm data
+          """
+          w1 Thighway=service Nn100,n101
+          """
+        Then place has no entry for W1
+
+    Scenario: Downgrading a highway when a second tag is present
+        When loading osm data
+          """
+          n100 x0 y0
+          n101 x0.0001 y0.0001
+          w1 Thighway=residential,tourism=hotel Nn100,n101
+          """
+        Then place contains
+          | object     |
+          | W1:highway |
+          | W1:tourism |
+        When updating osm data
+          """
+          w1 Thighway=service,tourism=hotel Nn100,n101
+          """
+        Then place has no entry for W1:highway
+        And place contains
+          | object     |
+          | W1:tourism |