Format with clang-format 3.8

2016-05-27 21:05:04 +02:00
parent 21c47514da
commit 6e16eab6ec
202 changed files with 2485 additions and 1863 deletions
@@ -1,5 +1,5 @@
-#include "extractor/guidance/constants.hpp"
 #include "extractor/guidance/intersection_handler.hpp"
+#include "extractor/guidance/constants.hpp"
 #include "extractor/guidance/toolkit.hpp"

 #include "util/guidance/toolkit.hpp"
@@ -38,12 +38,13 @@ IntersectionHandler::~IntersectionHandler() {}

 std::size_t IntersectionHandler::countValid(const Intersection &intersection) const
 {
-    return std::count_if(intersection.begin(), intersection.end(),
-                         [](const ConnectedRoad &road) { return road.entry_allowed; });
+    return std::count_if(intersection.begin(), intersection.end(), [](const ConnectedRoad &road) {
+        return road.entry_allowed;
+    });
 }

 TurnType::Enum IntersectionHandler::findBasicTurnType(const EdgeID via_edge,
-                                                const ConnectedRoad &road) const
+                                                      const ConnectedRoad &road) const
 {

    const auto &in_data = node_based_graph.GetEdgeData(via_edge);
@@ -94,9 +95,9 @@ TurnInstruction IntersectionHandler::getInstructionForObvious(const std::size_t
            // obvious turn onto a through street is a merge
            if (through_street)
            {
-                return {TurnType::Merge, road.turn.angle > STRAIGHT_ANGLE
-                                             ? DirectionModifier::SlightRight
-                                             : DirectionModifier::SlightLeft};
+                return {TurnType::Merge,
+                        road.turn.angle > STRAIGHT_ANGLE ? DirectionModifier::SlightRight
+                                                         : DirectionModifier::SlightLeft};
            }
            else
            {