Skip to content

Commit ef7a2b9

Browse files
refactor(map_launch): use map.launch.xml instead of map.launch.py (#6185)
* refactor(map_launch): use map.launch.xml instead of map.launch.py Signed-off-by: Yamato Ando <yamato.ando@tier4.jp> * style(pre-commit): autofix --------- Signed-off-by: Yamato Ando <yamato.ando@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 47f265d commit ef7a2b9

File tree

2 files changed

+53
-236
lines changed

2 files changed

+53
-236
lines changed

launch/tier4_map_launch/launch/map.launch.py

-223
This file was deleted.
+53-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,66 @@
11
<launch>
2+
<!-- map files -->
3+
<arg name="pointcloud_map_path"/>
4+
<arg name="pointcloud_map_metadata_path"/>
5+
<arg name="lanelet2_map_path"/>
6+
<arg name="map_projector_info_path"/>
7+
28
<!-- Parameter files -->
39
<arg name="pointcloud_map_loader_param_path"/>
410
<arg name="lanelet2_map_loader_param_path"/>
511

6-
<arg name="map_path" default=""/>
7-
<arg name="lanelet2_map_path" default="$(var map_path)/lanelet2_map.osm"/>
8-
<arg name="pointcloud_map_path" default="$(var map_path)/pointcloud_map.pcd"/>
12+
<!-- whether use intra-process -->
13+
<arg name="use_intra_process" default="false"/>
14+
15+
<!-- select container type -->
16+
<arg name="use_multithread" default="false"/>
17+
<let name="container_type" value="component_container" unless="$(var use_multithread)"/>
18+
<let name="container_type" value="component_container_mt" if="$(var use_multithread)"/>
919

1020
<group>
1121
<push-ros-namespace namespace="map"/>
12-
<include file="$(find-pkg-share map_loader)/launch/lanelet2_map_loader.launch.xml">
13-
<arg name="lanelet2_map_path" value="$(var lanelet2_map_path)"/>
14-
<arg name="lanelet2_map_loader_param_path" value="$(var lanelet2_map_loader_param_path)"/>
15-
</include>
1622

17-
<include file="$(find-pkg-share map_loader)/launch/pointcloud_map_loader.launch.xml">
18-
<arg name="pointcloud_map_path" value="$(var pointcloud_map_path)"/>
19-
<arg name="pointcloud_map_loader_param_path" value="$(var pointcloud_map_loader_param_path)"/>
20-
</include>
23+
<node_container pkg="rclcpp_components" exec="$(var container_type)" name="map_container" namespace="" output="screen">
24+
<composable_node pkg="map_loader" plugin="PointCloudMapLoaderNode" name="pointcloud_map_loader">
25+
<param from="$(var pointcloud_map_loader_param_path)"/>
26+
<param name="pcd_paths_or_directory" value="[$(var pointcloud_map_path)]"/>
27+
<param name="pcd_metadata_path" value="$(var pointcloud_map_metadata_path)"/>
28+
<remap from="output/pointcloud_map" to="pointcloud_map"/>
29+
<remap from="output/pointcloud_map_metadata" to="pointcloud_map_metadata"/>
30+
<remap from="service/get_partial_pcd_map" to="/map/get_partial_pointcloud_map"/>
31+
<remap from="service/get_differential_pcd_map" to="/map/get_differential_pointcloud_map"/>
32+
<remap from="service/get_selected_pcd_map" to="/map/get_selected_pointcloud_map"/>
33+
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
34+
</composable_node>
2135

22-
<include file="$(find-pkg-share map_tf_generator)/launch/map_tf_generator.launch.xml">
23-
<arg name="input_vector_map_topic" value="/map/vector_map"/>
36+
<composable_node pkg="map_loader" plugin="Lanelet2MapLoaderNode" name="lanelet2_map_loader">
37+
<param from="$(var lanelet2_map_loader_param_path)"/>
38+
<param name="lanelet2_map_path" value="$(var lanelet2_map_path)"/>
39+
<remap from="output/lanelet2_map" to="vector_map"/>
40+
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
41+
</composable_node>
42+
43+
<composable_node pkg="map_loader" plugin="Lanelet2MapVisualizationNode" name="lanelet2_map_visualization">
44+
<remap from="input/lanelet2_map" to="vector_map"/>
45+
<remap from="output/lanelet2_map_marker" to="vector_map_marker"/>
46+
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
47+
</composable_node>
48+
49+
<composable_node pkg="map_tf_generator" plugin="VectorMapTFGeneratorNode" name="vector_map_tf_generator">
50+
<param name="map_frame" value="map"/>
51+
<param name="viewer_frame" value="viewer"/>
52+
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
53+
</composable_node>
54+
</node_container>
55+
56+
<node pkg="map_loader" exec="map_hash_generator" name="map_hash_generator">
57+
<param name="lanelet2_map_path" value="$(var lanelet2_map_path)"/>
58+
<param name="pointcloud_map_path" value="$(var pointcloud_map_path)"/>
59+
</node>
60+
61+
<include file="$(find-pkg-share map_projection_loader)/launch/map_projection_loader.launch.xml">
62+
<arg name="map_projector_info_path" value="$(var map_projector_info_path)"/>
63+
<arg name="lanelet2_map_path" value="$(var lanelet2_map_path)"/>
2464
</include>
2565
</group>
2666
</launch>

0 commit comments

Comments
 (0)