Skip to content

Commit b0b8069

Browse files
themyloginthemylogin
committed
clang-format
1 parent d9d8739 commit b0b8069

File tree

3 files changed

+34
-30
lines changed

3 files changed

+34
-30
lines changed

‎include/extractor/intersection/intersection_analysis.hpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,15 @@ IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph,
7070
const TurnLanesIndexedArray &turn_lanes_data,
7171
const IntersectionEdge &incoming_edge);
7272

73-
IntersectionView getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
74-
const EdgeBasedNodeDataContainer &node_data_container,
75-
const RestrictionMap &node_restriction_map,
76-
const std::unordered_set<NodeID> &barrier_nodes,
77-
const TurnLanesIndexedArray &turn_lanes_data,
78-
const IntersectionEdge &incoming_edge,
79-
const IntersectionEdgeGeometries &edge_geometries,
80-
const std::unordered_set<EdgeID> &merged_edge_ids);
73+
IntersectionView
74+
getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
75+
const EdgeBasedNodeDataContainer &node_data_container,
76+
const RestrictionMap &node_restriction_map,
77+
const std::unordered_set<NodeID> &barrier_nodes,
78+
const TurnLanesIndexedArray &turn_lanes_data,
79+
const IntersectionEdge &incoming_edge,
80+
const IntersectionEdgeGeometries &edge_geometries,
81+
const std::unordered_set<EdgeID> &merged_edge_ids);
8182

8283
// Graph Compression cannot compress every setting. For example any barrier/traffic light cannot
8384
// be compressed. As a result, a simple road of the form `a ----- b` might end up as having an

‎src/extractor/edge_based_graph_factory.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -715,14 +715,15 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
715715
++node_based_edge_counter;
716716

717717
const auto connected_roads =
718-
extractor::intersection::getConnectedRoadsForEdgeGeometries(m_node_based_graph,
719-
m_edge_based_node_container,
720-
unconditional_node_restriction_map,
721-
m_barrier_nodes,
722-
turn_lanes_data,
723-
incoming_edge,
724-
edge_geometries,
725-
merged_edge_ids);
718+
extractor::intersection::getConnectedRoadsForEdgeGeometries(
719+
m_node_based_graph,
720+
m_edge_based_node_container,
721+
unconditional_node_restriction_map,
722+
m_barrier_nodes,
723+
turn_lanes_data,
724+
incoming_edge,
725+
edge_geometries,
726+
merged_edge_ids);
726727

727728
// check if this edge is part of a restriction via-way
728729
const auto is_restriction_via_edge =
@@ -770,8 +771,8 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
770771
}
771772
else
772773
{
773-
// It does not add incoming edge if there is outgoing so we should
774-
// find it ourselves
774+
// It does not add incoming edge if there is outgoing so we
775+
// should find it ourselves
775776
is_incoming = false;
776777
auto reversed_edge = m_node_based_graph.FindEdge(
777778
m_node_based_graph.GetTarget(connected_edge.eid),

‎src/extractor/intersection/intersection_analysis.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -755,14 +755,15 @@ IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph,
755755
merged_edge_ids);
756756
}
757757

758-
IntersectionView getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
759-
const EdgeBasedNodeDataContainer &node_data_container,
760-
const RestrictionMap &node_restriction_map,
761-
const std::unordered_set<NodeID> &barrier_nodes,
762-
const TurnLanesIndexedArray &turn_lanes_data,
763-
const IntersectionEdge &incoming_edge,
764-
const IntersectionEdgeGeometries &edge_geometries,
765-
const std::unordered_set<EdgeID> &merged_edge_ids)
758+
IntersectionView
759+
getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
760+
const EdgeBasedNodeDataContainer &node_data_container,
761+
const RestrictionMap &node_restriction_map,
762+
const std::unordered_set<NodeID> &barrier_nodes,
763+
const TurnLanesIndexedArray &turn_lanes_data,
764+
const IntersectionEdge &incoming_edge,
765+
const IntersectionEdgeGeometries &edge_geometries,
766+
const std::unordered_set<EdgeID> &merged_edge_ids)
766767
{
767768
const auto intersection_node = graph.GetTarget(incoming_edge.edge);
768769
const auto &outgoing_edges = intersection::getOutgoingEdges(graph, intersection_node);
@@ -776,10 +777,11 @@ IntersectionView getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamic
776777
const auto &geometry = processed_edge_geometries[index];
777778
const auto remote_node = graph.GetTarget(geometry.eid);
778779
const auto incoming_edge = graph.FindEdge(remote_node, intersection_node);
779-
processed_edge_geometries[edges_number + index] = {incoming_edge,
780-
util::bearing::reverse(geometry.initial_bearing),
781-
util::bearing::reverse(geometry.perceived_bearing),
782-
geometry.segment_length};
780+
processed_edge_geometries[edges_number + index] = {
781+
incoming_edge,
782+
util::bearing::reverse(geometry.initial_bearing),
783+
util::bearing::reverse(geometry.perceived_bearing),
784+
geometry.segment_length};
783785
}
784786

785787
// Enforce ordering of edges by IDs

0 commit comments

Comments
 (0)