chore: sync upstream

.github/CODEOWNERS

@@ -28,6 +28,7 @@ common/rtc_manager_rviz_plugin/** [email protected] [email protected] @
 common/signal_processing/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 common/tensorrt_common/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_api_utils/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
+common/tier4_automatic_goal_rviz_plugin/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_autoware_utils/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_calibration_rviz_plugin/** [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_control_rviz_plugin/** [email protected] @autowarefoundation/autoware-global-codeowners
@@ -36,7 +37,7 @@ common/tier4_debug_rviz_plugin/** [email protected] @autowarefoundation/
 common/tier4_debug_tools/** [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_localization_rviz_plugin/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_perception_rviz_plugin/** [email protected] @autowarefoundation/autoware-global-codeowners
-common/tier4_planning_rviz_plugin/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
+common/tier4_planning_rviz_plugin/** [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_screen_capture_rviz_plugin/** [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_simulated_clock_rviz_plugin/** [email protected] @autowarefoundation/autoware-global-codeowners
 common/tier4_state_rviz_plugin/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
@@ -45,6 +46,7 @@ common/tier4_vehicle_rviz_plugin/** [email protected] @autowarefoundation/
 common/time_utils/** [email protected] @autowarefoundation/autoware-global-codeowners
 common/trtexec_vendor/** [email protected] @autowarefoundation/autoware-global-codeowners
 common/tvm_utility/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
+control/autonomous_emergency_braking/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 control/control_performance_analysis/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 control/external_cmd_selector/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 control/joy_controller/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
@@ -58,16 +60,18 @@ control/shift_decider/** [email protected] @autowarefoundation/autoware-g
 control/trajectory_follower_base/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 control/trajectory_follower_node/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 control/vehicle_cmd_gate/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
+evaluator/diagnostic_converter/** [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 evaluator/kinematic_evaluator/** [email protected] @autowarefoundation/autoware-global-codeowners
 evaluator/localization_evaluator/** [email protected] @autowarefoundation/autoware-global-codeowners
+evaluator/planning_evaluator/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_autoware_api_launch/** [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_control_launch/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
-launch/tier4_localization_launch/** [email protected] @autowarefoundation/autoware-global-codeowners
+launch/tier4_localization_launch/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_map_launch/** [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_perception_launch/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_planning_launch/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_sensing_launch/** [email protected] @autowarefoundation/autoware-global-codeowners
-launch/tier4_simulator_launch/** [email protected] @autowarefoundation/autoware-global-codeowners
+launch/tier4_simulator_launch/** [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_system_launch/** [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 launch/tier4_vehicle_launch/** [email protected] @autowarefoundation/autoware-global-codeowners
 localization/ekf_localizer/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
@@ -83,6 +87,7 @@ map/map_height_fitter/** [email protected] [email protected] @autowarefou
 map/map_loader/** [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 map/map_tf_generator/** [email protected] @autowarefoundation/autoware-global-codeowners
 map/util/lanelet2_map_preprocessor/** [email protected] @autowarefoundation/autoware-global-codeowners
+perception/bytetrack/** [email protected] @autowarefoundation/autoware-global-codeowners
 perception/compare_map_segmentation/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 perception/crosswalk_traffic_light_estimator/** [email protected] @autowarefoundation/autoware-global-codeowners
 perception/detected_object_feature_remover/** [email protected] @autowarefoundation/autoware-global-codeowners
@@ -112,22 +117,23 @@ perception/tensorrt_yolo/** [email protected] @autowarefoundation/auto
 perception/tensorrt_yolox/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 perception/traffic_light_classifier/** [email protected] @autowarefoundation/autoware-global-codeowners
 perception/traffic_light_map_based_detector/** [email protected] @autowarefoundation/autoware-global-codeowners
+perception/traffic_light_selector/** [email protected] @autowarefoundation/autoware-global-codeowners
 perception/traffic_light_ssd_fine_detector/** [email protected] @autowarefoundation/autoware-global-codeowners
 perception/traffic_light_visualization/** [email protected] @autowarefoundation/autoware-global-codeowners
-planning/behavior_path_planner/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
+planning/behavior_path_planner/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/behavior_velocity_planner/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/costmap_generator/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/external_velocity_limit_selector/** [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/freespace_planner/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/freespace_planning_algorithms/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/mission_planner/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/motion_velocity_smoother/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
-planning/obstacle_avoidance_planner/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
+planning/obstacle_avoidance_planner/** [email protected] @autowarefoundation/autoware-global-codeowners
 planning/obstacle_cruise_planner/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/obstacle_stop_planner/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/obstacle_velocity_limiter/** [email protected] @autowarefoundation/autoware-global-codeowners
 planning/planning_debug_tools/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
-planning/planning_evaluator/** maxime.clement@tier4.jp @autowarefoundation/autoware-global-codeowners
+planning/planning_test_utils/** kyoichi.sugahara@tier4.jp @autowarefoundation/autoware-global-codeowners
 planning/planning_validator/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/route_handler/** [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-global-codeowners
 planning/rtc_auto_mode_manager/** [email protected] [email protected] @autowarefoundation/autoware-global-codeowners

.github/workflows/build-and-test-differential.yaml

@@ -77,7 +77,7 @@ jobs:
 
       - name: Get modified files
         id: get-modified-files
-        uses: tj-actions/changed-files@v34
+        uses: tj-actions/changed-files@v35
         with:
           files: |
             **/*.cpp

