From 3bdfbc2710e04a989aecbc3d4e7a2b7a6e31fe02 Mon Sep 17 00:00:00 2001
From: rafal-gorecki <rafal.gorecki@husarion.com>
Date: Mon, 6 May 2024 19:35:55 +0200
Subject: [PATCH] husarion_office_gz -> husarion_gz_worlds

---
 .gitignore                                                  | 2 +-
 rosbot/rosbot_simulation.repos                              | 4 ++--
 rosbot_gazebo/launch/simulation.launch.py                   | 2 +-
 rosbot_gazebo/package.xml                                   | 2 +-
 rosbot_gazebo/test/test_diff_drive_simulation.py            | 2 +-
 rosbot_gazebo/test/test_mecanum_simulation.py               | 2 +-
 rosbot_gazebo/test/test_multirobot_diff_drive_simulation.py | 2 +-
 rosbot_gazebo/test/test_multirobot_mecanum_simulation.py    | 2 +-
 rosbot_gazebo/test/test_namespaced_diff_drive_simulation.py | 2 +-
 rosbot_gazebo/test/test_namespaced_mecanum_simulation.py    | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 35a1da3b..c5a9c6c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ log
 rosbot_hardware_interfaces/
 ros_components_description/
 rosbot_controllers/
-husarion/husarion_office_gz
+husarion_gz_worlds
 gazebosim/gz_ros2_control
 diff_drive_controller
 imu_sensor_broadcaster
diff --git a/rosbot/rosbot_simulation.repos b/rosbot/rosbot_simulation.repos
index e4d80df2..bded3899 100644
--- a/rosbot/rosbot_simulation.repos
+++ b/rosbot/rosbot_simulation.repos
@@ -1,5 +1,5 @@
 repositories:
-  husarion/husarion_office_gz:
+  husarion_gz_worlds:
     type: git
-    url: https://github.com/husarion/husarion_office_gz
+    url: https://github.com/husarion/husarion_gz_worlds
     version: main
diff --git a/rosbot_gazebo/launch/simulation.launch.py b/rosbot_gazebo/launch/simulation.launch.py
index 2346f2b6..ab6afe7e 100644
--- a/rosbot_gazebo/launch/simulation.launch.py
+++ b/rosbot_gazebo/launch/simulation.launch.py
@@ -135,7 +135,7 @@ def generate_launch_description():
         ),
     )
 
-    world_package = FindPackageShare("husarion_office_gz")
+    world_package = FindPackageShare("husarion_gz_worlds")
     world_file = PathJoinSubstitution([world_package, "worlds", "husarion_world.sdf"])
     declare_world_arg = DeclareLaunchArgument(
         "world", default_value=world_file, description="SDF world file"
diff --git a/rosbot_gazebo/package.xml b/rosbot_gazebo/package.xml
index 2b532de4..6a7b7bf0 100644
--- a/rosbot_gazebo/package.xml
+++ b/rosbot_gazebo/package.xml
@@ -20,7 +20,7 @@
   <exec_depend>launch</exec_depend>
   <exec_depend>launch_ros</exec_depend>
 
-  <exec_depend>husarion_office_gz</exec_depend>
+  <exec_depend>husarion_gz_worlds</exec_depend>
   <exec_depend>ros_gz_sim</exec_depend>
   <!-- Ignition dependency is specified in the ros_gz_sim package,
     version can chosen using GZ_VERSION (or IGNITION_VERSION) env variable,
diff --git a/rosbot_gazebo/test/test_diff_drive_simulation.py b/rosbot_gazebo/test/test_diff_drive_simulation.py
index f84ec569..981c7cb4 100644
--- a/rosbot_gazebo/test/test_diff_drive_simulation.py
+++ b/rosbot_gazebo/test/test_diff_drive_simulation.py
@@ -47,7 +47,7 @@ def generate_test_description():
             "headless": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]
diff --git a/rosbot_gazebo/test/test_mecanum_simulation.py b/rosbot_gazebo/test/test_mecanum_simulation.py
index 3f41f7e7..c6ab6695 100644
--- a/rosbot_gazebo/test/test_mecanum_simulation.py
+++ b/rosbot_gazebo/test/test_mecanum_simulation.py
@@ -48,7 +48,7 @@ def generate_test_description():
             "headless": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]
diff --git a/rosbot_gazebo/test/test_multirobot_diff_drive_simulation.py b/rosbot_gazebo/test/test_multirobot_diff_drive_simulation.py
index a0c09690..549bc2bd 100644
--- a/rosbot_gazebo/test/test_multirobot_diff_drive_simulation.py
+++ b/rosbot_gazebo/test/test_multirobot_diff_drive_simulation.py
@@ -38,7 +38,7 @@ def generate_test_description():
             "launch",
             "rosbot_gazebo",
             "simulation.launch.py",
-            (f'world:={FindPackageShare("husarion_office_gz")}' "/worlds/empty_with_plugins.sdf"),
+            (f'world:={FindPackageShare("husarion_gz_worlds")}' "/worlds/empty_with_plugins.sdf"),
             "robots:=robot1={y: -4.0}; robot2={y: 0.0};",
             "headless:=True",
         ],
diff --git a/rosbot_gazebo/test/test_multirobot_mecanum_simulation.py b/rosbot_gazebo/test/test_multirobot_mecanum_simulation.py
index a4e2782a..79120cce 100644
--- a/rosbot_gazebo/test/test_multirobot_mecanum_simulation.py
+++ b/rosbot_gazebo/test/test_multirobot_mecanum_simulation.py
@@ -38,7 +38,7 @@ def generate_test_description():
             "launch",
             "rosbot_gazebo",
             "simulation.launch.py",
-            (f'world:={FindPackageShare("husarion_office_gz")}' "/worlds/empty_with_plugins.sdf"),
+            (f'world:={FindPackageShare("husarion_gz_worlds")}' "/worlds/empty_with_plugins.sdf"),
             "robots:=robot1={y: -4.0}; robot2={y: 0.0};",
             "mecanum:=True",
             "headless:=True",
diff --git a/rosbot_gazebo/test/test_namespaced_diff_drive_simulation.py b/rosbot_gazebo/test/test_namespaced_diff_drive_simulation.py
index b817db65..c9bef37f 100644
--- a/rosbot_gazebo/test/test_namespaced_diff_drive_simulation.py
+++ b/rosbot_gazebo/test/test_namespaced_diff_drive_simulation.py
@@ -47,7 +47,7 @@ def generate_test_description():
             "headless": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]
diff --git a/rosbot_gazebo/test/test_namespaced_mecanum_simulation.py b/rosbot_gazebo/test/test_namespaced_mecanum_simulation.py
index b60dd613..6ba653d0 100644
--- a/rosbot_gazebo/test/test_namespaced_mecanum_simulation.py
+++ b/rosbot_gazebo/test/test_namespaced_mecanum_simulation.py
@@ -47,7 +47,7 @@ def generate_test_description():
             "mecanum": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]