Skip to content

Commit 3402b6a

Browse files
authored
fix(autoware_behavior_path_static_obstacle_avoidance_module): fix bugprone-branch-clone (#9701)
fix: bugprone-error Signed-off-by: kobayu858 <yutaro.kobayashi@tier4.jp>
1 parent 72bc2dc commit 3402b6a

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/src/scene.cpp

+1-5
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,7 @@ void StaticObstacleAvoidanceModule::fillFundamentalData(
233233

234234
std::for_each(
235235
data.current_lanelets.begin(), data.current_lanelets.end(), [&](const auto & lanelet) {
236-
if (!not_use_adjacent_lane) {
237-
data.drivable_lanes.push_back(
238-
utils::static_obstacle_avoidance::generateExpandedDrivableLanes(
239-
lanelet, planner_data_, parameters_));
240-
} else if (red_signal_lane_itr->id() != lanelet.id()) {
236+
if (!not_use_adjacent_lane || red_signal_lane_itr->id() != lanelet.id()) {
241237
data.drivable_lanes.push_back(
242238
utils::static_obstacle_avoidance::generateExpandedDrivableLanes(
243239
lanelet, planner_data_, parameters_));

planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/src/shift_line_generator.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,7 @@ AvoidOutlines ShiftLineGenerator::generateAvoidOutline(
264264
AvoidOutlines outlines;
265265
for (auto & o : data.target_objects) {
266266
if (!o.avoid_margin.has_value()) {
267-
if (!data.red_signal_lane.has_value()) {
268-
o.info = ObjectInfo::INSUFFICIENT_DRIVABLE_SPACE;
269-
} else if (data.red_signal_lane.value().id() == o.overhang_lanelet.id()) {
267+
if (data.red_signal_lane.value().id() == o.overhang_lanelet.id()) {
270268
o.info = ObjectInfo::LIMIT_DRIVABLE_SPACE_TEMPORARY;
271269
} else {
272270
o.info = ObjectInfo::INSUFFICIENT_DRIVABLE_SPACE;

0 commit comments

Comments
 (0)