Skip to content

Commit 19e0875

Browse files
Merge pull request #1799 from tier4/sync-awf-latest
chore: sync awf-latest
2 parents eeb13a4 + 9aa61e6 commit 19e0875

File tree

33 files changed

+37
-1
lines changed

33 files changed

+37
-1
lines changed

control/autoware_control_performance_analysis/src/control_performance_analysis_core.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "autoware/motion_utils/trajectory/interpolation.hpp"
1818
#include "autoware/universe_utils/geometry/geometry.hpp"
19+
#include "autoware/universe_utils/geometry/pose_deviation.hpp"
1920

2021
#include <algorithm>
2122
#include <limits>

control/autoware_pid_longitudinal_controller/src/longitudinal_controller_utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include "autoware/pid_longitudinal_controller/longitudinal_controller_utils.hpp"
1616

17+
#include "autoware/universe_utils/geometry/geometry.hpp"
1718
#include "tf2/LinearMath/Matrix3x3.h"
1819
#include "tf2/LinearMath/Quaternion.h"
1920

control/autoware_predicted_path_checker/src/predicted_path_checker_node/predicted_path_checker_node.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <autoware/motion_utils/marker/marker_helper.hpp>
1818
#include <autoware/motion_utils/resample/resample.hpp>
1919
#include <autoware/universe_utils/geometry/geometry.hpp>
20+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2021
#include <autoware/universe_utils/math/unit_conversion.hpp>
2122
#include <tf2_eigen/tf2_eigen.hpp>
2223

control/autoware_predicted_path_checker/src/predicted_path_checker_node/utils.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#include "autoware/predicted_path_checker/utils.hpp"
1616

17+
#include <autoware/universe_utils/geometry/geometry.hpp>
18+
1719
#include <boost/format.hpp>
1820
#include <boost/geometry/algorithms/convex_hull.hpp>
1921
#include <boost/geometry/strategies/agnostic/hull_graham_andrew.hpp>

control/autoware_pure_pursuit/src/autoware_pure_pursuit/autoware_pure_pursuit_lateral_controller.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "autoware/pure_pursuit/util/planning_utils.hpp"
3535
#include "autoware/pure_pursuit/util/tf_utils.hpp"
3636

37+
#include <autoware/universe_utils/geometry/geometry.hpp>
3738
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
3839

3940
#include <algorithm>

planning/autoware_freespace_planner/src/autoware_freespace_planner/utils.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#include "autoware/freespace_planner/utils.hpp"
1616

1717
#include <autoware/motion_utils/trajectory/trajectory.hpp>
18+
#include <autoware/universe_utils/geometry/geometry.hpp>
19+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
1820

1921
#include <deque>
2022
#include <vector>

planning/autoware_obstacle_stop_planner/src/node.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <autoware/motion_utils/trajectory/conversion.hpp>
2525
#include <autoware/motion_utils/trajectory/trajectory.hpp>
2626
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
27+
#include <autoware/universe_utils/geometry/geometry.hpp>
2728
#include <autoware/universe_utils/ros/published_time_publisher.hpp>
2829
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
2930
#include <pcl_ros/transforms.hpp>

planning/autoware_obstacle_stop_planner/src/planner_utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <autoware/motion_utils/trajectory/conversion.hpp>
1919
#include <autoware/motion_utils/trajectory/trajectory.hpp>
2020
#include <autoware/universe_utils/geometry/boost_polygon_utils.hpp>
21+
#include <autoware/universe_utils/geometry/geometry.hpp>
2122

2223
#include <diagnostic_msgs/msg/key_value.hpp>
2324

planning/autoware_path_smoother/include/autoware/path_smoother/utils/trajectory_utils.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "autoware/motion_utils/trajectory/trajectory.hpp"
2222
#include "autoware/path_smoother/common_structs.hpp"
2323
#include "autoware/path_smoother/type_alias.hpp"
24+
#include "autoware/universe_utils/geometry/geometry.hpp"
2425

2526
#include <Eigen/Core>
2627

planning/autoware_path_smoother/src/utils/trajectory_utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "autoware/motion_utils/resample/resample.hpp"
1818
#include "autoware/motion_utils/trajectory/conversion.hpp"
1919
#include "autoware/path_smoother/utils/geometry_utils.hpp"
20+
#include "autoware/universe_utils/geometry/geometry.hpp"
2021

2122
#include "autoware_planning_msgs/msg/path_point.hpp"
2223
#include "autoware_planning_msgs/msg/trajectory_point.hpp"

planning/autoware_velocity_smoother/src/resample.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "autoware/motion_utils/resample/resample.hpp"
1818
#include "autoware/motion_utils/trajectory/conversion.hpp"
1919
#include "autoware/motion_utils/trajectory/trajectory.hpp"
20+
#include "autoware/universe_utils/geometry/geometry.hpp"
2021
#include "autoware/velocity_smoother/trajectory_utils.hpp"
2122

