mirror of
https://github.com/introlab/rtabmap_ros.git
synced 2026-10-03 16:27:46 +08:00
Updated to not use deprecated get3DMap().
This commit is contained in:
+20
-36
@@ -2705,24 +2705,16 @@ bool CoreWrapper::getMapDataCallback(rtabmap_ros::GetMap::Request& req, rtabmap_
|
|||||||
std::map<int, Transform> poses;
|
std::map<int, Transform> poses;
|
||||||
std::multimap<int, rtabmap::Link> constraints;
|
std::multimap<int, rtabmap::Link> constraints;
|
||||||
|
|
||||||
if(req.graphOnly)
|
rtabmap_.getGraph(
|
||||||
{
|
poses,
|
||||||
rtabmap_.getGraph(
|
constraints,
|
||||||
poses,
|
req.optimized,
|
||||||
constraints,
|
req.global,
|
||||||
req.optimized,
|
&signatures,
|
||||||
req.global,
|
!req.graphOnly,
|
||||||
&signatures);
|
!req.graphOnly,
|
||||||
}
|
!req.graphOnly,
|
||||||
else
|
!req.graphOnly);
|
||||||
{
|
|
||||||
rtabmap_.get3DMap(
|
|
||||||
signatures,
|
|
||||||
poses,
|
|
||||||
constraints,
|
|
||||||
req.optimized,
|
|
||||||
req.global);
|
|
||||||
}
|
|
||||||
|
|
||||||
//RGB-D SLAM data
|
//RGB-D SLAM data
|
||||||
rtabmap_ros::mapDataToROS(poses,
|
rtabmap_ros::mapDataToROS(poses,
|
||||||
@@ -2839,24 +2831,16 @@ bool CoreWrapper::publishMapCallback(rtabmap_ros::PublishMap::Request& req, rtab
|
|||||||
std::multimap<int, rtabmap::Link> constraints;
|
std::multimap<int, rtabmap::Link> constraints;
|
||||||
std::map<int, Signature > signatures;
|
std::map<int, Signature > signatures;
|
||||||
|
|
||||||
if(req.graphOnly)
|
rtabmap_.getGraph(
|
||||||
{
|
poses,
|
||||||
rtabmap_.getGraph(
|
constraints,
|
||||||
poses,
|
req.optimized,
|
||||||
constraints,
|
req.global,
|
||||||
req.optimized,
|
&signatures,
|
||||||
req.global,
|
!req.graphOnly,
|
||||||
&signatures);
|
!req.graphOnly,
|
||||||
}
|
!req.graphOnly,
|
||||||
else
|
!req.graphOnly);
|
||||||
{
|
|
||||||
rtabmap_.get3DMap(
|
|
||||||
signatures,
|
|
||||||
poses,
|
|
||||||
constraints,
|
|
||||||
req.optimized,
|
|
||||||
req.global);
|
|
||||||
}
|
|
||||||
|
|
||||||
ros::Time now = ros::Time::now();
|
ros::Time now = ros::Time::now();
|
||||||
if(mapDataPub_.getNumSubscribers())
|
if(mapDataPub_.getNumSubscribers())
|
||||||
|
|||||||
Reference in New Issue
Block a user