fix comparison for ramps on three-way turns

This commit is contained in:
Moritz Kobitzsch 2016-03-08 10:45:26 +01:00 committed by Patrick Niklaus
parent ba5f0af5a4
commit f769478abe

View File

@ -905,7 +905,7 @@ std::vector<TurnCandidate> handleThreeWayTurn(const NodeID from,
{ {
if (turn_candidates[1].valid && turn_candidates[2].valid) if (turn_candidates[1].valid && turn_candidates[2].valid)
{ {
if (TurnType::Turn == if (TurnType::Ramp !=
findBasicTurnType(from, via_edge, turn_candidates[1], node_based_graph)) findBasicTurnType(from, via_edge, turn_candidates[1], node_based_graph))
{ {
if (angularDeviation(turn_candidates[1].angle, STRAIGHT_ANGLE) < if (angularDeviation(turn_candidates[1].angle, STRAIGHT_ANGLE) <
@ -927,7 +927,7 @@ std::vector<TurnCandidate> handleThreeWayTurn(const NodeID from,
else else
turn_candidates[1].instruction = {TurnType::Ramp, DirectionModifier::SlightRight}; turn_candidates[1].instruction = {TurnType::Ramp, DirectionModifier::SlightRight};
if (TurnType::Turn == if (TurnType::Ramp !=
findBasicTurnType(from, via_edge, turn_candidates[2], node_based_graph)) findBasicTurnType(from, via_edge, turn_candidates[2], node_based_graph))
{ {
if (angularDeviation(turn_candidates[2].angle, STRAIGHT_ANGLE) < if (angularDeviation(turn_candidates[2].angle, STRAIGHT_ANGLE) <