Merge branch 'TaikiYamada4-chore/gnss_poser/add_autoware_prefix'

autowarefoundation · Aug 20, 2024 · 79adeff · 79adeff
2 parents 8ce80bd + 7e7aa53
commit 79adeff
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -199,14 +199,14 @@ planning/sampling_based_planner/autoware_bezier_sampler/** maxime.clement@tier4.
 planning/sampling_based_planner/autoware_frenet_planner/** [email protected]
 planning/sampling_based_planner/autoware_path_sampler/** [email protected]
 planning/sampling_based_planner/autoware_sampler_common/** [email protected]
+sensing/autoware_gnss_poser/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 sensing/autoware_image_diagnostics/** [email protected] [email protected]
 sensing/autoware_image_transport_decompressor/** [email protected] [email protected]
 sensing/autoware_pointcloud_preprocessor/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 sensing/autoware_radar_scan_to_pointcloud2/** [email protected] [email protected] [email protected] [email protected]
 sensing/autoware_radar_static_pointcloud_filter/** [email protected] [email protected] [email protected] [email protected]
 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/gnss_poser/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 sensing/imu_corrector/** [email protected] [email protected]
 sensing/livox/autoware_livox_tag_filter/** [email protected] [email protected]
 sensing/tier4_pcl_extensions/** [email protected] [email protected] [email protected]

diff --git a/sensing/gnss_poser/CMakeLists.txt → sensing/autoware_gnss_poser/CMakeLists.txt b/sensing/gnss_poser/CMakeLists.txt → sensing/autoware_gnss_poser/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(gnss_poser)
+project(autoware_gnss_poser)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -16,7 +16,7 @@ find_library(GeographicLib_LIBRARIES
 )
 
 set(GNSS_POSER_HEADERS
-  include/gnss_poser/gnss_poser_core.hpp
+  include/autoware/gnss_poser/gnss_poser_core.hpp
 )
 
 ament_auto_add_library(gnss_poser_node SHARED
@@ -29,7 +29,7 @@ target_link_libraries(gnss_poser_node
 )
 
 rclcpp_components_register_node(gnss_poser_node
-  PLUGIN "gnss_poser::GNSSPoser"
+  PLUGIN "autoware::gnss_poser::GNSSPoser"
   EXECUTABLE gnss_poser
 )
 

diff --git a/sensing/gnss_poser/README.md → sensing/autoware_gnss_poser/README.md b/sensing/gnss_poser/README.md → sensing/autoware_gnss_poser/README.md
@@ -33,7 +33,7 @@ If the transformation from `base_link` to the antenna cannot be obtained, it out
 
 ### Core Parameters
 
-{{ json_to_markdown("sensing/gnss_poser/schema/gnss_poser.schema.json") }}
+{{ json_to_markdown("sensing/autoware_gnss_poser/schema/gnss_poser.schema.json") }}
 
 ## Assumptions / Known limits
 

diff --git a/...g/gnss_poser/config/gnss_poser.param.yaml → ...e_gnss_poser/config/gnss_poser.param.yaml b/...g/gnss_poser/config/gnss_poser.param.yaml → ...e_gnss_poser/config/gnss_poser.param.yaml
diff --git a/...er/include/gnss_poser/gnss_poser_core.hpp → ...e/autoware/gnss_poser/gnss_poser_core.hpp b/...er/include/gnss_poser/gnss_poser_core.hpp → ...e/autoware/gnss_poser/gnss_poser_core.hpp
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef GNSS_POSER__GNSS_POSER_CORE_HPP_
-#define GNSS_POSER__GNSS_POSER_CORE_HPP_
+#ifndef AUTOWARE__GNSS_POSER__GNSS_POSER_CORE_HPP_
+#define AUTOWARE__GNSS_POSER__GNSS_POSER_CORE_HPP_
 
 #include <component_interface_specs/map.hpp>
 #include <component_interface_utils/rclcpp.hpp>
@@ -39,7 +39,7 @@
 
 #include <string>
 
-namespace gnss_poser
+namespace autoware::gnss_poser
 {
 class GNSSPoser : public rclcpp::Node
 {
@@ -101,6 +101,6 @@ class GNSSPoser : public rclcpp::Node
     msg_gnss_ins_orientation_stamped_;
   int gnss_pose_pub_method_;
 };
-}  // namespace gnss_poser
+}  // namespace autoware::gnss_poser
 
-#endif  // GNSS_POSER__GNSS_POSER_CORE_HPP_
+#endif  // AUTOWARE__GNSS_POSER__GNSS_POSER_CORE_HPP_
diff --git a/...g/gnss_poser/launch/gnss_poser.launch.xml → ...e_gnss_poser/launch/gnss_poser.launch.xml b/...g/gnss_poser/launch/gnss_poser.launch.xml → ...e_gnss_poser/launch/gnss_poser.launch.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launch>
-  <arg name="param_file" default="$(find-pkg-share gnss_poser)/config/gnss_poser.param.yaml"/>
+  <arg name="param_file" default="$(find-pkg-share autoware_gnss_poser)/config/gnss_poser.param.yaml"/>
   <arg name="input_topic_fix" default="/fix"/>
   <arg name="input_topic_orientation" default="/autoware_orientation"/>
   <arg name="output_topic_gnss_pose" default="gnss_pose"/>
   <arg name="output_topic_gnss_pose_cov" default="gnss_pose_cov"/>
   <arg name="output_topic_gnss_fixed" default="gnss_fixed"/>
 
-  <node pkg="gnss_poser" exec="gnss_poser" name="gnss_poser" output="both">
+  <node pkg="autoware_gnss_poser" exec="gnss_poser" name="gnss_poser" output="both">
     <remap from="fix" to="$(var input_topic_fix)"/>
     <remap from="autoware_orientation" to="$(var input_topic_orientation)"/>
     <remap from="gnss_pose" to="$(var output_topic_gnss_pose)"/>

diff --git a/sensing/gnss_poser/package.xml → sensing/autoware_gnss_poser/package.xml b/sensing/gnss_poser/package.xml → sensing/autoware_gnss_poser/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>gnss_poser</name>
+  <name>autoware_gnss_poser</name>
   <version>1.0.0</version>
-  <description>The ROS 2 gnss_poser package</description>
+  <description>The ROS 2 autoware_gnss_poser package</description>
   <maintainer email="[email protected]">Yamato Ando</maintainer>
   <maintainer email="[email protected]">Masahiro Sakamoto</maintainer>
   <maintainer email="[email protected]">Kento Yabuuchi</maintainer>

diff --git a/.../gnss_poser/schema/gnss_poser.schema.json → ..._gnss_poser/schema/gnss_poser.schema.json b/.../gnss_poser/schema/gnss_poser.schema.json → ..._gnss_poser/schema/gnss_poser.schema.json
diff --git a/sensing/gnss_poser/src/gnss_poser_core.cpp → ...toware_gnss_poser/src/gnss_poser_core.cpp b/sensing/gnss_poser/src/gnss_poser_core.cpp → ...toware_gnss_poser/src/gnss_poser_core.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "gnss_poser/gnss_poser_core.hpp"
+#include "autoware/gnss_poser/gnss_poser_core.hpp"
 
 #include <autoware/geography_utils/height.hpp>
 #include <autoware/geography_utils/projection.hpp>
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-namespace gnss_poser
+namespace autoware::gnss_poser
 {
 GNSSPoser::GNSSPoser(const rclcpp::NodeOptions & node_options)
 : rclcpp::Node("gnss_poser", node_options),
@@ -411,7 +411,7 @@ void GNSSPoser::publish_tf(
 
   tf2_broadcaster_.sendTransform(transform_stamped);
 }
-}  // namespace gnss_poser
+}  // namespace autoware::gnss_poser
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(gnss_poser::GNSSPoser)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::gnss_poser::GNSSPoser)