refactor(vehicle_velocity_converter)!: prefix package and namespace w…

…ith autoware (autowarefoundation#8967) * add autoware prefix Signed-off-by: a-maumau <[email protected]> * fix conflict Signed-off-by: a-maumau <[email protected]> --------- Signed-off-by: a-maumau <[email protected]> Co-authored-by: Yamato Ando <[email protected]>
vividf · Dec 6, 2024 · 0bbdbe1 · 0bbdbe1
1 parent 3231bbf
commit 0bbdbe1
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 15 deletions.
diff --git a/.github/_CODEOWNERS b/.github/_CODEOWNERS
@@ -211,7 +211,7 @@ sensing/autoware_radar_static_pointcloud_filter/** [email protected] shuns
 sensing/autoware_radar_threshold_filter/** [email protected] [email protected] [email protected] [email protected]
 sensing/autoware_radar_tracks_noise_filter/** [email protected] [email protected] [email protected] [email protected]
 sensing/livox/autoware_livox_tag_filter/** [email protected] [email protected]
-sensing/vehicle_velocity_converter/** [email protected]
+sensing/autoware_vehicle_velocity_converter/** [email protected]
 simulator/autoware_carla_interface/** [email protected] [email protected]
 simulator/dummy_perception_publisher/** [email protected]
 simulator/fault_injection/** [email protected]

diff --git a/launch/tier4_simulator_launch/launch/simulator.launch.xml b/launch/tier4_simulator_launch/launch/simulator.launch.xml
@@ -188,9 +188,9 @@
       <push-ros-namespace namespace="sensing"/>
       <arg name="input_vehicle_velocity_topic" default="/vehicle/status/velocity_status"/>
       <arg name="output_twist_with_covariance" default="/sensing/vehicle_velocity_converter/twist_with_covariance"/>
-      <arg name="config_file" default="$(find-pkg-share vehicle_velocity_converter)/config/vehicle_velocity_converter.param.yaml"/>
+      <arg name="config_file" default="$(find-pkg-share autoware_vehicle_velocity_converter)/config/vehicle_velocity_converter.param.yaml"/>
 
-      <node pkg="vehicle_velocity_converter" exec="vehicle_velocity_converter_node" output="both">
+      <node pkg="autoware_vehicle_velocity_converter" exec="autoware_vehicle_velocity_converter_node" output="both">
         <param from="$(var config_file)"/>
         <remap from="velocity_status" to="$(var input_vehicle_velocity_topic)"/>
         <remap from="twist_with_covariance" to="$(var output_twist_with_covariance)"/>

diff --git a/.../vehicle_velocity_converter/CHANGELOG.rst → ..._vehicle_velocity_converter/CHANGELOG.rst b/.../vehicle_velocity_converter/CHANGELOG.rst → ..._vehicle_velocity_converter/CHANGELOG.rst
diff --git a/...vehicle_velocity_converter/CMakeLists.txt → ...vehicle_velocity_converter/CMakeLists.txt b/...vehicle_velocity_converter/CMakeLists.txt → ...vehicle_velocity_converter/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(vehicle_velocity_converter)
+project(autoware_vehicle_velocity_converter)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}
-  PLUGIN "VehicleVelocityConverter"
+  PLUGIN "autoware::vehicle_velocity_converter::VehicleVelocityConverter"
   EXECUTABLE ${PROJECT_NAME}_node
   EXECUTOR SingleThreadedExecutor
 )

diff --git a/sensing/vehicle_velocity_converter/README.md → ...ware_vehicle_velocity_converter/README.md b/sensing/vehicle_velocity_converter/README.md → ...ware_vehicle_velocity_converter/README.md
@@ -1,4 +1,4 @@
-# vehicle_velocity_converter
+# autoware_vehicle_velocity_converter
 
 ## Purpose
 

diff --git a/...fig/vehicle_velocity_converter.param.yaml → ...fig/vehicle_velocity_converter.param.yaml b/...fig/vehicle_velocity_converter.param.yaml → ...fig/vehicle_velocity_converter.param.yaml
diff --git a/...nch/vehicle_velocity_converter.launch.xml → ...nch/vehicle_velocity_converter.launch.xml b/...nch/vehicle_velocity_converter.launch.xml → ...nch/vehicle_velocity_converter.launch.xml
@@ -1,9 +1,9 @@
 <launch>
   <arg name="input_vehicle_velocity_topic" default="velocity_status"/>
   <arg name="output_twist_with_covariance" default="twist_with_covariance"/>
-  <arg name="config_file" default="$(find-pkg-share vehicle_velocity_converter)/config/vehicle_velocity_converter.param.yaml"/>
+  <arg name="config_file" default="$(find-pkg-share autoware_vehicle_velocity_converter)/config/vehicle_velocity_converter.param.yaml"/>
 
-  <node pkg="vehicle_velocity_converter" exec="vehicle_velocity_converter_node" output="both">
+  <node pkg="autoware_vehicle_velocity_converter" exec="autoware_vehicle_velocity_converter_node" output="both">
     <param from="$(var config_file)"/>
     <remap from="velocity_status" to="$(var input_vehicle_velocity_topic)"/>
     <remap from="twist_with_covariance" to="$(var output_twist_with_covariance)"/>

diff --git a/...ng/vehicle_velocity_converter/package.xml → ...re_vehicle_velocity_converter/package.xml b/...ng/vehicle_velocity_converter/package.xml → ...re_vehicle_velocity_converter/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>vehicle_velocity_converter</name>
+  <name>autoware_vehicle_velocity_converter</name>
   <version>0.38.0</version>
-  <description>The vehicle_velocity_converter package</description>
+  <description>The autoware_vehicle_velocity_converter package</description>
   <maintainer email="[email protected]">Ryu Yamamoto</maintainer>
   <license>Apache License 2.0</license>
 

diff --git a/...er/schema/vehicle_velocity_converter.json → ...er/schema/vehicle_velocity_converter.json b/...er/schema/vehicle_velocity_converter.json → ...er/schema/vehicle_velocity_converter.json
diff --git a/...verter/src/vehicle_velocity_converter.cpp → ...verter/src/vehicle_velocity_converter.cpp b/...verter/src/vehicle_velocity_converter.cpp → ...verter/src/vehicle_velocity_converter.cpp
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "vehicle_velocity_converter/vehicle_velocity_converter.hpp"
+#include "vehicle_velocity_converter.hpp"
 
 #include <string>
 
+namespace autoware::vehicle_velocity_converter
+{
 VehicleVelocityConverter::VehicleVelocityConverter(const rclcpp::NodeOptions & options)
 : rclcpp::Node("vehicle_velocity_converter", options)
 {
@@ -55,6 +57,7 @@ void VehicleVelocityConverter::callback_velocity_report(
 
   twist_with_covariance_pub_->publish(twist_with_covariance_msg);
 }
+}  // namespace autoware::vehicle_velocity_converter
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(VehicleVelocityConverter)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::vehicle_velocity_converter::VehicleVelocityConverter)
diff --git a/..._converter/vehicle_velocity_converter.hpp → ...verter/src/vehicle_velocity_converter.hpp b/..._converter/vehicle_velocity_converter.hpp → ...verter/src/vehicle_velocity_converter.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef VEHICLE_VELOCITY_CONVERTER__VEHICLE_VELOCITY_CONVERTER_HPP_
-#define VEHICLE_VELOCITY_CONVERTER__VEHICLE_VELOCITY_CONVERTER_HPP_
+#ifndef VEHICLE_VELOCITY_CONVERTER_HPP_
+#define VEHICLE_VELOCITY_CONVERTER_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -25,6 +25,8 @@
 #include <string>
 #include <vector>
 
+namespace autoware::vehicle_velocity_converter
+{
 class VehicleVelocityConverter : public rclcpp::Node
 {
 public:
@@ -43,5 +45,6 @@ class VehicleVelocityConverter : public rclcpp::Node
   double stddev_wz_;
   double speed_scale_factor_;
 };
+}  // namespace autoware::vehicle_velocity_converter
 
-#endif  // VEHICLE_VELOCITY_CONVERTER__VEHICLE_VELOCITY_CONVERTER_HPP_
+#endif  // VEHICLE_VELOCITY_CONVERTER_HPP_