Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / osm2pgsql / update / relation.feature

diff --git a/test/bdd/osm2pgsql/update/relation.feature b/test/bdd/osm2pgsql/update/relation.feature
index 0eccd3e6fc83f16ca28c878a98b95a68aa7433d6..83ce912989f46b20c8a4b3d348f3d6a6c1ded7d9 100644 (file)
--- a/test/bdd/osm2pgsql/update/relation.feature
+++ b/test/bdd/osm2pgsql/update/relation.feature
@@ -137,7 +137,7 @@ Feature: Update of relations by osm2pgsql
           r1 Ttype=boundary,boundary=administrative,name=Foo,country_code=XX,admin_level=2 Mw1@
           """
         Then place contains
           r1 Ttype=boundary,boundary=administrative,name=Foo,country_code=XX,admin_level=2 Mw1@
           """
         Then place contains

-          | object | country_code | name           |
+          | object | addr+country | name           |

           | R1     | XX           | 'name' : 'Foo' |
 
     Scenario: Country boundary names are extended when country_code known
           | R1     | XX           | 'name' : 'Foo' |
 
     Scenario: Country boundary names are extended when country_code known


@@ -154,6 +154,6 @@ Feature: Update of relations by osm2pgsql
           r1 Ttype=boundary,boundary=administrative,name=Foo,country_code=ch,admin_level=2 Mw1@
           """
         Then place contains
           r1 Ttype=boundary,boundary=administrative,name=Foo,country_code=ch,admin_level=2 Mw1@
           """
         Then place contains

-            | object | country_code | name+name:de | name+name |
+            | object | addr+country | name+name:de | name+name |

             | R1     | ch           | Schweiz      | Foo       |
 
             | R1     | ch           | Schweiz      | Foo       |