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

opening typo

Browse Source
This commit is contained in:
karenzshea 2016-11-29 09:39:05 -05:00
parent 6ba36a2bc7
commit ce5bcc797b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,32 +528,32 @@ void collapseTurnAt(std::vector<RouteStep> &steps,
// check if the actual turn we wan't to announce is delayed. This situation describes a turn // check if the actual turn we wan't to announce is delayed. This situation describes a turn
// that is expressed by two turns, // that is expressed by two turns,
const auto isDelayedTurn = [](const RouteStep &openining_turn, const auto isDelayedTurn = [](const RouteStep &opening_turn,
const RouteStep &finishing_turn) { const RouteStep &finishing_turn) {
// only possible if both are compatible // only possible if both are compatible
if (!compatible(openining_turn, finishing_turn)) if (!compatible(opening_turn, finishing_turn))
return false; return false;
else else
{ {
const auto is_short_and_collapsable = const auto is_short_and_collapsable =
openining_turn.distance <= MAX_COLLAPSE_DISTANCE && opening_turn.distance <= MAX_COLLAPSE_DISTANCE &&
isCollapsableInstruction(finishing_turn.maneuver.instruction); isCollapsableInstruction(finishing_turn.maneuver.instruction);
const auto without_choice = choiceless(finishing_turn, openining_turn); const auto without_choice = choiceless(finishing_turn, opening_turn);
const auto is_not_too_long_and_choiceless = const auto is_not_too_long_and_choiceless =
openining_turn.distance <= 2 * MAX_COLLAPSE_DISTANCE && without_choice; opening_turn.distance <= 2 * MAX_COLLAPSE_DISTANCE && without_choice;
// for ramps we allow longer stretches, since they are often on some major brides/large // for ramps we allow longer stretches, since they are often on some major brides/large
// roads. A combined distance of of 4 intersections would be to long for a normal // roads. A combined distance of of 4 intersections would be to long for a normal
// collapse. In case of a ramp though, we also account for situations that have the ramp // collapse. In case of a ramp though, we also account for situations that have the ramp
// tagged late // tagged late
const auto is_delayed_turn_onto_a_ramp = const auto is_delayed_turn_onto_a_ramp =
openining_turn.distance <= 4 * MAX_COLLAPSE_DISTANCE && without_choice && opening_turn.distance <= 4 * MAX_COLLAPSE_DISTANCE && without_choice &&
util::guidance::hasRampType(finishing_turn.maneuver.instruction); util::guidance::hasRampType(finishing_turn.maneuver.instruction);
return !util::guidance::hasRampType(openining_turn.maneuver.instruction) && return !util::guidance::hasRampType(opening_turn.maneuver.instruction) &&
(is_short_and_collapsable || is_not_too_long_and_choiceless || (is_short_and_collapsable || is_not_too_long_and_choiceless ||
isLinkroad(openining_turn) || is_delayed_turn_onto_a_ramp); isLinkroad(opening_turn) || is_delayed_turn_onto_a_ramp);
} }
}; };