Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
Moritz Kobitzsch committed Feb 10, 2017
1 parent d43284f commit 643e63e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/engine/guidance/collapse_scenario_detection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ bool isUTurn(const RouteStepIterator step_prior_to_intersection,
const RouteStepIterator step_leaving_intersection);

// detect oscillating names where a name switch A->B->A occurs. This is often the case due to
// bridges or tunnels. Any such oszillation is not supposed to show up
// bridges or tunnels. Any such oszillation is not supposed to show up
bool isNameOszillation(const RouteStepIterator step_prior_to_intersection,
const RouteStepIterator step_entering_intersection,
const RouteStepIterator step_leaving_intersection);
Expand Down
1 change: 0 additions & 1 deletion include/engine/guidance/collapse_turns.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ struct TransferLanesStrategy : LaneStrategy
void operator()(RouteStep &step_at_turn_location, const RouteStep &transfer_from_step) const;
};


// Pattern to combine a route step using the predefined strategies
template <typename CombineStrategyClass, typename SignageStrategyClass, typename LaneStrategyClass>
void combineRouteSteps(RouteStep &step_at_turn_location,
Expand Down
5 changes: 3 additions & 2 deletions src/engine/guidance/verbosity_reduction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,10 @@ std::vector<RouteStep> collapseUseLane(std::vector<RouteStep> steps)
};

BOOST_ASSERT(steps.size() > 1);
for( auto step_itr = steps.begin() + 1; step_itr != steps.end(); ++step_itr)
for (auto step_itr = steps.begin() + 1; step_itr != steps.end(); ++step_itr)
{
if (step_itr->maneuver.instruction.type == TurnType::UseLane && canCollapseUseLane(*step_itr))
if (step_itr->maneuver.instruction.type == TurnType::UseLane &&
canCollapseUseLane(*step_itr))
{
auto previous_itr = findPreviousTurn(step_itr);
if (haveSameMode(*previous_itr, *step_itr))
Expand Down

0 comments on commit 643e63e

Please sign in to comment.