Rename and cleanup. (#4)

Merges 3d_mapping.lua into backpack_3d.lua. Renames launch files to be
consistent. Fixes a typo.

cartographer_ros/configuration_files/3d_mapping.lua

@@ -1,19 +0,0 @@
--- Copyright 2016 The Cartographer Authors
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---      http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-
-include "backpack_3d.lua"
-
-options.trajectory_builder.scans_per_accumulation = 2
-
-return options

cartographer_ros/configuration_files/backpack_3d.lua

@@ -29,4 +29,6 @@ options.sparse_pose_graph.constraint_builder.adaptive_voxel_filter = TRAJECTORY_
 options.sparse_pose_graph.constraint_builder.min_score = 0.62
 options.sparse_pose_graph.constraint_builder.log_matches = true
 
+options.trajectory_builder.scans_per_accumulation = 2
+
 return options

cartographer_ros/launch/backpack_3d.launch

@@ -90,7 +90,7 @@
       configuration_files_directories: [
         "$(find cartographer_ros)/configuration_files"
       ]
-      mapping_configuration_basename: "3d_mapping.lua"
+      mapping_configuration_basename: "backpack_3d.lua"
       imu_topic: "/imu"
       laser_scan_3d_topics: ["/horizontal_3d_laser", "/vertical_3d_laser"]
       laser_min_range_m: 0.

cartographer_ros/src/cartographer_node_main.cc

@@ -80,7 +80,7 @@ constexpr int kSubmapPublishPeriodInUts = 300 * 10000ll;  // 300 milliseconds
 constexpr int kPosePublishPeriodInUts = 5 * 10000ll;      // 5 milliseconds
 constexpr double kMaxTransformDelaySeconds = 1.;
 
-Rigid3d ToRidig3d(const geometry_msgs::TransformStamped& transform) {
+Rigid3d ToRigid3d(const geometry_msgs::TransformStamped& transform) {
   return Rigid3d(Eigen::Vector3d(transform.transform.translation.x,
                                  transform.transform.translation.y,
                                  transform.transform.translation.z),
@@ -220,7 +220,7 @@ Node::Node()
 
 Rigid3d Node::LookupToTrackingTransformOrThrow(
     const ::cartographer::common::Time time, const string& frame_id) {
-  return ToRidig3d(
+  return ToRigid3d(
       tf_buffer_.lookupTransform(tracking_frame_, frame_id, ToRos(time),
                                  ros::Duration(kMaxTransformDelaySeconds)));
 }