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

fix broken assertion

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-06-28 08:33:20 +02:00 committed by Patrick Niklaus
parent 311b348d09
commit 6265b8fa77
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/engine/guidance/lane_processing.cpp
View File

@ -64,7 +64,6 @@ std::vector<RouteStep> anticipateLaneChange(std::vector<RouteStep> steps)
const auto current_lanes = current.maneuver.lanes; const auto current_lanes = current.maneuver.lanes;
// Constrain the previous turn's lanes // Constrain the previous turn's lanes
auto &previous_inst = previous.maneuver.instruction;
auto &previous_lanes = previous.maneuver.lanes; auto &previous_lanes = previous.maneuver.lanes;
// Lane mapping (N:M) from previous lanes (N) to current lanes (M), with: // Lane mapping (N:M) from previous lanes (N) to current lanes (M), with:
// N > M, N > 1 fan-in situation, constrain N lanes to min(N,M) shared lanes // N > M, N > 1 fan-in situation, constrain N lanes to min(N,M) shared lanes

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

@ -1082,7 +1082,7 @@ std::vector<RouteStep> buildIntersections(std::vector<RouteStep> steps)
// previous instruction. // previous instruction.
if (instruction.type == TurnType::EndOfRoad) if (instruction.type == TurnType::EndOfRoad)
{ {
BOOST_ASSERT(step_index > 0 && step_index < step_index + 1 < steps.size()); BOOST_ASSERT(step_index > 0 && step_index + 1 < steps.size());
const auto &previous_step = steps[last_valid_instruction]; const auto &previous_step = steps[last_valid_instruction];
if (previous_step.intersections.size() < MIN_END_OF_ROAD_INTERSECTIONS) if (previous_step.intersections.size() < MIN_END_OF_ROAD_INTERSECTIONS)
step.maneuver.instruction.type = TurnType::Turn; step.maneuver.instruction.type = TurnType::Turn;