From 2ab7fcb0b220bb89a5a1c561d37b700cb16dd72b Mon Sep 17 00:00:00 2001 From: Moritz Kobitzsch Date: Wed, 19 Oct 2016 11:18:10 +0200 Subject: [PATCH] use-lane can occur in roundabouts as well --- CHANGELOG.md | 1 + src/engine/guidance/post_processing.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c70d9d203..a2dd5e23a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Changes from 5.4.1 - Bugfixes - #3032 Fixed a bug that could result in emitting `invalid` as an instruction type on sliproads with mode changes + - #3085 Fixed an outdated assertion that could throw without a cause for concern # 5.4.1 - Changes from 5.4.0 diff --git a/src/engine/guidance/post_processing.cpp b/src/engine/guidance/post_processing.cpp index e57d0fe98..21f7a3d9b 100644 --- a/src/engine/guidance/post_processing.cpp +++ b/src/engine/guidance/post_processing.cpp @@ -260,7 +260,8 @@ void closeOffRoundabout(const bool on_roundabout, BOOST_ASSERT(leavesRoundabout(steps[1].maneuver.instruction) || steps[1].maneuver.instruction.type == TurnType::StayOnRoundabout || steps[1].maneuver.instruction.type == TurnType::Suppressed || - steps[1].maneuver.instruction.type == TurnType::NoTurn); + steps[1].maneuver.instruction.type == TurnType::NoTurn || + steps[1].maneuver.instruction.type == TurnType::UseLane); steps[0].geometry_end = 1; steps[1].geometry_begin = 0; steps[1] = forwardInto(steps[1], steps[0]); @@ -840,7 +841,7 @@ std::vector collapseTurns(std::vector steps) } else { - //the sliproad turn is incompatible. So we handle it as a turn + // the sliproad turn is incompatible. So we handle it as a turn steps[one_back_index].maneuver.instruction.type = TurnType::Turn; } }