reflected comments: (1) use vector of ids (2) changed intersection.pa…

…ram.yaml

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

launch/tier4_planning_launch/config/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/intersection.param.yaml

@@ -16,7 +16,8 @@
       collision_start_margin_time: 5.0 # [s]
       collision_end_margin_time: 2.0 # [s]
       use_stuck_stopline: false # stopline generate before the intersection lanelet when is_stuck
-      frontcar_expected_decel: 1.0 # [m/ss] the expected deceleration of frontcar when frontcar as well as ego are turning
+      assumed_front_car_decel: 1.0 # [m/ss] the expected deceleration of frontcar when frontcar as well as ego are turning
+      enable_front_car_decel_prediction: false # By default this feature is disabled
 
     merge_from_private_road:
       stop_duration_sec: 1.0

planning/behavior_velocity_planner/config/intersection.param.yaml

@@ -16,7 +16,7 @@
       collision_start_margin_time: 5.0 # [s]
       collision_end_margin_time: 2.0 # [s]
       use_stuck_stopline: false # stopline generate before the intersection lanelet when is_stuck
-      frontcar_expected_decel: 1.0 # [m/ss] the expected deceleration of frontcar when frontcar as well as ego are turning
+      assumed_front_car_decel: 1.0 # [m/ss] the expected deceleration of front car when frontcar as well as ego are turning
       enable_front_car_decel_prediction: false # By default this feature is disabled
 
     merge_from_private_road:

planning/behavior_velocity_planner/include/scene_module/intersection/scene_intersection.hpp

@@ -124,7 +124,8 @@ class IntersectionModule : public SceneModuleInterface
     double collision_start_margin_time;  //! start margin time to check collision
     double collision_end_margin_time;    //! end margin time to check collision
     bool use_stuck_stopline;  //! stopline generate before the intersection lanelet when is_stuck.
-    double frontcar_expected_decel;  //! the expected deceleration of frontcar when frontcar as well
+    double
+      assumed_front_car_decel;  //! the expected deceleration of front car when front car as well
     bool enable_front_car_decel_prediction;  //! flag for using above feature
   };
 
@@ -167,7 +168,7 @@ class IntersectionModule : public SceneModuleInterface
     lanelet::LaneletMapConstPtr lanelet_map_ptr,
     const autoware_auto_planning_msgs::msg::PathWithLaneId & path,
     const std::vector<int> & detection_area_lanelet_ids,
-    const std::vector<lanelet::CompoundPolygon3d> & conflicting_areas,
+    const std::vector<int> & conflicting_area_lanelet_ids,
     const autoware_auto_perception_msgs::msg::PredictedObjects::ConstSharedPtr objects_ptr,
     const int closest_idx, const Polygon2d & stuck_vehicle_detect_area);
 
@@ -292,7 +293,7 @@ class IntersectionModule : public SceneModuleInterface
 
   /**
    * @brief Check if the ego is expected to stop in the opposite lane if the front vehicle starts
-   * deceleration from current veloctiy and stop befor the crosswalk. If the stop position of front
+   * deceleration from current velocity and stop befor the crosswalk. If the stop position of front
    * vehicle is in stuck area, and the position `ego_length` meter behind is in detection area,
    * return true
    * @param ego_poly Polygon of ego_with_next_lane
@@ -301,7 +302,7 @@ class IntersectionModule : public SceneModuleInterface
    */
   bool checkFrontVehicleDeceleration(
     lanelet::ConstLanelets & ego_lane_with_next_lane, lanelet::ConstLanelet & closest_lanelet,
-    const std::vector<lanelet::CompoundPolygon3d> & conflicting_areas,
+    const std::vector<int> & conflicting_area_lanelet_ids,
     const Polygon2d & stuck_vehicle_detect_area,
     const autoware_auto_perception_msgs::msg::PredictedObject & object) const;
   StateMachine state_machine_;  //! for state

planning/behavior_velocity_planner/include/scene_module/intersection/util.hpp

