Change internal map topic from "map" to "stdr_map"

stdr-simulator-ros-pkg · Nov 24, 2014 · 7c1cf6f · 7c1cf6f
1 parent 040b8a5
commit 7c1cf6f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/stdr_gui/include/stdr_gui/stdr_gui_controller.h b/stdr_gui/include/stdr_gui/stdr_gui_controller.h
@@ -232,7 +232,7 @@ namespace stdr_gui
       void initializeCommunications(void);
 
       /**
-      @brief Receives the occupancy grid map from stdr_server. Connects to "map" ROS topic
+      @brief Receives the occupancy grid map from stdr_server. Connects to "stdr_map" ROS topic
       @param msg [const nav_msgs::OccupancyGrid&] The OGM message
       @return void
       **/

diff --git a/stdr_gui/src/stdr_gui/stdr_gui_controller.cpp b/stdr_gui/src/stdr_gui/stdr_gui_controller.cpp
@@ -80,7 +80,7 @@ namespace stdr_gui
   void CGuiController::initializeCommunications(void)
   {
     map_subscriber_ = n_.subscribe(
-      "map", 
+      "stdr_map",
       1, 
       &CGuiController::receiveMap,
       this);
@@ -466,7 +466,7 @@ namespace stdr_gui
   }
 
   /**
-  @brief Receives the occupancy grid map from stdr_server. Connects to "map" \
+  @brief Receives the occupancy grid map from stdr_server. Connects to "stdr_map" \
   ROS topic
   @param msg [const nav_msgs::OccupancyGrid&] The OGM message
   @return void

diff --git a/stdr_robot/src/stdr_robot.cpp b/stdr_robot/src/stdr_robot.cpp
@@ -56,7 +56,7 @@ namespace stdr_robot
     _registerClientPtr->sendGoal(goal,
       boost::bind(&Robot::initializeRobot, this, _1, _2));
 
-    _mapSubscriber = n.subscribe("map", 1, &Robot::mapCallback, this);
+    _mapSubscriber = n.subscribe("stdr_map", 1, &Robot::mapCallback, this);
     _moveRobotService = n.advertiseService(
       getName() + "/replace", &Robot::moveRobotCallback, this);
 

diff --git a/stdr_server/src/map_server.cpp b/stdr_server/src/map_server.cpp
@@ -64,11 +64,11 @@ namespace stdr_server {
       &MapServer::publishTransform, this);
 
     //!< Latched publisher for metadata
-    metadata_pub= n.advertise<nav_msgs::MapMetaData>("map_metadata", 1, true);
+    metadata_pub= n.advertise<nav_msgs::MapMetaData>("stdr_map_metadata", 1, true);
     metadata_pub.publish( meta_data_message_ );
 
     //!< Latched publisher for data
-    map_pub = n.advertise<nav_msgs::OccupancyGrid>("map", 1, true);
+    map_pub = n.advertise<nav_msgs::OccupancyGrid>("stdr_map", 1, true);
     map_pub.publish( map_ );
   }