From 258aa715ba2ec0d1692998d18aea14490ab2fc0a Mon Sep 17 00:00:00 2001
From: danielsievers <35999903+danielsievers@users.noreply.github.com>
Date: Mon, 26 Feb 2018 12:45:53 +0100
Subject: [PATCH] Move GetTrajectoryData() down to PoseGraphInterface (#932)

---
 cartographer/mapping/pose_graph.h            | 3 ---
 cartographer/mapping/pose_graph_interface.h  | 3 +++
 cartographer_grpc/mapping/pose_graph_stub.cc | 5 +++++
 cartographer_grpc/mapping/pose_graph_stub.h  | 2 ++
 cartographer_grpc/testing/mock_pose_graph.h  | 4 ++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cartographer/mapping/pose_graph.h b/cartographer/mapping/pose_graph.h
index 24e18a8..53a5e41 100644
--- a/cartographer/mapping/pose_graph.h
+++ b/cartographer/mapping/pose_graph.h
@@ -125,9 +125,6 @@ class PoseGraph : public PoseGraphInterface {
   // Returns the odometry data.
   virtual sensor::MapByTime<sensor::OdometryData> GetOdometryData() = 0;
 
-  // Returns the trajectory data.
-  virtual std::map<int, TrajectoryData> GetTrajectoryData() = 0;
-
   // Returns the fixed frame pose data.
   virtual sensor::MapByTime<sensor::FixedFramePoseData>
   GetFixedFramePoseData() = 0;
diff --git a/cartographer/mapping/pose_graph_interface.h b/cartographer/mapping/pose_graph_interface.h
index db36e3a..f3d4587 100644
--- a/cartographer/mapping/pose_graph_interface.h
+++ b/cartographer/mapping/pose_graph_interface.h
@@ -111,6 +111,9 @@ class PoseGraphInterface {
   // Checks if the given trajectory is finished.
   virtual bool IsTrajectoryFinished(int trajectory_id) = 0;
 
+  // Returns the trajectory data.
+  virtual std::map<int, TrajectoryData> GetTrajectoryData() = 0;
+
   // Returns the collection of constraints.
   virtual std::vector<Constraint> constraints() = 0;
 
diff --git a/cartographer_grpc/mapping/pose_graph_stub.cc b/cartographer_grpc/mapping/pose_graph_stub.cc
index 54d24da..17c261a 100644
--- a/cartographer_grpc/mapping/pose_graph_stub.cc
+++ b/cartographer_grpc/mapping/pose_graph_stub.cc
@@ -121,6 +121,11 @@ bool PoseGraphStub::IsTrajectoryFinished(int trajectory_id) {
   LOG(FATAL) << "Not implemented";
 }
 
+std::map<int, cartographer::mapping::PoseGraphInterface::TrajectoryData>
+PoseGraphStub::GetTrajectoryData() {
+  LOG(FATAL) << "Not implemented";
+}
+
 std::vector<cartographer::mapping::PoseGraphInterface::Constraint>
 PoseGraphStub::constraints() {
   google::protobuf::Empty request;
diff --git a/cartographer_grpc/mapping/pose_graph_stub.h b/cartographer_grpc/mapping/pose_graph_stub.h
index f4e9f42..5c28929 100644
--- a/cartographer_grpc/mapping/pose_graph_stub.h
+++ b/cartographer_grpc/mapping/pose_graph_stub.h
@@ -46,6 +46,8 @@ class PoseGraphStub : public cartographer::mapping::PoseGraphInterface {
   std::map<std::string, cartographer::transform::Rigid3d> GetLandmarkPoses()
       override;
   bool IsTrajectoryFinished(int trajectory_id) override;
+  std::map<int, cartographer::mapping::PoseGraphInterface::TrajectoryData>
+  GetTrajectoryData() override;
   std::vector<Constraint> constraints() override;
   cartographer::mapping::proto::PoseGraph ToProto() override;
 
diff --git a/cartographer_grpc/testing/mock_pose_graph.h b/cartographer_grpc/testing/mock_pose_graph.h
index 30291d7..ce19d55 100644
--- a/cartographer_grpc/testing/mock_pose_graph.h
+++ b/cartographer_grpc/testing/mock_pose_graph.h
@@ -50,6 +50,10 @@ class MockPoseGraph : public cartographer::mapping::PoseGraphInterface {
   MOCK_METHOD0(GetLandmarkPoses,
                std::map<std::string, cartographer::transform::Rigid3d>());
   MOCK_METHOD1(IsTrajectoryFinished, bool(int));
+  MOCK_METHOD0(
+      GetTrajectoryData,
+      std::map<int,
+               cartographer::mapping::PoseGraphInterface::TrajectoryData>());
   MOCK_METHOD0(constraints, std::vector<Constraint>());
   MOCK_METHOD0(ToProto, cartographer::mapping::proto::PoseGraph());
 };