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

Simplify SubmapToProto use. (#152)

master
Wolfgang Hess 2016-10-27 17:00:33 +02:00 committed by GitHub
parent a1eb540ffa
commit 76212e1c79
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cartographer_ros/cartographer_ros/node_main.cc
View File

@ -285,34 +285,13 @@ bool Node::HandleSubmapQuery(
::cartographer_ros_msgs::SubmapQuery::Response& response) { ::cartographer_ros_msgs::SubmapQuery::Response& response) {
carto::common::MutexLocker lock(&mutex_); carto::common::MutexLocker lock(&mutex_);
if (request.trajectory_id < 0 ||
request.trajectory_id >= map_builder_.num_trajectory_builders()) {
LOG(ERROR) << "Requested submap from trajectory " << request.trajectory_id
<< " but there are only "
<< map_builder_.num_trajectory_builders() << " trajectories.";
return false;
}
const carto::mapping::Submaps* const submaps =
map_builder_.GetTrajectoryBuilder(request.trajectory_id)->submaps();
if (request.submap_index < 0 || request.submap_index >= submaps->size()) {
LOG(ERROR) << "Requested submap " << request.submap_index
<< " from trajectory " << request.trajectory_id
<< " but there are only " << submaps->size()
<< " submaps in this trajectory.";
return false;
}
carto::mapping::proto::SubmapQuery::Response response_proto; carto::mapping::proto::SubmapQuery::Response response_proto;
response_proto.set_submap_version( const std::string error = map_builder_.SubmapToProto(
submaps->Get(request.submap_index)->end_laser_fan_index); request.trajectory_id, request.submap_index, &response_proto);
const std::vector<carto::transform::Rigid3d> submap_transforms = if (!error.empty()) {
map_builder_.sparse_pose_graph()->GetSubmapTransforms(*submaps); LOG(ERROR) << error;
CHECK_EQ(submap_transforms.size(), submaps->size()); return false;
submaps->SubmapToProto(request.submap_index, }
map_builder_.sparse_pose_graph()->GetTrajectoryNodes(),
submap_transforms[request.submap_index],
&response_proto);
response.submap_version = response_proto.submap_version(); response.submap_version = response_proto.submap_version();
response.cells.insert(response.cells.begin(), response_proto.cells().begin(), response.cells.insert(response.cells.begin(), response_proto.cells().begin(),