mirror of
https://github.com/home-assistant/frontend.git
synced 2025-08-01 13:37:47 +00:00
Merge remote-tracking branch 'origin/streaming_history_hui-graph-header-footer_maps' into remove_legacy_history_calls
This commit is contained in:
commit
73b49642f8
@ -330,41 +330,39 @@ class HuiMapCard extends LitElement implements LovelaceCard {
|
|||||||
|
|
||||||
const paths: HaMapPaths[] = [];
|
const paths: HaMapPaths[] = [];
|
||||||
|
|
||||||
Object.keys(history).forEach((entityId) => {
|
for (const entityId of Object.keys(history)) {
|
||||||
const entityStates = history[entityId];
|
const entityStates = history[entityId];
|
||||||
if (entityStates?.length > 1) {
|
if (!entityStates?.length) {
|
||||||
// filter location data from states and remove all invalid locations
|
continue;
|
||||||
const points = entityStates.reduce(
|
|
||||||
(accumulator: HaMapPathPoint[], entityState) => {
|
|
||||||
const latitude = entityState.a.latitude;
|
|
||||||
const longitude = entityState.a.longitude;
|
|
||||||
if (latitude && longitude) {
|
|
||||||
const p = {} as HaMapPathPoint;
|
|
||||||
p.point = [latitude, longitude] as LatLngTuple;
|
|
||||||
const t = new Date(entityState.lu * 1000);
|
|
||||||
if (config.hours_to_show! || DEFAULT_HOURS_TO_SHOW > 144) {
|
|
||||||
// if showing > 6 days in the history trail, show the full
|
|
||||||
// date and time
|
|
||||||
p.tooltip = formatDateTime(t, this.hass.locale);
|
|
||||||
} else if (isToday(t)) {
|
|
||||||
p.tooltip = formatTime(t, this.hass.locale);
|
|
||||||
} else {
|
|
||||||
p.tooltip = formatTimeWeekday(t, this.hass.locale);
|
|
||||||
}
|
|
||||||
accumulator.push(p);
|
|
||||||
}
|
|
||||||
return accumulator;
|
|
||||||
},
|
|
||||||
[]
|
|
||||||
) as HaMapPathPoint[];
|
|
||||||
|
|
||||||
paths.push({
|
|
||||||
points,
|
|
||||||
color: this._getColor(entityId),
|
|
||||||
gradualOpacity: 0.8,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
// filter location data from states and remove all invalid locations
|
||||||
|
const points: HaMapPathPoint[] = [];
|
||||||
|
for (const entityState of entityStates) {
|
||||||
|
const latitude = entityState.a.latitude;
|
||||||
|
const longitude = entityState.a.longitude;
|
||||||
|
if (!latitude || !longitude) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const p = {} as HaMapPathPoint;
|
||||||
|
p.point = [latitude, longitude] as LatLngTuple;
|
||||||
|
const t = new Date(entityState.lu * 1000);
|
||||||
|
if (config.hours_to_show! || DEFAULT_HOURS_TO_SHOW > 144) {
|
||||||
|
// if showing > 6 days in the history trail, show the full
|
||||||
|
// date and time
|
||||||
|
p.tooltip = formatDateTime(t, this.hass.locale);
|
||||||
|
} else if (isToday(t)) {
|
||||||
|
p.tooltip = formatTime(t, this.hass.locale);
|
||||||
|
} else {
|
||||||
|
p.tooltip = formatTimeWeekday(t, this.hass.locale);
|
||||||
|
}
|
||||||
|
points.push(p);
|
||||||
|
}
|
||||||
|
paths.push({
|
||||||
|
points,
|
||||||
|
color: this._getColor(entityId),
|
||||||
|
gradualOpacity: 0.8,
|
||||||
|
});
|
||||||
|
}
|
||||||
return paths;
|
return paths;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user