Skip to content

Commit 0ebd1ae

Browse files
authored
fix(intersection): do not react to rtc for occlusion anymore if occlusion.enable is false (#3979)
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
1 parent 7f29360 commit 0ebd1ae

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

planning/behavior_velocity_intersection_module/src/scene_intersection.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,9 @@ void reactRTCApprovalByDecisionResult(
330330
path->points.at(stop_line_idx).point.pose, VelocityFactor::INTERSECTION);
331331
}
332332
}
333-
if (!rtc_occlusion_approved && !decision_result.is_detection_area_empty) {
333+
if (
334+
!rtc_occlusion_approved && !decision_result.is_detection_area_empty &&
335+
planner_param.occlusion.enable) {
334336
const auto occlusion_stop_line_idx = decision_result.stop_lines.occlusion_peeking_stop_line;
335337
planning_utils::setVelocityFromIndex(occlusion_stop_line_idx, 0.0, path);
336338
debug_data->occlusion_stop_wall_pose =
@@ -373,7 +375,7 @@ void reactRTCApprovalByDecisionResult(
373375
path->points.at(stop_line_idx).point.pose, VelocityFactor::INTERSECTION);
374376
}
375377
}
376-
if (!rtc_occlusion_approved) {
378+
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
377379
const auto stop_line_idx = decision_result.stop_lines.occlusion_peeking_stop_line;
378380
planning_utils::setVelocityFromIndex(stop_line_idx, 0.0, path);
379381
debug_data->occlusion_stop_wall_pose =
@@ -416,7 +418,7 @@ void reactRTCApprovalByDecisionResult(
416418
path->points.at(stop_line_idx).point.pose, VelocityFactor::INTERSECTION);
417419
}
418420
}
419-
if (!rtc_occlusion_approved) {
421+
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
420422
if (planner_param.occlusion.enable_creeping) {
421423
const size_t occlusion_peeking_stop_line = decision_result.occlusion_stop_line_idx;
422424
const size_t closest_idx = decision_result.stop_lines.closest_idx;
@@ -455,7 +457,7 @@ void reactRTCApprovalByDecisionResult(
455457
rtc_occlusion_approved);
456458
// NOTE: creep_velocity should be inserted first at closest_idx if !rtc_default_approved
457459

458-
if (!rtc_occlusion_approved) {
460+
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
459461
const size_t occlusion_peeking_stop_line =
460462
decision_result.stop_lines.occlusion_peeking_stop_line;
461463
if (planner_param.occlusion.enable_creeping) {
@@ -477,7 +479,7 @@ void reactRTCApprovalByDecisionResult(
477479
path->points.at(occlusion_peeking_stop_line).point.pose, VelocityFactor::INTERSECTION);
478480
}
479481
}
480-
if (!rtc_default_approved) {
482+
if (!rtc_default_approved && planner_param.occlusion.enable) {
481483
const auto stop_line_idx = decision_result.stop_lines.default_stop_line;
482484
planning_utils::setVelocityFromIndex(stop_line_idx, 0.0, path);
483485
debug_data->collision_stop_wall_pose =
@@ -520,7 +522,7 @@ void reactRTCApprovalByDecisionResult(
520522
path->points.at(stop_line_idx).point.pose, VelocityFactor::INTERSECTION);
521523
}
522524
}
523-
if (!rtc_occlusion_approved) {
525+
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
524526
const auto stop_line_idx = decision_result.occlusion_stop_line_idx;
525527
planning_utils::setVelocityFromIndex(stop_line_idx, 0.0, path);
526528
debug_data->occlusion_stop_wall_pose =
@@ -562,7 +564,7 @@ void reactRTCApprovalByDecisionResult(
562564
path->points.at(stop_line_idx).point.pose, VelocityFactor::INTERSECTION);
563565
}
564566
}
565-
if (!rtc_occlusion_approved) {
567+
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
566568
const auto stop_line_idx = decision_result.stop_lines.occlusion_peeking_stop_line;
567569
planning_utils::setVelocityFromIndex(stop_line_idx, 0.0, path);
568570
debug_data->occlusion_stop_wall_pose =

0 commit comments

Comments
 (0)