Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Add test case for sliproads converted from forks

Browse Source
This commit is contained in:
Patrick Niklaus 2017-12-18 15:45:04 +00:00 committed by Michael Krasnyk
parent 6dd029e6ea
commit 12d1d84b11
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
features/guidance/dedicated-turn-roads.feature
View File

@ -992,7 +992,6 @@ Feature: Slipways and Dedicated Turn Lanes
| dbef | primary | dbef | | | dbef | primary | dbef | |
| ae | primary_link | ae | yes | | ae | primary_link | ae | yes |
When I route I should get When I route I should get
| waypoints | route | turns | locations | | waypoints | route | turns | locations |
| s,f | sabc,dbef,dbef | depart,turn right,arrive | s,a,f | | s,f | sabc,dbef,dbef | depart,turn right,arrive | s,a,f |
@ -1019,7 +1018,6 @@ Feature: Slipways and Dedicated Turn Lanes
| dbcf | primary | dbcf | | | dbcf | primary | dbcf | |
| ac | primary_link | ae | yes | | ac | primary_link | ae | yes |
When I route I should get When I route I should get
| waypoints | route | turns | locations | | waypoints | route | turns | locations |
| s,f | sab,dbcf,dbcf | depart,turn right,arrive | s,a,f | | s,f | sab,dbcf,dbcf | depart,turn right,arrive | s,a,f |
@ -1047,7 +1045,31 @@ Feature: Slipways and Dedicated Turn Lanes
| ae | primary_link | sab | yes | | ae | primary_link | sab | yes |
| cg | primary | cg | | | cg | primary | cg | |
When I route I should get When I route I should get
| waypoints | route | turns | locations | | waypoints | route | turns | locations |
| s,f | sab,dbcef,dbcef | depart,turn right,arrive | s,a,f | | s,f | sab,dbcef,dbcef | depart,turn right,arrive | s,a,f |
@sliproads
Scenario: Sliproad converted from a fork
Given the node map
"""
d
.
b
s . a '.
`c
.
f
"""
And the ways
| nodes | highway | name | ref | oneway |
| sa | tertiary | | D 60A | yes |
| ab | tertiary | ab | D 60A | yes |
| ac | tertiary | | D 60A | yes |
| dbcf | tertiary | dbcf | D 543 | yes |
When I route I should get
| waypoints | route | turns | locations |
| s,f | ,dbcf,dbcf | depart,turn right,arrive | s,a,f |

1
src/extractor/guidance/sliproad_handler.cpp
View File

@ -582,7 +582,6 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
} }
else if (!name_table.GetNameForID(main_annotation.name_id).empty()) else if (!name_table.GetNameForID(main_annotation.name_id).empty())
{ {
OSRM_ASSERT(false, coordinates[intersection_node_id]);
intersection[*obvious].instruction.type = TurnType::NewName; intersection[*obvious].instruction.type = TurnType::NewName;
intersection[*obvious].instruction.direction_modifier = intersection[*obvious].instruction.direction_modifier =
getTurnDirection(intersection[*obvious].angle); getTurnDirection(intersection[*obvious].angle);