Skip to content

Commit 67bb644

Browse files
committed
feat(intersection_occlusion)!: react RTC disapproval and stop even if occlusion detection is OFF (autowarefoundation#6279)
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
1 parent b438fbe commit 67bb644

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

planning/behavior_velocity_intersection_module/src/scene_intersection.cpp

+7-9
Original file line numberDiff line numberDiff line change
@@ -735,9 +735,7 @@ void reactRTCApprovalByDecisionResult(
735735
path->points.at(stopline_idx).point.pose, VelocityFactor::UNKNOWN);
736736
}
737737
}
738-
if (
739-
!rtc_occlusion_approved && decision_result.occlusion_stopline_idx &&
740-
planner_param.occlusion.enable) {
738+
if (!rtc_occlusion_approved && decision_result.occlusion_stopline_idx) {
741739
const auto occlusion_stopline_idx = decision_result.occlusion_stopline_idx.value();
742740
planning_utils::setVelocityFromIndex(occlusion_stopline_idx, 0.0, path);
743741
debug_data->occlusion_stop_wall_pose =
@@ -814,7 +812,7 @@ void reactRTCApprovalByDecisionResult(
814812
path->points.at(stopline_idx).point.pose, VelocityFactor::UNKNOWN);
815813
}
816814
}
817-
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
815+
if (!rtc_occlusion_approved) {
818816
const auto stopline_idx = decision_result.occlusion_stopline_idx;
819817
planning_utils::setVelocityFromIndex(stopline_idx, 0.0, path);
820818
debug_data->occlusion_stop_wall_pose =
@@ -857,7 +855,7 @@ void reactRTCApprovalByDecisionResult(
857855
path->points.at(stopline_idx).point.pose, VelocityFactor::UNKNOWN);
858856
}
859857
}
860-
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
858+
if (!rtc_occlusion_approved) {
861859
if (planner_param.occlusion.creep_during_peeking.enable) {
862860
const size_t occlusion_peeking_stopline = decision_result.occlusion_stopline_idx;
863861
const size_t closest_idx = decision_result.closest_idx;
@@ -895,7 +893,7 @@ void reactRTCApprovalByDecisionResult(
895893
"PeekingTowardOcclusion, approval = (default: %d, occlusion: %d)", rtc_default_approved,
896894
rtc_occlusion_approved);
897895
// NOTE: creep_velocity should be inserted first at closest_idx if !rtc_default_approved
898-
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
896+
if (!rtc_occlusion_approved) {
899897
const size_t occlusion_peeking_stopline =
900898
decision_result.temporal_stop_before_attention_required
901899
? decision_result.first_attention_stopline_idx
@@ -965,7 +963,7 @@ void reactRTCApprovalByDecisionResult(
965963
path->points.at(stopline_idx).point.pose, VelocityFactor::UNKNOWN);
966964
}
967965
}
968-
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
966+
if (!rtc_occlusion_approved) {
969967
const auto stopline_idx = decision_result.temporal_stop_before_attention_required
970968
? decision_result.first_attention_stopline_idx
971969
: decision_result.occlusion_stopline_idx;
@@ -1066,7 +1064,7 @@ void reactRTCApprovalByDecisionResult(
10661064
path->points.at(stopline_idx).point.pose, VelocityFactor::UNKNOWN);
10671065
}
10681066
}
1069-
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
1067+
if (!rtc_occlusion_approved) {
10701068
const auto stopline_idx = decision_result.occlusion_stopline_idx;
10711069
planning_utils::setVelocityFromIndex(stopline_idx, 0.0, path);
10721070
debug_data->occlusion_stop_wall_pose =
@@ -1110,7 +1108,7 @@ void reactRTCApprovalByDecisionResult(
11101108
path->points.at(stopline_idx).point.pose, VelocityFactor::UNKNOWN);
11111109
}
11121110
}
1113-
if (!rtc_occlusion_approved && planner_param.occlusion.enable) {
1111+
if (!rtc_occlusion_approved) {
11141112
const auto stopline_idx = decision_result.occlusion_stopline_idx;
11151113
planning_utils::setVelocityFromIndex(stopline_idx, 0.0, path);
11161114
debug_data->occlusion_stop_wall_pose =

0 commit comments

Comments
 (0)