From 95c8ff481e97a9cbcde42c6f6fafdb711662245f Mon Sep 17 00:00:00 2001
From: Martin Pecka <peckama2@fel.cvut.cz>
Date: Tue, 30 Nov 2021 14:43:36 +0100
Subject: [PATCH 1/3] Remove duplicate mapping server relays from Spot

---
 .../launch/vehicle_topics.launch                             | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/submitted_models/ctu_cras_norlab_spot_sensor_config_1/launch/vehicle_topics.launch b/submitted_models/ctu_cras_norlab_spot_sensor_config_1/launch/vehicle_topics.launch
index 495200ee..f3f6ad82 100644
--- a/submitted_models/ctu_cras_norlab_spot_sensor_config_1/launch/vehicle_topics.launch
+++ b/submitted_models/ctu_cras_norlab_spot_sensor_config_1/launch/vehicle_topics.launch
@@ -69,9 +69,6 @@
             <arg name="node_name_suffix" value="imu_vras" />
         </include>
 
-        <!-- Mapping Server -->
-        <include file="$(find subt_ros)/launch/models_common/mapping_server_relays.launch">
-          <arg name="name" value="$(arg name)"/>
-        </include>
+        <!-- Mapping Server relays are included from the base model -->
     </group>
 </launch>

From b690bd82e8fc39d3d4e0e24e9850fdef3fd2421d Mon Sep 17 00:00:00 2001
From: Martin Pecka <peckama2@fel.cvut.cz>
Date: Tue, 30 Nov 2021 14:44:26 +0100
Subject: [PATCH 2/3] Remove duplicate mapping server relays from Spot

---
 .../marble_spot_sensor_config_1/launch/vehicle_topics.launch | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/submitted_models/marble_spot_sensor_config_1/launch/vehicle_topics.launch b/submitted_models/marble_spot_sensor_config_1/launch/vehicle_topics.launch
index a3d794b8..25fa6239 100644
--- a/submitted_models/marble_spot_sensor_config_1/launch/vehicle_topics.launch
+++ b/submitted_models/marble_spot_sensor_config_1/launch/vehicle_topics.launch
@@ -87,10 +87,7 @@
             <arg name="node_name_suffix" value="imu_vras" />
         </include>
 
-        <!-- Mapping Server -->
-        <include file="$(find subt_ros)/launch/models_common/mapping_server_relays.launch">
-          <arg name="name" value="$(arg name)"/>
-        </include>
+        <!-- Mapping Server relays are included from the base model -->
 
     </group>
 </launch>

From 3443106aad97bfacbdd108990712b9a25001c1fa Mon Sep 17 00:00:00 2001
From: Martin Pecka <peckama2@fel.cvut.cz>
Date: Tue, 30 Nov 2021 14:45:02 +0100
Subject: [PATCH 3/3] Removed duplicate mapping server relays from Spot

---
 .../marble_spot_sensor_config_2/launch/vehicle_topics.launch | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/submitted_models/marble_spot_sensor_config_2/launch/vehicle_topics.launch b/submitted_models/marble_spot_sensor_config_2/launch/vehicle_topics.launch
index 27f28a47..a76ef78b 100644
--- a/submitted_models/marble_spot_sensor_config_2/launch/vehicle_topics.launch
+++ b/submitted_models/marble_spot_sensor_config_2/launch/vehicle_topics.launch
@@ -87,9 +87,6 @@
             <arg name="node_name_suffix" value="imu_vras" />
         </include>
 
-        <!-- Mapping Server -->
-        <include file="$(find subt_ros)/launch/models_common/mapping_server_relays.launch">
-          <arg name="name" value="$(arg name)"/>
-        </include>
+        <!-- Mapping Server relays are included from the base model -->
     </group>
 </launch>