feat(planning): use StringStamped in autoware_internal_debug_msgs

Signed-off-by: Takayuki Murooka <[email protected]>
autowarefoundation · Dec 23, 2024 · 668e266 · 668e266
1 parent 067ee7a
commit 668e266
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 15 deletions.
diff --git a/...clude/autoware/external_velocity_limit_selector/external_velocity_limit_selector_node.hpp b/...clude/autoware/external_velocity_limit_selector/external_velocity_limit_selector_node.hpp
@@ -18,7 +18,7 @@
 #include <external_velocity_limit_selector_parameters.hpp>
 #include <rclcpp/rclcpp.hpp>
 
-#include <tier4_debug_msgs/msg/string_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/string_stamped.hpp>
 #include <tier4_planning_msgs/msg/velocity_limit.hpp>
 #include <tier4_planning_msgs/msg/velocity_limit_clear_command.hpp>
 
@@ -29,7 +29,7 @@
 namespace autoware::external_velocity_limit_selector
 {
 
-using tier4_debug_msgs::msg::StringStamped;
+using autoware_internal_debug_msgs::msg::StringStamped;
 using tier4_planning_msgs::msg::VelocityLimit;
 using tier4_planning_msgs::msg::VelocityLimitClearCommand;
 using tier4_planning_msgs::msg::VelocityLimitConstraints;

diff --git a/planning/autoware_external_velocity_limit_selector/package.xml b/planning/autoware_external_velocity_limit_selector/package.xml
@@ -17,6 +17,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>generate_parameter_library</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/planning/autoware_path_optimizer/include/autoware/path_optimizer/type_alias.hpp b/planning/autoware_path_optimizer/include/autoware/path_optimizer/type_alias.hpp
@@ -15,6 +15,7 @@
 #ifndef AUTOWARE__PATH_OPTIMIZER__TYPE_ALIAS_HPP_
 #define AUTOWARE__PATH_OPTIMIZER__TYPE_ALIAS_HPP_
 
+#include "autoware_internal_debug_msgs/msg/string_stamped.hpp"
 #include "autoware_planning_msgs/msg/path.hpp"
 #include "autoware_planning_msgs/msg/path_point.hpp"
 #include "autoware_planning_msgs/msg/trajectory.hpp"
@@ -25,7 +26,6 @@
 #include "nav_msgs/msg/odometry.hpp"
 #include "std_msgs/msg/header.hpp"
 #include "tier4_debug_msgs/msg/float64_stamped.hpp"
-#include "tier4_debug_msgs/msg/string_stamped.hpp"
 #include "visualization_msgs/msg/marker_array.hpp"
 
 namespace autoware::path_optimizer
@@ -43,8 +43,8 @@ using nav_msgs::msg::Odometry;
 using visualization_msgs::msg::Marker;
 using visualization_msgs::msg::MarkerArray;
 // debug
+using autoware_internal_debug_msgs::msg::StringStamped;
 using tier4_debug_msgs::msg::Float64Stamped;
-using tier4_debug_msgs::msg::StringStamped;
 }  // namespace autoware::path_optimizer
 
 #endif  // AUTOWARE__PATH_OPTIMIZER__TYPE_ALIAS_HPP_
diff --git a/planning/autoware_path_optimizer/package.xml b/planning/autoware_path_optimizer/package.xml
@@ -14,6 +14,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_interpolation</depend>
   <depend>autoware_motion_utils</depend>
   <depend>autoware_osqp_interface</depend>

diff --git a/planning/autoware_path_smoother/include/autoware/path_smoother/type_alias.hpp b/planning/autoware_path_smoother/include/autoware/path_smoother/type_alias.hpp
@@ -15,6 +15,7 @@
 #ifndef AUTOWARE__PATH_SMOOTHER__TYPE_ALIAS_HPP_
 #define AUTOWARE__PATH_SMOOTHER__TYPE_ALIAS_HPP_
 
+#include "autoware_internal_debug_msgs/msg/string_stamped.hpp"
 #include "autoware_planning_msgs/msg/path.hpp"
 #include "autoware_planning_msgs/msg/path_point.hpp"
 #include "autoware_planning_msgs/msg/trajectory.hpp"
@@ -23,7 +24,6 @@
 #include "nav_msgs/msg/odometry.hpp"
 #include "std_msgs/msg/header.hpp"
 #include "tier4_debug_msgs/msg/float64_stamped.hpp"
-#include "tier4_debug_msgs/msg/string_stamped.hpp"
 
 namespace autoware::path_smoother
 {
@@ -37,8 +37,8 @@ using autoware_planning_msgs::msg::TrajectoryPoint;
 // navigation
 using nav_msgs::msg::Odometry;
 // debug
+using autoware_internal_debug_msgs::msg::StringStamped;
 using tier4_debug_msgs::msg::Float64Stamped;
-using tier4_debug_msgs::msg::StringStamped;
 }  // namespace autoware::path_smoother
 
 #endif  // AUTOWARE__PATH_SMOOTHER__TYPE_ALIAS_HPP_
diff --git a/planning/autoware_path_smoother/package.xml b/planning/autoware_path_smoother/package.xml
@@ -14,6 +14,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_interpolation</depend>
   <depend>autoware_motion_utils</depend>
   <depend>autoware_osqp_interface</depend>

diff --git a/...autoware_behavior_path_planner/include/autoware/behavior_path_planner/planner_manager.hpp b/...autoware_behavior_path_planner/include/autoware/behavior_path_planner/planner_manager.hpp
@@ -45,7 +45,7 @@ using SceneModulePtr = std::shared_ptr<SceneModuleInterface>;
 using SceneModuleManagerPtr = std::shared_ptr<SceneModuleManagerInterface>;
 using DebugPublisher = autoware::universe_utils::DebugPublisher;
 using DebugDoubleMsg = tier4_debug_msgs::msg::Float64Stamped;
