From 9105e8eb06babacded0ab35163458735cec0e144 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@f169173b-cf89-36c8-b27e-44dbe73f0c83>
Date: Mon, 7 Jul 2014 15:12:57 +0000
Subject: [PATCH] rviz plugin: MapCloudDisplay looking for rtabmap/get_map
 service name by default, also disabled qt signal when resting dowloadMap
 property (causing double downloads of the map)

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/ros-pkg@1476 f169173b-cf89-36c8-b27e-44dbe73f0c83
---
 src/rviz/MapCloudDisplay.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rviz/MapCloudDisplay.cpp b/src/rviz/MapCloudDisplay.cpp
index ce8b2f6a..c8197cfd 100644
--- a/src/rviz/MapCloudDisplay.cpp
+++ b/src/rviz/MapCloudDisplay.cpp
@@ -416,16 +416,21 @@ void MapCloudDisplay::downloadMap()
 	getMapSrv.request.global = true;
 	getMapSrv.request.optimized = true;
 	getMapSrv.request.graphOnly = false;
-	if(!ros::service::call("get_map", getMapSrv))
+	if(!ros::service::call("rtabmap/get_map", getMapSrv))
 	{
-		ROS_WARN("MapCloudDisplay: Can't call \"get_map\" service");
+		ROS_ERROR("MapCloudDisplay: Can't call \"rtabmap/get_map\" service. "
+				  "Tip: if rtabmap node is in not in rtabmap namespace, you can remap the service "
+				  "to \"get_map\" in the launch "
+				  "file like: <remap from=\"rtabmap/get_map\" to=\"get_map\"/>.");
 	}
 	else
 	{
 		this->reset();
 		processMapData(getMapSrv.response.data);
 	}
+	download_map_->blockSignals(true);
 	download_map_->setBool(false);
+	download_map_->blockSignals(false);
 }
 
 void MapCloudDisplay::causeRetransform()