Skip to content

Commit a09d59a

Browse files
committed
fix: launch file
Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>
1 parent 79f9c24 commit a09d59a

File tree

2 files changed

+4
-36
lines changed

2 files changed

+4
-36
lines changed

launch/tier4_map_launch/launch/map.launch.xml

+2-8
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
<arg name="map_projection_loader_param_path"/>
1515

1616
<!-- Dynamic lanelet loading -->
17-
<arg name="enable_differential_map_loading"/>
18-
19-
<!-- whether use intra-process -->
20-
<arg name="use_intra_process" default="false"/>
17+
<arg name="enable_differential_map_loading" default="false"/>
2118

2219
<!-- select container type -->
2320
<arg name="use_multithread" default="false" unless="$(var enable_differential_map_loading)"/>
@@ -47,7 +44,6 @@
4744
<param name="enable_differential_map_loading" value="$(var enable_differential_map_loading)"/>
4845
<remap from="output/lanelet2_map" to="vector_map"/>
4946
<remap from="service/get_differential_lanelet_map" to="/map/get_differential_lanelet_map"/>
50-
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
5147
</composable_node>
5248

5349
<composable_node
@@ -60,18 +56,16 @@
6056
<remap from="input/odometry" to="/localization/kinematic_state"/>
6157
<remap from="output/lanelet2_map" to="dynamic_vector_map"/>
6258
<remap from="service/get_differential_lanelet_map" to="/map/get_differential_lanelet_map"/>
63-
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
6459
</composable_node>
6560

6661
<composable_node pkg="autoware_lanelet2_map_visualizer" plugin="autoware::lanelet2_map_visualizer::Lanelet2MapVisualizationNode" name="lanelet2_map_visualization">
6762
<remap from="input/lanelet2_map" to="vector_map"/>
6863
<remap from="output/lanelet2_map_marker" to="vector_map_marker"/>
6964
</composable_node>
7065

71-
<composable_node pkg="map_loader" plugin="Lanelet2MapVisualizationNode" name="dynamic_lanelet2_map_visualization" if="$(var enable_differential_map_loading)">
66+
<composable_node pkg="autoware_lanelet2_map_visualizer" plugin="autoware::lanelet2_map_visualizer::Lanelet2MapVisualizationNode" name="dynamic_lanelet2_map_visualization" if="$(var enable_differential_map_loading)">
7267
<remap from="input/lanelet2_map" to="/map/dynamic_vector_map"/>
7368
<remap from="output/lanelet2_map_marker" to="/map/dynamic_vector_map_marker"/>
74-
<extra_arg name="use_intra_process_comms" value="$(var use_intra_process)"/>
7569
</composable_node>
7670

7771
<composable_node pkg="autoware_map_tf_generator" plugin="autoware::map_tf_generator::VectorMapTFGeneratorNode" name="vector_map_tf_generator">

map/autoware_map_loader/schema/lanelet2_map_loader.schema.json

+2-28
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,11 @@
2626
"description": "If true, `centerline` in the Lanelet2 map will be used as a `waypoints` tag.",
2727
"default": true
2828
},
29-
"lanelet2_map_path": {
29+
"lanelet2_map_paths_or_directory": {
3030
"type": "string",
31-
"description": "The lanelet2 map path pointing to the .osm file",
31+
"description": "The lanelet2 map path pointing to the .osm file or directory that contains multiple .osm files",
3232
"default": ""
3333
},
34-
"dummy_metadata": {
35-
"type": "object",
36-
"properties": {
37-
"min_x": {
38-
"type": "number",
39-
"description": "When the dynamic map loading is true and the map is a single file, this is the minimum x value of the map",
40-
"default": "0.0"
41-
},
42-
"min_y": {
43-
"type": "number",
44-
"description": "When the dynamic map loading is true and the map is a single file, this is the minimum y value of the map",
45-
"default": "0.0"
46-
},
47-
"x_resolution": {
48-
"type": "number",
49-
"description": "When the dynamic map loading is true and the map is a single file, this is the resolution of the x axis",
50-
"default": "100000.0"
51-
},
52-
"y_resolution": {
53-
"type": "number",
54-
"description": "When the dynamic map loading is true and the map is a single file, this is the resolution of the y axis",
55-
"default": "100000.0"
56-
}
57-
},
58-
"required": ["min_x", "min_y", "x_resolution", "y_resolution"]
59-
}
6034
},
6135
"required": ["enable_differential_map_loading", "allow_unsupported_version", "center_line_resolution", "use_waypoints", "lanelet2_map_path"],
6236
"additionalProperties": false

0 commit comments

Comments
 (0)