Skip to content

Commit d52569c

Browse files
Fixed arg name
Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp>
1 parent d89c660 commit d52569c

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

localization/pose_initializer/launch/pose_initializer.launch.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<arg name="stop_check_enabled"/>
88

99
<arg name="sub_gnss_pose_cov" default="sub_gnss_pose_cov"/>
10-
<arg name="fit_target" default="pointcloud_map"/>
10+
<arg name="gnss_initial_pose_auto_fix_target" default="pointcloud_map"/>
1111

1212
<node pkg="pose_initializer" exec="pose_initializer_node" name="pose_initializer_node">
1313
<param from="$(var config_file)" allow_substs="true"/>
@@ -18,8 +18,8 @@
1818
<remap from="pose_reset" to="/initialpose3d"/>
1919
<remap from="ekf_trigger_node" to="/localization/pose_twist_fusion_filter/trigger_node"/>
2020
<remap from="ndt_trigger_node" to="/localization/pose_estimator/trigger_node"/>
21-
<param name="map_loader_name" value="/map/pointcloud_map_loader"/>
22-
<param name="fit_target" value="$(var fit_target)"/>
21+
<param name="map_height_fitter.map_loader_name" value="/map/pointcloud_map_loader"/>
22+
<param name="map_height_fitter.target" value="$(var gnss_initial_pose_auto_fix_target)"/>
2323
<remap from="~/pointcloud_map" to="/map/pointcloud_map"/>
2424
<remap from="~/partial_map_load" to="/map/get_partial_pointcloud_map"/>
2525
<remap from="~/vector_map" to="/map/vector_map"/>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/**:
22
ros__parameters:
3-
map_loader_name: "/map/pointcloud_map_loader"
4-
fit_target: "pointcloud_map"
3+
map_height_fitter:
4+
map_loader_name: "/map/pointcloud_map_loader"
5+
fit_target: "pointcloud

map/map_height_fitter/schema/map_height_fitter.schema.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"map_height_fitter": {
77
"type": "object",
88
"properties": {
9-
"map_loader_name": {
9+
"map_height_fitter.map_loader_name": {
1010
"type": "string",
1111
"description": "Node name of the map loader from which this map_height_fitter will retrieve its parameters",
1212
"default": "/map/pointcloud_map_loader"
1313
},
14-
"fit_target": {
14+
"map_height_fitter.target": {
1515
"type": "string",
1616
"description": "Target map to fit (choose from 'pointcloud_map', 'vector_map')",
1717
"default": "pointcloud_map"

map/map_height_fitter/src/map_height_fitter.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct MapHeightFitter::Impl
6464

6565
MapHeightFitter::Impl::Impl(rclcpp::Node * node) : tf2_listener_(tf2_buffer_), node_(node)
6666
{
67-
fit_target_ = node->declare_parameter<std::string>("fit_target");
67+
fit_target_ = node->declare_parameter<std::string>("map_height_fitter.target");
6868
if (fit_target_ == "pointcloud_map") {
6969
const auto callback =
7070
[this](const std::shared_future<std::vector<rclcpp::Parameter>> & future) {
@@ -87,7 +87,8 @@ MapHeightFitter::Impl::Impl(rclcpp::Node * node) : tf2_listener_(tf2_buffer_), n
8787
}
8888
};
8989

90-
const auto map_loader_name = node->declare_parameter<std::string>("map_loader_name");
90+
const auto map_loader_name =
91+
node->declare_parameter<std::string>("map_height_fitter.map_loader_name");
9192
params_pcd_map_loader_ = rclcpp::AsyncParametersClient::make_shared(node, map_loader_name);
9293
params_pcd_map_loader_->wait_for_service();
9394
params_pcd_map_loader_->get_parameters({enable_partial_load}, callback);

system/default_ad_api_helpers/ad_api_adaptors/launch/rviz_adaptors.launch.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<launch>
2-
<arg name="fit_target" default="pointcloud_map"/>
2+
<arg name="rviz_initial_pose_auto_fix_target" default="pointcloud_map"/>
33

44
<group>
55
<push-ros-namespace namespace="default_ad_api/helpers"/>
66
<node pkg="ad_api_adaptors" exec="initial_pose_adaptor" name="initial_pose_adaptor">
77
<param from="$(find-pkg-share ad_api_adaptors)/config/initial_pose.param.yaml"/>
8-
<param name="map_loader_name" value="/map/pointcloud_map_loader"/>
9-
<param name="fit_target" value="$(var fit_target)"/>
8+
<param name="map_height_fitter.map_loader_name" value="/map/pointcloud_map_loader"/>
9+
<param name="map_height_fitter.target" value="$(var rviz_initial_pose_auto_fix_target)"/>
1010
<remap from="~/initialpose" to="/initialpose"/>
1111
<remap from="~/pointcloud_map" to="/map/pointcloud_map"/>
1212
<remap from="~/partial_map_load" to="/map/get_partial_pointcloud_map"/>

0 commit comments

Comments
 (0)