Skip to content

Commit 1e8504c

Browse files
committed
chore: update namespace and file structure
Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent bcad7b9 commit 1e8504c

File tree

5 files changed

+21
-31
lines changed

5 files changed

+21
-31
lines changed

launch/tier4_perception_launch/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def create_time_series_outlier_filter_components(input_topic, output_topic):
320320
components.append(
321321
ComposableNode(
322322
package="occupancy_grid_map_outlier_filter",
323-
plugin="occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent",
323+
plugin="autoware::occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent",
324324
name="occupancy_grid_based_outlier_filter",
325325
remappings=[
326326
("~/input/occupancy_grid_map", "/perception/occupancy_grid_map/map"),

perception/occupancy_grid_map_outlier_filter/CMakeLists.txt

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ find_package(OpenCV REQUIRED)
88
find_package(Eigen3 REQUIRED)
99
find_package(Boost REQUIRED)
1010
find_package(PCL REQUIRED)
11-
find_package(pcl_conversions REQUIRED)
1211
find_package(OpenMP)
1312
ament_auto_find_build_dependencies()
1413

@@ -22,26 +21,26 @@ include_directories(
2221
${GRID_MAP_INCLUDE_DIR}
2322
)
2423

25-
ament_auto_add_library(occupancy_grid_map_outlier_filter SHARED
26-
src/occupancy_grid_map_outlier_filter_nodelet.cpp
24+
ament_auto_add_library(${PROJECT_NAME} SHARED
25+
src/occupancy_grid_map_outlier_filter_node.cpp
2726
)
2827

29-
target_link_libraries(occupancy_grid_map_outlier_filter
28+
target_link_libraries(${PROJECT_NAME}
3029
${Boost_LIBRARIES}
3130
${OpenCV_LIBRARIES}
3231
${PCL_LIBRARIES}
3332
)
3433

3534
if(OPENMP_FOUND)
36-
set_target_properties(occupancy_grid_map_outlier_filter PROPERTIES
35+
set_target_properties(${PROJECT_NAME} PROPERTIES
3736
COMPILE_FLAGS ${OpenMP_CXX_FLAGS}
3837
LINK_FLAGS ${OpenMP_CXX_FLAGS}
3938
)
4039
endif()
4140

4241
# -- Occupancy Grid Map Outlier Filter --
43-
rclcpp_components_register_node(occupancy_grid_map_outlier_filter
44-
PLUGIN "occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent"
42+
rclcpp_components_register_node(${PROJECT_NAME}
43+
PLUGIN "autoware::occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent"
4544
EXECUTABLE occupancy_grid_map_outlier_filter_node)
4645

4746
ament_auto_package(INSTALL_TO_SHARE)

perception/occupancy_grid_map_outlier_filter/package.xml

-10
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,18 @@
1818
<buildtool_depend>autoware_cmake</buildtool_depend>
1919

2020
<depend>autoware_universe_utils</depend>
21-
<depend>autoware_vehicle_msgs</depend>
22-
<depend>diagnostic_updater</depend>
23-
<depend>image_transport</depend>
24-
<depend>lanelet2_extension</depend>
25-
<depend>libopencv-dev</depend>
2621
<depend>libpcl-all-dev</depend>
2722
<depend>message_filters</depend>
2823
<depend>nav_msgs</depend>
2924
<depend>pcl_conversions</depend>
30-
<depend>pcl_msgs</depend>
3125
<depend>pcl_ros</depend>
3226
<depend>pointcloud_preprocessor</depend>
3327
<depend>rclcpp</depend>
3428
<depend>rclcpp_components</depend>
3529
<depend>sensor_msgs</depend>
3630
<depend>std_msgs</depend>
37-
<depend>tf2</depend>
3831
<depend>tf2_eigen</depend>
39-
<depend>tf2_geometry_msgs</depend>
4032
<depend>tf2_ros</depend>
41-
<depend>tier4_debug_msgs</depend>
42-
<depend>tier4_pcl_extensions</depend>
4333

4434
<test_depend>ament_lint_auto</test_depend>
4535
<test_depend>autoware_lint_common</test_depend>

perception/occupancy_grid_map_outlier_filter/src/occupancy_grid_map_outlier_filter_nodelet.cpp perception/occupancy_grid_map_outlier_filter/src/occupancy_grid_map_outlier_filter_node.cpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "occupancy_grid_map_outlier_filter/occupancy_grid_map_outlier_filter_nodelet.hpp"
15+
#include "occupancy_grid_map_outlier_filter_node.hpp"
16+
17+
#include "autoware/universe_utils/geometry/geometry.hpp"
18+
#include "autoware/universe_utils/ros/debug_publisher.hpp"
19+
#include "autoware/universe_utils/system/stop_watch.hpp"
1620

17-
#include <autoware/universe_utils/geometry/geometry.hpp>
18-
#include <autoware/universe_utils/ros/debug_publisher.hpp>
19-
#include <autoware/universe_utils/system/stop_watch.hpp>
2021
#include <pcl_ros/transforms.hpp>
2122

2223
#include <boost/optional.hpp>
@@ -101,7 +102,7 @@ boost::optional<char> getCost(
101102

102103
} // namespace
103104

104-
namespace occupancy_grid_map_outlier_filter
105+
namespace autoware::occupancy_grid_map_outlier_filter
105106
{
106107
RadiusSearch2dFilter::RadiusSearch2dFilter(rclcpp::Node & node)
107108
{
@@ -489,8 +490,8 @@ void OccupancyGridMapOutlierFilterComponent::Debugger::transformToBaseLink(
489490
transformPointcloud(ros_input, *(node_.tf2_), node_.base_link_frame_, output);
490491
}
491492

492-
} // namespace occupancy_grid_map_outlier_filter
493+
} // namespace autoware::occupancy_grid_map_outlier_filter
493494

494495
#include <rclcpp_components/register_node_macro.hpp>
495496
RCLCPP_COMPONENTS_REGISTER_NODE(
496-
occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent)
497+
autoware::occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent)
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef OCCUPANCY_GRID_MAP_OUTLIER_FILTER__OCCUPANCY_GRID_MAP_OUTLIER_FILTER_NODELET_HPP_
16-
#define OCCUPANCY_GRID_MAP_OUTLIER_FILTER__OCCUPANCY_GRID_MAP_OUTLIER_FILTER_NODELET_HPP_
15+
#ifndef OCCUPANCY_GRID_MAP_OUTLIER_FILTER_NODE_HPP_
16+
#define OCCUPANCY_GRID_MAP_OUTLIER_FILTER_NODE_HPP_
1717

18+
#include "autoware/universe_utils/ros/published_time_publisher.hpp"
1819
#include "pointcloud_preprocessor/filter.hpp"
1920

20-
#include <autoware/universe_utils/ros/published_time_publisher.hpp>
2121
#include <pcl/common/impl/common.hpp>
2222
#include <rclcpp/rclcpp.hpp>
2323

@@ -40,7 +40,7 @@
4040
#include <memory>
4141
#include <string>
4242

43-
namespace occupancy_grid_map_outlier_filter
43+
namespace autoware::occupancy_grid_map_outlier_filter
4444
{
4545
using geometry_msgs::msg::Pose;
4646
using nav_msgs::msg::OccupancyGrid;
@@ -129,6 +129,6 @@ class OccupancyGridMapOutlierFilterComponent : public rclcpp::Node
129129
std::string base_link_frame_;
130130
int cost_threshold_;
131131
};
132-
} // namespace occupancy_grid_map_outlier_filter
132+
} // namespace autoware::occupancy_grid_map_outlier_filter
133133

134-
#endif // OCCUPANCY_GRID_MAP_OUTLIER_FILTER__OCCUPANCY_GRID_MAP_OUTLIER_FILTER_NODELET_HPP_
134+
#endif // OCCUPANCY_GRID_MAP_OUTLIER_FILTER_NODE_HPP_

0 commit comments

Comments
 (0)