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

clang-format

Browse Source
This commit is contained in:
themylogin 2021-01-27 13:11:54 +01:00
parent d9d873903f
commit b0b8069ab0
3 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/extractor/intersection/intersection_analysis.hpp
View File

@ -70,14 +70,15 @@ IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph,
const TurnLanesIndexedArray &turn_lanes_data, const TurnLanesIndexedArray &turn_lanes_data,
const IntersectionEdge &incoming_edge); const IntersectionEdge &incoming_edge);
IntersectionView getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph, IntersectionView
const EdgeBasedNodeDataContainer &node_data_container, getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
const RestrictionMap &node_restriction_map, const EdgeBasedNodeDataContainer &node_data_container,
const std::unordered_set<NodeID> &barrier_nodes, const RestrictionMap &node_restriction_map,
const TurnLanesIndexedArray &turn_lanes_data, const std::unordered_set<NodeID> &barrier_nodes,
const IntersectionEdge &incoming_edge, const TurnLanesIndexedArray &turn_lanes_data,
const IntersectionEdgeGeometries &edge_geometries, const IntersectionEdge &incoming_edge,
const std::unordered_set<EdgeID> &merged_edge_ids); const IntersectionEdgeGeometries &edge_geometries,
const std::unordered_set<EdgeID> &merged_edge_ids);
// Graph Compression cannot compress every setting. For example any barrier/traffic light cannot // Graph Compression cannot compress every setting. For example any barrier/traffic light cannot
// be compressed. As a result, a simple road of the form `a ----- b` might end up as having an // be compressed. As a result, a simple road of the form `a ----- b` might end up as having an

21
src/extractor/edge_based_graph_factory.cpp
View File

@ -715,14 +715,15 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
++node_based_edge_counter; ++node_based_edge_counter;
const auto connected_roads = const auto connected_roads =
extractor::intersection::getConnectedRoadsForEdgeGeometries(m_node_based_graph, extractor::intersection::getConnectedRoadsForEdgeGeometries(
m_edge_based_node_container, m_node_based_graph,
unconditional_node_restriction_map, m_edge_based_node_container,
m_barrier_nodes, unconditional_node_restriction_map,
turn_lanes_data, m_barrier_nodes,
incoming_edge, turn_lanes_data,
edge_geometries, incoming_edge,
merged_edge_ids); edge_geometries,
merged_edge_ids);
// check if this edge is part of a restriction via-way // check if this edge is part of a restriction via-way
const auto is_restriction_via_edge = const auto is_restriction_via_edge =
@ -770,8 +771,8 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
} }
else else
{ {
// It does not add incoming edge if there is outgoing so we should // It does not add incoming edge if there is outgoing so we
// find it ourselves // should find it ourselves
is_incoming = false; is_incoming = false;
auto reversed_edge = m_node_based_graph.FindEdge( auto reversed_edge = m_node_based_graph.FindEdge(
m_node_based_graph.GetTarget(connected_edge.eid), m_node_based_graph.GetTarget(connected_edge.eid),

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

@ -755,14 +755,15 @@ IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph,
merged_edge_ids); merged_edge_ids);
} }
IntersectionView getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph, IntersectionView
const EdgeBasedNodeDataContainer &node_data_container, getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
const RestrictionMap &node_restriction_map, const EdgeBasedNodeDataContainer &node_data_container,
const std::unordered_set<NodeID> &barrier_nodes, const RestrictionMap &node_restriction_map,
const TurnLanesIndexedArray &turn_lanes_data, const std::unordered_set<NodeID> &barrier_nodes,
const IntersectionEdge &incoming_edge, const TurnLanesIndexedArray &turn_lanes_data,
const IntersectionEdgeGeometries &edge_geometries, const IntersectionEdge &incoming_edge,
const std::unordered_set<EdgeID> &merged_edge_ids) const IntersectionEdgeGeometries &edge_geometries,
const std::unordered_set<EdgeID> &merged_edge_ids)
{ {
const auto intersection_node = graph.GetTarget(incoming_edge.edge); const auto intersection_node = graph.GetTarget(incoming_edge.edge);
const auto &outgoing_edges = intersection::getOutgoingEdges(graph, intersection_node); const auto &outgoing_edges = intersection::getOutgoingEdges(graph, intersection_node);
@ -776,10 +777,11 @@ IntersectionView getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamic
const auto &geometry = processed_edge_geometries[index]; const auto &geometry = processed_edge_geometries[index];
const auto remote_node = graph.GetTarget(geometry.eid); const auto remote_node = graph.GetTarget(geometry.eid);
const auto incoming_edge = graph.FindEdge(remote_node, intersection_node); const auto incoming_edge = graph.FindEdge(remote_node, intersection_node);
processed_edge_geometries[edges_number + index] = {incoming_edge, processed_edge_geometries[edges_number + index] = {
util::bearing::reverse(geometry.initial_bearing), incoming_edge,
util::bearing::reverse(geometry.perceived_bearing), util::bearing::reverse(geometry.initial_bearing),
geometry.segment_length}; util::bearing::reverse(geometry.perceived_bearing),
geometry.segment_length};
} }
// Enforce ordering of edges by IDs // Enforce ordering of edges by IDs