@@ -126,6 +126,9 @@ double calcArcLengthFromPath(
 
 lanelet::ConstLanelet generateOffsetLanelet(
   const lanelet::ConstLanelet lanelet, double right_margin, double left_margin);
+
+geometry_msgs::msg::Pose toPose(const geometry_msgs::msg::Point & p);
+
 }  // namespace util
 }  // namespace behavior_velocity_planner
 

planning/behavior_velocity_planner/src/scene_module/intersection/manager.cpp

@@ -51,7 +51,7 @@ IntersectionModuleManager::IntersectionModuleManager(rclcpp::Node & node)
   ip.collision_start_margin_time = node.declare_parameter(ns + ".collision_start_margin_time", 5.0);
   ip.collision_end_margin_time = node.declare_parameter(ns + ".collision_end_margin_time", 2.0);
   ip.use_stuck_stopline = node.declare_parameter(ns + ".use_stuck_stopline", true);
-  ip.frontcar_expected_decel = node.declare_parameter(ns + ".frontcar_expected_decel", 1.0);
+  ip.assumed_front_car_decel = node.declare_parameter(ns + ".assumed_front_car_decel", 1.0);
   ip.enable_front_car_decel_prediction =
     node.declare_parameter(ns + ".enable_front_car_decel_prediction", false);
 }

planning/behavior_velocity_planner/src/scene_module/intersection/scene_intersection.cpp

@@ -50,13 +50,6 @@ static geometry_msgs::msg::Pose getObjectPoseWithVelocityDirection(
   return obj_pose;
 }
 
