12345qiupeng
/
cartographer_ros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 'landmarks' instead of 'landmark'. (#931)

master
Alexander Belyaev 2018-07-09 13:23:52 +02:00 committed by GitHub
parent 0aa6ecc40f
commit 944b22575f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cartographer_ros/cartographer_ros/msg_conversion.cc
View File

@ -276,7 +276,7 @@ ToPointCloudWithIntensities(const sensor_msgs::PointCloud2& msg) {
LandmarkData ToLandmarkData(const LandmarkList& landmark_list) { LandmarkData ToLandmarkData(const LandmarkList& landmark_list) {
LandmarkData landmark_data; LandmarkData landmark_data;
landmark_data.time = FromRos(landmark_list.header.stamp); landmark_data.time = FromRos(landmark_list.header.stamp);
for (const LandmarkEntry& entry : landmark_list.landmark) { for (const LandmarkEntry& entry : landmark_list.landmarks) {
landmark_data.landmark_observations.push_back( landmark_data.landmark_observations.push_back(
{entry.id, ToRigid3d(entry.tracking_from_landmark_transform), {entry.id, ToRigid3d(entry.tracking_from_landmark_transform),
entry.translation_weight, entry.rotation_weight}); entry.translation_weight, entry.rotation_weight});

2
cartographer_ros/cartographer_ros/msg_conversion_test.cc
View File

@ -121,7 +121,7 @@ TEST(MsgConversion, LandmarkListToLandmarkData) {
landmark_0.tracking_from_landmark_transform.orientation.z = 0.0; landmark_0.tracking_from_landmark_transform.orientation.z = 0.0;
landmark_0.translation_weight = 1.0; landmark_0.translation_weight = 1.0;
landmark_0.rotation_weight = 2.0; landmark_0.rotation_weight = 2.0;
message.landmark.push_back(landmark_0); message.landmarks.push_back(landmark_0);
LandmarkData actual_landmark_data = ToLandmarkData(message); LandmarkData actual_landmark_data = ToLandmarkData(message);
EXPECT_THAT(actual_landmark_data, EXPECT_THAT(actual_landmark_data,

2
cartographer_ros_msgs/msg/LandmarkList.msg
View File

@ -13,4 +13,4 @@
# limitations under the License. # limitations under the License.
std_msgs/Header header std_msgs/Header header
cartographer_ros_msgs/LandmarkEntry[] landmark cartographer_ros_msgs/LandmarkEntry[] landmarks