Fixed use of OSC Paramters as entryNames for catalogs

Change-Id: I96287fc85ec3dc0d33e79e37fa078d5414054f9c
carla-simulator · Nov 8, 2021 · 19c8d59 · 19c8d59
1 parent e5b06cc
commit 19c8d59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Docs/CHANGELOG.md b/Docs/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 ### :bug: Bug Fixes
 * Fixed a bug with repetitions / scenario groups causing the simulation to crash after the second one.
+* Fixed use of OSC Parameters as entry names for catalogs
 
 ## CARLA ScenarioRunner 0.9.12
 ### :rocket: New Features

diff --git a/srunner/tools/openscenario_parser.py b/srunner/tools/openscenario_parser.py
@@ -361,8 +361,7 @@ def get_catalog_entry(catalogs, catalog_reference):
         returns:
             Catalog entry (XML ElementTree)
         """
-
-        entry = catalogs[catalog_reference.attrib.get("catalogName")][catalog_reference.attrib.get("entryName")]
+        entry = catalogs[catalog_reference.attrib.get("catalogName")][ParameterRef(catalog_reference.attrib.get("entryName"))]
         entry_copy = copy.deepcopy(entry)
         catalog_copy = copy.deepcopy(catalog_reference)
         entry = OpenScenarioParser.assign_catalog_parameters(entry_copy, catalog_copy)