.github/workflows/clang-tidy-pr-comments-manually.yaml

@@ -30,9 +30,9 @@ jobs:
         if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
         id: set-variables
         run: |
-          echo ::set-output name=pr-id::"$(cat /tmp/clang-tidy-result/pr-id.txt)"
-          echo ::set-output name=pr-head-repo::"$(cat /tmp/clang-tidy-result/pr-head-repo.txt)"
-          echo ::set-output name=pr-head-ref::"$(cat /tmp/clang-tidy-result/pr-head-ref.txt)"
+          echo "pr-id=$(cat /tmp/clang-tidy-result/pr-id.txt)" >> $GITHUB_OUTPUT
+          echo "pr-head-repo=$(cat /tmp/clang-tidy-result/pr-head-repo.txt)" >> $GITHUB_OUTPUT
+          echo "pr-head-ref=$(cat /tmp/clang-tidy-result/pr-head-ref.txt)" >> $GITHUB_OUTPUT
 
       - name: Check out PR head
         if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}

.github/workflows/clang-tidy-pr-comments.yaml

@@ -31,9 +31,9 @@ jobs:
         if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
         id: set-variables
         run: |
-          echo ::set-output name=pr-id::"$(cat /tmp/clang-tidy-result/pr-id.txt)"
-          echo ::set-output name=pr-head-repo::"$(cat /tmp/clang-tidy-result/pr-head-repo.txt)"
-          echo ::set-output name=pr-head-ref::"$(cat /tmp/clang-tidy-result/pr-head-ref.txt)"
+          echo "pr-id=$(cat /tmp/clang-tidy-result/pr-id.txt)" >> $GITHUB_OUTPUT
+          echo "pr-head-repo=$(cat /tmp/clang-tidy-result/pr-head-repo.txt)" >> $GITHUB_OUTPUT
+          echo "pr-head-ref=$(cat /tmp/clang-tidy-result/pr-head-ref.txt)" >> $GITHUB_OUTPUT
 
       - name: Check out PR head
         if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}

.github/workflows/github-release.yaml

@@ -26,8 +26,8 @@ jobs:
             REF_NAME="${{ github.ref_name }}"
           fi
 
-          echo ::set-output name=ref-name::"$REF_NAME"
-          echo ::set-output name=tag-name::"${REF_NAME#beta/}"
+          echo "ref-name=$REF_NAME" >> $GITHUB_OUTPUT
+          echo "tag-name=${REF_NAME#beta/}" >> $GITHUB_OUTPUT"
 
       - name: Check out repository
         uses: actions/checkout@v3
@@ -39,7 +39,7 @@ jobs:
         id: set-target-name
         run: |
           if [[ "${{ steps.set-tag-name.outputs.ref-name }}" =~ "beta/" ]]; then
-            echo ::set-output name=target-name::"${{ steps.set-tag-name.outputs.ref-name }}"
+            echo "target-name=${{ steps.set-tag-name.outputs.ref-name }}" >> $GITHUB_OUTPUT
           fi
 
       - name: Create a local tag for beta branches
@@ -62,7 +62,7 @@ jobs:
             verb=edit
           fi
 
-          echo ::set-output name=verb::"$verb"
+          echo "verb=$verb" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.pre-commit-config-optional.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/tcort/markdown-link-check
-    rev: v3.10.3
+    rev: v3.11.0
     hooks:
       - id: markdown-link-check
         args: [--config=.markdown-link-check.json]

.pre-commit-config.yaml

@@ -24,12 +24,12 @@ repos:
         args: [-c, .markdownlint.yaml, --fix]
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.4
+    rev: v3.0.0-alpha.6
     hooks:
       - id: prettier
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.29.0
+    rev: v1.30.0
     hooks:
       - id: yamllint
 
