Merge pull request #237 from arup-group/fix-bug-236

bugfix 236
arup-group · Jul 12, 2023 · 4d180c4 · 4d180c4
2 parents db721ae + bb2d8e2
commit 4d180c4
Show file tree

Hide file tree

Showing 4 changed files with 1,129 additions and 894 deletions.
diff --git a/elara/event_handlers.py b/elara/event_handlers.py
@@ -56,7 +56,7 @@ def vehicle_mode(self, vehicle_id: str) -> str:
         :param vehicle_id: Vehicle ID string
         :return: Vehicle mode type string
         """
-        if vehicle_id in self.resources['transit_schedule'].veh_to_mode_map.keys():
+        if self.resources['transit_schedule'].is_transit(vehicle_id=vehicle_id):
             return self.resources['transit_schedule'].veh_to_mode_map[vehicle_id]
         elif vehicle_id in self.resources['vehicles'].veh_to_mode_map:
             return self.resources['vehicles'].veh_to_mode_map[vehicle_id]

diff --git a/elara/inputs.py b/elara/inputs.py
@@ -321,6 +321,15 @@ def build(
 
         self.logger.debug(f'Transit Schedule Route modes = {self.modes}')
         self.logger.debug(f'Transit Schedule Stop modes = {list(self.mode_to_stops_map)}')
+
+
+    def is_transit(self, vehicle_id: str) -> bool:
+        """Given a vehicle's ID, return if it is a transit mode.
+        Based on existance in veh_to_mode_map.
+        :param vehicle_id: Vehicle ID string
+        :return: bool
+        """
+        return vehicle_id in self.veh_to_mode_map
 
     @staticmethod
     def get_node_elem(elem):