diff --git a/ops/home/plans/plan-v9.png b/ops/home/plans/plan-v9.png
new file mode 100644
index 0000000..f3d326d
Binary files /dev/null and b/ops/home/plans/plan-v9.png differ
diff --git a/ops/home/rooms-card.js b/ops/home/rooms-card.js
index 35bb45c..e00810b 100644
--- a/ops/home/rooms-card.js
+++ b/ops/home/rooms-card.js
@@ -1,214 +1,217 @@
-/* Покомнатная панель: план-подложка (img) + слой зон (SVG) по контурам комнат. */
-const ROOMS = [
- { id: "terrasa", name: "Терраса", icon: "mdi:deck",
- poly: [[0.00, 0.00], [2.45, 0.00], [2.45, 8.35], [0.00, 8.35]] },
- { id: "kitchen", name: "Кухня-гостиная", icon: "mdi:silverware-fork-knife",
- poly: [[2.45, 0.00], [6.16, 0.00], [6.16, 8.35], [2.45, 8.35]] },
- { id: "postirochnaia", name: "Тех.пом.", icon: "mdi:server",
- poly: [[5.71, -1.50], [7.62, -1.50], [7.62, 0.00], [5.71, 0.00]] },
- { id: "sanuzel", name: "Санузел", icon: "mdi:shower",
- poly: [[5.83, 0.30], [7.74, 0.30], [7.74, 1.55], [7.30, 1.55],
- [7.30, 3.07], [5.83, 3.07]] },
- { id: "tualet", name: "Туалет", icon: "mdi:toilet",
- poly: [[7.74, 1.90], [8.62, 1.90], [8.62, 3.55], [7.74, 3.55]] },
- { id: "garderob", name: "Гардероб", icon: "mdi:hanger",
- poly: [[9.05, 0.05], [10.95, 0.05], [10.95, 1.50], [9.05, 1.50]] },
- { id: "kladovaia", name: "Кладовая", icon: "mdi:package-variant",
- poly: [[9.29, 1.50], [10.95, 1.50], [10.95, 2.83], [9.29, 2.83]] },
- { id: "koridor", name: "Холл", icon: "mdi:door-open",
- poly: [[7.74, 3.07], [9.05, 3.07], [9.05, 2.83], [11.07, 2.83],
- [11.07, 5.48], [7.74, 5.48]] },
- { id: "prihozhaya", name: "Прихожая", icon: "mdi:door",
- poly: [[5.95, 5.48], [7.74, 5.48], [7.74, 7.41], [5.95, 7.41]] },
- { id: "tambur", name: "Тамбур", icon: "mdi:door",
- poly: [[5.95, 7.41], [7.74, 7.41], [7.74, 8.38], [5.95, 8.38]] },
- { id: "kabinet", name: "Комната 11,45", icon: "mdi:desk",
- poly: [[11.07, 0.05], [14.55, 0.05], [14.55, 3.31], [11.07, 3.31]] },
- { id: "danina_komnata", name: "Комната 12,04", icon: "mdi:teddy-bear",
- poly: [[7.74, 5.48], [11.07, 5.48], [11.07, 8.38], [7.74, 8.38]] },
- { id: "spalnia", name: "Комната 14,34", icon: "mdi:bed",
- poly: [[11.07, 3.55], [14.55, 3.55], [14.55, 8.60], [11.07, 8.60]] },
- { id: "kryltso", name: "Крыльцо", icon: "mdi:stairs",
- poly: [[5.95, 8.38], [7.74, 8.38], [7.74, 9.70], [5.95, 9.70]] },
-];
-const KEY_DOMAINS = ["light", "switch", "climate", "media_player", "cover", "fan"];
-const SENSOR_HINT = /temperature|humidity|co2|illuminance/;
-const IMG_W = 916, IMG_H = 768, PX0 = 180, PY0 = 173, PX_M = 42.0, PY_M = 41.4;
-
-class RoomsCard extends HTMLElement {
- constructor() {
- super();
- this._areas = [];
- this._ent2area = {};
- this._selected = null;
- this._loaded = false;
- this._mode = "plan";
- this.attachShadow({ mode: "open" });
- }
-
- setConfig(config) { this._config = config || {}; }
-
- set hass(hass) {
- this._hass = hass;
- if (!this._loaded) { this._loaded = true; this._loadRegistries(); }
- else this._render();
- }
-
- async _loadRegistries() {
- try {
- const [areas, devices, entities] = await Promise.all([
- this._hass.callWS({ type: "config/area_registry/list" }),
- this._hass.callWS({ type: "config/device_registry/list" }),
- this._hass.callWS({ type: "config/entity_registry/list" }),
- ]);
- this._areas = areas;
- const devArea = {};
- for (const d of devices) if (d.area_id) devArea[d.id] = d.area_id;
- this._ent2area = {};
- for (const e of entities) {
- const a = e.area_id || devArea[e.device_id];
- if (a) this._ent2area[e.entity_id] = a;
- }
- } catch (err) { this._error = String(err); }
- this._render();
- }
-
- _entitiesOf(areaId) {
- if (!areaId) return [];
- return Object.entries(this._ent2area).filter(([, a]) => a === areaId)
- .map(([e]) => e).filter((e) => this._hass.states[e]);
- }
-
- _domain(e) { return e.split(".")[0]; }
-
- _on(areaId) {
- return this._entitiesOf(areaId).filter((e) => {
- const st = this._hass.states[e];
- return (this._domain(e) === "light" || this._domain(e) === "switch") && st.state === "on";
- }).length;
- }
-
- _sensors(areaId) {
- const out = [];
- for (const e of this._entitiesOf(areaId)) {
- if (this._domain(e) !== "sensor" || !SENSOR_HINT.test(e)) continue;
- const st = this._hass.states[e];
- out.push(`${(st.attributes.friendly_name || e).split(" ").slice(-1)[0]}: ${st.state}${st.attributes.unit_of_measurement || ""}`);
- }
- return out.slice(0, 2);
- }
-
- _toggle(e) {
- const d = this._domain(e);
- if (d === "light" || d === "switch") this._hass.callService(d, "toggle", { entity_id: e });
- }
-
- _planHtml(areaId) {
- const pts = (poly) => poly.map(([x, y]) =>
- `${(x * PX_M + PX0).toFixed(1)},${(y * PY_M + PY0).toFixed(1)}`).join(" ");
- const shapes = ROOMS.map((r) => {
- const sel = r.id === areaId;
- return `${r.name}`;
- }).join("");
- return `
-

-
-
`;
- }
-
- _render() {
- if (!this._hass) return;
- const areaId = this._selected;
- const tiles = ROOMS.map((r) => {
- const ens = this._entitiesOf(r.id);
- const on = this._on(r.id);
- const sensors = this._sensors(r.id).join(" · ");
- return ``;
- }).join("");
-
- let detail = "";
- if (areaId) {
- const room = ROOMS.find((r) => r.id === areaId);
- const ens = this._entitiesOf(areaId);
- const groups = {};
- for (const e of ens) (groups[this._domain(e)] ||= []).push(e);
- const rows = Object.keys(groups).sort((a, b) => {
- const ia = KEY_DOMAINS.includes(a) ? KEY_DOMAINS.indexOf(a) : 60 + a.charCodeAt(0);
- const ib = KEY_DOMAINS.includes(b) ? KEY_DOMAINS.indexOf(b) : 60 + b.charCodeAt(0);
- return ia - ib;
- }).map((dom) => {
- const items = groups[dom].map((e) => {
- const st = this._hass.states[e];
- const nm = st.attributes.friendly_name || e;
- const val = st.state + (st.attributes.unit_of_measurement || "");
- const act = ["light", "switch"].includes(dom)
- ? `${st.state === "on" ? "вкл" : "выкл"}` : "";
- return `${nm}${val}${act}
`;
- }).join("");
- return `${dom} · ${groups[dom].length}
${items}
`;
- }).join("");
- detail = `${room ? room.name : areaId}
-
${rows || "
устройств пока нет
"}
`;
- }
-
- this.shadowRoot.innerHTML = `
-
-
-
-
- ${this._mode === "plan" ? this._planHtml(areaId) : `${tiles}
`}
- ${detail}`;
-
- this.shadowRoot.querySelectorAll("[data-mode]").forEach((b) =>
- b.addEventListener("click", () => { this._mode = b.dataset.mode; this._render(); }));
- this.shadowRoot.querySelectorAll(".zone, .tile").forEach((el) =>
- el.addEventListener("click", () => {
- this._selected = this._selected === el.dataset.a ? null : el.dataset.a; this._render();
- }));
- this.shadowRoot.querySelectorAll(".sw").forEach((s) =>
- s.addEventListener("click", (ev) => { ev.stopPropagation(); this._toggle(s.dataset.e); }));
- const close = this.shadowRoot.querySelector(".close");
- if (close) close.addEventListener("click", () => { this._selected = null; this._render(); });
- }
-
- getCardSize() { return 12; }
-}
-
-customElements.define("rooms-card", RoomsCard);
+/* Покомнатная панель: план рисуется по стенам (SVG), зоны = комнаты. */
+const ROOMS = [
+ { id: "terrasa", name: "Терраса", icon: "mdi:deck",
+ poly: [[0.00, 0.00], [2.45, 0.00], [2.45, 8.60], [0.00, 8.60]] },
+ { id: "kitchen", name: "Кухня-гостиная", icon: "mdi:silverware-fork-knife",
+ poly: [[2.45, 0.00], [6.21, 0.00], [6.21, 8.60], [2.45, 8.60]] },
+ { id: "postirochnaia", name: "Тех.пом.", icon: "mdi:server",
+ poly: [[5.71, -1.50], [7.62, -1.50], [7.62, 0.00], [5.71, 0.00]] },
+ { id: "sanuzel", name: "Санузел", icon: "mdi:shower",
+ poly: [[5.83, 0.00], [7.95, 0.00], [7.95, 2.97], [5.83, 2.97]] },
+ { id: "tualet", name: "Туалет", icon: "mdi:toilet",
+ poly: [[7.95, 1.55], [9.00, 1.55], [9.00, 2.97], [7.95, 2.97]] },
+ { id: "garderob", name: "Гардероб", icon: "mdi:hanger",
+ poly: [[9.00, 0.00], [10.81, 0.00], [10.81, 1.55], [9.00, 1.55]] },
+ { id: "kladovaia", name: "Кладовая", icon: "mdi:package-variant",
+ poly: [[9.00, 1.55], [10.81, 1.55], [10.81, 2.40], [9.00, 2.40]] },
+ { id: "koridor", name: "Холл", icon: "mdi:door-open",
+ poly: [[6.21, 2.97], [10.81, 2.97], [10.81, 5.29], [6.21, 5.29]] },
+ { id: "prihozhaya", name: "Прихожая", icon: "mdi:door",
+ poly: [[6.21, 5.29], [7.74, 5.29], [7.74, 7.35], [6.21, 7.35]] },
+ { id: "tambur", name: "Тамбур", icon: "mdi:door",
+ poly: [[6.21, 7.35], [7.74, 7.35], [7.74, 8.60], [6.21, 8.60]] },
+ { id: "kabinet", name: "Комната 11,45", icon: "mdi:desk",
+ poly: [[11.33, 0.00], [14.52, 0.00], [14.52, 3.41], [11.33, 3.41]] },
+ { id: "danina_komnata", name: "Комната 12,04", icon: "mdi:teddy-bear",
+ poly: [[7.74, 5.29], [11.33, 5.29], [11.33, 8.60], [7.74, 8.60]] },
+ { id: "spalnia", name: "Комната 14,34", icon: "mdi:bed",
+ poly: [[11.33, 3.41], [14.52, 3.41], [14.52, 8.60], [11.33, 8.60]] },
+ { id: "kryltso", name: "Крыльцо", icon: "mdi:stairs",
+ poly: [[6.21, 8.60], [7.74, 8.60], [7.74, 10.10], [6.21, 10.10]] },
+];
+const KEY_DOMAINS = ["light", "switch", "climate", "media_player", "cover", "fan"];
+const SENSOR_HINT = /temperature|humidity|co2|illuminance/;
+/* рамка плана в метрах */
+const VB = [-0.4, -1.9, 15.0, 10.5];
+
+class RoomsCard extends HTMLElement {
+ constructor() {
+ super();
+ this._areas = [];
+ this._ent2area = {};
+ this._selected = null;
+ this._loaded = false;
+ this._mode = "plan";
+ this.attachShadow({ mode: "open" });
+ }
+
+ setConfig(config) { this._config = config || {}; }
+
+ set hass(hass) {
+ this._hass = hass;
+ if (!this._loaded) { this._loaded = true; this._loadRegistries(); }
+ else this._render();
+ }
+
+ async _loadRegistries() {
+ try {
+ const [areas, devices, entities] = await Promise.all([
+ this._hass.callWS({ type: "config/area_registry/list" }),
+ this._hass.callWS({ type: "config/device_registry/list" }),
+ this._hass.callWS({ type: "config/entity_registry/list" }),
+ ]);
+ this._areas = areas;
+ const devArea = {};
+ for (const d of devices) if (d.area_id) devArea[d.id] = d.area_id;
+ this._ent2area = {};
+ for (const e of entities) {
+ const a = e.area_id || devArea[e.device_id];
+ if (a) this._ent2area[e.entity_id] = a;
+ }
+ } catch (err) { this._error = String(err); }
+ this._render();
+ }
+
+ _entitiesOf(areaId) {
+ if (!areaId) return [];
+ return Object.entries(this._ent2area).filter(([, a]) => a === areaId)
+ .map(([e]) => e).filter((e) => this._hass.states[e]);
+ }
+
+ _domain(e) { return e.split(".")[0]; }
+
+ _on(areaId) {
+ return this._entitiesOf(areaId).filter((e) => {
+ const st = this._hass.states[e];
+ return (this._domain(e) === "light" || this._domain(e) === "switch") && st.state === "on";
+ }).length;
+ }
+
+ _sensors(areaId) {
+ const out = [];
+ for (const e of this._entitiesOf(areaId)) {
+ if (this._domain(e) !== "sensor" || !SENSOR_HINT.test(e)) continue;
+ const st = this._hass.states[e];
+ out.push(`${(st.attributes.friendly_name || e).split(" ").slice(-1)[0]}: ${st.state}${st.attributes.unit_of_measurement || ""}`);
+ }
+ return out.slice(0, 2);
+ }
+
+ _toggle(e) {
+ const d = this._domain(e);
+ if (d === "light" || d === "switch") this._hass.callService(d, "toggle", { entity_id: e });
+ }
+
+ _planSvg(areaId) {
+ const [vx, vy, vw, vh] = VB;
+ let shapes = "";
+ let labels = "";
+ for (const r of ROOMS) {
+ const pts = r.poly.map(([x, y]) => `${x},${y}`).join(" ");
+ const sel = r.id === areaId;
+ const on = this._on(r.id);
+ shapes += `${r.name}`;
+ const cx = r.poly.reduce((s, p) => s + p[0], 0) / r.poly.length;
+ const cy = r.poly.reduce((s, p) => s + p[1], 0) / r.poly.length;
+ labels += `${r.name}${on ? " · " + on : ""}`;
+ }
+ return ``;
+ }
+
+ _render() {
+ if (!this._hass) return;
+ const areaId = this._selected;
+ const tiles = ROOMS.map((r) => {
+ const ens = this._entitiesOf(r.id);
+ const on = this._on(r.id);
+ const sensors = this._sensors(r.id).join(" · ");
+ return ``;
+ }).join("");
+
+ let detail = "";
+ if (areaId) {
+ const room = ROOMS.find((r) => r.id === areaId);
+ const ens = this._entitiesOf(areaId);
+ const groups = {};
+ for (const e of ens) (groups[this._domain(e)] ||= []).push(e);
+ const rows = Object.keys(groups).sort((a, b) => {
+ const ia = KEY_DOMAINS.includes(a) ? KEY_DOMAINS.indexOf(a) : 60 + a.charCodeAt(0);
+ const ib = KEY_DOMAINS.includes(b) ? KEY_DOMAINS.indexOf(b) : 60 + b.charCodeAt(0);
+ return ia - ib;
+ }).map((dom) => {
+ const items = groups[dom].map((e) => {
+ const st = this._hass.states[e];
+ const nm = st.attributes.friendly_name || e;
+ const val = st.state + (st.attributes.unit_of_measurement || "");
+ const act = ["light", "switch"].includes(dom)
+ ? `${st.state === "on" ? "вкл" : "выкл"}` : "";
+ return `${nm}${val}${act}
`;
+ }).join("");
+ return `${dom} · ${groups[dom].length}
${items}
`;
+ }).join("");
+ detail = `${room ? room.name : areaId}
+
${rows || "
устройств пока нет
"}
`;
+ }
+
+ this.shadowRoot.innerHTML = `
+
+
+
+
+ ${this._mode === "plan" ? this._planSvg(areaId) : `${tiles}
`}
+ ${detail}`;
+
+ this.shadowRoot.querySelectorAll("[data-mode]").forEach((b) =>
+ b.addEventListener("click", () => { this._mode = b.dataset.mode; this._render(); }));
+ this.shadowRoot.querySelectorAll(".zone, .tile").forEach((el) =>
+ el.addEventListener("click", () => {
+ this._selected = this._selected === el.dataset.a ? null : el.dataset.a; this._render();
+ }));
+ this.shadowRoot.querySelectorAll(".sw").forEach((s) =>
+ s.addEventListener("click", (ev) => { ev.stopPropagation(); this._toggle(s.dataset.e); }));
+ const close = this.shadowRoot.querySelector(".close");
+ if (close) close.addEventListener("click", () => { this._selected = null; this._render(); });
+ }
+
+ getCardSize() { return 12; }
+}
+
+customElements.define("rooms-card", RoomsCard);