Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions src/panels/lovelace/cards/hui-map-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,24 @@ class HuiMapCard extends PolymerElement {
throw new Error("Error in card configuration.");
}

this._configEntities = processConfigEntities(config.entities);
if (!config.entities && !config.geo_location_sources) {
throw new Error(
"Either entities or geo_location_sources must be defined"
);
}
if (config.entities && !Array.isArray(config.entities)) {
throw new Error("Entities need to be an array");
}
if (
config.geo_location_sources &&
!Array.isArray(config.geo_location_sources)
) {
throw new Error("Geo_location_sources needs to be an array");
}

this._config = config;
this._configGeoLocationSources = config.geo_location_sources;
this._configEntities = config.entities;
}

getCardSize() {
Expand Down Expand Up @@ -205,7 +221,24 @@ class HuiMapCard extends PolymerElement {
}
const mapItems = (this._mapItems = []);

this._configEntities.forEach((entity) => {
let allEntities = [];
if (this._configEntities) {
allEntities = allEntities.concat(this._configEntities);
}
if (this._configGeoLocationSources) {
Object.keys(this.hass.states).forEach((entityId) => {
const stateObj = this.hass.states[entityId];
if (
computeStateDomain(stateObj) === "geo_location" &&
this._configGeoLocationSources.includes(stateObj.attributes.source)
) {
allEntities.push(entityId);
}
});
}
allEntities = processConfigEntities(allEntities);

allEntities.forEach((entity) => {
const entityId = entity.entity;
if (!(entityId in hass.states)) {
return;
Expand Down