fix(autoware_behavior_path_planner_common): fix bugprone-errors (#9700)

fix: bugprone-error Signed-off-by: kobayu858 <[email protected]>
autowarefoundation · Dec 20, 2024 · a7314b6 · a7314b6
1 parent 857aa71
commit a7314b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...e_behavior_path_planner_common/src/utils/drivable_area_expansion/static_drivable_area.cpp b/...e_behavior_path_planner_common/src/utils/drivable_area_expansion/static_drivable_area.cpp
@@ -1127,9 +1127,7 @@ std::vector<lanelet::ConstPoint3d> getBoundWithHatchedRoadMarkings(
           get_corresponding_polygon_index(*current_polygon, bound_point.id()));
       }
     } else {
-      if (!polygon) {
-        will_close_polygon = true;
-      } else if (polygon.value().id() != current_polygon.value().id()) {
+      if (!polygon || polygon.value().id() != current_polygon.value().id()) {
         will_close_polygon = true;
       } else {
         current_polygon_border_indices.push_back(
@@ -1496,9 +1494,9 @@ std::vector<geometry_msgs::msg::Point> postProcess(
     [](const lanelet::ConstLineString3d & points, std::vector<geometry_msgs::msg::Point> & bound) {
       for (const auto & bound_p : points) {
         const auto cp = lanelet::utils::conversion::toGeomMsgPt(bound_p);
-        if (bound.empty()) {
-          bound.push_back(cp);
-        } else if (autoware::universe_utils::calcDistance2d(cp, bound.back()) > overlap_threshold) {
+        if (
+          bound.empty() ||
+          autoware::universe_utils::calcDistance2d(cp, bound.back()) > overlap_threshold) {
           bound.push_back(cp);
         }
       }

diff --git a/...utils/occupancy_grid_based_collision_detector/occupancy_grid_based_collision_detector.cpp b/...utils/occupancy_grid_based_collision_detector/occupancy_grid_based_collision_detector.cpp
@@ -80,7 +80,7 @@ void OccupancyGridBasedCollisionDetector::setMap(const nav_msgs::msg::OccupancyG
   for (uint32_t i = 0; i < height; i++) {
     is_obstacle_table.at(i).resize(width);
     for (uint32_t j = 0; j < width; j++) {
-      const int cost = costmap_.data[i * width + j];
+      const int cost = costmap_.data[i * width + j];  // NOLINT
 
       if (cost < 0 || param_.obstacle_threshold <= cost) {
         is_obstacle_table[i][j] = true;