Implement GetLocalToGlobalTransform() in gRPC service (#797)

master
Christoph Schütte 2018-01-08 16:28:41 +01:00 committed by Wally B. Feed
parent d240261701
commit bd2fbbf1a1
4 changed files with 68 additions and 1 deletions

View File

@ -0,0 +1,45 @@
/*
* Copyright 2018 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.
*/
#ifndef CARTOGRAPHER_GRPC_HANDLERS_GET_LOCAL_TO_GLOBAL_TRANSFORM_HANDLER_H
#define CARTOGRAPHER_GRPC_HANDLERS_GET_LOCAL_TO_GLOBAL_TRANSFORM_HANDLER_H
namespace cartographer_grpc {
namespace handlers {
class GetLocalToGlobalTransformHandler
: public framework::RpcHandler<proto::GetLocalToGlobalTransformRequest,
proto::GetLocalToGlobalTransformResponse> {
public:
void OnRequest(
const proto::GetLocalToGlobalTransformRequest& request) override {
auto response = cartographer::common::make_unique<
proto::GetLocalToGlobalTransformResponse>();
auto local_to_global =
GetContext<MapBuilderServer::MapBuilderContext>()
->map_builder()
.pose_graph()
->GetLocalToGlobalTransform(request.trajectory_id());
*response->mutable_local_to_global() =
cartographer::transform::ToProto(local_to_global);
Send(std::move(response));
}
};
} // namespace handlers
} // namespace cartographer_grpc
#endif // CARTOGRAPHER_GRPC_HANDLERS_GET_LOCAL_TO_GLOBAL_TRANSFORM_HANDLER_H

View File

@ -23,6 +23,7 @@
#include "cartographer_grpc/handlers/add_trajectory_handler.h" #include "cartographer_grpc/handlers/add_trajectory_handler.h"
#include "cartographer_grpc/handlers/finish_trajectory_handler.h" #include "cartographer_grpc/handlers/finish_trajectory_handler.h"
#include "cartographer_grpc/handlers/get_all_submap_poses.h" #include "cartographer_grpc/handlers/get_all_submap_poses.h"
#include "cartographer_grpc/handlers/get_local_to_global_transform_handler.h"
#include "cartographer_grpc/handlers/get_submap_handler.h" #include "cartographer_grpc/handlers/get_submap_handler.h"
#include "cartographer_grpc/handlers/get_trajectory_node_poses_handler.h" #include "cartographer_grpc/handlers/get_trajectory_node_poses_handler.h"
#include "cartographer_grpc/handlers/receive_local_slam_results_handler.h" #include "cartographer_grpc/handlers/receive_local_slam_results_handler.h"
@ -127,6 +128,9 @@ MapBuilderServer::MapBuilderServer(
"GetTrajectoryNodePoses"); "GetTrajectoryNodePoses");
server_builder.RegisterHandler<handlers::GetAllSubmapPosesHandler, server_builder.RegisterHandler<handlers::GetAllSubmapPosesHandler,
proto::MapBuilderService>("GetAllSubmapPoses"); proto::MapBuilderService>("GetAllSubmapPoses");
server_builder.RegisterHandler<handlers::GetLocalToGlobalTransformHandler,
proto::MapBuilderService>(
"GetLocalToGlobalTransform");
grpc_server_ = server_builder.Build(); grpc_server_ = server_builder.Build();
grpc_server_->SetExecutionContext( grpc_server_->SetExecutionContext(
cartographer::common::make_unique<MapBuilderContext>(this)); cartographer::common::make_unique<MapBuilderContext>(this));

View File

@ -59,7 +59,13 @@ PoseGraphStub::GetAllSubmapPoses() {
cartographer::transform::Rigid3d PoseGraphStub::GetLocalToGlobalTransform( cartographer::transform::Rigid3d PoseGraphStub::GetLocalToGlobalTransform(
int trajectory_id) { int trajectory_id) {
LOG(FATAL) << "Not implemented"; grpc::ClientContext client_context;
proto::GetLocalToGlobalTransformRequest request;
request.set_trajectory_id(trajectory_id);
proto::GetLocalToGlobalTransformResponse response;
CHECK(stub_->GetLocalToGlobalTransform(&client_context, request, &response)
.ok());
return cartographer::transform::ToRigid3(response.local_to_global());
} }
cartographer::mapping::MapById<cartographer::mapping::NodeId, cartographer::mapping::MapById<cartographer::mapping::NodeId,

View File

@ -103,6 +103,14 @@ message GetAllSubmapPosesResponse {
repeated SubmapPose submap_poses = 1; repeated SubmapPose submap_poses = 1;
} }
message GetLocalToGlobalTransformRequest {
int32 trajectory_id = 1;
}
message GetLocalToGlobalTransformResponse {
cartographer.transform.proto.Rigid3d local_to_global = 1;
}
service MapBuilderService { service MapBuilderService {
// Starts a new trajectory and returns its index. // Starts a new trajectory and returns its index.
rpc AddTrajectory(AddTrajectoryRequest) returns (AddTrajectoryResponse); rpc AddTrajectory(AddTrajectoryRequest) returns (AddTrajectoryResponse);
@ -142,4 +150,8 @@ service MapBuilderService {
// Returns the current optimized submap poses. // Returns the current optimized submap poses.
rpc GetAllSubmapPoses(google.protobuf.Empty) rpc GetAllSubmapPoses(google.protobuf.Empty)
returns (GetAllSubmapPosesResponse); returns (GetAllSubmapPosesResponse);
// Returns the current local-to-global transform for the trajectory.
rpc GetLocalToGlobalTransform(GetLocalToGlobalTransformRequest)
returns (GetLocalToGlobalTransformResponse);
} }