Skip to content
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

Fix guidance sliproads scenario 3 #4493

Merged
merged 4 commits into from
Oct 9, 2017
Merged

Fix guidance sliproads scenario 3 #4493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bc5b22
Adjust lower bound for crossroad angle in sliproads handler, #4348/2
oxidase Sep 11, 2017
c8ad44b
Sliproad case with a single intersection in a cross-road
oxidase Sep 11, 2017
e08dad0
Allow a single intersection in a cross-road of sliproads, #4348/3
oxidase Sep 11, 2017
d6974cb
Don't use sliproad scenario if two name announcements are required
oxidase Sep 12, 2017
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- MLD uses a unidirectional Dijkstra for 1-to-N and N-to-1 matrices
- Guidance
- Fixed some cases of sliproads pre-processing (https://github.com/Project-OSRM/osrm-backend/issues/4348)
- don't suppress name announcements via sliproad handler

# 5.12.0
- Changes from 5.11:
Expand Down
28 changes: 28 additions & 0 deletions features/guidance/dedicated-turn-roads.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,3 +1023,31 @@ Feature: Slipways and Dedicated Turn Lanes
When I route I should get
| waypoints | route | turns | locations |
| s,f | sab,dbcf,dbcf | depart,turn right,arrive | s,a,f |


@sliproads
Scenario: Sliproad with a single intersection in a cross-road
Given the node map
"""
d
.
s . a . b
` .
' c . g
..
e
.
f
"""

And the ways
| nodes | highway | name | oneway |
| sab | primary | sab | |
| dbcef | primary | dbcef | |
| ae | primary_link | sab | yes |
| cg | primary | cg | |


When I route I should get
| waypoints | route | turns | locations |
| s,f | sab,dbcef,dbcef | depart,turn right,arrive | s,a,f |
20 changes: 10 additions & 10 deletions features/guidance/roundabout.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,16 +829,16 @@ Feature: Basic Roundabout
"""

And the ways
| nodes | highway | junction | oneway | # |
| abcda | tertiary | roundabout | | circle |
| ebds | tertiary | | | road |
| cm | tertiary | | | |
| ds | tertiary | | | road |
| rstur | tertiary | roundabout | | circle2 |
| ufghl | tertiary | | | road |
| tv | tertiary | | | |
| gi | tertiary | | yes | sliproad |
| jhik | tertiary | | | crossroad |
| nodes | highway | junction | oneway | # |
| abcda | tertiary | roundabout | | circle |
| ebds | tertiary | | | road |
| cm | tertiary | | | |
| ds | tertiary | | | road |
| rstur | tertiary | roundabout | | circle2 |
| ufghl | tertiary | | | road |
| tv | tertiary | | | |
| gi | tertiary_link | | yes | sliproad |
| jhik | tertiary | | | crossroad |


When I route I should get
Expand Down
40 changes: 36 additions & 4 deletions src/extractor/guidance/sliproad_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
using namespace util::coordinate_calculation;

// In addition, if it's a right/left turn we expect the rightmost/leftmost
// turn at `c` to be more or less ~90 degree for a Sliproad scenario.
// turn at `c` to be more than a minimal angle (40°) for a Sliproad scenario.
double deviation_from_straight = 0;

if (is_right_sliproad_turn)
Expand Down Expand Up @@ -423,7 +423,7 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
const auto length = haversineDistance(coordinates[intersection_node_id],
coordinates[main_road_intersection->node]);

const double perpendicular_angle = 90 + FUZZY_ANGLE_DIFFERENCE;
const double minimal_crossroad_angle_of_intersection = 40.;

if (length >= MIN_LENGTH)
{
Expand All @@ -433,7 +433,7 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
}

// Check sliproads with skew main intersections
if (deviation_from_straight > perpendicular_angle &&
if (deviation_from_straight > 180. - minimal_crossroad_angle_of_intersection &&
!node_based_graph.GetEdgeData(sliproad.eid).road_classification.IsLinkClass())
{
continue;
Expand Down Expand Up @@ -487,13 +487,45 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
continue;
}

// Check if main road -> sliproad (non-link) -> candidate road requires two name
// announcements then don't suppress one announcement via sliproad handler
const auto main_road_name_id = node_based_graph.GetEdgeData(main_road.eid).name_id;
if (!sliproad_data.road_classification.IsLinkClass() &&
sliproad_data.name_id != EMPTY_NAMEID && main_road_name_id != EMPTY_NAMEID &&
candidate_data.name_id != EMPTY_NAMEID &&
util::guidance::requiresNameAnnounced(main_road_name_id,
sliproad_data.name_id,
name_table,
street_name_suffix_table) &&
util::guidance::requiresNameAnnounced(sliproad_data.name_id,
candidate_data.name_id,
name_table,
street_name_suffix_table))
{
continue;
}

// If the Sliproad `bd` is a link, `bc` and `cd` must not be links.
if (!isValidSliproadLink(sliproad, main_road, candidate_road))
{
continue;
}

if (node_based_graph.GetTarget(candidate_road.eid) == main_road_intersection->node)
// Check that the cross-road `candidate_road_target` that starts at `d` ends at
// main intersection node `c` or has a common node `e` with a cross-road from `c`
// a ... b .... c a ... b .... c
// ` . ` .
// ` . ` e...
// ` . ` .
// d d
//
const auto candidate_road_target = node_based_graph.GetTarget(candidate_road.eid);
if ((candidate_road_target == main_road_intersection->node) ||
(candidate_road_target == node_based_graph.GetTarget(crossing_road.eid) &&
util::bearing::angleBetween(candidate_road.bearing, crossing_road.bearing) <
FUZZY_ANGLE_DIFFERENCE &&
(getTurnDirection(candidate_road.angle) == DirectionModifier::SharpRight ||
getTurnDirection(candidate_road.angle) == DirectionModifier::SharpLeft)))
{
sliproad.instruction.type = TurnType::Sliproad;
sliproad_found = true;
Expand Down