From cb1c38a8d4f4e9b265d572768f9f433a6104fe45 Mon Sep 17 00:00:00 2001
From: bernat <bernatx@gmail.com>
Date: Wed, 28 Jul 2021 09:11:53 +0200
Subject: [PATCH] Fixing some vehicle names

---
 Docs/tuto_G_scenic.md                                         | 2 +-
 PythonAPI/examples/lidar_to_camera.py                         | 2 +-
 .../examples/rss/scenarios/unstructured_blocked_road.xosc     | 4 ++--
 .../rss/scenarios/unstructured_pedestrian_on_road.xosc        | 2 +-
 PythonAPI/util/check_lidar_bb.py                              | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Docs/tuto_G_scenic.md b/Docs/tuto_G_scenic.md
index f9f2d1323..81e648989 100644
--- a/Docs/tuto_G_scenic.md
+++ b/Docs/tuto_G_scenic.md
@@ -66,7 +66,7 @@ The scenario involves two vehicles, the leading vehicle and the ego vehicle. We
 
 ```scenic
 ## CONSTANTS
-EGO_MODEL = "vehicle.lincoln.mkz2017"
+EGO_MODEL = "vehicle.lincoln.mkz_2017"
 EGO_SPEED = 10
 EGO_BRAKING_THRESHOLD = 12
 
diff --git a/PythonAPI/examples/lidar_to_camera.py b/PythonAPI/examples/lidar_to_camera.py
index f6adc9fa5..cc409e809 100644
--- a/PythonAPI/examples/lidar_to_camera.py
+++ b/PythonAPI/examples/lidar_to_camera.py
@@ -76,7 +76,7 @@ def tutorial(args):
 
     try:
         # Search the desired blueprints
-        vehicle_bp = bp_lib.filter("vehicle.lincoln.mkz2017")[0]
+        vehicle_bp = bp_lib.filter("vehicle.lincoln.mkz_2017")[0]
         camera_bp = bp_lib.filter("sensor.camera.rgb")[0]
         lidar_bp = bp_lib.filter("sensor.lidar.ray_cast")[0]
 
diff --git a/PythonAPI/examples/rss/scenarios/unstructured_blocked_road.xosc b/PythonAPI/examples/rss/scenarios/unstructured_blocked_road.xosc
index 92b489940..81556ba5b 100644
--- a/PythonAPI/examples/rss/scenarios/unstructured_blocked_road.xosc
+++ b/PythonAPI/examples/rss/scenarios/unstructured_blocked_road.xosc
@@ -12,7 +12,7 @@
   </RoadNetwork>
   <Entities>
     <ScenarioObject name="hero">
-      <Vehicle name="vehicle.lincoln.mkz2017" vehicleCategory="car">
+      <Vehicle name="vehicle.lincoln.mkz_2017" vehicleCategory="car">
         <ParameterDeclarations/>
         <Performance maxSpeed="69.444" maxAcceleration="10.0" maxDeceleration="10.0"/>
         <BoundingBox>
@@ -30,7 +30,7 @@
       </Vehicle>
     </ScenarioObject>
     <ScenarioObject name="blockingVehicle">
-      <Vehicle name="vehicle.lincoln.mkz2017" vehicleCategory="car">
+      <Vehicle name="vehicle.lincoln.mkz_2017" vehicleCategory="car">
         <ParameterDeclarations/>
         <Performance maxSpeed="69.444" maxAcceleration="10.0" maxDeceleration="10.0"/>
         <BoundingBox>
diff --git a/PythonAPI/examples/rss/scenarios/unstructured_pedestrian_on_road.xosc b/PythonAPI/examples/rss/scenarios/unstructured_pedestrian_on_road.xosc
index 40230351a..b8dbb2a1d 100644
--- a/PythonAPI/examples/rss/scenarios/unstructured_pedestrian_on_road.xosc
+++ b/PythonAPI/examples/rss/scenarios/unstructured_pedestrian_on_road.xosc
@@ -9,7 +9,7 @@
     </RoadNetwork>
     <Entities>
         <ScenarioObject name="hero">
-            <Vehicle name="vehicle.lincoln.mkz2017" vehicleCategory="car">
+            <Vehicle name="vehicle.lincoln.mkz_2017" vehicleCategory="car">
                 <ParameterDeclarations/>
                 <Performance maxSpeed="69.444" maxAcceleration="200" maxDeceleration="10.0"/>
                 <BoundingBox>
diff --git a/PythonAPI/util/check_lidar_bb.py b/PythonAPI/util/check_lidar_bb.py
index 316d44c48..b7dcdb9c6 100644
--- a/PythonAPI/util/check_lidar_bb.py
+++ b/PythonAPI/util/check_lidar_bb.py
@@ -316,7 +316,7 @@ def main():
         sensor_queue = Queue()
 
         # Spawning ego vehicle
-        actor_BP = world.get_blueprint_library().filter("vehicle.lincoln.mkz2017")[0]
+        actor_BP = world.get_blueprint_library().filter("vehicle.lincoln.mkz_2017")[0]
         car_tr = carla.Transform(carla.Location(x=239, y=125, z=0.9), carla.Rotation(yaw=-88.5))
         actor = world.spawn_actor(actor_BP, car_tr)
 
@@ -368,4 +368,3 @@ if __name__ == "__main__":
         main()
     except KeyboardInterrupt:
         print(' - Exited by user.')
-