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..fd8b83e3c07cfc07a7bfa7329973afae84852a95 100644 (file)
--- a/test/bdd/osm2pgsql/update/relation.feature
+++ b/test/bdd/osm2pgsql/update/relation.feature
@@ -11,11 +11,11 @@ Feature: Update of relations by osm2pgsql
           n202 x0.0001 y0.0001
           n203 x0.0001 y0
           w2 Tref=45' Nn200,n201,n202,n203,n200
           n202 x0.0001 y0.0001
           n203 x0.0001 y0
           w2 Tref=45' Nn200,n201,n202,n203,n200

-          r1 Ttype=multipolygon,tourism=hotel,name=XZ' Mw2@
+          r1 Ttype=multipolygon,tourism=hotel,name=XZ Mw2@

           """
         Then place contains
           """
         Then place contains

-          | object | class   | type   | name
-          | R1     | tourism | hotel  | 'name' : 'XZ'
+          | object | class   | type   | name |
+          | R1     | tourism | hotel  | 'name' : 'XZ' |

           When updating osm data
             """
             r1 Ttype=multipolygon,tourism=hotel,name=XZ Mn1@
           When updating osm data
             """
             r1 Ttype=multipolygon,tourism=hotel,name=XZ Mn1@


@@ -34,16 +34,16 @@ Feature: Update of relations by osm2pgsql
           r1 Ttype=multipolygon,tourism=hotel,name=XZ Mw2@
           """
         Then place contains
           r1 Ttype=multipolygon,tourism=hotel,name=XZ Mw2@
           """
         Then place contains

-          | object | class   | type   | name
-          | R1     | tourism | hotel  | 'name' : 'XZ'
+          | object | class   | type   | name |
+          | R1     | tourism | hotel  | 'name' : 'XZ' |

         When updating osm data
           """
           r1 Ttype=multipolygon,amenity=prison,name=XZ Mw2@
           """
         Then place has no entry for R1:tourism
         And place contains
         When updating osm data
           """
           r1 Ttype=multipolygon,amenity=prison,name=XZ Mw2@
           """
         Then place has no entry for R1:tourism
         And place contains

-          | object | class   | type   | name
-          | R1     | amenity | prison | 'name' : 'XZ'
+          | object | class   | type   | name |
+          | R1     | amenity | prison | 'name' : 'XZ' |

 
     Scenario: Change name of a relation
         When loading osm data
 
     Scenario: Change name of a relation
         When loading osm data


@@ -56,15 +56,15 @@ Feature: Update of relations by osm2pgsql
           r1 Ttype=multipolygon,tourism=hotel,name=AB Mw2@
           """
         Then place contains
           r1 Ttype=multipolygon,tourism=hotel,name=AB Mw2@
           """
         Then place contains

-          | object | class   | type   | name
-          | R1     | tourism | hotel  | 'name' : 'AB'
+          | object | class   | type   | name |
+          | R1     | tourism | hotel  | 'name' : 'AB' |

         When updating osm data
           """
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains
         When updating osm data
           """
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains

-          | object | class   | type   | name
-          | R1     | tourism | hotel  | 'name' : 'XZ'
+          | object | class   | type   | name |
+          | R1     | tourism | hotel  | 'name' : 'XY' |

 
     Scenario: Change type of a relation into something unknown
         When loading osm data
 
     Scenario: Change type of a relation into something unknown
         When loading osm data


@@ -77,8 +77,8 @@ Feature: Update of relations by osm2pgsql
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains

-          | object | class   | type   | name
-          | R1     | tourism | hotel  | 'name' : 'XZ'
+          | object | class   | type   | name |
+          | R1     | tourism | hotel  | 'name' : 'XY' |

         When updating osm data
           """
           r1 Ttype=multipolygon,amenities=prison,name=XY Mw2@
         When updating osm data
           """
           r1 Ttype=multipolygon,amenities=prison,name=XY Mw2@


@@ -96,8 +96,8 @@ Feature: Update of relations by osm2pgsql
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains

-          | object | class   | type   | name
-          | R1     | tourism | hotel  | 'name' : 'XZ'
+          | object | class   | type   | name |
+          | R1     | tourism | hotel  | 'name' : 'XY' |

         When updating osm data
           """
           r1 Ttourism=hotel,name=XY Mw2@
         When updating osm data
           """
           r1 Ttourism=hotel,name=XY Mw2@


@@ -115,8 +115,8 @@ Feature: Update of relations by osm2pgsql
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains
           r1 Ttype=multipolygon,tourism=hotel,name=XY Mw2@
           """
         Then place contains

-          | object | class   | type   | name
-          | R1     | tourism | hotel  | 'name' : 'XZ'
+          | object | class   | type   | name |
+          | R1     | tourism | hotel  | 'name' : 'XY' |

         When updating osm data
           """
           r1 Ttype=multipolygonn,tourism=hotel,name=XY Mw2@
         When updating osm data
           """
           r1 Ttype=multipolygonn,tourism=hotel,name=XY Mw2@


@@ -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       |