diff --git a/Docs/CHANGELOG.md b/Docs/CHANGELOG.md index c275f2275..5990772a2 100644 --- 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 index 4e5384e27..5dc0f8536 100644 --- 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)