fix interaction between sliproads/segregated intersections

include/engine/routing_algorithms/routing_base.hpp

@@ -702,15 +702,15 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
             }
         }
 
-        const auto insertInCoreHeap =
-            [](const CoreEntryPoint &p, SearchEngineData::QueryHeap &core_heap) {
-                NodeID id;
-                EdgeWeight weight;
-                NodeID parent;
-                // TODO this should use std::apply when we get c++17 support
-                std::tie(id, weight, parent) = p;
-                core_heap.Insert(id, weight, parent);
-            };
+        const auto insertInCoreHeap = [](const CoreEntryPoint &p,
+                                         SearchEngineData::QueryHeap &core_heap) {
+            NodeID id;
+            EdgeWeight weight;
+            NodeID parent;
+            // TODO this should use std::apply when we get c++17 support
+            std::tie(id, weight, parent) = p;
+            core_heap.Insert(id, weight, parent);
+        };
 
         forward_core_heap.Clear();
         for (const auto &p : forward_entry_points)

include/extractor/guidance/motorway_handler.hpp

@@ -2,8 +2,8 @@
 #define OSRM_EXTRACTOR_GUIDANCE_MOTORWAY_HANDLER_HPP_
 
 #include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/intersection_generator.hpp"
+#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/query_node.hpp"
 
 #include "util/attributes.hpp"

include/extractor/guidance/roundabout_handler.hpp

@@ -3,8 +3,8 @@
 
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/intersection_generator.hpp"
+#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/roundabout_type.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"

include/extractor/guidance/toolkit.hpp

@@ -211,7 +211,7 @@ inline bool requiresNameAnnounced(const std::string &from,
         const auto first_prefix_and_suffixes = getPrefixAndSuffix(first);
         const auto second_prefix_and_suffixes = getPrefixAndSuffix(second);
         // reverse strings, get suffices and reverse them to get prefixes
-        const auto checkTable = [&](const std::string& str) {
+        const auto checkTable = [&](const std::string &str) {
             return str.empty() || suffix_table.isSuffix(str);
         };
 

include/extractor/guidance/turn_handler.hpp

@@ -2,8 +2,8 @@
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_HANDLER_HPP_
 
 #include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/intersection_generator.hpp"
+#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/query_node.hpp"
 
 #include "util/attributes.hpp"

include/util/node_based_graph.hpp

@@ -53,9 +53,8 @@ struct NodeBasedEdgeData
 
     bool IsCompatibleTo(const NodeBasedEdgeData &other) const
     {
-        return (reversed == other.reversed) &&
-               (roundabout == other.roundabout) && (startpoint == other.startpoint) &&
-               (access_restricted == other.access_restricted) &&
+        return (reversed == other.reversed) && (roundabout == other.roundabout) &&
+               (startpoint == other.startpoint) && (access_restricted == other.access_restricted) &&
                (travel_mode == other.travel_mode) &&
                (road_classification == other.road_classification);
     }