Fixed handling of Weather in OSC

Fixed an issue introduced 3 commits before (#656)
carla-simulator · Oct 20, 2020 · 5ca1878 · 5ca1878
1 parent 06ec3ac
commit 5ca1878
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/srunner/tools/openscenario_parser.py b/srunner/tools/openscenario_parser.py
@@ -284,8 +284,10 @@ def get_friction_from_env_action(xml_tree, catalogs):
         returns:
            friction (float)
         """
-        if xml_tree.find("EnvironmentAction") is not None:
-            set_environment = next(xml_tree.iter("EnvironmentAction"))
+
+        if xml_tree.findall('.//EnvironmentAction'):
+            node = xml_tree.findall('.//EnvironmentAction')[0]
+            set_environment = next(node.iter("EnvironmentAction"))
         else:
             return 1.0
 
@@ -316,8 +318,10 @@ def get_weather_from_env_action(xml_tree, catalogs):
         returns:
            Weather (srunner.scenariomanager.weather_sim.Weather)
         """
-        if xml_tree.find("EnvironmentAction") is not None:
-            set_environment = next(xml_tree.iter("EnvironmentAction"))
+
+        if xml_tree.findall('.//EnvironmentAction'):
+            node = xml_tree.findall('.//EnvironmentAction')[0]
+            set_environment = next(node.iter("EnvironmentAction"))
         else:
             return Weather(carla.WeatherParameters())