jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-17 18:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add backward compatibility with older versions of Traccar server (#146639)

Browse Source 
Co-authored-by: Joakim Sørensen <joasoe@proton.me>
This commit is contained in:
Robin Thoni 2025-07-04 14:36:25 +02:00 committed by GitHub
parent 1fc624c7a7
commit 4be2e84ce6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/traccar_server/coordinator.py
View File

@ -31,7 +31,7 @@ from .const import (
EVENTS,
LOGGER,
)
from .helpers import get_device, get_first_geofence
from .helpers import get_device, get_first_geofence, get_geofence_ids
class TraccarServerCoordinatorDataDevice(TypedDict):
@ -131,7 +131,7 @@ class TraccarServerCoordinator(DataUpdateCoordinator[TraccarServerCoordinatorDat
"device": device,
"geofence": get_first_geofence(
geofences,
position["geofenceIds"] or [],
get_geofence_ids(device, position),
),
"position": position,
"attributes": attr,
@ -187,7 +187,7 @@ class TraccarServerCoordinator(DataUpdateCoordinator[TraccarServerCoordinatorDat
self.data[device_id]["attributes"] = attr
self.data[device_id]["geofence"] = get_first_geofence(
self._geofences,
position["geofenceIds"] or [],
get_geofence_ids(self.data[device_id]["device"], position),
)
update_devices.add(device_id)

16
homeassistant/components/traccar_server/helpers.py
View File

@ -2,7 +2,7 @@
from __future__ import annotations
from pytraccar import DeviceModel, GeofenceModel
from pytraccar import DeviceModel, GeofenceModel, PositionModel
def get_device(device_id: int, devices: list[DeviceModel]) -> DeviceModel | None:
@ -22,3 +22,17 @@ def get_first_geofence(
(geofence for geofence in geofences if geofence["id"] in target),
None,
)
def get_geofence_ids(
device: DeviceModel,
position: PositionModel,
) -> list[int]:
"""Compatibility helper to return a list of geofence IDs."""
# For Traccar >=5.8 https://github.com/traccar/traccar/commit/30bafaed42e74863c5ca68a33c87f39d1e2de93d
if "geofenceIds" in position:
return position["geofenceIds"] or []
# For Traccar <5.8
if "geofenceIds" in device:
return device["geofenceIds"] or []
return []