diff --git a/nexus_integration_tests/CMakeLists.txt b/nexus_integration_tests/CMakeLists.txt index dbc13ab..e8c1518 100644 --- a/nexus_integration_tests/CMakeLists.txt +++ b/nexus_integration_tests/CMakeLists.txt @@ -115,7 +115,7 @@ add_custom_target(generate_zenoh_bridge_configs ALL COMMAND ros2 run nexus_network_configuration nexus_network_configuration -n ${nexus_network_cfg_path} -o ${zenoh_cfg_output_dir} ) -install(DIRECTORY launch config rviz scripts maps DESTINATION share/${PROJECT_NAME}) +install(DIRECTORY launch config rviz scripts DESTINATION share/${PROJECT_NAME}) # Install the zenoh config directory containing generated configs. message("zenoh_cfg_output_dir: " ${zenoh_cfg_output_dir}) install(DIRECTORY ${zenoh_cfg_output_dir} DESTINATION share/${PROJECT_NAME}/config/) @@ -178,7 +178,7 @@ endif() # Modified from rmf_demos_maps # Get absolute path of the building map -set(building_map "maps/depot/depot.building.yaml") +set(building_map "config/rmf/maps/depot/depot.building.yaml") get_filename_component(building_map_path ${building_map} REALPATH) # Get the output world name @@ -186,7 +186,7 @@ string(REGEX REPLACE "\\.[^.]*\.[^.]*$" "" no_extension_path ${building_map_path string(REGEX MATCH "[^\/]+$" world_name ${no_extension_path}) set(output_world_name ${world_name}) -set(output_dir ${CMAKE_CURRENT_BINARY_DIR}/maps/${output_world_name}) +set(output_dir ${CMAKE_CURRENT_BINARY_DIR}/config/rmf/maps/${output_world_name}) set(output_world_path ${output_dir}/${output_world_name}.world) set(output_model_dir ${output_dir}/models) @@ -199,7 +199,7 @@ message("REPLACING ROBOT MODELS WITH THOSE FROM FUEL") if (NO_DOWNLOAD_MODELS) add_custom_command( DEPENDS ${building_map_path} - COMMAND ros2 run rmf_building_map_tools building_map_generator gazebo ${building_map_path} ${output_world_path} ${output_model_dir} --TEMPLATE_WORLD_FILE ${CMAKE_CURRENT_SOURCE_DIR}/maps/depot/depot_template.sdf --SKIP_CAMERA_POSE + COMMAND ros2 run rmf_building_map_tools building_map_generator gazebo ${building_map_path} ${output_world_path} ${output_model_dir} --TEMPLATE_WORLD_FILE ${CMAKE_CURRENT_SOURCE_DIR}/config/rmf/maps/depot/depot_template.sdf --SKIP_CAMERA_POSE COMMAND sed -i 's|model:\/\/DeliveryRobot<\/uri>|https:\/\/fuel.gazebosim.org\/1.0\/Open-RMF\/models\/DeliveryRobotWithConveyor<\/uri>|g' ${output_world_path} OUTPUT ${output_world_path} ) @@ -207,7 +207,7 @@ else() message("DOWNLOADING MODELS WITH COMMAND: ros2 run rmf_building_map_tools building_map_model_downloader ${building_map_path}") add_custom_command( DEPENDS ${building_map_path} - COMMAND ros2 run rmf_building_map_tools building_map_generator gazebo ${building_map_path} ${output_world_path} ${output_model_dir} --TEMPLATE_WORLD_FILE ${CMAKE_CURRENT_SOURCE_DIR}/maps/depot/depot_template.sdf --SKIP_CAMERA_POSE + COMMAND ros2 run rmf_building_map_tools building_map_generator gazebo ${building_map_path} ${output_world_path} ${output_model_dir} --TEMPLATE_WORLD_FILE ${CMAKE_CURRENT_SOURCE_DIR}/config/rmf/maps/depot/depot_template.sdf --SKIP_CAMERA_POSE COMMAND sed -i 's|model:\/\/DeliveryRobot<\/uri>|https:\/\/fuel.gazebosim.org\/1.0\/Open-RMF\/models\/DeliveryRobotWithConveyor<\/uri>|g' ${output_world_path} COMMAND ros2 run rmf_building_map_tools building_map_model_downloader ${building_map_path} -e ~/.gazebo/models OUTPUT ${output_world_path} @@ -232,7 +232,7 @@ add_custom_target(generate_${output_world_name}_nav_graphs ALL install( DIRECTORY ${output_dir} - DESTINATION share/${PROJECT_NAME}/maps + DESTINATION share/${PROJECT_NAME}/config/rmf/maps ) ament_package() diff --git a/nexus_integration_tests/maps/depot/depot.building.yaml b/nexus_integration_tests/config/rmf/maps/depot/depot.building.yaml similarity index 100% rename from nexus_integration_tests/maps/depot/depot.building.yaml rename to nexus_integration_tests/config/rmf/maps/depot/depot.building.yaml diff --git a/nexus_integration_tests/maps/depot/depot_scan.png b/nexus_integration_tests/config/rmf/maps/depot/depot_scan.png similarity index 100% rename from nexus_integration_tests/maps/depot/depot_scan.png rename to nexus_integration_tests/config/rmf/maps/depot/depot_scan.png diff --git a/nexus_integration_tests/maps/depot/depot_template.sdf b/nexus_integration_tests/config/rmf/maps/depot/depot_template.sdf similarity index 100% rename from nexus_integration_tests/maps/depot/depot_template.sdf rename to nexus_integration_tests/config/rmf/maps/depot/depot_template.sdf diff --git a/nexus_integration_tests/launch/rmf_transporter.launch.xml b/nexus_integration_tests/launch/rmf_transporter.launch.xml index 4f9c6e1..96ac0a9 100644 --- a/nexus_integration_tests/launch/rmf_transporter.launch.xml +++ b/nexus_integration_tests/launch/rmf_transporter.launch.xml @@ -22,7 +22,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -63,8 +63,8 @@ - - + +