AUTO-6408: Fix incorrect map name to match with hd map

daviduhm · daviduhm · commit 13c92096e7b0 · 2021-03-11T18:31:35.000-08:00
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_B_15.py b/examples/NHTSA/Perform-Lane-Change/PLC_B_15.py
@@ -30,7 +30,7 @@
 print("PLC_B_15 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_B_25.py b/examples/NHTSA/Perform-Lane-Change/PLC_B_25.py
@@ -30,7 +30,7 @@
 print("PLC_B_25 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_B_35.py b/examples/NHTSA/Perform-Lane-Change/PLC_B_35.py
@@ -30,7 +30,7 @@
 print("PLC_B_35 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_CP_15.py b/examples/NHTSA/Perform-Lane-Change/PLC_CP_15.py
@@ -32,7 +32,7 @@
 print("PLC_CP_15 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_CP_25.py b/examples/NHTSA/Perform-Lane-Change/PLC_CP_25.py
@@ -32,7 +32,7 @@
 print("PLC_CP_25 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_CP_35.py b/examples/NHTSA/Perform-Lane-Change/PLC_CP_35.py
@@ -32,7 +32,7 @@
 print("PLC_CP_35 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_SN_15.py b/examples/NHTSA/Perform-Lane-Change/PLC_SN_15.py
@@ -38,7 +38,7 @@
 print("PLC_SN_15 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_SN_25.py b/examples/NHTSA/Perform-Lane-Change/PLC_SN_25.py
@@ -32,7 +32,7 @@
 print("PLC_SN_25 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_SN_35.py b/examples/NHTSA/Perform-Lane-Change/PLC_SN_35.py
@@ -32,7 +32,7 @@
 print("PLC_SN_35 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_SP_15.py b/examples/NHTSA/Perform-Lane-Change/PLC_SP_15.py
@@ -30,7 +30,7 @@
 print("PLC_SP_15 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_SP_25.py b/examples/NHTSA/Perform-Lane-Change/PLC_SP_25.py
@@ -30,7 +30,7 @@
 print("PLC_SP_25 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/examples/NHTSA/Perform-Lane-Change/PLC_SP_35.py b/examples/NHTSA/Perform-Lane-Change/PLC_SP_35.py
@@ -30,7 +30,7 @@
 print("PLC_SP_35 - ", end='')
 
 sim = lgsvl.Simulator(LGSVL__SIMULATOR_HOST, LGSVL__SIMULATOR_PORT)
-scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight1lanesame)
+scene_name = env.str("LGSVL__MAP", lgsvl.wise.DefaultAssets.map_straight2lanesame)
 if sim.current_scene == scene_name:
     sim.reset()
 else:
diff --git a/lgsvl/wise/wise.py b/lgsvl/wise/wise.py
@@ -45,6 +45,10 @@ class DefaultAssets:
     # https://wise.svlsimulator.com/maps/profile/1e2287cf-c590-4804-bcb1-18b2fd3752d1
     map_straight1lanesame = "1e2287cf-c590-4804-bcb1-18b2fd3752d1"
 
+    # Map loaded in some of the examples. Changing the map may lead to unexpected behaviour in the example scripts. Default value is "Straight2LaneSame".
+    # https://wise.svlsimulator.com/maps/profile/b39d3ef9-21d7-409d-851b-4c90dad80a25
+    map_straight2lanesame = "b39d3ef9-21d7-409d-851b-4c90dad80a25"
+
     # Map loaded in some of the examples. Changing the map may lead to unexpected behaviour in the example scripts. Default value is "Straight2LaneSameCurbRightIntersection".
     # https://wise.svlsimulator.com/maps/profile/378edc3f-8fce-4596-87dc-7d12fc2ad743
     map_straight2lanesamecurbrightintersection = "378edc3f-8fce-4596-87dc-7d12fc2ad743"
