Skip to content

BDD tests: change handling of untagged nodes #2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2025
Merged

BDD tests: change handling of untagged nodes #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions tests/bdd/flex/expire.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Feature: Changes on way with expire on zoom 0
"""
w10 v1 dV Ta=b Nn10,n11
"""
And an empty grid

When running osm2pgsql flex with parameters
| --slim | -a |
Expand All @@ -43,7 +42,6 @@ Feature: Changes on way with expire on zoom 0
"""
n1 v2 dV x1 y2
"""
And an empty grid

When running osm2pgsql flex with parameters
| --slim | -a |
Expand All @@ -60,7 +58,6 @@ Feature: Changes on way with expire on zoom 0
"""
w10 v1 dV Tt1=yes Nn10,n11
"""
And an empty grid

When running osm2pgsql flex with parameters
| --slim | -a |
Expand All @@ -79,7 +76,6 @@ Feature: Changes on way with expire on zoom 0
"""
w11 v2 dV Ta=b Nn10,n11
"""
And an empty grid

When running osm2pgsql flex with parameters
| --slim | -a |
Expand All @@ -96,7 +92,6 @@ Feature: Changes on way with expire on zoom 0
"""
w11 v2 dD
"""
And an empty grid

When running osm2pgsql flex with parameters
| --slim | -a |
Expand Down
3 changes: 1 addition & 2 deletions tests/bdd/flex/locator.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ Feature: Locators
| way_id | region | ST_AsText(geom) |
| 20 | P1 | (10 0,20 10,10 10,10 0) |

Given an empty grid
And the OSM data
Given the OSM data
"""
n10 v1 dV Tamenity=post_box x15.0 y8.0
n11 v1 dV Tamenity=post_box x15.0 y2.0
Expand Down
18 changes: 6 additions & 12 deletions tests/bdd/flex/node-add.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ Feature: Adding nodes to a flex database


Scenario: node is not relevant
Given an empty grid
And the OSM data
Given the OSM data
"""
n10 v1 dV Tt=ag x0 y0
r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
Expand All @@ -49,8 +48,7 @@ Feature: Adding nodes to a flex database


Scenario: add to t1
Given an empty grid
And the OSM data
Given the OSM data
"""
n10 v1 dV Tt1=yes x0 y0
r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
Expand All @@ -72,8 +70,7 @@ Feature: Adding nodes to a flex database


Scenario: add to t2
Given an empty grid
And the OSM data
Given the OSM data
"""
n10 v1 dV Tt2=yes x0 y0
r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
Expand All @@ -95,8 +92,7 @@ Feature: Adding nodes to a flex database


Scenario: add to t1 and t2
Given an empty grid
And the OSM data
Given the OSM data
"""
n10 v1 dV Tt1=yes,t2=yes x0 y0
r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
Expand All @@ -119,8 +115,7 @@ Feature: Adding nodes to a flex database


Scenario: add to tboth (only stage1)
Given an empty grid
And the OSM data
Given the OSM data
"""
n10 v1 dV Ttboth=yes x0 y0
r30 v2 dV Tt=ag Mn10@,n11@,n12@mark,n13@,n14@mark
Expand All @@ -142,8 +137,7 @@ Feature: Adding nodes to a flex database