-static geometry_msgs::msg::Pose toPose(const geometry_msgs::msg::Point & p)
-{
-  geometry_msgs::msg::Pose pose;
-  pose.position = p;
-  return pose;
-}
-
 IntersectionModule::IntersectionModule(
   const int64_t module_id, const int64_t lane_id, std::shared_ptr<const PlannerData> planner_data,
   const PlannerParam & planner_param, const rclcpp::Logger logger,
@@ -174,7 +167,6 @@ bool IntersectionModule::modifyPathVelocity(
   /* get dynamic object */
   const auto objects_ptr = planner_data_->predicted_objects;
 
-  // std::vector<lanelet::ConstLanelets> stuck_vehicle_detect_area_lanelets;
   /* calculate dynamic collision around detection area */
   const double detect_length =
     planner_param_.stuck_vehicle_detect_dist + planner_data_->vehicle_info_.vehicle_length_m;
@@ -183,8 +175,8 @@ bool IntersectionModule::modifyPathVelocity(
     planner_param_.stuck_vehicle_detect_dist);
   bool is_stuck = checkStuckVehicleInIntersection(objects_ptr, stuck_vehicle_detect_area);
   bool has_collision = checkCollision(
-    lanelet_map_ptr, *path, detection_area_lanelet_ids, conflicting_areas, objects_ptr, closest_idx,
-    stuck_vehicle_detect_area);
+    lanelet_map_ptr, *path, detection_area_lanelet_ids, conflicting_area_lanelet_ids, objects_ptr,
+    closest_idx, stuck_vehicle_detect_area);
   bool is_entry_prohibited = (has_collision || is_stuck);
   if (external_go) {
     is_entry_prohibited = false;
@@ -263,7 +255,7 @@ bool IntersectionModule::checkCollision(
   lanelet::LaneletMapConstPtr lanelet_map_ptr,
   const autoware_auto_planning_msgs::msg::PathWithLaneId & path,
   const std::vector<int> & detection_area_lanelet_ids,
-  const std::vector<lanelet::CompoundPolygon3d> & conflicting_areas,
+  const std::vector<int> & conflicting_area_lanelet_ids,
   const autoware_auto_perception_msgs::msg::PredictedObjects::ConstSharedPtr objects_ptr,
   const int closest_idx, const Polygon2d & stuck_vehicle_detect_area)
 {
@@ -300,8 +292,8 @@ bool IntersectionModule::checkCollision(
       if (
         planner_param_.enable_front_car_decel_prediction &&
         checkFrontVehicleDeceleration(
-          ego_lane_with_next_lane, closest_lanelet, conflicting_areas, stuck_vehicle_detect_area,
-          object))
+          ego_lane_with_next_lane, closest_lanelet, conflicting_area_lanelet_ids,
+          stuck_vehicle_detect_area, object))
         return true;
     }
 
@@ -696,7 +688,7 @@ double IntersectionModule::calcDistanceUntilIntersectionLanelet(
 
 bool IntersectionModule::checkFrontVehicleDeceleration(
   lanelet::ConstLanelets & ego_lane_with_next_lane, lanelet::ConstLanelet & closest_lanelet,
-  const std::vector<lanelet::CompoundPolygon3d> & conflicting_areas,
+  const std::vector<int> & conflicting_area_lanelet_ids,
   const Polygon2d & stuck_vehicle_detect_area,
   const autoware_auto_perception_msgs::msg::PredictedObject & object) const
 {
@@ -712,7 +704,7 @@ bool IntersectionModule::checkFrontVehicleDeceleration(
   for (auto && p : ego_lane_with_next_lane[1].centerline())
     centerpoints.push_back(std::move(lanelet::utils::conversion::toGeomMsgPt(p)));
   const double lat_offset =
-    std::fabs(tier4_autoware_utils::calcLateralOffset(centerpoints, object_pose.position));
+    std::fabs(motion_utils::calcLateralOffset(centerpoints, object_pose.position));
   // get the nearest centerpoint to object
   std::vector<double> dist_obj_centerpoints;
   for (const auto & p : centerpoints)
@@ -729,9 +721,9 @@ bool IntersectionModule::checkFrontVehicleDeceleration(
     p2 = centerpoints[i + 1];
     acc_dist_prev = acc_dist;
     const auto arc_position_p1 =
-      lanelet::utils::getArcCoordinates(ego_lane_with_next_lane, toPose(p1));
+      lanelet::utils::getArcCoordinates(ego_lane_with_next_lane, util::toPose(p1));
     const auto arc_position_p2 =
-      lanelet::utils::getArcCoordinates(ego_lane_with_next_lane, toPose(p2));
+      lanelet::utils::getArcCoordinates(ego_lane_with_next_lane, util::toPose(p2));
     const double delta = arc_position_p2.length - arc_position_p1.length;
     acc_dist += delta;
     if (acc_dist > stopping_distance) {
@@ -774,10 +766,12 @@ bool IntersectionModule::checkFrontVehicleDeceleration(
     if (acc_dist > vehicle_length) break;
   }
   bool is_behind_point_in_detection_area = false;
-  for (const auto & conflicting_area : conflicting_areas) {
-    const auto conflicting_area_ = lanelet::utils::to2D(conflicting_area);
+  const auto & laneletLayer = planner_data_->route_handler_->getLaneletMapPtr()->laneletLayer;
+  for (const auto & conflicting_area_lanelet_id : conflicting_area_lanelet_ids) {
+    const auto conflicting_area =
+      lanelet::utils::to2D(std::move(laneletLayer.get(conflicting_area_lanelet_id).polygon3d()));
     Polygon2d poly{};
-    for (const auto & p : conflicting_area_) {
+    for (const auto & p : conflicting_area) {
       poly.outer().emplace_back(p.x(), p.y());
     }
     if (bg::intersects(to_bg2d(centerpoints[behind_predicted_obj_point_idx]), poly)) {

planning/behavior_velocity_planner/src/scene_module/intersection/util.cpp

@@ -501,6 +501,13 @@ lanelet::ConstLanelet generateOffsetLanelet(
   return std::move(lanelet_with_margin);
 }
 
+geometry_msgs::msg::Pose toPose(const geometry_msgs::msg::Point & p)
+{
+  geometry_msgs::msg::Pose pose;
+  pose.position = p;
+  return pose;
+}
+
 bool generateStopLineBeforeIntersection(
   const int lane_id, lanelet::LaneletMapConstPtr lanelet_map_ptr,
   const std::shared_ptr<const PlannerData> & planner_data,