Merge branch 'indigo' of https://github.com/turtlebot/turtlebot_apps …

…into indigo
turtlebot · May 27, 2015 · 1dfde6a · 1dfde6a
2 parents db87065 + 9a6b9b6
commit 1dfde6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/turtlebot_rapps/package.xml b/turtlebot_rapps/package.xml
@@ -39,7 +39,7 @@
 
     <rocon_app>rapps/waypoint_nav/waypoint_nav.rapp</rocon_app>
 
-    <!--<rocon_app>rapps/map_manager/map_manager.rapp</rocon_app>-->
+    <rocon_app>rapps/map_manager/map_manager.rapp</rocon_app>
     <rocon_app>rapps/teleop/teleop.rapp</rocon_app>
     <rocon_app>rapps/video_teleop/video_teleop.rapp</rocon_app>
     <rocon_app>rapps/xbox360_teleop/xbox360_teleop.rapp</rocon_app>

diff --git a/turtlebot_rapps/rapps/map_manager/map_manager.launch b/turtlebot_rapps/rapps/map_manager/map_manager.launch
@@ -10,4 +10,11 @@
   </node>
 -->
 <!--  <node pkg="map_store" type="map_manager" name="map_manager" output="screen"/>-->
+
+  <!-- World Canvas -->
+  <arg name="debug" default="false"/>
+  <node pkg="world_canvas_server" type="world_canvas_server" name="world_canvas_server" args="$(arg debug)" output="screen">
+    <param name="start_map_manager" value="true"/>
+    <param name="auto_save_map" value="false"/>
+  </node>
 </launch>