Skip to content

Commit ed60229

Browse files
satoshi-otasatoshi-ota
authored
refactor(vehicle_info_utils)!: prefix package and namespace with autoware (autowarefoundation#7353)
* chore(autoware_vehicle_info_utils): rename header Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(bpp-common): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(path_optimizer): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(velocity_smoother): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(bvp-common): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(static_centerline_generator): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(obstacle_cruise_planner): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(obstacle_velocity_limiter): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(mission_planner): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(obstacle_stop_planner): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(planning_validator): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(surround_obstacle_checker): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(goal_planner): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(start_planner): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(control_performance_analysis): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(lane_departure_checker): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(predicted_path_checker): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(vehicle_cmd_gate): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(obstacle_collision_checker): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(operation_mode_transition_manager): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(mpc): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(control): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(common): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(perception): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(evaluator): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(freespace): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(planning): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(vehicle): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(simulator): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(launch): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(system): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * chore(sensing): vehicle info Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> * fix(autoware_joy_controller): remove unused deps Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com> --------- Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
1 parent badc3e7 commit ed60229

194 files changed

Lines changed: 350 additions & 338 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ vehicle/accel_brake_map_calibrator/** taiki.tanaka@tier4.jp takeshi.miura@tier4.
248248
vehicle/autoware_steer_offset_estimator/** taiki.tanaka@tier4.jp
249249
vehicle/external_cmd_converter/** takamasa.horibe@tier4.jp
250250
vehicle/raw_vehicle_cmd_converter/** makoto.kurihara@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp
251-
vehicle/vehicle_info_util/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
251+
vehicle/autoware_steer_offset_estimator/** taiki.tanaka@tier4.jp
252+
vehicle/autoware_vehicle_info_utils/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
252253

253254
### Copied from .github/CODEOWNERS-manual ###

‎common/global_parameter_loader/launch/global_params.launch.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def launch_setup(context, *args, **kwargs):
3333

3434
load_vehicle_info = IncludeLaunchDescription(
3535
PythonLaunchDescriptionSource(
36-
[FindPackageShare("vehicle_info_util"), "/launch/vehicle_info.launch.py"]
36+
[FindPackageShare("autoware_vehicle_info_utils"), "/launch/vehicle_info.launch.py"]
3737
),
3838
launch_arguments={
3939
"vehicle_info_param_file": [vehicle_description_pkg, "/config/vehicle_info.param.yaml"]

‎common/global_parameter_loader/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1111
<buildtool_depend>autoware_cmake</buildtool_depend>
1212

13-
<exec_depend>vehicle_info_util</exec_depend>
13+
<exec_depend>autoware_vehicle_info_utils</exec_depend>
1414

1515
<test_depend>ament_lint_auto</test_depend>
1616
<test_depend>autoware_lint_common</test_depend>

‎common/tier4_localization_rviz_plugin/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1212
<buildtool_depend>autoware_cmake</buildtool_depend>
1313

14+
<depend>autoware_vehicle_info_utils</depend>
1415
<depend>geometry_msgs</depend>
1516
<depend>libqt5-core</depend>
1617
<depend>libqt5-gui</depend>
@@ -20,7 +21,6 @@
2021
<depend>rviz_common</depend>
2122
<depend>rviz_default_plugins</depend>
2223
<depend>tf2_ros</depend>
23-
<depend>vehicle_info_util</depend>
2424

2525
<test_depend>ament_lint_auto</test_depend>
2626
<test_depend>autoware_lint_common</test_depend>

‎common/tier4_localization_rviz_plugin/src/pose_history_footprint/display.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ void PoseHistoryFootprint::updateFootprint()
172172
if (!vehicle_info_) {
173173
try {
174174
vehicle_info_ = std::make_shared<VehicleInfo>(
175-
VehicleInfoUtil(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
175+
VehicleInfoUtils(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
176176
updateVehicleInfo();
177177
} catch (const std::exception & e) {
178178
RCLCPP_WARN_THROTTLE(

‎common/tier4_localization_rviz_plugin/src/pose_history_footprint/display.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#ifndef POSE_HISTORY_FOOTPRINT__DISPLAY_HPP_
1616
#define POSE_HISTORY_FOOTPRINT__DISPLAY_HPP_
1717

18+
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
1819
#include <rviz_common/message_filter_display.hpp>
19-
#include <vehicle_info_util/vehicle_info_util.hpp>
2020

2121
#include <geometry_msgs/msg/pose_stamped.hpp>
2222

@@ -39,8 +39,8 @@ class BoolProperty;
3939
namespace rviz_plugins
4040
{
4141

42-
using vehicle_info_util::VehicleInfo;
43-
using vehicle_info_util::VehicleInfoUtil;
42+
using autoware::vehicle_info_utils::VehicleInfo;
43+
using autoware::vehicle_info_utils::VehicleInfoUtils;
4444

4545
class PoseHistoryFootprint
4646
: public rviz_common::MessageFilterDisplay<geometry_msgs::msg::PoseStamped>

‎common/tier4_planning_rviz_plugin/include/tier4_planning_rviz_plugin/path/display_base.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#ifndef TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_BASE_HPP_
1616
#define TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_BASE_HPP_
1717

18+
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
1819
#include <rclcpp/rclcpp.hpp>
1920
#include <rviz_common/display_context.hpp>
2021
#include <rviz_common/frame_manager_iface.hpp>
@@ -25,7 +26,6 @@
2526
#include <rviz_common/properties/parse_color.hpp>
2627
#include <rviz_common/validate_floats.hpp>
2728
#include <rviz_rendering/objects/movable_text.hpp>
28-
#include <vehicle_info_util/vehicle_info_util.hpp>
2929

3030
#include <autoware_planning_msgs/msg/path.hpp>
3131

@@ -97,8 +97,8 @@ bool validateFloats(const typename T::ConstSharedPtr & msg_ptr)
9797

9898
namespace rviz_plugins
9999
{
100-
using vehicle_info_util::VehicleInfo;
101-
using vehicle_info_util::VehicleInfoUtil;
100+
using autoware::vehicle_info_utils::VehicleInfo;
101+
using autoware::vehicle_info_utils::VehicleInfoUtils;
102102
template <typename T>
103103
class AutowarePathBaseDisplay : public rviz_common::MessageFilterDisplay<T>
104104
{

‎common/tier4_planning_rviz_plugin/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<buildtool_depend>autoware_cmake</buildtool_depend>
1313

1414
<depend>autoware_planning_msgs</depend>
15+
<depend>autoware_vehicle_info_utils</depend>
1516
<depend>libqt5-core</depend>
1617
<depend>libqt5-gui</depend>
1718
<depend>libqt5-widgets</depend>
@@ -25,7 +26,6 @@
2526
<depend>tf2_ros</depend>
2627
<depend>tier4_autoware_utils</depend>
2728
<depend>tier4_planning_msgs</depend>
28-
<depend>vehicle_info_util</depend>
2929

3030
<test_depend>ament_lint_auto</test_depend>
3131
<test_depend>autoware_lint_common</test_depend>

‎common/tier4_planning_rviz_plugin/src/path/display.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void AutowarePathWithLaneIdDisplay::preProcessMessageDetail()
3131
if (!vehicle_info_) {
3232
try {
3333
vehicle_info_ = std::make_shared<VehicleInfo>(
34-
VehicleInfoUtil(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
34+
VehicleInfoUtils(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
3535
updateVehicleInfo();
3636
} catch (const std::exception & e) {
3737
RCLCPP_WARN_ONCE(
@@ -107,7 +107,7 @@ void AutowarePathDisplay::preProcessMessageDetail()
107107
if (!vehicle_info_) {
108108
try {
109109
vehicle_info_ = std::make_shared<VehicleInfo>(
110-
VehicleInfoUtil(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
110+
VehicleInfoUtils(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
111111
updateVehicleInfo();
112112
} catch (const std::exception & e) {
113113
RCLCPP_WARN_ONCE(
@@ -124,7 +124,7 @@ void AutowareTrajectoryDisplay::preProcessMessageDetail()
124124
if (!vehicle_info_) {
125125
try {
126126
vehicle_info_ = std::make_shared<VehicleInfo>(
127-
VehicleInfoUtil(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
127+
VehicleInfoUtils(*rviz_ros_node_.lock()->get_raw_node()).getVehicleInfo());
128128
updateVehicleInfo();
129129
} catch (const std::exception & e) {
130130
RCLCPP_WARN_ONCE(

‎control/autoware_autonomous_emergency_braking/include/autoware_autonomous_emergency_braking/node.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
#ifndef AUTOWARE_AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_
1616
#define AUTOWARE_AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_
1717

18+
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
1819
#include <diagnostic_updater/diagnostic_updater.hpp>
1920
#include <motion_utils/trajectory/trajectory.hpp>
2021
#include <pcl_ros/transforms.hpp>
2122
#include <rclcpp/rclcpp.hpp>
2223
#include <tier4_autoware_utils/geometry/geometry.hpp>
2324
#include <tier4_autoware_utils/ros/polling_subscriber.hpp>
24-
#include <vehicle_info_util/vehicle_info_util.hpp>
2525

2626
#include <autoware_planning_msgs/msg/trajectory.hpp>
2727
#include <autoware_system_msgs/msg/autoware_state.hpp>
@@ -59,11 +59,11 @@ using nav_msgs::msg::Odometry;
5959
using sensor_msgs::msg::Imu;
6060
using sensor_msgs::msg::PointCloud2;
6161
using PointCloud = pcl::PointCloud<pcl::PointXYZ>;
62+
using autoware::vehicle_info_utils::VehicleInfo;
6263
using diagnostic_updater::DiagnosticStatusWrapper;
6364
using diagnostic_updater::Updater;
6465
using tier4_autoware_utils::Point2d;
6566
using tier4_autoware_utils::Polygon2d;
66-
using vehicle_info_util::VehicleInfo;
6767
using visualization_msgs::msg::Marker;
6868
using visualization_msgs::msg::MarkerArray;
6969
using Path = std::vector<geometry_msgs::msg::Pose>;

0 commit comments

Comments
 (0)