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

Fix steps collapsing after non-closed roundabouts, #4100

Browse Source
This commit is contained in:
Michael Krasnyk 2017-05-31 09:39:15 +02:00
parent 5d4ab4100a
commit 858ec2e655
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/engine/guidance/collapse_turns.cpp
View File

@ -53,7 +53,7 @@ double findTotalTurnAngle(const RouteStep &entry_step, const RouteStep &exit_ste
// both angles are in the same direction, the total turn gets increased // both angles are in the same direction, the total turn gets increased
//  // 
// a ---- b // a ---- b
// \ // \ 
// c // c
// | // |
// d // d
@ -315,10 +315,21 @@ RouteSteps collapseTurnInstructions(RouteSteps steps)
if (entersRoundabout(current_step->maneuver.instruction) || if (entersRoundabout(current_step->maneuver.instruction) ||
staysOnRoundabout(current_step->maneuver.instruction)) staysOnRoundabout(current_step->maneuver.instruction))
{ {
// Skip over all instructions within the roundabout // Skip over all instructions within the roundabout or check for
for (; current_step + 1 != steps.end(); ++current_step) // special case from setUpRoundabout of a single Enter{Rotary,..} instruction
if (leavesRoundabout(current_step->maneuver.instruction)) auto next_exit_or_enter =
break; std::find_if(current_step + 1, std::prev(steps.end()), [](const auto &step) {
return leavesRoundabout(step.maneuver.instruction) ||
entersRoundabout(step.maneuver.instruction);
});
bool is_touching_or_crossing_roundabout =
!leavesRoundabout(next_exit_or_enter->maneuver.instruction) &&
current_step->maneuver.exit == 1;
// If the instruction touches or crosses the roundabout then the current instruction
// is also an exit one otherwise move the current step to the corresponding exit
current_step = is_touching_or_crossing_roundabout ? current_step : next_exit_or_enter;
// are we done for good? // are we done for good?
if (current_step + 1 == steps.end()) if (current_step + 1 == steps.end())