update osm2pgsql (nameless landuses) and add tests for it

diff --git a/osm2pgsql b/osm2pgsql
index 13c11f8842146a79cb0629b603e5acdfbb0bfd58..8fc89648fa877674e889cd26014815a3f029e039 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 13c11f8842146a79cb0629b603e5acdfbb0bfd58
+Subproject commit 8fc89648fa877674e889cd26014815a3f029e039

diff --git a/tests/features/osm2pgsql/import/simple.feature b/tests/features/osm2pgsql/import/simple.feature
index 053c853c398a414c25fe76526d8608940f90ccce..447dab0d0b23d29f202e0fd8aad6f20cd4f4bab8 100644 (file)
--- a/tests/features/osm2pgsql/import/simple.feature
+++ b/tests/features/osm2pgsql/import/simple.feature
@@ -1,6 +1,6 @@
 @DB
 Feature: Import of simple objects by osm2pgsql
 @DB
 Feature: Import of simple objects by osm2pgsql

-    Testing basic functions of osm2pgsql.
+    Testing basic tagging in osm2pgsql imports.

 
     Scenario: Import simple objects
         Given the osm nodes:
 
     Scenario: Import simple objects
         Given the osm nodes:


@@ -15,11 +15,11 @@ Feature: Import of simple objects by osm2pgsql
           | 201 | 0 1
           | 202 | 1 1
           | 203 | 1 0
           | 201 | 0 1
           | 202 | 1 1
           | 203 | 1 0

-        Given the osm ways:
+        And the osm ways:

           | id | tags                             | nodes
           | 1  | 'shop' : 'toys', 'name' : 'tata' | 100 101 102
           | 2  | 'ref' : '45'                     | 200 201 202 203 200
           | id | tags                             | nodes
           | 1  | 'shop' : 'toys', 'name' : 'tata' | 100 101 102
           | 2  | 'ref' : '45'                     | 200 201 202 203 200

-        Given the osm relations:
+        And the osm relations:

           | id | tags                                                        | members
           | 1  | 'type' : 'multipolygon', 'tourism' : 'hotel', 'name' : 'XZ' | N1,W2
         When loading osm data
           | id | tags                                                        | members
           | 1  | 'type' : 'multipolygon', 'tourism' : 'hotel', 'name' : 'XZ' | N1,W2
         When loading osm data


@@ -47,3 +47,22 @@ Feature: Import of simple objects by osm2pgsql
         Then table place contains
           | object | class | type
           | N1     | place | house
         Then table place contains
           | object | class | type
           | N1     | place | house

+
+     Scenario: Landuses are only imported when named
+        Given the osm nodes:
+          | id  | geometry
+          | 100 | 0 0
+          | 101 | 0 0.1
+          | 102 | 0.1 0.1
+          | 200 | 0 0
+          | 202 | 1 1
+          | 203 | 1 0
+        And the osm ways:
+          | id | tags                                          | nodes
+          | 1  | 'landuse' : 'residential', 'name' : 'rainbow' | 100 101 102 100
+          | 2  | 'landuse' : 'residential'                     | 200 202 203 200
+        When loading osm data
+        Then table place contains
+          | object | class   | type
+          | W1     | landuse | residential
+        And table place has no entry for W2