Scenario: add to tboth (stage1 and stage2)
Given an empty grid
And the OSM data
Given the OSM data
"""
n10 v1 dV Ttboth=yes x0 y0
r30 v2 dV Tt=ag Mn10@mark,n11@,n12@mark,n13@,n14@mark
Expand Down
27 changes: 9 additions & 18 deletions tests/bdd/flex/relation-changes.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 0 rows

Given an empty grid
And the OSM data
Given the OSM data
"""
r30 v2 dV Ttype=multipolygon Mw20@,w21@
"""
Expand All @@ -56,8 +55,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 0 rows

Given an empty grid
And the OSM data
Given the OSM data
"""
w21 v2 dV Nn12,n13,n10
"""
Expand All @@ -79,8 +77,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 0 rows

Given an empty grid
And the OSM data
Given the OSM data
"""
n12 v2 dV x10.1 y10.1
"""
Expand All @@ -103,8 +100,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 0 rows

Given an empty grid
And the OSM data
Given the OSM data
"""
r30 v2 dV Ttype=multipolygon Mw20@,w21@
"""
Expand All @@ -127,8 +123,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 1 row

Given an empty grid
And the OSM data
Given the OSM data
"""
r30 v2 dV Mw20@,w21@
"""
Expand All @@ -151,8 +146,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 1 row

Given an empty grid
And the OSM data
Given the OSM data
"""
w21 v2 dV <new nodelist>
"""
Expand Down Expand Up @@ -180,8 +174,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 1 row

Given an empty grid
And the OSM data
Given the OSM data
"""
n12 v2 dV <new coordinates>
"""
Expand Down Expand Up @@ -209,8 +202,7 @@ Feature: Handling changes to relations
| --slim |
Then table osm2pgsql_test_relations has 1 row

Given an empty grid
And the OSM data
Given the OSM data
"""
r30 v2 dV Ttype=multipolygon <new memberlist>
"""
Expand Down Expand Up @@ -240,8 +232,7 @@ Feature: Handling changes to relations
| area_id | tags->'natural' | tags->'landuse' |
| -30 | wood | NULL |

Given an empty grid
And the OSM data
Given the OSM data
"""
r30 v2 dV Ttype=multipolygon,landuse=forest Mw20@,w21@
"""
Expand Down
18 changes: 6 additions & 12 deletions tests/bdd/flex/way-add.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ Feature: Adding ways to a flex database


Scenario: way is not relevant
Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v1 dV Tt=ag Nn10,n11
r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
Expand All @@ -53,8 +52,7 @@ Feature: Adding ways to a flex database


Scenario: add to t1
Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v1 dV Tt1=yes Nn10,n11
r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
Expand All @@ -76,8 +74,7 @@ Feature: Adding ways to a flex database


Scenario: add to t2
Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v1 dV Tt2=yes Nn10,n11
r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
Expand All @@ -99,8 +96,7 @@ Feature: Adding ways to a flex database


Scenario: add to t1 and t2
Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v1 dV Tt1=yes,t2=yes Nn10,n11
r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
Expand All @@ -123,8 +119,7 @@ Feature: Adding ways to a flex database


Scenario: add to tboth (only stage1)
Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v1 dV Ttboth=yes Nn10,n11
r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark
Expand All @@ -146,8 +141,7 @@ Feature: Adding ways to a flex database


Scenario: add to tboth (stage1 and stage2)
Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v1 dV Ttboth=yes Nn10,n11
r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark
Expand Down
15 changes: 5 additions & 10 deletions tests/bdd/flex/way-change.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ Feature: Changing ways in a flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
<input>
"""
Expand Down Expand Up @@ -84,8 +83,7 @@ Feature: Changing ways in a flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
<input>
"""
Expand Down Expand Up @@ -138,8 +136,7 @@ Feature: Changing ways in a flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
<input>
"""
Expand Down Expand Up @@ -196,8 +193,7 @@ Feature: Changing ways in a flex database
| 13 | NULL |
| 14 | {30} |

Given an empty grid
And the OSM data
Given the OSM data
"""
<input>
"""
Expand Down Expand Up @@ -243,8 +239,7 @@ Feature: Changing ways in a flex database
| 13 | NULL |
| 14 | {30} |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dV Tt1=yes,t2=yes,tboth=yes Nn10,n11
"""
Expand Down
24 changes: 8 additions & 16 deletions tests/bdd/flex/way-del.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down Expand Up @@ -74,8 +73,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down Expand Up @@ -117,8 +115,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down Expand Up @@ -159,8 +156,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down Expand Up @@ -202,8 +198,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down Expand Up @@ -245,8 +240,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down Expand Up @@ -289,8 +283,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down Expand Up @@ -332,8 +325,7 @@ Feature: Deleting ways in a 2-stage flex database
| 13 |
| 14 |

Given an empty grid
And the OSM data
Given the OSM data
"""
w10 v2 dD
"""
Expand Down
Loading