From 90e342b21e76a0760468529b867056948098570c Mon Sep 17 00:00:00 2001 From: Axel Date: Thu, 5 Mar 2020 11:06:32 +0100 Subject: [PATCH] Fixed lane 0 and rtree issues. --- LibCarla/source/carla/road/Map.cpp | 184 +++++++++++++++-------------- LibCarla/source/carla/road/Map.h | 2 +- 2 files changed, 96 insertions(+), 90 deletions(-) diff --git a/LibCarla/source/carla/road/Map.cpp b/LibCarla/source/carla/road/Map.cpp index 3c508fe0a..683a4e2f8 100644 --- a/LibCarla/source/carla/road/Map.cpp +++ b/LibCarla/source/carla/road/Map.cpp @@ -69,6 +69,9 @@ namespace road { FuncT &&func) { for (const auto &pair : lane_section.GetLanes()) { const auto &lane = pair.second; + if (lane.GetId() == 0) { + continue; + } if ((static_cast(lane.GetType()) & static_cast(Lane::LaneType::Driving)) > 0) { std::forward(func)(Waypoint{ road_id, @@ -88,6 +91,9 @@ namespace road { FuncT &&func) { for (const auto &pair : lane_section.GetLanes()) { const auto &lane = pair.second; + if (lane.GetId() == 0) { + continue; + } if ((static_cast(lane.GetType()) & static_cast(lane_type)) > 0) { std::forward(func)(Waypoint{ road_id, @@ -110,7 +116,7 @@ namespace road { } } - /// Return a waypoint for each drivable lane of the specified type on each lane section of @a road. + /// Return a waypoint for each lane of the specified type on each lane section of @a road. template static void ForEachLane(const Road &road, Lane::LaneType lane_type, FuncT &&func) { for (const auto &lane_section : road.GetLaneSections()) { @@ -706,7 +712,7 @@ namespace road { return result; } - std::vector> Map::GenerateTopology() const { + std::vector> Map::GenerateTopology(Lane::LaneType /*lane_type*/) const { std::vector> result; for (const auto &pair : _data.GetRoads()) { const auto &road = pair.second; @@ -744,10 +750,18 @@ namespace road { // =========================================================================== // Checks whether the geometry is straight or not - bool IsLineStraight(const Road &road, const Lane &lane, element::GeometryType geometry_type) { + bool IsLineStraight(const Road &road, + const Lane &lane, + const element::RoadInfoGeometry* geometry) { + auto geometry_type = geometry->GetGeometry().GetType(); if (geometry_type != element::GeometryType::LINE) { return false; } + if(lane.GetDistance() < geometry->GetDistance() || + lane.GetDistance() + lane.GetLength() > + geometry->GetDistance() + geometry->GetGeometry().GetLength()) { + return false; + } auto lane_offsets = lane.GetInfos(); for (auto *lane_offset : lane_offsets) { if (abs(lane_offset->GetPolynomial().GetC()) > 0 || @@ -803,15 +817,11 @@ namespace road { // returns the remaining length of the geometry depending on the lane // direction - double GetRemainingLength( - const Lane &lane, - double geometry_start_s, - double geometry_end_s, - double current_s) { + double GetRemainingLength(const Lane &lane, double current_s) { if (lane.GetId() < 0) { - return (geometry_end_s - current_s); + return (lane.GetDistance() + lane.GetLength() - current_s); } else { - return (current_s - geometry_start_s); + return (current_s - lane.GetDistance()); } } @@ -823,108 +833,104 @@ namespace road { // 1.8 degrees, maximum angle in a curve to place a segment constexpr double angle_threshold = geom::Math::Pi() / 100.0; - // Generate waypoints at start of every road and for everey lane - std::vector topology = GenerateWaypointsOnRoadEntries(Lane::LaneType::Any); + // Generate waypoints at start of every lane + std::vector topology; + for (const auto &pair : _data.GetRoads()) { + const auto &road = pair.second; + ForEachLane(road, Lane::LaneType::Any, [&](auto &&waypoint) { + if(waypoint.lane_id != 0) { + topology.push_back(waypoint); + } + }); + } std::vector rtree_elements; // container of segments and // waypoints - // Loop through all road lanes + // Loop through all lanes for (auto &waypoint : topology) { auto &lane_start_waypoint = waypoint; auto current_waypoint = lane_start_waypoint; const Road &road = _data.GetRoad(current_waypoint.road_id); + const Lane &lane = GetLane(current_waypoint); + const auto *geometry = road.GetInfo(current_waypoint.s); - // loop through every geometry in the road - while (current_waypoint.s <= road.GetLength() && current_waypoint.s >= 0) { - const Lane &lane = GetLane(current_waypoint); - const auto *geometry = road.GetInfo(current_waypoint.s); - // start s of this geometry in the road - double geometry_start_s = geometry->GetGeometry().GetStartOffset(); - // end s this geometry in the road - double geometry_end_s = geometry_start_s + geometry->GetGeometry().GetLength(); + geom::Transform current_transform = ComputeTransform(current_waypoint); - geom::Transform current_transform = ComputeTransform(current_waypoint); + // Save computation time in straight lines + if (IsLineStraight(road, lane, geometry)) { + double delta_s = min_delta_s; + double remaining_length = + GetRemainingLength(lane, current_waypoint.s); + remaining_length -= epsilon; + delta_s = remaining_length; + if (delta_s < epsilon) { + continue; + } + auto next = GetNext(current_waypoint, delta_s); - // Save computation time in straight lines - if (IsLineStraight(road, lane, geometry->GetGeometry().GetType())) { + RELEASE_ASSERT(next.size() == 1); + RELEASE_ASSERT(next.front().road_id == current_waypoint.road_id); + auto next_waypoint = next.front(); + + AddElementToRtreeAndUpdateTransforms( + rtree_elements, + current_transform, + current_waypoint, + next_waypoint); + // end of lane + } else { + auto next_waypoint = current_waypoint; + + // Loop until the end of the lane + // Advance in small s-increments + while (true) { double delta_s = min_delta_s; double remaining_length = - GetRemainingLength(lane, geometry_start_s, geometry_end_s, current_waypoint.s); + GetRemainingLength(lane, next_waypoint.s); remaining_length -= epsilon; - delta_s = remaining_length; + delta_s = std::min(delta_s, remaining_length); + if (delta_s < epsilon) { + AddElementToRtreeAndUpdateTransforms( + rtree_elements, + current_transform, + current_waypoint, + next_waypoint); break; } - auto next = GetNext(current_waypoint, delta_s); - RELEASE_ASSERT(next.size() == 1); - RELEASE_ASSERT(next.front().road_id == current_waypoint.road_id); - auto next_waypoint = next.front(); - AddElementToRtreeAndUpdateTransforms( - rtree_elements, - current_transform, - current_waypoint, - next_waypoint); - } else { - auto next_waypoint = current_waypoint; - // Loop until the end of the geometry - while (true) { - double delta_s = min_delta_s; - double remaining_length = - GetRemainingLength( - lane, - geometry_start_s, - geometry_end_s, - next_waypoint.s); - remaining_length -= epsilon; - delta_s = std::min(delta_s, remaining_length); - if (delta_s < epsilon) { - AddElementToRtreeAndUpdateTransforms( - rtree_elements, - current_transform, - current_waypoint, - next_waypoint); - break; - } - - auto next = GetNext(next_waypoint, delta_s); - if (next.size() != 1 || - current_waypoint.road_id != next.front().road_id) { - AddElementToRtreeAndUpdateTransforms( - rtree_elements, - current_transform, - current_waypoint, - next_waypoint); - break; - } - next_waypoint = next.front(); - - geom::Transform next_transform = ComputeTransform(next_waypoint); - double angle = geom::Math::GetVectorAngle( - current_transform.GetForwardVector(), next_transform.GetForwardVector()); - - if (abs(angle) > angle_threshold) { - AddElementToRtree( - rtree_elements, - current_transform, - next_transform, - current_waypoint, - next_waypoint); - current_waypoint = next_waypoint; - current_transform = next_transform; - } + auto next = GetNext(next_waypoint, delta_s); + if (next.size() != 1 || + current_waypoint.section_id != next.front().section_id) { + AddElementToRtreeAndUpdateTransforms( + rtree_elements, + current_transform, + current_waypoint, + next_waypoint); + break; + } + + next_waypoint = next.front(); + geom::Transform next_transform = ComputeTransform(next_waypoint); + double angle = geom::Math::GetVectorAngle( + current_transform.GetForwardVector(), next_transform.GetForwardVector()); + + if (abs(angle) > angle_threshold) { + AddElementToRtree( + rtree_elements, + current_transform, + next_transform, + current_waypoint, + next_waypoint); + current_waypoint = next_waypoint; + current_transform = next_transform; } - } - auto next = GetNext(current_waypoint, 10.0 * epsilon); - if (next.size() != 1 || next.front().road_id != current_waypoint.road_id) { - break; - } else { - current_waypoint = next.front(); } } } + // Add segments to Rtree _rtree.InsertElements(rtree_elements); } diff --git a/LibCarla/source/carla/road/Map.h b/LibCarla/source/carla/road/Map.h index 6cbb91f85..99c759dab 100644 --- a/LibCarla/source/carla/road/Map.h +++ b/LibCarla/source/carla/road/Map.h @@ -128,7 +128,7 @@ namespace road { /// Generate the minimum set of waypoints that define the topology of @a /// map. The waypoints are placed at the entrance of each lane. - std::vector> GenerateTopology() const; + std::vector> GenerateTopology(Lane::LaneType lane_type = Lane::LaneType::Driving) const; /// Generate waypoints of the junction std::vector> GetJunctionWaypoints(JuncId id, Lane::LaneType lane_type) const;