From 0c304e9b232d29bea90fac70a81b1050ec57c32e Mon Sep 17 00:00:00 2001
From: Hilary Luo <103377417+hilary-luo@users.noreply.github.com>
Date: Thu, 11 Apr 2024 17:07:57 -0400
Subject: [PATCH] Update deprecated links (#70)

* Update deprecated links

* Commented out models that are currently broken on the fuel server
---
 turtlebot4_ignition_bringup/worlds/depot.sdf  |  2 +-
 .../worlds/warehouse.sdf                      | 46 ++++++++++---------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/turtlebot4_ignition_bringup/worlds/depot.sdf b/turtlebot4_ignition_bringup/worlds/depot.sdf
index af0ce8d..c7f04c0 100644
--- a/turtlebot4_ignition_bringup/worlds/depot.sdf
+++ b/turtlebot4_ignition_bringup/worlds/depot.sdf
@@ -14,7 +14,7 @@
 
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Depot
+        https://fuel.gazebosim.org/1.0/OpenRobotics/models/Depot
       </uri>
     </include>
 
diff --git a/turtlebot4_ignition_bringup/worlds/warehouse.sdf b/turtlebot4_ignition_bringup/worlds/warehouse.sdf
index 4acac6d..eb31ad1 100644
--- a/turtlebot4_ignition_bringup/worlds/warehouse.sdf
+++ b/turtlebot4_ignition_bringup/worlds/warehouse.sdf
@@ -43,75 +43,76 @@
     <!-- Base -->
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Warehouse
+        https://fuel.gazebosim.org/1.0/OpenRobotics/models/Warehouse
       </uri>
       <name>warehouse</name>
       <pose>0 0 -0.1 0 0 0</pose>
     </include>
 
     <!-- Pallet Box Mobile -->
+    <!--
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/pallet_box_mobile
+        https://fuel.gazebosim.org/1.0/MovAi/models/pallet_box_mobile
       </uri>
       <name>pallet_box_0</name>
       <pose>-4 12 0.01 0 0 0</pose>
       <static>true</static>
-    </include>
+    </include> -->
 
     <!-- Shelves -->
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf_big
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf_big
       </uri>
       <name>shelf_big_0</name>
       <pose>-8.5 -13 0 0 -0 0</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf_big
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf_big
       </uri>
       <name>shelf_big_1</name>
       <pose>6.5 -13 0 0 -0 0</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf_big
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf_big
       </uri>
       <name>shelf_big_2</name>
       <pose>-1.5 -13 0 0 -0 0</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_3</name>
       <pose>13.5 4.5 0 0 -0 0</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_4</name>
       <pose>10 4.5 0 0 -0 0</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_5</name>
       <pose>13.5 -21 0 0 -0 0</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_6</name>
       <pose>13.5 -15 0 0 -0 0</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_7</name>
       <pose>0.4 -2 0 0 -0 0</pose>
@@ -121,35 +122,35 @@
 
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf_big
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf_big
       </uri>
       <name>shelf_big_3</name>
       <pose>3.5 9.5 0 0 0 1.57</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf_big
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf_big
       </uri>
       <name>shelf_big_4</name>
       <pose>-1.3 18.5 0 0 0 1.57</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_0</name>
       <pose>-10 21.5 0 0 -0 1.57</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_1</name>
       <pose>-7 23.6 0 0 -0 1.57</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/MovAi/models/shelf
+        https://fuel.gazebosim.org/1.0/MovAi/models/shelf
       </uri>
       <name>shelf_2</name>
       <pose>-4 21.5 0 0 -0 1.57</pose>
@@ -190,28 +191,28 @@
 
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Chair
+        https://fuel.gazebosim.org/1.0/OpenRobotics/models/Chair
       </uri>
       <name>chair_0</name>
       <pose>14.3 -5.5 0 0 -0 3</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Chair
+        https://fuel.gazebosim.org/1.0/OpenRobotics/models/Chair
       </uri>
       <name>chair_1</name>
       <pose>14.3 -4 0 0 -0 -3</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/foldable_chair
+        https://fuel.gazebosim.org/1.0/OpenRobotics/models/foldable_chair
       </uri>
       <name>fchair_0</name>
       <pose>-11.5 6.4 0 0 -0 -1.8</pose>
     </include>
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/foldable_chair
+        https://fuel.gazebosim.org/1.0/OpenRobotics/models/foldable_chair
       </uri>
       <name>fchair1</name>
       <pose>-14 6.5 0 0 -0 1.9</pose>
@@ -221,7 +222,7 @@
 
     <include>
       <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Table
+        https://fuel.gazebosim.org/1.0/OpenRobotics/models/Table
       </uri>
       <name>table0</name>
       <pose>-12.7 6.5 0 0 0 0</pose>
@@ -229,13 +230,14 @@
 
     <!-- People -->
 
+    <!--
     <include>
       <uri>
       https://fuel.gazebosim.org/1.0/OpenRobotics/models/Rescue Randy Sitting
       </uri>
       <name>Person 0 - Sitting</name>
       <pose>14.65 -10 0 0 0 -1.57</pose>
-    </include> 
+    </include> -->
 
     <include>
       <uri>