@@ -735,9 +735,7 @@ void reactRTCApprovalByDecisionResult(
735
735
path->points .at (stopline_idx).point .pose , VelocityFactor::UNKNOWN);
736
736
}
737
737
}
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 ) {
741
739
const auto occlusion_stopline_idx = decision_result.occlusion_stopline_idx .value ();
742
740
planning_utils::setVelocityFromIndex (occlusion_stopline_idx, 0.0 , path);
743
741
debug_data->occlusion_stop_wall_pose =
@@ -814,7 +812,7 @@ void reactRTCApprovalByDecisionResult(
814
812
path->points .at (stopline_idx).point .pose , VelocityFactor::UNKNOWN);
815
813
}
816
814
}
817
- if (!rtc_occlusion_approved && planner_param. occlusion . enable ) {
815
+ if (!rtc_occlusion_approved) {
818
816
const auto stopline_idx = decision_result.occlusion_stopline_idx ;
819
817
planning_utils::setVelocityFromIndex (stopline_idx, 0.0 , path);
820
818
debug_data->occlusion_stop_wall_pose =
@@ -857,7 +855,7 @@ void reactRTCApprovalByDecisionResult(
857
855
path->points .at (stopline_idx).point .pose , VelocityFactor::UNKNOWN);
858
856
}
859
857
}
860
- if (!rtc_occlusion_approved && planner_param. occlusion . enable ) {
858
+ if (!rtc_occlusion_approved) {
861
859
if (planner_param.occlusion .creep_during_peeking .enable ) {
862
860
const size_t occlusion_peeking_stopline = decision_result.occlusion_stopline_idx ;
863
861
const size_t closest_idx = decision_result.closest_idx ;
@@ -895,7 +893,7 @@ void reactRTCApprovalByDecisionResult(
895
893
" PeekingTowardOcclusion, approval = (default: %d, occlusion: %d)" , rtc_default_approved,
896
894
rtc_occlusion_approved);
897
895
// 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) {
899
897
const size_t occlusion_peeking_stopline =
900
898
decision_result.temporal_stop_before_attention_required
901
899
? decision_result.first_attention_stopline_idx
@@ -965,7 +963,7 @@ void reactRTCApprovalByDecisionResult(
965
963
path->points .at (stopline_idx).point .pose , VelocityFactor::UNKNOWN);
966
964
}
967
965
}
968
- if (!rtc_occlusion_approved && planner_param. occlusion . enable ) {
966
+ if (!rtc_occlusion_approved) {
969
967
const auto stopline_idx = decision_result.temporal_stop_before_attention_required
970
968
? decision_result.first_attention_stopline_idx
971
969
: decision_result.occlusion_stopline_idx ;
@@ -1066,7 +1064,7 @@ void reactRTCApprovalByDecisionResult(
1066
1064
path->points .at (stopline_idx).point .pose , VelocityFactor::UNKNOWN);
1067
1065
}
1068
1066
}
1069
- if (!rtc_occlusion_approved && planner_param. occlusion . enable ) {
1067
+ if (!rtc_occlusion_approved) {
1070
1068
const auto stopline_idx = decision_result.occlusion_stopline_idx ;
1071
1069
planning_utils::setVelocityFromIndex (stopline_idx, 0.0 , path);
1072
1070
debug_data->occlusion_stop_wall_pose =
@@ -1110,7 +1108,7 @@ void reactRTCApprovalByDecisionResult(
1110
1108
path->points .at (stopline_idx).point .pose , VelocityFactor::UNKNOWN);
1111
1109
}
1112
1110
}
1113
- if (!rtc_occlusion_approved && planner_param. occlusion . enable ) {
1111
+ if (!rtc_occlusion_approved) {
1114
1112
const auto stopline_idx = decision_result.occlusion_stopline_idx ;
1115
1113
planning_utils::setVelocityFromIndex (stopline_idx, 0.0 , path);
1116
1114
debug_data->occlusion_stop_wall_pose =
0 commit comments