From 10079d17f39e6893d0d93ba6b08ecb184d952c95 Mon Sep 17 00:00:00 2001 From: Masaki Baba Date: Fri, 9 Aug 2024 14:25:30 +0900 Subject: [PATCH] refactor(geo_pose_projector)!: prefix package and namespace with autoware (#8334) * add autoware_ prefix Signed-off-by: a-maumau * style(pre-commit): autofix --------- Signed-off-by: a-maumau Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: SakodaShintaro --- .github/CODEOWNERS | 2 +- .../pose_twist_estimator/eagleye/eagleye_rt.launch.xml | 2 +- launch/tier4_localization_launch/package.xml | 2 +- .../CMakeLists.txt | 4 ++-- .../README.md | 4 ++-- .../config/geo_pose_projector.param.yaml | 0 .../launch/geo_pose_projector.launch.xml | 4 ++-- .../package.xml | 4 ++-- .../schema/geo_pose_projector.schema.json | 0 .../src/geo_pose_projector.cpp | 5 ++++- .../src/geo_pose_projector.hpp | 3 +++ 11 files changed, 18 insertions(+), 12 deletions(-) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/CMakeLists.txt (78%) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/README.md (91%) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/config/geo_pose_projector.param.yaml (100%) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/launch/geo_pose_projector.launch.xml (61%) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/package.xml (92%) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/schema/geo_pose_projector.schema.json (100%) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/src/geo_pose_projector.cpp (96%) rename localization/{geo_pose_projector => autoware_geo_pose_projector}/src/geo_pose_projector.hpp (95%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7a06ee09b7a2b..caeebe87193cf 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -86,7 +86,7 @@ localization/autoware_pose_covariance_modifier/** melike@leodrive.ai localization/autoware_stop_filter/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/autoware_twist2accel/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/ekf_localizer/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp takamasa.horibe@tier4.jp takeshi.ishita@tier4.jp yamato.ando@tier4.jp -localization/geo_pose_projector/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp +localization/autoware_geo_pose_projector/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/gyro_odometer/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/localization_error_monitor/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/localization_util/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp diff --git a/launch/tier4_localization_launch/launch/pose_twist_estimator/eagleye/eagleye_rt.launch.xml b/launch/tier4_localization_launch/launch/pose_twist_estimator/eagleye/eagleye_rt.launch.xml index 6cf8d390f919b..ba16625c5ceda 100644 --- a/launch/tier4_localization_launch/launch/pose_twist_estimator/eagleye/eagleye_rt.launch.xml +++ b/launch/tier4_localization_launch/launch/pose_twist_estimator/eagleye/eagleye_rt.launch.xml @@ -149,7 +149,7 @@ - + diff --git a/launch/tier4_localization_launch/package.xml b/launch/tier4_localization_launch/package.xml index b3dc75bbf79cc..2f02be72ec5ad 100644 --- a/launch/tier4_localization_launch/package.xml +++ b/launch/tier4_localization_launch/package.xml @@ -19,12 +19,12 @@ automatic_pose_initializer autoware_ar_tag_based_localizer + autoware_geo_pose_projector autoware_pointcloud_preprocessor eagleye_geo_pose_fusion eagleye_gnss_converter eagleye_rt ekf_localizer - geo_pose_projector gyro_odometer ndt_scan_matcher pose_estimator_arbiter diff --git a/localization/geo_pose_projector/CMakeLists.txt b/localization/autoware_geo_pose_projector/CMakeLists.txt similarity index 78% rename from localization/geo_pose_projector/CMakeLists.txt rename to localization/autoware_geo_pose_projector/CMakeLists.txt index f274e7d23dbab..a1f74c2307f98 100644 --- a/localization/geo_pose_projector/CMakeLists.txt +++ b/localization/autoware_geo_pose_projector/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(geo_pose_projector) +project(autoware_geo_pose_projector) 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 "GeoPoseProjector" + PLUGIN "autoware::geo_pose_projector::GeoPoseProjector" EXECUTABLE ${PROJECT_NAME}_node EXECUTOR SingleThreadedExecutor ) diff --git a/localization/geo_pose_projector/README.md b/localization/autoware_geo_pose_projector/README.md similarity index 91% rename from localization/geo_pose_projector/README.md rename to localization/autoware_geo_pose_projector/README.md index a3363336da1a7..2dd83a2077aab 100644 --- a/localization/geo_pose_projector/README.md +++ b/localization/autoware_geo_pose_projector/README.md @@ -1,4 +1,4 @@ -# geo_pose_projector +# autoware_geo_pose_projector ## Overview @@ -20,7 +20,7 @@ This node is a simple node that subscribes to the geo-referenced pose topic and ## Parameters -{{ json_to_markdown("localization/geo_pose_projector/schema/geo_pose_projector.schema.json") }} +{{ json_to_markdown("localization/autoware_geo_pose_projector/schema/geo_pose_projector.schema.json") }} ## Limitations diff --git a/localization/geo_pose_projector/config/geo_pose_projector.param.yaml b/localization/autoware_geo_pose_projector/config/geo_pose_projector.param.yaml similarity index 100% rename from localization/geo_pose_projector/config/geo_pose_projector.param.yaml rename to localization/autoware_geo_pose_projector/config/geo_pose_projector.param.yaml diff --git a/localization/geo_pose_projector/launch/geo_pose_projector.launch.xml b/localization/autoware_geo_pose_projector/launch/geo_pose_projector.launch.xml similarity index 61% rename from localization/geo_pose_projector/launch/geo_pose_projector.launch.xml rename to localization/autoware_geo_pose_projector/launch/geo_pose_projector.launch.xml index de6785a016858..899aebb37ba75 100644 --- a/localization/geo_pose_projector/launch/geo_pose_projector.launch.xml +++ b/localization/autoware_geo_pose_projector/launch/geo_pose_projector.launch.xml @@ -2,9 +2,9 @@ - + - + diff --git a/localization/geo_pose_projector/package.xml b/localization/autoware_geo_pose_projector/package.xml similarity index 92% rename from localization/geo_pose_projector/package.xml rename to localization/autoware_geo_pose_projector/package.xml index 3ffa7cb1c7111..a56a53d609370 100644 --- a/localization/geo_pose_projector/package.xml +++ b/localization/autoware_geo_pose_projector/package.xml @@ -1,9 +1,9 @@ - geo_pose_projector + autoware_geo_pose_projector 0.1.0 - The geo_pose_projector package + The autoware_geo_pose_projector package Yamato Ando Masahiro Sakamoto Kento Yabuuchi diff --git a/localization/geo_pose_projector/schema/geo_pose_projector.schema.json b/localization/autoware_geo_pose_projector/schema/geo_pose_projector.schema.json similarity index 100% rename from localization/geo_pose_projector/schema/geo_pose_projector.schema.json rename to localization/autoware_geo_pose_projector/schema/geo_pose_projector.schema.json diff --git a/localization/geo_pose_projector/src/geo_pose_projector.cpp b/localization/autoware_geo_pose_projector/src/geo_pose_projector.cpp similarity index 96% rename from localization/geo_pose_projector/src/geo_pose_projector.cpp rename to localization/autoware_geo_pose_projector/src/geo_pose_projector.cpp index 80bb407958de2..e7fda37e07acd 100644 --- a/localization/geo_pose_projector/src/geo_pose_projector.cpp +++ b/localization/autoware_geo_pose_projector/src/geo_pose_projector.cpp @@ -25,6 +25,8 @@ #include +namespace autoware::geo_pose_projector +{ GeoPoseProjector::GeoPoseProjector(const rclcpp::NodeOptions & options) : rclcpp::Node("geo_pose_projector", options), publish_tf_(declare_parameter("publish_tf")) { @@ -102,6 +104,7 @@ void GeoPoseProjector::on_geo_pose(const GeoPoseWithCovariance::ConstSharedPtr m tf_broadcaster_->sendTransform(transform_stamped); } } +} // namespace autoware::geo_pose_projector #include -RCLCPP_COMPONENTS_REGISTER_NODE(GeoPoseProjector) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::geo_pose_projector::GeoPoseProjector) diff --git a/localization/geo_pose_projector/src/geo_pose_projector.hpp b/localization/autoware_geo_pose_projector/src/geo_pose_projector.hpp similarity index 95% rename from localization/geo_pose_projector/src/geo_pose_projector.hpp rename to localization/autoware_geo_pose_projector/src/geo_pose_projector.hpp index 738e805ef8101..3ece595a7b1bd 100644 --- a/localization/geo_pose_projector/src/geo_pose_projector.hpp +++ b/localization/autoware_geo_pose_projector/src/geo_pose_projector.hpp @@ -28,6 +28,8 @@ #include #include +namespace autoware::geo_pose_projector +{ class GeoPoseProjector : public rclcpp::Node { private: @@ -54,5 +56,6 @@ class GeoPoseProjector : public rclcpp::Node std::string parent_frame_; std::string child_frame_; }; +} // namespace autoware::geo_pose_projector #endif // GEO_POSE_PROJECTOR_HPP_