2223
#include <algorithm>

planning/autoware_velocity_smoother/src/smoother/analytical_jerk_constrained_smoother/analytical_jerk_constrained_smoother.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "autoware/motion_utils/resample/resample.hpp"
1818
#include "autoware/motion_utils/trajectory/conversion.hpp"
19+
#include "autoware/universe_utils/geometry/geometry.hpp"
1920
#include "autoware/velocity_smoother/trajectory_utils.hpp"
2021

2122
#include <algorithm>

planning/autoware_velocity_smoother/src/smoother/analytical_jerk_constrained_smoother/velocity_planning_utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "autoware/velocity_smoother/smoother/analytical_jerk_constrained_smoother/velocity_planning_utils.hpp"
1616

1717
#include "autoware/interpolation/linear_interpolation.hpp"
18+
#include "autoware/universe_utils/geometry/geometry.hpp"
1819

1920
#include <algorithm>
2021
#include <vector>

planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/utils/path_safety_checker/safety_check.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
2222
#include <autoware/universe_utils/geometry/geometry.hpp>
23+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2324

2425
#include <autoware_perception_msgs/msg/predicted_object.hpp>
2526
#include <autoware_perception_msgs/msg/predicted_path.hpp>

planning/behavior_path_planner/autoware_behavior_path_planner_common/src/utils/path_safety_checker/objects_filtering.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <autoware/motion_utils/trajectory/interpolation.hpp>
2121
#include <autoware/universe_utils/geometry/boost_polygon_utils.hpp>
22+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2223

2324
#include <boost/geometry/algorithms/distance.hpp>
2425

planning/behavior_path_planner/autoware_behavior_path_planner_common/src/utils/utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <autoware/motion_utils/resample/resample.hpp>
2020
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
2121
#include <autoware/universe_utils/geometry/boost_polygon_utils.hpp>
22+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2223
#include <autoware/universe_utils/math/unit_conversion.hpp>
2324
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
2425
#include <autoware_lanelet2_extension/utility/query.hpp>

planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <autoware/motion_utils/trajectory/trajectory.hpp>
2121
#include <autoware/universe_utils/geometry/boost_polygon_utils.hpp>
2222
#include <autoware/universe_utils/geometry/geometry.hpp>
23+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2324
#include <autoware/universe_utils/ros/marker_helper.hpp>
2425
#include <autoware/universe_utils/ros/uuid_helper.hpp>
2526

planning/behavior_velocity_planner/autoware_behavior_velocity_intersection_module/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<depend>autoware_route_handler</depend>
3232
<depend>autoware_rtc_interface</depend>
3333
<depend>autoware_test_utils</depend>
34-
<depend>autoware_universe_utils</depend>
3534
<depend>autoware_vehicle_info_utils</depend>
3635
<depend>fmt</depend>
3736
<depend>geometry_msgs</depend>

planning/behavior_velocity_planner/autoware_behavior_velocity_intersection_module/src/util.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <autoware/behavior_velocity_planner_common/utilization/path_utilization.hpp>
2121
#include <autoware/behavior_velocity_planner_common/utilization/util.hpp>
2222
#include <autoware/motion_utils/trajectory/trajectory.hpp>
23+
#include <autoware/universe_utils/geometry/geometry.hpp>
2324
#include <autoware_lanelet2_extension/utility/utilities.hpp>
2425

2526
#include <boost/geometry/algorithms/correct.hpp>

planning/behavior_velocity_planner/autoware_behavior_velocity_no_drivable_lane_module/src/util.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <autoware/behavior_velocity_planner_common/utilization/util.hpp>
2121
#include <autoware/motion_utils/marker/virtual_wall_marker_creator.hpp>
22+
#include <autoware/universe_utils/geometry/geometry.hpp>
2223

2324
#include <lanelet2_core/geometry/Polygon.h>
2425

planning/behavior_velocity_planner/autoware_behavior_velocity_planner_common/src/utilization/path_utilization.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <autoware/behavior_velocity_planner_common/utilization/path_utilization.hpp>
1616
#include <autoware/motion_utils/resample/resample.hpp>
1717
#include <autoware/motion_utils/trajectory/trajectory.hpp>
18+
#include <autoware/universe_utils/geometry/geometry.hpp>
1819
#include <rclcpp/rclcpp.hpp>
1920

2021
#include <algorithm>

planning/behavior_velocity_planner/autoware_behavior_velocity_planner_common/src/utilization/util.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "autoware/behavior_velocity_planner_common/utilization/boost_geometry_helper.hpp"
1818
#include "autoware/motion_utils/trajectory/trajectory.hpp"
19+
#include "autoware/universe_utils/geometry/geometry.hpp"
1920
#include "autoware_lanelet2_extension/utility/query.hpp"
2021

2122
#include <autoware_planning_msgs/msg/path_point.hpp>

