Skip to content

Commit 04b2560

Browse files
authored
Install resource folder and use correct topic (#40)
* Resource folder needs to be installed, and will be empty for people who don't have sargans.tif * RVIZ was subscribed to the wrong topic because not all map_publisher nodes were launched with a namespace Signed-off-by: Ryan Friedman <[email protected]>
1 parent 341aaa5 commit 04b2560

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ install(DIRECTORY
9393
DESTINATION share/${PROJECT_NAME}/
9494
)
9595

96+
install(DIRECTORY
97+
resources
98+
DESTINATION share/${PROJECT_NAME}/
99+
)
100+
96101
# Test
97102
include(CTest)
98103
if(BUILD_TESTING)

launch/load_tif_launch.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<arg name="location" default="sargans"/>
44
<node pkg="tf2_ros" exec="static_transform_publisher" name="world_map" args="--frame-id world --child-frame-id map"/>
55

6-
<node pkg="grid_map_geo" exec="test_tif_loader" name="test_tif_loader" output="screen">
6+
<node pkg="grid_map_geo" exec="test_tif_loader" name="test_tif_loader" namespace="grid_map_geo" output="screen">
77
<param name="tif_path" value="$(find-pkg-share grid_map_geo)/resources/sargans.tif"/>
88
<param name="tif_color_path" value="$(find-pkg-share grid_map_geo)/resources/sargans_color.tif"/>
99
</node>
1010

1111
<group if="$(var rviz)">
12-
<node exec="rviz2" name="rviz2" pkg="rviz2" args="-d $(find-pkg-share grid_map_geo)/rviz/config.rviz" />
12+
<node pkg="rviz2" exec="rviz2" name="rviz2" args="-d $(find-pkg-share grid_map_geo)/rviz/config.rviz"/>
1313
</group>
1414
</launch>

resources/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)