evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expose more attributes in rejseplanen (#37216)

Browse source
This commit is contained in:
Martin Eberhardt 2020-09-03 13:43:35 +02:00 • committed by GitHub
parent 1c90bdddb4
commit 8ca9724258
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
homeassistant/components/rejseplanen/sensor.py
View file

@ -24,8 +24,12 @@ ATTR_STOP_NAME = "stop"
ATTR_ROUTE = "route" ATTR_ROUTE = "route"
ATTR_TYPE = "type" ATTR_TYPE = "type"
ATTR_DIRECTION = "direction" ATTR_DIRECTION = "direction"
ATTR_FINAL_STOP = "final_stop"
ATTR_DUE_IN = "due_in" ATTR_DUE_IN = "due_in"
ATTR_DUE_AT = "due_at" ATTR_DUE_AT = "due_at"
ATTR_SCHEDULED_AT = "scheduled_at"
ATTR_REAL_TIME_AT = "real_time_at"
ATTR_TRACK = "track"
ATTR_NEXT_UP = "next_departures" ATTR_NEXT_UP = "next_departures"
ATTRIBUTION = "Data provided by rejseplanen.dk" ATTRIBUTION = "Data provided by rejseplanen.dk"
@ -115,18 +119,17 @@ class RejseplanenTransportSensor(Entity):
if len(self._times) > 1: if len(self._times) > 1:
next_up = self._times[1:] next_up = self._times[1:]
return { attributes = {
ATTR_DUE_IN: self._times[0][ATTR_DUE_IN],
ATTR_DUE_AT: self._times[0][ATTR_DUE_AT],
ATTR_TYPE: self._times[0][ATTR_TYPE],
ATTR_ROUTE: self._times[0][ATTR_ROUTE],
ATTR_DIRECTION: self._times[0][ATTR_DIRECTION],
ATTR_STOP_NAME: self._times[0][ATTR_STOP_NAME],
ATTR_STOP_ID: self._stop_id,
ATTR_ATTRIBUTION: ATTRIBUTION, ATTR_ATTRIBUTION: ATTRIBUTION,
ATTR_NEXT_UP: next_up, ATTR_NEXT_UP: next_up,
ATTR_STOP_ID: self._stop_id,
} }
if self._times[0] is not None:
attributes.update(self._times[0])
return attributes
@property @property
def unit_of_measurement(self): def unit_of_measurement(self):
"""Return the unit this state is expressed in.""" """Return the unit this state is expressed in."""
@ -203,13 +206,15 @@ class PublicTransportData:
for item in results: for item in results:
route = item.get("name") route = item.get("name")
due_at_date = item.get("rtDate") scheduled_date = item.get("date")
due_at_time = item.get("rtTime") scheduled_time = item.get("time")
real_time_date = due_at_date = item.get("rtDate")
real_time_time = due_at_time = item.get("rtTime")
if due_at_date is None: if due_at_date is None:
due_at_date = item.get("date") # Scheduled date due_at_date = scheduled_date
if due_at_time is None: if due_at_time is None:
due_at_time = item.get("time") # Scheduled time due_at_time = scheduled_time
if ( if (
due_at_date is not None due_at_date is not None
@ -217,15 +222,26 @@ class PublicTransportData:
and route is not None and route is not None
): ):
due_at = f"{due_at_date} {due_at_time}" due_at = f"{due_at_date} {due_at_time}"
scheduled_at = f"{scheduled_date} {scheduled_time}"
departure_data = { departure_data = {
ATTR_DIRECTION: item.get("direction"),
ATTR_DUE_IN: due_in_minutes(due_at), ATTR_DUE_IN: due_in_minutes(due_at),
ATTR_DUE_AT: due_at, ATTR_DUE_AT: due_at,
ATTR_TYPE: item.get("type"), ATTR_FINAL_STOP: item.get("finalStop"),
ATTR_ROUTE: route, ATTR_ROUTE: route,
ATTR_DIRECTION: item.get("direction"), ATTR_SCHEDULED_AT: scheduled_at,
ATTR_STOP_NAME: item.get("stop"), ATTR_STOP_NAME: item.get("stop"),
ATTR_TYPE: item.get("type"),
} }
if real_time_date is not None and real_time_time is not None:
departure_data[
ATTR_REAL_TIME_AT
] = f"{real_time_date} {real_time_time}"
if item.get("rtTrack") is not None:
departure_data[ATTR_TRACK] = item.get("rtTrack")
self.info.append(departure_data) self.info.append(departure_data)
if not self.info: if not self.info: