From b7b3a1908b0e7878e20448a74ddfcf856129246c Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronchongth@gmail.com>
Date: Wed, 8 Jun 2022 11:27:33 +0800
Subject: [PATCH] Cleaning up additional flat scenario on the roof

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
---
 .../launch/multi_uav_drag_flat_demo.launch.py | 54 -------------------
 ...ulti_uav_drag_with_handles_demo.launch.py} |  0
 mbzirc_ign/worlds/test/multi_drone_drag.sdf   | 10 ----
 3 files changed, 64 deletions(-)
 delete mode 100644 mbzirc_ign/launch/multi_uav_drag_flat_demo.launch.py
 rename mbzirc_ign/launch/{multi_uav_drag_flat_handles_demo.launch.py => multi_uav_drag_with_handles_demo.launch.py} (100%)

diff --git a/mbzirc_ign/launch/multi_uav_drag_flat_demo.launch.py b/mbzirc_ign/launch/multi_uav_drag_flat_demo.launch.py
deleted file mode 100644
index 93898567..00000000
--- a/mbzirc_ign/launch/multi_uav_drag_flat_demo.launch.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2022 Open Source Robotics Foundation, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from launch import LaunchDescription
-from launch.actions import IncludeLaunchDescription
-from launch.actions.execute_process import ExecuteProcess
-from launch.substitutions import ThisLaunchFileDir
-from launch.launch_description_sources import PythonLaunchDescriptionSource
-from launch_ros.actions import Node
-
-def generate_launch_description():
-    return LaunchDescription([
-        IncludeLaunchDescription(
-            PythonLaunchDescriptionSource(
-                [ThisLaunchFileDir(), '/spawn.launch.py']),
-            launch_arguments={
-                'name': 'quadrotor_1',
-                'world': 'empty_platform',
-                'model': 'mbzirc_quadrotor',
-                'x': '-0.21',
-                'y': '0.2',
-                'z': '4.45',
-                'P': '0',
-                'R': '0',
-                'gripper': 'mbzirc_suction_gripper'
-            }.items(),
-        ),
-        IncludeLaunchDescription(
-            PythonLaunchDescriptionSource(
-                [ThisLaunchFileDir(), '/spawn.launch.py']),
-            launch_arguments={
-                'name': 'quadrotor_2',
-                'world': 'empty_platform',
-                'model': 'mbzirc_quadrotor',
-                'x': '-0.71',
-                'y': '0.2',
-                'z': '4.45',
-                'P': '0',
-                'R': '0',
-                'gripper': 'mbzirc_suction_gripper'
-            }.items(),
-        ),
-    ])
diff --git a/mbzirc_ign/launch/multi_uav_drag_flat_handles_demo.launch.py b/mbzirc_ign/launch/multi_uav_drag_with_handles_demo.launch.py
similarity index 100%
rename from mbzirc_ign/launch/multi_uav_drag_flat_handles_demo.launch.py
rename to mbzirc_ign/launch/multi_uav_drag_with_handles_demo.launch.py
diff --git a/mbzirc_ign/worlds/test/multi_drone_drag.sdf b/mbzirc_ign/worlds/test/multi_drone_drag.sdf
index 87488d00..177f1871 100644
--- a/mbzirc_ign/worlds/test/multi_drone_drag.sdf
+++ b/mbzirc_ign/worlds/test/multi_drone_drag.sdf
@@ -135,15 +135,5 @@ ros2 run mbzirc_ign multi_uav_demo.py
         https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Large Dry Box Handles
       </uri>
     </include>
-
-    <!--
-    <include>
-      <name>large_crate_handles_flat</name>
-      <pose relative_to="Vessel F">-0.46 0.2 3.8 0 0 0.0</pose>
-      <uri>
-        https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Large Crate Handles
-      </uri>
-    </include>
-    -->
   </world>
 </sdf>