planning/behavior_velocity_planner/autoware_behavior_velocity_run_out_module/src/scene.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <autoware/motion_utils/distance/distance.hpp>
2323
#include <autoware/motion_utils/trajectory/trajectory.hpp>
2424
#include <autoware/universe_utils/geometry/geometry.hpp>
25+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2526
#include <autoware/universe_utils/ros/uuid_helper.hpp>
2627

2728
#include <boost/geometry/algorithms/intersection.hpp>

planning/behavior_velocity_planner/autoware_behavior_velocity_run_out_module/src/utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <autoware/motion_utils/distance/distance.hpp>
1818
#include <autoware/motion_utils/trajectory/path_with_lane_id.hpp>
19+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
1920

2021
#include <boost/geometry/algorithms/correct.hpp>
2122
#include <boost/geometry/algorithms/intersects.hpp>

planning/behavior_velocity_planner/autoware_behavior_velocity_run_out_module/test/test_dynamic_obstacle.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <autoware/motion_utils/trajectory/trajectory.hpp>
2222
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
2323
#include <autoware/universe_utils/geometry/geometry.hpp>
24+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2425
#include <autoware/universe_utils/math/normalization.hpp>
2526
#include <autoware_test_utils/autoware_test_utils.hpp>
2627
#include <rclcpp/clock.hpp>

planning/motion_velocity_planner/autoware_motion_velocity_dynamic_obstacle_stop_module/src/collision.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <autoware/motion_utils/trajectory/trajectory.hpp>
1818
#include <autoware/universe_utils/geometry/boost_polygon_utils.hpp>
19+
#include <autoware/universe_utils/geometry/geometry.hpp>
1920
#include <autoware/universe_utils/ros/uuid_helper.hpp>
2021

2122
#include <boost/geometry.hpp>

planning/motion_velocity_planner/autoware_motion_velocity_dynamic_obstacle_stop_module/src/object_filtering.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#include "types.hpp"
1818

1919
#include <autoware/motion_utils/trajectory/trajectory.hpp>
20+
#include <autoware/universe_utils/geometry/geometry.hpp>
21+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
2022

2123
#include <geometry_msgs/msg/detail/pose__struct.hpp>
2224

planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/filter_predicted_objects.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <autoware/motion_utils/trajectory/trajectory.hpp>
1818
#include <autoware/traffic_light_utils/traffic_light_utils.hpp>
1919
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
20+
#include <autoware/universe_utils/geometry/geometry.hpp>
2021

2122
#include <boost/geometry/algorithms/detail/intersects/interface.hpp>
2223
#include <boost/geometry/algorithms/intersects.hpp>

planning/sampling_based_planner/autoware_path_sampler/include/autoware_path_sampler/utils/geometry_utils.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "autoware/interpolation/spline_interpolation.hpp"
2020
#include "autoware/interpolation/spline_interpolation_points_2d.hpp"
2121
#include "autoware/motion_utils/trajectory/trajectory.hpp"
22+
#include "autoware/universe_utils/geometry/geometry.hpp"
2223
#include "autoware_path_sampler/common_structs.hpp"
2324
#include "autoware_path_sampler/type_alias.hpp"
2425
#include "autoware_vehicle_info_utils/vehicle_info_utils.hpp"

planning/sampling_based_planner/autoware_path_sampler/include/autoware_path_sampler/utils/trajectory_utils.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "autoware/interpolation/spline_interpolation.hpp"
2020
#include "autoware/interpolation/spline_interpolation_points_2d.hpp"
2121
#include "autoware/motion_utils/trajectory/trajectory.hpp"
22+
#include "autoware/universe_utils/geometry/geometry.hpp"
2223
#include "autoware_path_sampler/common_structs.hpp"
2324
#include "autoware_path_sampler/type_alias.hpp"
2425
#include "autoware_sampler_common/structures.hpp"

planning/sampling_based_planner/autoware_sampler_common/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<build_depend>autoware_cmake</build_depend>
1313

1414
<depend>autoware_interpolation</depend>
15+
<depend>autoware_universe_utils</depend>
1516

1617
<test_depend>ament_cmake_ros</test_depend>
1718
<test_depend>ament_lint_auto</test_depend>

tools/reaction_analyzer/src/reaction_analyzer_node.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
#include "reaction_analyzer_node.hpp"
1616

17+
#include <autoware/universe_utils/geometry/geometry.hpp>
18+
#include <autoware/universe_utils/geometry/pose_deviation.hpp>
19+
1720
#include <functional>
1821
#include <map>
1922
#include <memory>

vehicle/autoware_raw_vehicle_cmd_converter/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<depend>autoware_control_msgs</depend>
2626
<depend>autoware_internal_debug_msgs</depend>
2727
<depend>autoware_interpolation</depend>
28+
<depend>autoware_universe_utils</depend>
2829
<depend>autoware_vehicle_msgs</depend>
2930
<depend>geometry_msgs</depend>
3031
<depend>nav_msgs</depend>

0 commit comments

Comments
 (0)