Fix timezone issue (home-assistant#92005)

konnected-io · Apr 25, 2023 · 74e3cac · 74e3cac
1 parent 083f42c
commit 74e3cac
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/homeassistant/components/gtfs/sensor.py b/homeassistant/components/gtfs/sensor.py
@@ -610,14 +610,6 @@ def update(self) -> None:
                 self._include_tomorrow,
             )
 
-            # Define the state as a UTC timestamp with ISO 8601 format
-            if not self._departure:
-                self._state = None
-            else:
-                self._state = self._departure["departure_time"].replace(
-                    tzinfo=dt_util.UTC
-                )
-
             # Fetch trip and route details once, unless updated
             if not self._departure:
                 self._trip = None
@@ -648,6 +640,19 @@ def update(self) -> None:
                     )
                     self._agency = False
 
+            # Define the state as a UTC timestamp with ISO 8601 format
+            if not self._departure:
+                self._state = None
+            else:
+                if self._agency:
+                    self._state = self._departure["departure_time"].replace(
+                        tzinfo=dt_util.get_time_zone(self._agency.agency_timezone)
+                    )
+                else:
+                    self._state = self._departure["departure_time"].replace(
+                        tzinfo=dt_util.UTC
+                    )
+
             # Assign attributes, icon and name
             self.update_attributes()