Skip to content

Fix for Zone icon visibility on Map panel and Lovelace Map card #4085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 4 commits into from
Oct 21, 2019
Merged

Fix for Zone icon visibility on Map panel and Lovelace Map card #4085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ac8a5f
Set icon color to black in ha-panel-map.js
springstan Oct 20, 2019
f2b5bdb
Changed icon color depending on dark mode in lovelace map card
springstan Oct 20, 2019
e722a46
Fixed build error by swapping var for let and const
springstan Oct 20, 2019
9d10ab8
Replaced hardcoded style with the light and dark classes
springstan Oct 21, 2019
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
24 changes: 22 additions & 2 deletions src/panels/lovelace/cards/hui-map-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,13 +325,25 @@ class HuiMapCard extends LitElement implements LovelaceCard {
continue;
}

// create icon
let iconHTML = "";
if (icon) {
const el = document.createElement("ha-icon");
el.setAttribute("icon", icon);
iconHTML = el.outerHTML;
} else {
const el = document.createElement("span");
el.innerHTML = title;
iconHTML = el.outerHTML;
}

// create marker with the icon
mapItems.push(
Leaflet.marker([latitude, longitude], {
icon: Leaflet.divIcon({
html: icon ? `<ha-icon icon="${icon}"></ha-icon>` : title,
html: iconHTML,
iconSize: [24, 24],
className: "",
className: this._config!.dark_mode === true ? "dark" : "light",
}),
interactive: false,
title,
Expand Down Expand Up @@ -455,6 +467,14 @@ class HuiMapCard extends LitElement implements LovelaceCard {
:host([ispanel]) #root {
height: 100%;
}

.dark {
color: #ffffff;
}

.light {
color: #000000;
}
`;
}
}
Expand Down
12 changes: 9 additions & 3 deletions src/panels/map/ha-panel-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
width: 100%;
z-index: 0;
}

.light {
color: #000000;
}
</style>

<app-toolbar>
Expand Down Expand Up @@ -120,16 +124,18 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
el.setAttribute("icon", entity.attributes.icon);
iconHTML = el.outerHTML;
} else {
iconHTML = title;
const el = document.createElement("span");
el.innerHTML = title;
iconHTML = el.outerHTML;
}

icon = this.Leaflet.divIcon({
html: iconHTML,
iconSize: [24, 24],
className: "",
className: "light",
});

// create market with the icon
// create marker with the icon
mapItems.push(
this.Leaflet.marker(
[entity.attributes.latitude, entity.attributes.longitude],
Expand Down