-using DebugStringMsg = tier4_debug_msgs::msg::StringStamped;
+using DebugStringMsg = autoware_internal_debug_msgs::msg::StringStamped;
 
 struct SceneModuleUpdateInfo
 {

diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_crosswalk_module/package.xml b/planning/behavior_velocity_planner/autoware_behavior_velocity_crosswalk_module/package.xml
@@ -23,6 +23,7 @@
 
   <depend>autoware_behavior_velocity_planner_common</depend>
   <depend>autoware_grid_map_utils</depend>
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_interpolation</depend>
   <depend>autoware_lanelet2_extension</depend>
   <depend>autoware_motion_utils</depend>

diff --git a/...vior_velocity_planner/autoware_behavior_velocity_crosswalk_module/src/scene_crosswalk.cpp b/...vior_velocity_planner/autoware_behavior_velocity_crosswalk_module/src/scene_crosswalk.cpp
@@ -153,11 +153,11 @@ StopFactor createStopFactor(
   return stop_factor;
 }
 
-tier4_debug_msgs::msg::StringStamped createStringStampedMessage(
+autoware_internal_debug_msgs::msg::StringStamped createStringStampedMessage(
   const rclcpp::Time & now, const int64_t module_id_,
   const std::vector<std::tuple<std::string, CollisionPoint, CollisionState>> & collision_points)
 {
-  tier4_debug_msgs::msg::StringStamped msg;
+  autoware_internal_debug_msgs::msg::StringStamped msg;
   msg.stamp = now;
   for (const auto & collision_point : collision_points) {
     std::stringstream ss;
@@ -199,8 +199,8 @@ CrosswalkModule::CrosswalkModule(
 
   road_ = lanelet_map_ptr->laneletLayer.get(lane_id);
 
-  collision_info_pub_ =
-    node.create_publisher<tier4_debug_msgs::msg::StringStamped>("~/debug/collision_info", 1);
+  collision_info_pub_ = node.create_publisher<autoware_internal_debug_msgs::msg::StringStamped>(
+    "~/debug/collision_info", 1);
 }
 
 bool CrosswalkModule::modifyPathVelocity(PathWithLaneId * path)

diff --git a/...vior_velocity_planner/autoware_behavior_velocity_crosswalk_module/src/scene_crosswalk.hpp b/...vior_velocity_planner/autoware_behavior_velocity_crosswalk_module/src/scene_crosswalk.hpp
@@ -23,9 +23,9 @@
 #include <autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp>
 #include <rclcpp/rclcpp.hpp>
 
+#include <autoware_internal_debug_msgs/msg/string_stamped.hpp>
 #include <autoware_perception_msgs/msg/predicted_objects.hpp>
 #include <sensor_msgs/msg/point_cloud2.hpp>
-#include <tier4_debug_msgs/msg/string_stamped.hpp>
 
 #include <boost/assert.hpp>
 #include <boost/assign/list_of.hpp>
@@ -456,7 +456,8 @@ class CrosswalkModule : public SceneModuleInterface
 
   const int64_t module_id_;
 
-  rclcpp::Publisher<tier4_debug_msgs::msg::StringStamped>::SharedPtr collision_info_pub_;
+  rclcpp::Publisher<autoware_internal_debug_msgs::msg::StringStamped>::SharedPtr
+    collision_info_pub_;
 
   lanelet::ConstLanelet crosswalk_;
 

diff --git a/...sampling_based_planner/autoware_path_sampler/include/autoware_path_sampler/type_alias.hpp b/...sampling_based_planner/autoware_path_sampler/include/autoware_path_sampler/type_alias.hpp
@@ -15,6 +15,7 @@
 #ifndef AUTOWARE_PATH_SAMPLER__TYPE_ALIAS_HPP_
 #define AUTOWARE_PATH_SAMPLER__TYPE_ALIAS_HPP_
 
+#include "autoware_internal_debug_msgs/msg/string_stamped.hpp"
 #include "autoware_perception_msgs/msg/predicted_objects.hpp"
 #include "autoware_planning_msgs/msg/path.hpp"
 #include "autoware_planning_msgs/msg/path_point.hpp"
@@ -25,7 +26,6 @@
 #include "geometry_msgs/msg/twist.hpp"
 #include "nav_msgs/msg/odometry.hpp"
 #include "std_msgs/msg/header.hpp"
-#include "tier4_debug_msgs/msg/string_stamped.hpp"
 #include "visualization_msgs/msg/marker_array.hpp"
 
 namespace autoware::path_sampler
@@ -45,7 +45,7 @@ using nav_msgs::msg::Odometry;
 using visualization_msgs::msg::Marker;
 using visualization_msgs::msg::MarkerArray;
 // debug
-using tier4_debug_msgs::msg::StringStamped;
+using autoware_internal_debug_msgs::msg::StringStamped;
 }  // namespace autoware::path_sampler
 
 #endif  // AUTOWARE_PATH_SAMPLER__TYPE_ALIAS_HPP_
diff --git a/planning/sampling_based_planner/autoware_path_sampler/package.xml b/planning/sampling_based_planner/autoware_path_sampler/package.xml
@@ -15,6 +15,7 @@
 
   <depend>autoware_bezier_sampler</depend>
   <depend>autoware_frenet_planner</depend>
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_interpolation</depend>
   <depend>autoware_motion_utils</depend>
   <depend>autoware_perception_msgs</depend>