diff --git a/sensing/radar_static_pointcloud_filter/CMakeLists.txt b/sensing/radar_static_pointcloud_filter/CMakeLists.txt index ecd33d3166b19..a796a0fa9734d 100644 --- 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 index b1063562b1708..45c706791535c 100644 --- a/sensing/radar_static_pointcloud_filter/package.xml +++ b/sensing/radar_static_pointcloud_filter/package.xml @@ -20,9 +20,6 @@ radar_msgs rclcpp rclcpp_components - tf2 - tf2_geometry_msgs - tf2_ros ament_clang_format ament_lint_auto diff --git a/sensing/radar_static_pointcloud_filter/src/radar_static_pointcloud_filter_node/radar_static_pointcloud_filter_node.cpp b/sensing/radar_static_pointcloud_filter/src/radar_static_pointcloud_filter_node.cpp similarity index 95% rename from sensing/radar_static_pointcloud_filter/src/radar_static_pointcloud_filter_node/radar_static_pointcloud_filter_node.cpp rename to sensing/radar_static_pointcloud_filter/src/radar_static_pointcloud_filter_node.cpp index 985f30c8e34b5..74c099b9bf32b 100644 --- a/sensing/radar_static_pointcloud_filter/src/radar_static_pointcloud_filter_node/radar_static_pointcloud_filter_node.cpp +++ b/sensing/radar_static_pointcloud_filter/src/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 #include @@ -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/sensing/radar_static_pointcloud_filter/include/radar_static_pointcloud_filter/radar_static_pointcloud_filter_node.hpp b/sensing/radar_static_pointcloud_filter/src/radar_static_pointcloud_filter_node.hpp similarity index 87% rename from sensing/radar_static_pointcloud_filter/include/radar_static_pointcloud_filter/radar_static_pointcloud_filter_node.hpp rename to sensing/radar_static_pointcloud_filter/src/radar_static_pointcloud_filter_node.hpp index 72a78f35251f7..eff8437eb51d2 100644 --- a/sensing/radar_static_pointcloud_filter/include/radar_static_pointcloud_filter/radar_static_pointcloud_filter_node.hpp +++ b/sensing/radar_static_pointcloud_filter/src/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 #include -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_