From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 17 Nov 2018 16:32:30 +0000 (+0100)
Subject: update osm2pgsql (restrict operator)
X-Git-Tag: v3.3.0~71
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c84648c157181dd1e3f9f82b8647990206a2cfcb

update osm2pgsql (restrict operator)

Fixes #1176.
---

diff --git a/osm2pgsql b/osm2pgsql
index 93b73e5f..433ad388 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 93b73e5f5c3b20e80027ecf272f553d26f49f2e8
+Subproject commit 433ad388b88d74235e9fc4dd12fa608719b32904
diff --git a/test/bdd/osm2pgsql/import/tags.feature b/test/bdd/osm2pgsql/import/tags.feature
index e2594343..2e44e145 100644
--- a/test/bdd/osm2pgsql/import/tags.feature
+++ b/test/bdd/osm2pgsql/import/tags.feature
@@ -51,8 +51,10 @@ Feature: Tag evaluation
          """
          n1 Thighway=yes,operator=Foo,name=null
          n2 Tshop=grocery,operator=Foo
-         n3 Tamenity=hospital,operator=Foo
+         n3 Tamenity=restaurant,operator=Foo
          n4 Ttourism=hotel,operator=Foo
+         n5 Tamenity=hospital,operator=Foo,name=Meme
+         n6 Tamenity=fuel,operator=Foo
          """
         Then place contains
          | object | name |
@@ -60,6 +62,8 @@ Feature: Tag evaluation
          | N2     | 'operator' : 'Foo' |
          | N3     | 'operator' : 'Foo' |
          | N4     | 'operator' : 'Foo' |
+         | N5     | 'name' : 'Meme' |
+         | N6     | 'operator' : 'Foo' |
 
     Scenario Outline: Ignored name tags
         When loading osm data