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

prefer obvious turn assignment over forks

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-06-13 14:33:36 +02:00
parent 2b5355edca
commit 47b19f209b
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/guidance/collapse.feature
View File

@ -606,9 +606,11 @@ Feature: Collapse
| restriction | bc | fdcg | c | no_right_turn | | restriction | bc | fdcg | c | no_right_turn |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
| a,g | road,cross,cross | depart,turn left,arrive | | a,g | road,cross,cross | depart,turn left,arrive |
| a,e | road,road,road | depart,continue slight right,arrive | | a,e | road,road,road | depart,continue slight right,arrive |
# We should discuss whether the next item should be collapsed to depart,turn right,arrive.
| a,f | road,road,cross,cross | depart,continue slight right,turn right,arrive |
Scenario: On-Off on Highway Scenario: On-Off on Highway
Given the node map Given the node map

15
features/guidance/fork.feature
View File

@ -281,3 +281,18 @@ Feature: Fork Instructions
| a,c | abd,bc,bc | depart,turn slight left,arrive | | a,c | abd,bc,bc | depart,turn slight left,arrive |
| a,d | abd,abd | depart,arrive | | a,d | abd,abd | depart,arrive |
| a,e | abd,be,be | depart,turn slight right,arrive | | a,e | abd,be,be | depart,turn slight right,arrive |
Scenario: Don't Fork when leaving Road
Given the node map
| a | | b | | c |
| | | | | d |
And the ways
| nodes | highway |
| abc | secondary |
| bd | secondary |
When I route I should get
| waypoints | route | turns |
| a,c | abc,abc | depart,arrive |
| a,d | abc,bd,bd | depart,turn slight right,arrive |

22
src/extractor/guidance/turn_handler.cpp
View File

@ -109,8 +109,12 @@ Intersection TurnHandler::handleThreeWayTurn(const EdgeID via_edge, Intersection
const bool is_much_narrower_than_other = const bool is_much_narrower_than_other =
angularDeviation(other.turn.angle, STRAIGHT_ANGLE) / angularDeviation(other.turn.angle, STRAIGHT_ANGLE) /
angularDeviation(road.turn.angle, STRAIGHT_ANGLE) > angularDeviation(road.turn.angle, STRAIGHT_ANGLE) >
INCREASES_BY_FOURTY_PERCENT; INCREASES_BY_FOURTY_PERCENT &&
angularDeviation(angularDeviation(other.turn.angle, STRAIGHT_ANGLE),
angularDeviation(road.turn.angle, STRAIGHT_ANGLE)) >
FUZZY_ANGLE_DIFFERENCE;
return is_much_narrower_than_other; return is_much_narrower_than_other;
}; };
@ -129,13 +133,9 @@ Intersection TurnHandler::handleThreeWayTurn(const EdgeID via_edge, Intersection
.road_classification.road_class; .road_classification.road_class;
const auto right_class = node_based_graph.GetEdgeData(intersection[1].turn.eid) const auto right_class = node_based_graph.GetEdgeData(intersection[1].turn.eid)
.road_classification.road_class; .road_classification.road_class;
if (canBeSeenAsFork(left_class, right_class)) if (isObviousOfTwo(intersection[1], intersection[2]) &&
{ (second_data.name_id != in_data.name_id ||
assignFork(via_edge, intersection[2], intersection[1]); first_data.name_id == second_data.name_id))
}
else if (isObviousOfTwo(intersection[1], intersection[2]) &&
(second_data.name_id != in_data.name_id ||
first_data.name_id == second_data.name_id))
{ {
intersection[1].turn.instruction = intersection[1].turn.instruction =
getInstructionForObvious(intersection.size(), via_edge, false, intersection[1]); getInstructionForObvious(intersection.size(), via_edge, false, intersection[1]);
@ -151,6 +151,10 @@ Intersection TurnHandler::handleThreeWayTurn(const EdgeID via_edge, Intersection
intersection[1].turn.instruction = {findBasicTurnType(via_edge, intersection[1]), intersection[1].turn.instruction = {findBasicTurnType(via_edge, intersection[1]),
DirectionModifier::SlightRight}; DirectionModifier::SlightRight};
} }
else if (canBeSeenAsFork(left_class, right_class))
{
assignFork(via_edge, intersection[2], intersection[1]);
}
else else
{ {
intersection[1].turn.instruction = {findBasicTurnType(via_edge, intersection[1]), intersection[1].turn.instruction = {findBasicTurnType(via_edge, intersection[1]),