diff --git a/include/extractor/guidance/intersection_handler.hpp b/include/extractor/guidance/intersection_handler.hpp index d58d8f786..4247aacb6 100644 --- a/include/extractor/guidance/intersection_handler.hpp +++ b/include/extractor/guidance/intersection_handler.hpp @@ -579,13 +579,13 @@ std::size_t IntersectionHandler::findObviousTurn(const EdgeID via_edge, return {}; return intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - parameters); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + parameters); }(); if (!previous_intersection.empty()) diff --git a/include/extractor/guidance/node_based_graph_walker.hpp b/include/extractor/guidance/node_based_graph_walker.hpp index 4ceb0001b..4f1f8d131 100644 --- a/include/extractor/guidance/node_based_graph_walker.hpp +++ b/include/extractor/guidance/node_based_graph_walker.hpp @@ -223,13 +223,13 @@ NodeBasedGraphWalker::TraverseRoad(NodeID current_node_id, // look at the next intersection const auto next_intersection = intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - {current_node_id, current_edge_id}); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + {current_node_id, current_edge_id}); // don't follow u-turns or go past our initial intersection if (next_intersection.size() <= 1) diff --git a/include/extractor/intersection/intersection_analysis.hpp b/include/extractor/intersection/intersection_analysis.hpp index 852fa6652..09121f2b4 100644 --- a/include/extractor/intersection/intersection_analysis.hpp +++ b/include/extractor/intersection/intersection_analysis.hpp @@ -60,7 +60,7 @@ convertToIntersectionView(const util::NodeBasedDynamicGraph &graph, // Check for restrictions/barriers and generate a list of valid and invalid turns present at // the node reached from `incoming_edge`. The resulting candidates have to be analyzed // for their actual instructions later on. -template +template guidance::IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph, const EdgeBasedNodeDataContainer &node_data_container, diff --git a/src/extractor/guidance/intersection_handler.cpp b/src/extractor/guidance/intersection_handler.cpp index 110aae170..037375a58 100644 --- a/src/extractor/guidance/intersection_handler.cpp +++ b/src/extractor/guidance/intersection_handler.cpp @@ -483,13 +483,13 @@ IntersectionHandler::getNextIntersection(const NodeID at, const EdgeID via) cons } auto intersection = intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - intersection_parameters); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + intersection_parameters); auto intersection_node = node_based_graph.GetTarget(intersection_parameters.edge); if (intersection.size() <= 2 || intersection.isTrafficSignalOrBarrier()) diff --git a/src/extractor/guidance/mergable_road_detector.cpp b/src/extractor/guidance/mergable_road_detector.cpp index ff9b3295d..01abea722 100644 --- a/src/extractor/guidance/mergable_road_detector.cpp +++ b/src/extractor/guidance/mergable_road_detector.cpp @@ -559,13 +559,13 @@ bool MergableRoadDetector::IsLinkRoad(const NodeID intersection_node, intersection::skipDegreeTwoNodes(node_based_graph, {intersection_node, road.eid}); const auto next_intersection_along_road = intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - next_intersection_parameters); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + next_intersection_parameters); const auto extract_name_id = [this](const MergableRoadData &road) { return node_data_container .GetAnnotation(node_based_graph.GetEdgeData(road.eid).annotation_data) diff --git a/src/extractor/guidance/node_based_graph_walker.cpp b/src/extractor/guidance/node_based_graph_walker.cpp index f475ae100..cc4d88f7b 100644 --- a/src/extractor/guidance/node_based_graph_walker.cpp +++ b/src/extractor/guidance/node_based_graph_walker.cpp @@ -280,13 +280,13 @@ void IntersectionFinderAccumulator::update(const NodeID from_node, via_edge_id = via_edge; intersection = intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - {from_node, via_edge}); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + {from_node, via_edge}); } } // namespace guidance diff --git a/src/extractor/guidance/turn_discovery.cpp b/src/extractor/guidance/turn_discovery.cpp index eb0606191..9f53c70c5 100644 --- a/src/extractor/guidance/turn_discovery.cpp +++ b/src/extractor/guidance/turn_discovery.cpp @@ -76,13 +76,13 @@ bool findPreviousIntersection(const NodeID node_v, const auto node_v_reverse_intersection = intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - {node_w, u_turn_at_node_w}); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + {node_w, u_turn_at_node_w}); // Continue along the straightmost turn. If there is no straight turn, we cannot find a valid // previous intersection. const auto straightmost_at_v_in_reverse = @@ -96,13 +96,13 @@ bool findPreviousIntersection(const NodeID node_v, const auto node_u = node_based_graph.GetTarget(straightmost_at_v_in_reverse->eid); const auto node_u_reverse_intersection = intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - {node_v, straightmost_at_v_in_reverse->eid}); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + {node_v, straightmost_at_v_in_reverse->eid}); // now check that the u-turn at the given intersection connects to via-edge // The u-turn at the now found intersection should, hopefully, represent the previous edge. @@ -121,13 +121,13 @@ bool findPreviousIntersection(const NodeID node_v, } result_intersection = intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - {node_u, result_via_edge}); + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + {node_u, result_via_edge}); const auto check_via_edge = result_intersection.end() != std::find_if(result_intersection.begin(), diff --git a/src/extractor/guidance/turn_lane_handler.cpp b/src/extractor/guidance/turn_lane_handler.cpp index 084d5ce5d..2110a3650 100644 --- a/src/extractor/guidance/turn_lane_handler.cpp +++ b/src/extractor/guidance/turn_lane_handler.cpp @@ -572,17 +572,17 @@ std::pair TurnLaneHandler::partitionLaneData( // find out about the next intersection. To check for valid matches, we also need the turn // types. We can skip merging/angle adjustments, though - const auto next_intersection = - turn_analysis.AssignTurnTypes(at, - straightmost->eid, - intersection::getConnectedRoads(node_based_graph, - node_data_container, - node_coordinates, - compressed_geometries, - node_restriction_map, - barrier_nodes, - turn_lanes_data, - {at, straightmost->eid})); + const auto next_intersection = turn_analysis.AssignTurnTypes( + at, + straightmost->eid, + intersection::getConnectedRoads(node_based_graph, + node_data_container, + node_coordinates, + compressed_geometries, + node_restriction_map, + barrier_nodes, + turn_lanes_data, + {at, straightmost->eid})); // check where we can match turn lanes std::size_t straightmost_tag_index = turn_lane_data.size(); diff --git a/src/extractor/intersection/intersection_analysis.cpp b/src/extractor/intersection/intersection_analysis.cpp index 6d7238243..a4c3e5275 100644 --- a/src/extractor/intersection/intersection_analysis.cpp +++ b/src/extractor/intersection/intersection_analysis.cpp @@ -202,7 +202,7 @@ auto getIntersectionLanes(const util::NodeBasedDynamicGraph &graph, const NodeID return max_lanes_intersection; } -template +template IntersectionEdgeGeometries getIntersectionOutgoingGeometries(const util::NodeBasedDynamicGraph &graph, const extractor::CompressedEdgeContainer &compressed_geometries, @@ -233,7 +233,7 @@ getIntersectionOutgoingGeometries(const util::NodeBasedDynamicGraph &graph, util::coordinate_calculation::bearing(geometry[0], close_coordinate); const auto representative_coordinate = - USE_CLOSE_BEARINGS || graph.GetOutDegree(intersection_node) <= 2 + USE_CLOSE_COORDINATE || graph.GetOutDegree(intersection_node) <= 2 ? coordinate_extractor.GetCoordinateCloseToTurn( intersection_node, outgoing_edge, false, remote_node) : coordinate_extractor.ExtractRepresentativeCoordinate(intersection_node, @@ -756,7 +756,7 @@ convertToIntersectionView(const util::NodeBasedDynamicGraph &graph, // That means we not only get (from_node, turn_node, c) in the above example // but also (from_node, turn_node, a), (from_node, turn_node, b). These turns are // marked as invalid and only needed for intersection classification. -template +template guidance::IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph, const EdgeBasedNodeDataContainer &node_data_container, @@ -769,7 +769,7 @@ getConnectedRoads(const util::NodeBasedDynamicGraph &graph, { const auto intersection_node = graph.GetTarget(incoming_edge.edge); const auto &outgoing_edges = intersection::getOutgoingEdges(graph, intersection_node); - auto edge_geometries = getIntersectionOutgoingGeometries( + auto edge_geometries = getIntersectionOutgoingGeometries( graph, compressed_geometries, node_coordinates, intersection_node); // Add incoming edges with reversed bearings @@ -800,28 +800,25 @@ getConnectedRoads(const util::NodeBasedDynamicGraph &graph, std::unordered_set()); } -template -guidance::IntersectionView +template guidance::IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph, - const EdgeBasedNodeDataContainer &node_data_container, - const std::vector &node_coordinates, - const extractor::CompressedEdgeContainer &compressed_geometries, - const RestrictionMap &node_restriction_map, - const std::unordered_set &barrier_nodes, - const guidance::TurnLanesIndexedArray &turn_lanes_data, - const IntersectionEdge &incoming_edge); + const EdgeBasedNodeDataContainer &node_data_container, + const std::vector &node_coordinates, + const extractor::CompressedEdgeContainer &compressed_geometries, + const RestrictionMap &node_restriction_map, + const std::unordered_set &barrier_nodes, + const guidance::TurnLanesIndexedArray &turn_lanes_data, + const IntersectionEdge &incoming_edge); -template -guidance::IntersectionView +template guidance::IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph, - const EdgeBasedNodeDataContainer &node_data_container, - const std::vector &node_coordinates, - const extractor::CompressedEdgeContainer &compressed_geometries, - const RestrictionMap &node_restriction_map, - const std::unordered_set &barrier_nodes, - const guidance::TurnLanesIndexedArray &turn_lanes_data, - const IntersectionEdge &incoming_edge); - + const EdgeBasedNodeDataContainer &node_data_container, + const std::vector &node_coordinates, + const extractor::CompressedEdgeContainer &compressed_geometries, + const RestrictionMap &node_restriction_map, + const std::unordered_set &barrier_nodes, + const guidance::TurnLanesIndexedArray &turn_lanes_data, + const IntersectionEdge &incoming_edge); IntersectionEdge skipDegreeTwoNodes(const util::NodeBasedDynamicGraph &graph, IntersectionEdge road) {