diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index efdd2121bf369..278329cd3c725 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -189,7 +189,7 @@ planning/obstacle_stop_planner/** berkay@leodrive.ai bnk@leodrive.ai satoshi.ota planning/obstacle_velocity_limiter/** maxime.clement@tier4.jp planning/path_smoother/** maxime.clement@tier4.jp takayuki.murooka@tier4.jp planning/planning_test_utils/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp zulfaqar.azmi@tier4.jp -planning/planning_topic_converter/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp +planning/autoware_planning_topic_converter/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp planning/planning_validator/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp planning/route_handler/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp takayuki.murooka@tier4.jp zulfaqar.azmi@tier4.jp planning/rtc_interface/** fumiya.watanabe@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp taiki.tanaka@tier4.jp diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml index 0612f67de4c2b..a44e46acb01a6 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml @@ -98,7 +98,7 @@ - + diff --git a/launch/tier4_planning_launch/package.xml b/launch/tier4_planning_launch/package.xml index d07fc67b33751..b26b6d4fb6276 100644 --- a/launch/tier4_planning_launch/package.xml +++ b/launch/tier4_planning_launch/package.xml @@ -60,6 +60,7 @@ autoware_behavior_velocity_planner autoware_external_velocity_limit_selector autoware_path_optimizer + autoware_planning_topic_converter autoware_remaining_distance_time_calculator autoware_velocity_smoother behavior_path_planner @@ -71,7 +72,6 @@ obstacle_cruise_planner obstacle_stop_planner planning_evaluator - planning_topic_converter planning_validator scenario_selector surround_obstacle_checker diff --git a/planning/.pages b/planning/.pages index 07643e854b0ca..4966ff7dc0bb3 100644 --- a/planning/.pages +++ b/planning/.pages @@ -86,5 +86,5 @@ nav: - 'Stop Reason Visualizer': https://github.com/autowarefoundation/autoware_tools/blob/main/planning/planning_debug_tools/doc-stop-reason-visualizer.md - 'Planning Test Utils': planning/planning_test_utils - 'Planning Test Manager': planning/autoware_planning_test_manager - - 'Planning Topic Converter': planning/planning_topic_converter + - 'Planning Topic Converter': planning/autoware_planning_topic_converter - 'Planning Validator': planning/planning_validator diff --git a/planning/planning_topic_converter/CMakeLists.txt b/planning/autoware_planning_topic_converter/CMakeLists.txt similarity index 83% rename from planning/planning_topic_converter/CMakeLists.txt rename to planning/autoware_planning_topic_converter/CMakeLists.txt index 75b63d26c316f..ae1b585895e5e 100644 --- a/planning/planning_topic_converter/CMakeLists.txt +++ b/planning/autoware_planning_topic_converter/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(planning_topic_converter) +project(autoware_planning_topic_converter) ### Compile options if(NOT CMAKE_CXX_STANDARD) @@ -17,7 +17,7 @@ ament_auto_add_library(planning_topic_converter SHARED ) rclcpp_components_register_node(planning_topic_converter - PLUGIN "planning_topic_converter::PathToTrajectory" + PLUGIN "autoware::planning_topic_converter::PathToTrajectory" EXECUTABLE path_to_trajectory_converter ) diff --git a/planning/planning_topic_converter/README.md b/planning/autoware_planning_topic_converter/README.md similarity index 86% rename from planning/planning_topic_converter/README.md rename to planning/autoware_planning_topic_converter/README.md index 74137cda0197d..e5036c6c0903c 100644 --- a/planning/planning_topic_converter/README.md +++ b/planning/autoware_planning_topic_converter/README.md @@ -12,7 +12,7 @@ The tools in this package are provided as composable ROS 2 component nodes, so t ```xml - + diff --git a/planning/planning_topic_converter/include/planning_topic_converter/converter_base.hpp b/planning/autoware_planning_topic_converter/include/autoware_planning_topic_converter/converter_base.hpp similarity index 83% rename from planning/planning_topic_converter/include/planning_topic_converter/converter_base.hpp rename to planning/autoware_planning_topic_converter/include/autoware_planning_topic_converter/converter_base.hpp index a093d9a952029..e3b0fe5069e92 100644 --- a/planning/planning_topic_converter/include/planning_topic_converter/converter_base.hpp +++ b/planning/autoware_planning_topic_converter/include/autoware_planning_topic_converter/converter_base.hpp @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_ -#define PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_ +#ifndef AUTOWARE_PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_ +#define AUTOWARE_PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_ #include "rclcpp/rclcpp.hpp" #include #include -namespace planning_topic_converter +namespace autoware::planning_topic_converter { template @@ -46,6 +46,6 @@ class ConverterBase : public rclcpp::Node private: }; -} // namespace planning_topic_converter +} // namespace autoware::planning_topic_converter -#endif // PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_ +#endif // AUTOWARE_PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_ diff --git a/planning/planning_topic_converter/include/planning_topic_converter/path_to_trajectory.hpp b/planning/autoware_planning_topic_converter/include/autoware_planning_topic_converter/path_to_trajectory.hpp similarity index 75% rename from planning/planning_topic_converter/include/planning_topic_converter/path_to_trajectory.hpp rename to planning/autoware_planning_topic_converter/include/autoware_planning_topic_converter/path_to_trajectory.hpp index 708f624e97898..7ca50d6c4e50c 100644 --- a/planning/planning_topic_converter/include/planning_topic_converter/path_to_trajectory.hpp +++ b/planning/autoware_planning_topic_converter/include/autoware_planning_topic_converter/path_to_trajectory.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_ -#define PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_ +#ifndef AUTOWARE_PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_ +#define AUTOWARE_PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_ -#include "planning_topic_converter/converter_base.hpp" +#include "autoware_planning_topic_converter/converter_base.hpp" #include "rclcpp/rclcpp.hpp" #include @@ -23,7 +23,7 @@ #include -namespace planning_topic_converter +namespace autoware::planning_topic_converter { using autoware_planning_msgs::msg::Path; @@ -40,6 +40,6 @@ class PathToTrajectory : public ConverterBase void process(const Path::ConstSharedPtr msg) override; }; -} // namespace planning_topic_converter +} // namespace autoware::planning_topic_converter -#endif // PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_ +#endif // AUTOWARE_PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_ diff --git a/planning/planning_topic_converter/package.xml b/planning/autoware_planning_topic_converter/package.xml similarity index 86% rename from planning/planning_topic_converter/package.xml rename to planning/autoware_planning_topic_converter/package.xml index 3699f3e53900c..be44523fa9852 100644 --- a/planning/planning_topic_converter/package.xml +++ b/planning/autoware_planning_topic_converter/package.xml @@ -1,8 +1,8 @@ - planning_topic_converter + autoware_planning_topic_converter 0.1.0 - The planning_topic_converter package + The autoware_planning_topic_converter package Satoshi OTA Shumpei Wakabayashi diff --git a/planning/planning_topic_converter/src/path_to_trajectory.cpp b/planning/autoware_planning_topic_converter/src/path_to_trajectory.cpp similarity index 88% rename from planning/planning_topic_converter/src/path_to_trajectory.cpp rename to planning/autoware_planning_topic_converter/src/path_to_trajectory.cpp index 757dcd0d9f632..d7aceb1abd106 100644 --- a/planning/planning_topic_converter/src/path_to_trajectory.cpp +++ b/planning/autoware_planning_topic_converter/src/path_to_trajectory.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "planning_topic_converter/path_to_trajectory.hpp" +#include "autoware_planning_topic_converter/path_to_trajectory.hpp" #include #include -namespace planning_topic_converter +namespace autoware::planning_topic_converter { namespace { @@ -54,7 +54,7 @@ void PathToTrajectory::process(const Path::ConstSharedPtr msg) pub_->publish(output); } -} // namespace planning_topic_converter +} // namespace autoware::planning_topic_converter #include -RCLCPP_COMPONENTS_REGISTER_NODE(planning_topic_converter::PathToTrajectory) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::planning_topic_converter::PathToTrajectory)