Skip to content

Commit 0fbf54e

Browse files
authored
Merge branch 'main' into refactor/control/remove_unnecessary_func
2 parents dc44b22 + 98ea837 commit 0fbf54e

File tree

2 files changed

+5
-12
lines changed
  • planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/src
  • sensing/autoware_pointcloud_preprocessor

2 files changed

+5
-12
lines changed

planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/src/scene.cpp

+4-12
Original file line numberDiff line numberDiff line change
@@ -988,18 +988,6 @@ auto StaticObstacleAvoidanceModule::getTurnSignal(
988988
return getPreviousModuleOutput().turn_signal_info;
989989
}
990990

991-
const auto itr =
992-
std::remove_if(shift_lines.begin(), shift_lines.end(), [&, this](const auto & s) {
993-
const auto threshold = planner_data_->parameters.turn_signal_shift_length_threshold;
994-
return std::abs(s.start_shift_length - s.end_shift_length) < threshold ||
995-
is_ignore_signal(s.id);
996-
});
997-
shift_lines.erase(itr, shift_lines.end());
998-
999-
if (shift_lines.empty()) {
1000-
return getPreviousModuleOutput().turn_signal_info;
1001-
}
1002-
1003991
const auto target_shift_line = [&]() {
1004992
const auto & s1 = shift_lines.front();
1005993

@@ -1042,6 +1030,10 @@ auto StaticObstacleAvoidanceModule::getTurnSignal(
10421030
return s1;
10431031
}();
10441032

1033+
if (is_ignore_signal(target_shift_line.id)) {
1034+
return getPreviousModuleOutput().turn_signal_info;
1035+
}
1036+
10451037
const auto original_signal = getPreviousModuleOutput().turn_signal_info;
10461038

10471039
constexpr bool is_driving_forward = true;

sensing/autoware_pointcloud_preprocessor/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<depend>autoware_pcl_extensions</depend>
3232
<depend>autoware_point_types</depend>
3333
<depend>autoware_utils</depend>
34+
<depend>autoware_vehicle_msgs</depend>
3435
<depend>cgal</depend>
3536
<depend>cv_bridge</depend>
3637
<depend>diagnostic_updater</depend>

0 commit comments

Comments
 (0)