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

use-lane can occur in roundabouts as well

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-10-19 11:18:10 +02:00
parent e498dff90e
commit 2ab7fcb0b2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- Changes from 5.4.1 - Changes from 5.4.1
- Bugfixes - Bugfixes
- #3032 Fixed a bug that could result in emitting `invalid` as an instruction type on sliproads with mode changes - #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 # 5.4.1
- Changes from 5.4.0 - Changes from 5.4.0

5
src/engine/guidance/post_processing.cpp
View File

@ -260,7 +260,8 @@ void closeOffRoundabout(const bool on_roundabout,
BOOST_ASSERT(leavesRoundabout(steps[1].maneuver.instruction) || BOOST_ASSERT(leavesRoundabout(steps[1].maneuver.instruction) ||
steps[1].maneuver.instruction.type == TurnType::StayOnRoundabout || steps[1].maneuver.instruction.type == TurnType::StayOnRoundabout ||
steps[1].maneuver.instruction.type == TurnType::Suppressed || 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[0].geometry_end = 1;
steps[1].geometry_begin = 0; steps[1].geometry_begin = 0;
steps[1] = forwardInto(steps[1], steps[0]); steps[1] = forwardInto(steps[1], steps[0]);
@ -840,7 +841,7 @@ std::vector<RouteStep> collapseTurns(std::vector<RouteStep> steps)
} }
else 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; steps[one_back_index].maneuver.instruction.type = TurnType::Turn;
} }
} }