From e3c2d4dddcd99c3218ea43af7676662581cd080e 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 | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ce4a4d31..6c0279e77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,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 c3ff15da3..ff52bdcb1 100644 --- a/src/engine/guidance/post_processing.cpp +++ b/src/engine/guidance/post_processing.cpp @@ -265,7 +265,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]);