chore(autoware_external_velocity_limit_selector): add prefix `autowar…

…e_` (#7295) chore(autoware_external_velocity_limit_selector): rename Signed-off-by: satoshi-ota <[email protected]>
autowarefoundation · Jun 6, 2024 · ff2fbd6 · ff2fbd6
1 parent 5913c5c
commit ff2fbd6
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 16 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -177,7 +177,7 @@ planning/behavior_velocity_stop_line_module/** [email protected] shumpei.
 planning/behavior_velocity_traffic_light_module/** [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_walkway_module/** [email protected] [email protected] [email protected] [email protected]
 planning/costmap_generator/** [email protected] [email protected] [email protected]
-planning/external_velocity_limit_selector/** [email protected] [email protected] [email protected] [email protected] [email protected]
+planning/autoware_external_velocity_limit_selector/** [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/freespace_planner/** [email protected] [email protected] [email protected]
 planning/freespace_planning_algorithms/** [email protected] [email protected] [email protected]
 planning/mission_planner/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]

diff --git a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml
@@ -19,7 +19,7 @@
   <group>
     <!-- external velocity limit selector -->
     <group>
-      <include file="$(find-pkg-share external_velocity_limit_selector)/launch/external_velocity_limit_selector.launch.xml">
+      <include file="$(find-pkg-share autoware_external_velocity_limit_selector)/launch/external_velocity_limit_selector.launch.xml">
         <arg name="common_param_path" value="$(var common_param_path)"/>
         <arg name="param_path" value="$(var velocity_smoother_param_path)"/>
       </include>

diff --git a/launch/tier4_planning_launch/package.xml b/launch/tier4_planning_launch/package.xml
@@ -58,13 +58,13 @@
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
   <exec_depend>autoware_behavior_velocity_planner</exec_depend>
+  <exec_depend>autoware_external_velocity_limit_selector</exec_depend>
   <exec_depend>autoware_path_optimizer</exec_depend>
   <exec_depend>autoware_remaining_distance_time_calculator</exec_depend>
   <exec_depend>autoware_velocity_smoother</exec_depend>
   <exec_depend>behavior_path_planner</exec_depend>
   <exec_depend>costmap_generator</exec_depend>
   <exec_depend>external_cmd_selector</exec_depend>
-  <exec_depend>external_velocity_limit_selector</exec_depend>
   <exec_depend>freespace_planner</exec_depend>
   <exec_depend>glog_component</exec_depend>
   <exec_depend>mission_planner</exec_depend>

diff --git a/planning/.pages b/planning/.pages
@@ -74,7 +74,7 @@ nav:
   - 'Static Centerline Generator': planning/autoware_static_centerline_generator
   - 'API and Library':
     - 'Costmap Generator': planning/costmap_generator
-    - 'External Velocity Limit Selector': planning/external_velocity_limit_selector
+    - 'External Velocity Limit Selector': planning/autoware_external_velocity_limit_selector
     - 'Objects of Interest Marker Interface': planning/objects_of_interest_marker_interface
     - 'Route Handler': planning/route_handler
     - 'RTC Interface': planning/rtc_interface

diff --git a/...al_velocity_limit_selector/CMakeLists.txt → ...al_velocity_limit_selector/CMakeLists.txt b/...al_velocity_limit_selector/CMakeLists.txt → ...al_velocity_limit_selector/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(external_velocity_limit_selector)
+project(autoware_external_velocity_limit_selector)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -9,7 +9,7 @@ ament_auto_add_library(external_velocity_limit_selector_node SHARED
 )
 
 rclcpp_components_register_node(external_velocity_limit_selector_node
-  PLUGIN "ExternalVelocityLimitSelectorNode"
+  PLUGIN "autoware::external_velocity_limit_selector::ExternalVelocityLimitSelectorNode"
   EXECUTABLE external_velocity_limit_selector
 )
 

diff --git a/...xternal_velocity_limit_selector/README.md → ...xternal_velocity_limit_selector/README.md b/...xternal_velocity_limit_selector/README.md → ...xternal_velocity_limit_selector/README.md
diff --git a/..._limit_selector/config/default.param.yaml → ..._limit_selector/config/default.param.yaml b/..._limit_selector/config/default.param.yaml → ..._limit_selector/config/default.param.yaml
diff --git a/...selector/config/default_common.param.yaml → ...selector/config/default_common.param.yaml b/...selector/config/default_common.param.yaml → ...selector/config/default_common.param.yaml
diff --git a/...mage/external_velocity_limit_selector.png → ...mage/external_velocity_limit_selector.png b/...mage/external_velocity_limit_selector.png → ...mage/external_velocity_limit_selector.png
diff --git a/...external_velocity_limit_selector_node.hpp → ...external_velocity_limit_selector_node.hpp b/...external_velocity_limit_selector_node.hpp → ...external_velocity_limit_selector_node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_
-#define EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_
+#ifndef AUTOWARE_EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_
+#define AUTOWARE_EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -26,6 +26,9 @@
 #include <string>
 #include <unordered_map>
 
+namespace autoware::external_velocity_limit_selector
+{
+
 using tier4_debug_msgs::msg::StringStamped;
 using tier4_planning_msgs::msg::VelocityLimit;
 using tier4_planning_msgs::msg::VelocityLimitClearCommand;
@@ -77,5 +80,6 @@ class ExternalVelocityLimitSelectorNode : public rclcpp::Node
   VelocityLimit hardest_limit_{};
   VelocityLimitTable velocity_limit_table_;
 };
+}  // namespace autoware::external_velocity_limit_selector
 
-#endif  // EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_
+#endif  // AUTOWARE_EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_
diff --git a/...ternal_velocity_limit_selector.launch.xml → ...ternal_velocity_limit_selector.launch.xml b/...ternal_velocity_limit_selector.launch.xml → ...ternal_velocity_limit_selector.launch.xml
@@ -1,7 +1,7 @@
 <launch>
   <!-- common param -->
-  <arg name="common_param_path" default="$(find-pkg-share external_velocity_limit_selector)/config/default_common.param.yaml"/>
-  <arg name="param_path" default="$(find-pkg-share external_velocity_limit_selector)/config/default.param.yaml"/>
+  <arg name="common_param_path" default="$(find-pkg-share autoware_external_velocity_limit_selector)/config/default_common.param.yaml"/>
+  <arg name="param_path" default="$(find-pkg-share autoware_external_velocity_limit_selector)/config/default.param.yaml"/>
 
   <!-- input/output -->
   <arg name="input_velocity_limit_from_api" default="/planning/scenario_planning/max_velocity_default"/>
@@ -10,7 +10,7 @@
   <arg name="output_velocity_limit_from_selector" default="/planning/scenario_planning/max_velocity"/>
   <arg name="output_debug_string" default="/planning/scenario_planning/external_velocity_limit_selector/debug"/>
 
-  <node pkg="external_velocity_limit_selector" exec="external_velocity_limit_selector" name="external_velocity_limit_selector" output="screen">
+  <node pkg="autoware_external_velocity_limit_selector" exec="external_velocity_limit_selector" name="external_velocity_limit_selector" output="screen">
     <param from="$(var common_param_path)"/>
     <param from="$(var param_path)"/>
     <remap from="input/velocity_limit_from_api" to="$(var input_velocity_limit_from_api)"/>

diff --git a/...ernal_velocity_limit_selector/package.xml → ...ernal_velocity_limit_selector/package.xml b/...ernal_velocity_limit_selector/package.xml → ...ernal_velocity_limit_selector/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>external_velocity_limit_selector</name>
+  <name>autoware_external_velocity_limit_selector</name>
   <version>0.1.0</version>
-  <description>The external_velocity_limit_selector ROS 2 package</description>
+  <description>The autoware_external_velocity_limit_selector ROS 2 package</description>
   <maintainer email="[email protected]">Satoshi Ota</maintainer>
   <maintainer email="[email protected]">Shinnosuke Hirakawa</maintainer>
   <maintainer email="[email protected]">Shumpei Wakabayashi</maintainer>

diff --git a/...external_velocity_limit_selector_node.cpp → ...external_velocity_limit_selector_node.cpp b/...external_velocity_limit_selector_node.cpp → ...external_velocity_limit_selector_node.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "external_velocity_limit_selector/external_velocity_limit_selector_node.hpp"
+#include "autoware_external_velocity_limit_selector/external_velocity_limit_selector_node.hpp"
 
 #include <deque>
 #include <memory>
@@ -21,6 +21,9 @@
 #include <utility>
 #include <vector>
 
+namespace autoware::external_velocity_limit_selector
+{
+
 namespace
 {
 VelocityLimit getHardestLimit(
@@ -236,6 +239,8 @@ void ExternalVelocityLimitSelectorNode::updateVelocityLimit()
 
   hardest_limit_ = getHardestLimit(velocity_limit_table_, node_param_);
 }
+}  // namespace autoware::external_velocity_limit_selector
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(ExternalVelocityLimitSelectorNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(
+  autoware::external_velocity_limit_selector::ExternalVelocityLimitSelectorNode)