refactor(autoware_path_distance_calculator): prefix package and names…

…pace with autoware Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
autowarefoundation · Aug 6, 2024 · bdd646d · bdd646d
1 parent b29c84e
commit bdd646d
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 12 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,6 +5,7 @@ common/autoware_grid_map_utils/** maxime.clement@tier4.jp
 common/autoware_motion_utils/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
 common/autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/** ahmed.ebrahim@leodrive.ai
 common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/** khalil@leodrive.ai
+common/autoware_path_distance_calculator/** isamu.takagi@tier4.jp
 common/autoware_perception_rviz_plugin/** opensource@apex.ai shunsuke.miura@tier4.jp taiki.tanaka@tier4.jp takeshi.miura@tier4.jp yoshi.ri@tier4.jp
 common/autoware_point_types/** david.wong@tier4.jp max.schmeller@tier4.jp
 common/autoware_test_utils/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp zulfaqar.azmi@tier4.jp
@@ -24,7 +25,6 @@ common/interpolation/** fumiya.watanabe@tier4.jp takayuki.murooka@tier4.jp
 common/kalman_filter/** koji.minoda@tier4.jp takeshi.ishita@tier4.jp yukihiro.saito@tier4.jp
 common/object_recognition_utils/** shunsuke.miura@tier4.jp takayuki.murooka@tier4.jp yoshi.ri@tier4.jp
 common/osqp_interface/** fumiya.watanabe@tier4.jp maxime.clement@tier4.jp satoshi.ota@tier4.jp takayuki.murooka@tier4.jp
-common/path_distance_calculator/** isamu.takagi@tier4.jp
 common/perception_utils/** shunsuke.miura@tier4.jp yoshi.ri@tier4.jp
 common/polar_grid/** yukihiro.saito@tier4.jp
 common/qp_interface/** fumiya.watanabe@tier4.jp maxime.clement@tier4.jp satoshi.ota@tier4.jp takayuki.murooka@tier4.jp

diff --git a/common/.pages b/common/.pages
@@ -50,7 +50,7 @@ nav:
     - 'traffic_light_recognition_marker_publisher': common/traffic_light_recognition_marker_publisher/Readme
   - 'Node':
     - 'Goal Distance Calculator': common/goal_distance_calculator/Readme
-    - 'Path Distance Calculator': common/path_distance_calculator/Readme
+    - 'Path Distance Calculator': common/autoware_path_distance_calculator/Readme
   - 'Others':
     - 'autoware_ad_api_specs': common/autoware_ad_api_specs
     - 'component_interface_specs': common/component_interface_specs

diff --git a/...n/path_distance_calculator/CMakeLists.txt → ...e_path_distance_calculator/CMakeLists.txt b/...n/path_distance_calculator/CMakeLists.txt → ...e_path_distance_calculator/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(path_distance_calculator)
+project(autoware_path_distance_calculator)
 
 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 "PathDistanceCalculator"
+  PLUGIN "autoware::path_distance_calculator::PathDistanceCalculator"
   EXECUTABLE ${PROJECT_NAME}_node
 )
 

diff --git a/common/path_distance_calculator/Readme.md → ...toware_path_distance_calculator/Readme.md b/common/path_distance_calculator/Readme.md → ...toware_path_distance_calculator/Readme.md
@@ -1,4 +1,4 @@
-# path_distance_calculator
+# autoware_path_distance_calculator
 
 ## Purpose
 

diff --git a/...aunch/path_distance_calculator.launch.xml → ...aunch/path_distance_calculator.launch.xml b/...aunch/path_distance_calculator.launch.xml → ...aunch/path_distance_calculator.launch.xml
@@ -1,7 +1,7 @@
 <launch>
   <arg name="path" default="/planning/scenario_planning/lane_driving/behavior_planning/path"/>
   <arg name="distance" default="~/distance"/>
-  <node pkg="path_distance_calculator" exec="path_distance_calculator_node" name="path_distance_calculator">
+  <node pkg="autoware_path_distance_calculator" exec="path_distance_calculator_node" name="path_distance_calculator">
     <remap from="~/input/path" to="$(var path)"/>
     <remap from="~/output/distance" to="$(var distance)"/>
   </node>

diff --git a/common/path_distance_calculator/package.xml → ...ware_path_distance_calculator/package.xml b/common/path_distance_calculator/package.xml → ...ware_path_distance_calculator/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>path_distance_calculator</name>
+  <name>autoware_path_distance_calculator</name>
   <version>0.0.0</version>
-  <description>The path_distance_calculator package</description>
+  <description>The autoware_path_distance_calculator package</description>
   <maintainer email="isamu.takagi@tier4.jp">Takagi, Isamu</maintainer>
   <license>Apache License 2.0</license>
 

diff --git a/...lculator/src/path_distance_calculator.cpp → ...lculator/src/path_distance_calculator.cpp b/...lculator/src/path_distance_calculator.cpp → ...lculator/src/path_distance_calculator.cpp
@@ -22,6 +22,8 @@
 #include <utility>
 #include <vector>
 
+namespace autoware::path_distance_calculator
+{
 PathDistanceCalculator::PathDistanceCalculator(const rclcpp::NodeOptions & options)
 : Node("path_distance_calculator", options), self_pose_listener_(this)
 {
@@ -54,6 +56,6 @@ PathDistanceCalculator::PathDistanceCalculator(const rclcpp::NodeOptions & optio
     pub_dist_->publish(msg);
   });
 }
-
+}  // namespace autoware::path_distance_calculator
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(PathDistanceCalculator)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::path_distance_calculator::PathDistanceCalculator)
diff --git a/...lculator/src/path_distance_calculator.hpp → ...lculator/src/path_distance_calculator.hpp b/...lculator/src/path_distance_calculator.hpp → ...lculator/src/path_distance_calculator.hpp
@@ -22,6 +22,9 @@
 #include <autoware_planning_msgs/msg/path.hpp>
 #include <tier4_debug_msgs/msg/float64_stamped.hpp>
 
+namespace autoware::path_distance_calculator
+{
+
 class PathDistanceCalculator : public rclcpp::Node
 {
 public:
@@ -35,4 +38,6 @@ class PathDistanceCalculator : public rclcpp::Node
   autoware::universe_utils::SelfPoseListener self_pose_listener_;
 };
 
+}  // namespace autoware::path_distance_calculator
+
 #endif  // PATH_DISTANCE_CALCULATOR_HPP_
diff --git a/launch/tier4_autoware_api_launch/launch/deprecated_api.launch.xml b/launch/tier4_autoware_api_launch/launch/deprecated_api.launch.xml
@@ -15,6 +15,6 @@
   <!-- autoware api utils -->
   <group>
     <push-ros-namespace namespace="autoware_api/utils"/>
-    <include file="$(find-pkg-share path_distance_calculator)/launch/path_distance_calculator.launch.xml"/>
+    <include file="$(find-pkg-share autoware_path_distance_calculator)/launch/path_distance_calculator.launch.xml"/>
   </group>
 </launch>
diff --git a/launch/tier4_autoware_api_launch/package.xml b/launch/tier4_autoware_api_launch/package.xml
@@ -14,9 +14,9 @@
   <exec_depend>ad_api_adaptors</exec_depend>
   <exec_depend>autoware_iv_external_api_adaptor</exec_depend>
   <exec_depend>autoware_iv_internal_api_adaptor</exec_depend>
+  <exec_depend>autoware_path_distance_calculator</exec_depend>
   <exec_depend>awapi_awiv_adapter</exec_depend>
   <exec_depend>default_ad_api</exec_depend>
-  <exec_depend>path_distance_calculator</exec_depend>
   <exec_depend>rosbridge_server</exec_depend>
   <exec_depend>topic_tools</exec_depend>