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

Apply formatting

Browse Source
This commit is contained in:
Dennis Luxen 2024-05-06 08:12:55 +02:00
parent 3dc407095e
commit 4caee0339e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/engine/guidance/collapse_scenario_detection.hpp
View File

@ -16,7 +16,7 @@ bool basicCollapsePreconditions(const RouteStepIterator first,
// Staggered intersection are very short zig-zags of a few meters. // Staggered intersection are very short zig-zags of a few meters.
// We do not want to announce these short left-rights or right-lefts: // We do not want to announce these short left-rights or right-lefts:
//  //  
// * -> b a -> * // * -> b a -> *
// | or | becomes a -> b // | or | becomes a -> b
// a -> * * -> b // a -> * * -> b
@ -26,7 +26,7 @@ bool isStaggeredIntersection(const RouteStepIterator step_prior_to_intersection,
// Two two turns following close after another, we can announce them as a U-Turn if both end up // Two two turns following close after another, we can announce them as a U-Turn if both end up
// involving the same (segregated) road. // involving the same (segregated) road.
//  //  
// b < - y // b < - y
// | will be represented by at x, turn around instead of turn left at x, turn left at y // | will be represented by at x, turn around instead of turn left at x, turn left at y
// a - > x // a - > x
@ -42,11 +42,11 @@ bool isNameOszillation(const RouteStepIterator step_prior_to_intersection,
// Sometimes, segments names don't match the perceived turns. We try to detect these additional // Sometimes, segments names don't match the perceived turns. We try to detect these additional
// name changes and issue a combined turn. // name changes and issue a combined turn.
//  //  
// | e | // | e |
// a - b - c // a - b - c
// d // d
//  //  
// can have `a-b` as one name, `b-c-d` as a second. At `b` we would issue a new name, even though // can have `a-b` as one name, `b-c-d` as a second. At `b` we would issue a new name, even though
// the road turns right after. The offset would only be there due to the broad road at `e` // the road turns right after. The offset would only be there due to the broad road at `e`
bool maneuverPreceededByNameChange(const RouteStepIterator step_prior_to_intersection, bool maneuverPreceededByNameChange(const RouteStepIterator step_prior_to_intersection,
@ -73,11 +73,11 @@ bool doubleChoiceless(const RouteStepIterator step_entering_intersection,
// Due to obvious detection, sometimes we can have straight turns followed by a different turn right // Due to obvious detection, sometimes we can have straight turns followed by a different turn right
// next to each other. We combine both turns into one, if the second turn is without choice // next to each other. We combine both turns into one, if the second turn is without choice
//  //  
//  e //   e
// a - b - c // a - b - c
// ' d // ' d
//  //  
// with a main road `abd`, the turn `continue straight` at `b` and `turn left at `c` will become a // with a main road `abd`, the turn `continue straight` at `b` and `turn left at `c` will become a
// `turn left` at `b` // `turn left` at `b`
bool straightTurnFollowedByChoiceless(const RouteStepIterator step_entering_intersection, bool straightTurnFollowedByChoiceless(const RouteStepIterator step_entering_intersection,

4
src/extractor/intersection/intersection_analysis.cpp
View File

@ -128,7 +128,7 @@ std::pair<bool, double> findMergedBearing(const util::NodeBasedDynamicGraph &gra
{ {
// In some intersections, turning roads can introduce artificial turns if we merge here. // In some intersections, turning roads can introduce artificial turns if we merge here.
// Consider a scenario like: // Consider a scenario like:
//  //  
// a . g - f // a . g - f
// | . // | .
// | . // | .
@ -136,7 +136,7 @@ std::pair<bool, double> findMergedBearing(const util::NodeBasedDynamicGraph &gra
// d-b--------e // d-b--------e
// | // |
// c // c
//  //  
// Merging `bgf` and `be` would introduce an angle, even though d-b-e is perfectly straight // Merging `bgf` and `be` would introduce an angle, even though d-b-e is perfectly straight
// We don't change the angle, if such an opposite road exists // We don't change the angle, if such an opposite road exists
return {false, entry.perceived_bearing}; return {false, entry.perceived_bearing};