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

make all u-turns continue

Browse Source
This commit is contained in:
Moritz Kobitzsch
2017-06-01 11:43:53 +02:00
committed by Daniel J. H
parent ceaf065d0e
commit a92674022a
6 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extractor/guidance/intersection_handler.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ TurnInstruction IntersectionHandler::getInstructionForObvious(const std::size_t
if (angularDeviation(road.angle, 0) < 0.01)
{
return {TurnType::Turn, DirectionModifier::UTurn};
return {TurnType::Continue, DirectionModifier::UTurn};
}
if (type == TurnType::Turn)
{
src/extractor/guidance/turn_analysis.cpp
+4 -3
View File
@@ -188,9 +188,10 @@ Intersection TurnAnalysis::setTurnTypes(const NodeID node_prior_to_intersection,
const EdgeID onto_edge = road.eid;
const NodeID to_nid = node_based_graph.GetTarget(onto_edge);
road.instruction = {TurnType::Turn,
(node_prior_to_intersection == to_nid) ? DirectionModifier::UTurn
: getTurnDirection(road.angle)};
if (node_prior_to_intersection == to_nid)
road.instruction = {TurnType::Continue, DirectionModifier::UTurn};
else
road.instruction = {TurnType::Turn, getTurnDirection(road.angle)};
}
return intersection;
}
src/extractor/guidance/turn_lane_matcher.cpp
+2 -2
View File
@@ -239,7 +239,7 @@ Intersection triviallyMatchLanesToTurns(Intersection intersection,
road_index = 2;
}
intersection[u_turn].entry_allowed = true;
intersection[u_turn].instruction.type = TurnType::Turn;
intersection[u_turn].instruction.type = TurnType::Continue;
intersection[u_turn].instruction.direction_modifier = DirectionModifier::UTurn;
matchRoad(intersection[u_turn], lane_data.back());
@@ -283,7 +283,7 @@ Intersection triviallyMatchLanesToTurns(Intersection intersection,
u_turn = intersection.size() - 1;
}
intersection[u_turn].entry_allowed = true;
intersection[u_turn].instruction.type = TurnType::Turn;
intersection[u_turn].instruction.type = TurnType::Continue;
intersection[u_turn].instruction.direction_modifier = DirectionModifier::UTurn;
matchRoad(intersection[u_turn], lane_data.back());