From 93b8cc38d8fd83b918484f29d34b65629c1fcfdf Mon Sep 17 00:00:00 2001
From: Simon Lamon <32477463+silamon@users.noreply.github.com>
Date: Mon, 2 Jun 2025 15:13:23 +0200
Subject: [PATCH] Small nmbs sensor attributes refactoring (#145956)

Attributes refactoring
---
 homeassistant/components/nmbs/sensor.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/nmbs/sensor.py b/homeassistant/components/nmbs/sensor.py
index 9cd41b412d0..1bb83e142d5 100644
--- a/homeassistant/components/nmbs/sensor.py
+++ b/homeassistant/components/nmbs/sensor.py
@@ -247,7 +247,6 @@ class NMBSSensor(SensorEntity):
 
         delay = get_delay_in_minutes(self._attrs.departure.delay)
         departure = get_time_until(self._attrs.departure.time)
-        canceled = self._attrs.departure.canceled
 
         attrs = {
             "destination": self._attrs.departure.station,
@@ -257,14 +256,13 @@ class NMBSSensor(SensorEntity):
             "vehicle_id": self._attrs.departure.vehicle,
         }
 
-        if not canceled:
-            attrs["departure"] = f"In {departure} minutes"
-            attrs["departure_minutes"] = departure
-            attrs["canceled"] = False
-        else:
+        attrs["canceled"] = self._attrs.departure.canceled
+        if attrs["canceled"]:
             attrs["departure"] = None
             attrs["departure_minutes"] = None
-            attrs["canceled"] = True
+        else:
+            attrs["departure"] = f"In {departure} minutes"
+            attrs["departure_minutes"] = departure
 
         if self._show_on_map and self.station_coordinates:
             attrs[ATTR_LATITUDE] = self.station_coordinates[0]
@@ -280,9 +278,8 @@ class NMBSSensor(SensorEntity):
                 via.timebetween
             ) + get_delay_in_minutes(via.departure.delay)
 
-        if delay > 0:
-            attrs["delay"] = f"{delay} minutes"
-            attrs["delay_minutes"] = delay
+        attrs["delay"] = f"{delay} minutes"
+        attrs["delay_minutes"] = delay
 
         return attrs