Create fetch_maps package

GaitechYu · Sep 16, 2015 · d7575a6 · d7575a6
1 parent 577547a
commit d7575a6
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 9 deletions.
diff --git a/fetch_maps/CMakeLists.txt b/fetch_maps/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(fetch_maps)
+
+find_package(catkin REQUIRED)
+catkin_package()
+
+install(
+  DIRECTORY maps
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+)
diff --git a/fetch_navigation/maps/4_26_15.pgm → fetch_maps/maps/4_26_15.pgm b/fetch_navigation/maps/4_26_15.pgm → fetch_maps/maps/4_26_15.pgm
diff --git a/fetch_navigation/maps/4_26_15.yaml → fetch_maps/maps/4_26_15.yaml b/fetch_navigation/maps/4_26_15.yaml → fetch_maps/maps/4_26_15.yaml
diff --git a/fetch_navigation/maps/4_26_15_keepout.pgm → fetch_maps/maps/4_26_15_keepout.pgm b/fetch_navigation/maps/4_26_15_keepout.pgm → fetch_maps/maps/4_26_15_keepout.pgm
diff --git a/fetch_navigation/maps/4_26_15_keepout.yaml → fetch_maps/maps/4_26_15_keepout.yaml b/fetch_navigation/maps/4_26_15_keepout.yaml → fetch_maps/maps/4_26_15_keepout.yaml
diff --git a/fetch_maps/package.xml b/fetch_maps/package.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<package>
+  <name>fetch_maps</name>
+  <version>0.0.1</version>
+  <description>The fetch_maps package</description>
+
+  <maintainer email="[email protected]">Michael Ferguson</maintainer>
+  <maintainer email="[email protected]">Aaron Blasdel</maintainer>
+  <author>Michael Gregg</author>
+  <author>Michael Ferguson</author>
+  <author>Aaron Blasdel</author>
+  <license>BSD</license>
+
+  <buildtool_depend>catkin</buildtool_depend>
+</package>
diff --git a/fetch_navigation/CMakeLists.txt b/fetch_navigation/CMakeLists.txt
@@ -14,11 +14,6 @@ install(
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
-install(
-  DIRECTORY maps
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-)
-
 install(
   PROGRAMS scripts/tilt_head.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

diff --git a/fetch_navigation/launch/fetch_nav.launch b/fetch_navigation/launch/fetch_nav.launch
@@ -3,8 +3,8 @@
   <!-- Navigation requires at least one map.
        In addition, it is sometimes desirable to have a "keepout" map
        which is used for costmaps, but not localization -->
-  <arg name="map_file" default="$(find fetch_navigation)/maps/4_26_15.yaml" />
-  <arg name="map_keepout_file" default="$(find fetch_navigation)/maps/4_26_15_keepout.yaml" />
+  <arg name="map_file" default="$(find fetch_maps)/maps/4_26_15.yaml" />
+  <arg name="map_keepout_file" default="$(find fetch_maps)/maps/4_26_15_keepout.yaml" />
   <arg name="use_keepout" default="false" />
 
   <!-- Navigation parameter files -->

diff --git a/fetch_navigation/launch/freight_nav.launch b/fetch_navigation/launch/freight_nav.launch
@@ -3,8 +3,8 @@
   <!-- Navigation requires at least one map.
        In addition, it is sometimes desirable to have a "keepout" map
        which is used for costmaps, but not localization -->
-  <arg name="map_file" default="$(find fetch_navigation)/maps/4_26_15.yaml" />
-  <arg name="map_keepout_file" default="$(find fetch_navigation)/maps/4_26_15_keepout.yaml" />
+  <arg name="map_file" default="$(find fetch_maps)/maps/4_26_15.yaml" />
+  <arg name="map_keepout_file" default="$(find fetch_maps)/maps/4_26_15_keepout.yaml" />
   <arg name="use_keepout" default="false" />
 
   <!-- Navigation parameter files -->

diff --git a/fetch_navigation/package.xml b/fetch_navigation/package.xml
@@ -10,5 +10,6 @@
 
   <run_depend>fetch_depth_layer</run_depend>
   <run_depend>navigation</run_depend>
+  <run_depend>fetch_maps</run_depend>
   <run_depend>slam_karto</run_depend>
 </package>