8a63ad9b4b
* Added post process logic to collapse segregated turn instructions * format updates * Fixed coordinates to reflect reality Updated left turn road name * fixed coordinates to fix test * Skip last step when processing segregated steps * updated segregated turn test * Updated segregated test * Updated test: Segregated Intersection, Cross Belonging to Correct Street - features/guidance/collapse.feature:79 * Fixed all but one for features/guidance/collapse.feature:124 * Fixed Scenario: Partly Segregated Intersection, Two Segregated Roads, Intersection belongs to Second - features/guidance/collapse.feature:219 * Fixed 7 of th 9 failures for Scenario: Partly Segregated Intersection, Two Segregated Roads, Intersection belongs to Second - features/guidance/collapse.feature:219 * Fixed 7 of the 9 failures for Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles (2) - features/guidance/collapse.feature:318 * Fixed Scenario: Segregated Intersection into Slight Turn - features/guidance/collapse.feature:581 * Updated Scenario: U-turn after a traffic light - features/guidance/turn-lanes.feature:1220 * Updated how we combine segregated steps * Added test to Verify end of road left turn across divided roads * Fixed divided highwat tests * Fixed test failure * fixed Scenario: Partitioned turn, Slight Curve - maxspeed - features/guidance/turn-lanes.feature:936 * Fixed Scenario: Partitioned turn, Slight Curve - features/guidance/turn-lanes.feature:961 * Added strategies to combine segrgated intersections * Added setModifier alias for readability * Added strategies to combine segrgated intersections * Format updates * Fixes segregated indentification to not mark `circular` edge as segregated * Added intersection prior to turn so we still call out end of road * updated expectation to be turn instead of continue * Confirmed with @oxidase that the lane information if correct - updated the expectation * Added logic to handle wider straights Fixed tests * Update CHANGELOG.md Added #4925 * Removed TODO * Process straight step prior to wider straight step
140 lines
4.5 KiB
Gherkin
140 lines
4.5 KiB
Gherkin
@routing @guidance
|
|
Feature: Divided road entry
|
|
|
|
Background:
|
|
Given the profile "car"
|
|
Given a grid size of 5 meters
|
|
|
|
Scenario: Join on a divided road named after the main road
|
|
Given the node map
|
|
"""
|
|
a-------b-----c
|
|
|
|
|
d-------e-----f
|
|
|
|
|
|
|
|
i---g---j
|
|
|
|
|
|
|
|
h
|
|
"""
|
|
|
|
And the ways
|
|
| nodes | name | highway | oneway |
|
|
| abc | main st | residential | -1 |
|
|
| def | main st | residential | yes |
|
|
| be | main st | residential | |
|
|
| egh | side st | residential | |
|
|
| igj | maple st | residential | |
|
|
|
|
When I route I should get
|
|
| waypoints | route | turns |
|
|
| h,a | side st,main st,main st| depart,end of road left,arrive |
|
|
|
|
|
|
# Similar to previous one, but the joining way is tagged with the side-street name
|
|
Scenario: Join on a divided road, named after the side street
|
|
Given the node map
|
|
"""
|
|
a-------b-----c
|
|
|
|
|
d-------e-----f
|
|
|
|
|
|
|
|
i---g---j
|
|
|
|
|
|
|
|
h
|
|
"""
|
|
|
|
And the ways
|
|
| nodes | name | highway | oneway |
|
|
| abc | main st | residential | -1 |
|
|
| def | main st | residential | yes |
|
|
| begh | side st | residential | |
|
|
| igj | maple st | residential | |
|
|
|
|
When I route I should get
|
|
| waypoints | route | turns |
|
|
| h,a | side st,main st,main st| depart,end of road left,arrive |
|
|
|
|
|
|
# Center join named after crossroad
|
|
Scenario: Crossing a divided road, named after side-street
|
|
Given the node map
|
|
"""
|
|
h
|
|
|
|
|
a-------b-----c
|
|
|
|
|
d-------e-----f
|
|
|
|
|
|
|
|
g
|
|
"""
|
|
|
|
And the ways
|
|
| nodes | name | highway | oneway |
|
|
| abc | main st | residential | -1 |
|
|
| def | main st | residential | yes |
|
|
| hbeg | side st | residential | |
|
|
|
|
When I route I should get
|
|
| waypoints | route | turns |
|
|
| g,a | side st,main st,main st| depart,turn left,arrive |
|
|
|
|
# Join named after divided road
|
|
Scenario: Crossing a divided road, named after main street
|
|
Given the node map
|
|
"""
|
|
h
|
|
|
|
|
a-------b-----c
|
|
|
|
|
d-------e-----f
|
|
|
|
|
|
|
|
g
|
|
"""
|
|
|
|
And the ways
|
|
| nodes | name | highway | oneway |
|
|
| abc | main st | residential | -1 |
|
|
| def | main st | residential | yes |
|
|
| be | main st | residential | |
|
|
| hb | side st | residential | |
|
|
| eg | side st | residential | |
|
|
|
|
When I route I should get
|
|
| waypoints | route | turns |
|
|
| g,a | side st,main st,main st| depart,turn left,arrive |
|
|
|
|
# Verify end of road left turn across divided roads
|
|
Scenario: Join on a divided road, named after the side street
|
|
Given the node map
|
|
"""
|
|
a-----h--b-----c
|
|
| |
|
|
d-----i--e-----f
|
|
| |
|
|
| |
|
|
m---j--g---n
|
|
| |
|
|
| |
|
|
k l
|
|
"""
|
|
|
|
And the ways
|
|
| nodes | name | highway | oneway |
|
|
| ahbc | main st | residential | -1 |
|
|
| dief | main st | residential | yes |
|
|
| begl | side st | residential | -1 |
|
|
| hijk | side st | residential | yes |
|
|
| mjgn | maple st| residential | no |
|
|
|
|
When I route I should get
|
|
| waypoints | route | turns |
|
|
| l,a | side st,main st,main st| depart,end of road left,arrive |
|
|
|
|
|