X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/19e9748874afa4419d89cc36e12613ad57ee867a..734dff037405469ada9a226be9c98be583823226:/test/bdd/osm2pgsql/update/relation.feature?ds=sidebyside diff --git a/test/bdd/osm2pgsql/update/relation.feature b/test/bdd/osm2pgsql/update/relation.feature index 88889f9a..794ef5c5 100644 --- 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 - r1 Ttype=multipolygon,tourism=hotel,name=XZ' Mw2@ + 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,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 - | 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 - | 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 @@ -56,15 +56,15 @@ Feature: Update of relations by osm2pgsql 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 - | 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 @@ -77,8 +77,8 @@ Feature: Update of relations by osm2pgsql 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@ @@ -96,15 +96,14 @@ Feature: Update of relations by osm2pgsql 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@ """ Then place has no entry for R1 - @wip Scenario: Type tag is renamed to something unknown When loading osm data """ @@ -116,11 +115,27 @@ Feature: Update of relations by osm2pgsql 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@ """ Then place has no entry for R1 + Scenario: Country boundary names are left untouched when country_code unknown + When loading osm data + """ + n200 Tamenity=prison x0 y0 + n201 x0 y0.0001 + n202 x0.0001 y0.0001 + n203 x0.0001 y0 + """ + And updating osm data + """ + w1 Nn200,n201,n202,n203,n200 + r1 Ttype=boundary,boundary=administrative,name=Foo,country_code=XX,admin_level=2 Mw1@ + """ + Then place contains + | object | addr+country | name | + | R1 | XX | 'name' : 'Foo' |