@@ -49,7 +49,7 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.6.0-1
+    rev: v3.6.0-2
     hooks:
       - id: shfmt
         args: [-w, -s, -i=4]
@@ -66,7 +66,7 @@ repos:
         args: [--line-length=100]
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v15.0.7
+    rev: v16.0.0
     hooks:
       - id: clang-format
         types_or: [c++, c, cuda]

common/autoware_testing/package.xml

@@ -12,6 +12,8 @@
 
   <build_depend>autoware_cmake</build_depend>
 
+  <buildtool_export_depend>ros_testing</buildtool_export_depend>
+
   <test_depend>ament_cmake_core</test_depend>
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>

common/motion_utils/include/motion_utils/trajectory/trajectory.hpp

@@ -273,7 +273,7 @@ boost::optional<size_t> findNearestIndex(
 
   for (size_t i = 0; i < points.size(); ++i) {
     const auto squared_dist = tier4_autoware_utils::calcSquaredDistance2d(points.at(i), pose);
-    if (squared_dist > max_squared_dist) {
+    if (squared_dist > max_squared_dist || squared_dist >= min_squared_dist) {
       continue;
     }
 
@@ -283,10 +283,6 @@ boost::optional<size_t> findNearestIndex(
       continue;
     }
 
-    if (squared_dist >= min_squared_dist) {
-      continue;
-    }
-
     min_squared_dist = squared_dist;
     min_idx = i;
     is_nearest_found = true;
@@ -1536,6 +1532,82 @@ boost::optional<double> calcDistanceToForwardStopPoint(
 
   return std::max(0.0, closest_stop_dist);
 }
+
+// NOTE: Points after forward length from the point will be cropped
+//       forward_length is assumed to be positive.
+template <typename T>
+T cropForwardPoints(
+  const T & points, const geometry_msgs::msg::Point & target_pos, const size_t target_seg_idx,
+  const double forward_length)
+{
+  if (points.empty()) {
+    return T{};
+  }
+
+  double sum_length =
+    -motion_utils::calcLongitudinalOffsetToSegment(points, target_seg_idx, target_pos);
+  for (size_t i = target_seg_idx + 1; i < points.size(); ++i) {
+    sum_length += tier4_autoware_utils::calcDistance2d(points.at(i), points.at(i - 1));
+    if (forward_length < sum_length) {
+      const size_t end_idx = i;
+      return T{points.begin(), points.begin() + end_idx};
+    }
+  }
+
+  return points;
+}
+
+// NOTE: Points before backward length from the point will be cropped
+//       backward_length is assumed to be positive.
+template <typename T>
+T cropBackwardPoints(
+  const T & points, const geometry_msgs::msg::Point & target_pos, const size_t target_seg_idx,
+  const double backward_length)
+{
+  if (points.empty()) {
+    return T{};
+  }
+
+  double sum_length =
+    -motion_utils::calcLongitudinalOffsetToSegment(points, target_seg_idx, target_pos);
+  for (int i = target_seg_idx; 0 < i; --i) {
+    sum_length -= tier4_autoware_utils::calcDistance2d(points.at(i), points.at(i - 1));
+    if (sum_length < -backward_length) {
+      const size_t begin_idx = i;
+      return T{points.begin() + begin_idx, points.end()};
+    }
+  }
+
+  return points;
+}
+
+template <typename T>
+T cropPoints(
+  const T & points, const geometry_msgs::msg::Point & target_pos, const size_t target_seg_idx,
+  const double forward_length, const double backward_length)
+{
+  if (points.empty()) {
+    return T{};
+  }
+
+  // NOTE: Cropping forward must be done first in order to keep target_seg_idx.
+  const auto cropped_forward_points =
+    cropForwardPoints(points, target_pos, target_seg_idx, forward_length);
+
+  const size_t modified_target_seg_idx =
+    std::min(target_seg_idx, cropped_forward_points.size() - 2);
+  const auto cropped_points = cropBackwardPoints(
+    cropped_forward_points, target_pos, modified_target_seg_idx, backward_length);
+
+  if (cropped_points.size() < 2) {
+    RCLCPP_ERROR(
+      rclcpp::get_logger("obstacle_avoidance_planner.trajectory_utils"),
+      ". Return original points since cropped_points size is less than 2.");
+    return points;
+  }
+
+  return cropped_points;
+}
 }  // namespace motion_utils
 
 #endif  // MOTION_UTILS__TRAJECTORY__TRAJECTORY_HPP_