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

access way names through RouteStep in post processing

Browse Source
This commit is contained in:
karenzshea
2017-11-28 17:29:13 +01:00
committed by Patrick Niklaus
parent d5232d5f5c
commit 56459d37d1
3 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/guidance/collapse_turns.cpp
+2 -15
View File
@@ -371,9 +371,6 @@ RouteSteps collapseTurnInstructions(RouteSteps steps, const datafacade::BaseData
break;
const auto previous_step = findPreviousTurn(current_step);
const auto previous_step_name = facade.GetNameForID(previous_step->name_id).to_string();
const auto current_step_name = facade.GetNameForID(current_step->name_id).to_string();
const auto next_step_name = facade.GetNameForID(next_step->name_id).to_string();
// don't collapse anything that does change modes
if (current_step->mode != next_step->mode)
@@ -390,12 +387,7 @@ RouteSteps collapseTurnInstructions(RouteSteps steps, const datafacade::BaseData
TransferSignageStrategy(),
NoModificationStrategy());
}
else if (isUTurn(previous_step,
current_step,
next_step,
previous_step_name,
current_step_name,
next_step_name))
else if (isUTurn(previous_step, current_step, next_step))
{
combineRouteSteps(
*current_step,
@@ -475,12 +467,7 @@ RouteSteps collapseTurnInstructions(RouteSteps steps, const datafacade::BaseData
const auto far_back_step_name = facade.GetNameForID(far_back_step->name_id).to_string();
// due to name changes, we can find u-turns a bit late. Thats why we check far back as
// well
if (isUTurn(far_back_step,
previous_step,
current_step,
far_back_step_name,
previous_step_name,
current_step_name))
if (isUTurn(far_back_step, previous_step, current_step))
{
combineRouteSteps(
*previous_step,