refactor(radar_static_pointcloud_filter): fix namespace and directory…

… structure (#7914) refactor: update include paths and namespace for radar_static_pointcloud_filter
autowarefoundation · Jul 10, 2024 · f2fa715 · f2fa715
1 parent 0db8f67
commit f2fa715
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/sensing/radar_static_pointcloud_filter/CMakeLists.txt b/sensing/radar_static_pointcloud_filter/CMakeLists.txt
@@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED)
 autoware_package()
 
 # Targets
-ament_auto_add_library(radar_static_pointcloud_filter_node_component SHARED
-  src/radar_static_pointcloud_filter_node/radar_static_pointcloud_filter_node.cpp
+ament_auto_add_library(${PROJECT_NAME} SHARED
+  src/radar_static_pointcloud_filter_node.cpp
 )
 
-rclcpp_components_register_node(radar_static_pointcloud_filter_node_component
-  PLUGIN "radar_static_pointcloud_filter::RadarStaticPointcloudFilterNode"
+rclcpp_components_register_node(${PROJECT_NAME}
+  PLUGIN "autoware::radar_static_pointcloud_filter::RadarStaticPointcloudFilterNode"
   EXECUTABLE radar_static_pointcloud_filter_node
 )
 

diff --git a/sensing/radar_static_pointcloud_filter/package.xml b/sensing/radar_static_pointcloud_filter/package.xml
@@ -20,9 +20,6 @@
   <depend>radar_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
-  <depend>tf2</depend>
-  <depend>tf2_geometry_msgs</depend>
-  <depend>tf2_ros</depend>
 
   <test_depend>ament_clang_format</test_depend>
   <test_depend>ament_lint_auto</test_depend>

diff --git a/...e/radar_static_pointcloud_filter_node.cpp → ...c/radar_static_pointcloud_filter_node.cpp b/...e/radar_static_pointcloud_filter_node.cpp → ...c/radar_static_pointcloud_filter_node.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "radar_static_pointcloud_filter/radar_static_pointcloud_filter_node.hpp"
+#include "radar_static_pointcloud_filter_node.hpp"
 
 #include <geometry_msgs/msg/transform_stamped.hpp>
 #include <geometry_msgs/msg/twist_with_covariance.hpp>
@@ -75,7 +75,7 @@ geometry_msgs::msg::Vector3 compensateEgoVehicleTwist(
 }
 }  // namespace
 
-namespace radar_static_pointcloud_filter
+namespace autoware::radar_static_pointcloud_filter
 {
 using nav_msgs::msg::Odometry;
 using radar_msgs::msg::RadarReturn;
@@ -167,7 +167,8 @@ bool RadarStaticPointcloudFilterNode::isStaticPointcloud(
          (compensated_velocity.x < node_param_.doppler_velocity_sd);
 }
 
-}  // namespace radar_static_pointcloud_filter
+}  // namespace autoware::radar_static_pointcloud_filter
 
 #include "rclcpp_components/register_node_macro.hpp"
-RCLCPP_COMPONENTS_REGISTER_NODE(radar_static_pointcloud_filter::RadarStaticPointcloudFilterNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(
+  autoware::radar_static_pointcloud_filter::RadarStaticPointcloudFilterNode)
diff --git a/...r/radar_static_pointcloud_filter_node.hpp → ...c/radar_static_pointcloud_filter_node.hpp b/...r/radar_static_pointcloud_filter_node.hpp → ...c/radar_static_pointcloud_filter_node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RADAR_STATIC_POINTCLOUD_FILTER__RADAR_STATIC_POINTCLOUD_FILTER_NODE_HPP_
-#define RADAR_STATIC_POINTCLOUD_FILTER__RADAR_STATIC_POINTCLOUD_FILTER_NODE_HPP_
+#ifndef RADAR_STATIC_POINTCLOUD_FILTER_NODE_HPP_
+#define RADAR_STATIC_POINTCLOUD_FILTER_NODE_HPP_
 
 #include "autoware/universe_utils/ros/transform_listener.hpp"
 
@@ -31,7 +31,7 @@
 #include <string>
 #include <vector>
 
-namespace radar_static_pointcloud_filter
+namespace autoware::radar_static_pointcloud_filter
 {
 using nav_msgs::msg::Odometry;
 using radar_msgs::msg::RadarReturn;
@@ -77,6 +77,6 @@ class RadarStaticPointcloudFilterNode : public rclcpp::Node
     const RadarReturn & radar_return, const Odometry::ConstSharedPtr & odom_msg,
     geometry_msgs::msg::TransformStamped::ConstSharedPtr transform);
 };
-}  // namespace radar_static_pointcloud_filter
+}  // namespace autoware::radar_static_pointcloud_filter
 
-#endif  // RADAR_STATIC_POINTCLOUD_FILTER__RADAR_STATIC_POINTCLOUD_FILTER_NODE_HPP_
+#endif  // RADAR_STATIC_POINTCLOUD_FILTER_NODE_HPP_