+ `,ci=1e3;function hi(t){return t&&Array.isArray(t.spaces)?t.spaces.map(t=>{const e=ci/t.aspect;return{id:t.id,title:t.title,vb:[t.view_box[0]*ci,t.view_box[1]*e,t.view_box[2]*ci,t.view_box[3]*e],bg:t.plan_url?{href:t.plan_url,x:0,y:0,w:ci,h:e}:null,rooms:(t.rooms||[]).map(t=>({id:t.id,name:t.name,area:t.area??null,x:null!=t.x?t.x*ci:void 0,y:null!=t.y?t.y*e:void 0,w:null!=t.w?t.w*ci:void 0,h:null!=t.h?t.h*e:void 0,poly:t.poly?t.poly.map(t=>[t[0]*ci,t[1]*e]):void 0}))}}):[]}function pi(t){if(t.poly&&t.poly.length){const e=t.poly.map(t=>t[0]),i=t.poly.map(t=>t[1]),s=Math.min(...e),o=Math.min(...i);return{x:s,y:o,w:Math.max(...e)-s,h:Math.max(...i)-o}}return{x:t.x??0,y:t.y??0,w:t.w??0,h:t.h??0}}function di(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}function ui(t){const e=hi(t.cfg),i=e.find(e=>e.id===t.spaceId);if(!i)return null;const s=i.vb,o=He(t.cfg.spaces.find(e=>e.id===t.spaceId)),n=t.iconSize??2.5,r=n>8?2.5:n,a={};for(const e of t.cfg.spaces||[])for(const t of e.rooms||[])t.area&&(a[t.area]=e.id);const l=t.cfg.settings?.exclude_integrations?new Set(t.cfg.settings.exclude_integrations):ht,c=dt(t.cfg.settings?.icon_rules?.length?t.cfg.settings.icon_rules:pt),h=ti({hass:t.hass,areaToSpace:a,markers:t.cfg.markers||[],settings:t.cfg.settings||{},excluded:l,showAll:!!t.cfg.settings?.show_all,firstSpaceId:e[0]?.id||"",loc:e=>ri(t.lang,e),iconRules:c}),p=h.filter(e=>e.space===t.spaceId),d=function(t,e,i){const s={},o=i/100*ci*1.3;for(const i of e.rooms){if(!i.area)continue;const e=t.filter(t=>t.area===i.area);if(!e.length)continue;const n=pi(i),r=.1*Math.min(n.w,n.h),a=n.w-2*r,l=n.h-2*r,c=Math.max(1,Math.round(Math.sqrt(e.length*a/Math.max(l,1)))),h=a/c,p=l/Math.max(Math.ceil(e.length/c),1),d=e.map((t,e)=>({x:n.x+r+h*(e%c+.5),y:n.y+r+p*(Math.floor(e/c)+.5)}));Ie(d,n,o,.5*r),e.forEach((t,e)=>s[t.id]=d[e])}return s}(p,i,r),u=i.rooms.filter(t=>t.area||o.showBorders).map(e=>{let s="room "+(i.bg?"overlay":"yard"),n="";if(o.showBorders||"none"!==o.fill){s+=" styled";const i=[`--room-stroke:${o.color}`,`--room-stroke-op:${o.showBorders?o.opacity:0}`],r=e.area?je(o.fill,"lqi"===o.fill?function(t,e,i){const s=[];for(const o of e){if(o.area!==i||o.virtual)continue;const e=Ke(t,o.entities);null!=e&&s.push(e)}return Ne(s)}(t.hass,p,e.area):null,"light"===o.fill?ei(t.hass,p,e.area):"none","temp"===o.fill?ii(t.hass,p,e.area):null,o.tempMin,o.tempMax):null;r?(s+=" filled",i.push(`--room-fill:${r}`,`--room-fill-op:${(.3*o.opacity).toFixed(3)}`)):i.push("--room-fill:transparent","--room-fill-op:0"),n=i.join(";")}const r=!i.bg&&!o.showNames,a=di(e),l=e.poly?j`${e.name} `:W}`}),m=p.map(e=>{const o=function(t,e,i,s,o){const n=e[t.id];if(n&&n.s===t.space){const e=i.spaces.find(e=>e.id===t.space)?.aspect||1;return{x:n.x*ci,y:n.y*(ci/e)}}if(s[t.id])return s[t.id];const r=o.vb;return{x:r[0]+r[2]/2,y:r[1]+r[3]/2}}(e,t.layout,t.cfg,d,i),n=(o.x-s[0])/s[2]*100,r=(o.y-s[1])/s[3]*100;return H`
`}),_=o.showNames?i.rooms.filter(t=>t.name).map(e=>{const n=function(t,e,i,s){const o=i["rl_"+(t.id||"")];if(o&&o.s===e){const t=s.spaces.find(t=>t.id===e)?.aspect||1;return{x:o.x*ci,y:o.y*(ci/t)}}const n=di(t);return{x:n[0],y:n[1]}}(e,i.id,t.layout,t.cfg),r=(n.x-s[0])/s[2]*100,a=(n.y-s[1])/s[3]*100,l=Math.min(1,o.opacity+.25);return H`${e.name}
`}):[];return j`
+ ${e.name}
`}):[];return H`
-
- `}let le=null,ce=null,he=!1;const de=new Set;function pe(){if(le)return le;try{const t=JSON.parse(localStorage.getItem("houseplan_card_cfg_v1")||"null");if(t&&t.config&&Array.isArray(t.config.spaces))return{config:t.config,rev:t.rev||0,layout:t.layout||{}}}catch{}return null}function ue(t){return le?Promise.resolve(le):ce||(ce=async function(t){const[e,i]=await Promise.all([t.callWS({type:"houseplan/config/get"}),t.callWS({type:"houseplan/layout/get"})]);if(le={config:e?.config??null,rev:e?.rev??0,layout:i?.layout??{}},!he&&t.connection?.subscribeEvents){he=!0;try{await t.connection.subscribeEvents(()=>{le=null,de.forEach(t=>t())},"houseplan_config_updated")}catch{he=!1}}return le}(t).finally(()=>{ce=null}),ce)}class _e extends lt{constructor(){super(...arguments),this._spaces=null,this._spacesLoading=!1}setConfig(t){this._config=t}async _loadSpaces(){if(!this._spaces&&!this._spacesLoading&&this.hass){this._spacesLoading=!0;try{const t=await this.hass.callWS({type:"houseplan/config/get"});this._spaces=(t?.config?.spaces||[]).map(t=>({value:t.id,label:t.title||t.id}))}catch{this._spaces=[]}finally{this._spacesLoading=!1}}}get _lang(){return Qt(this.hass,this._config?.language)}get _schema(){const t=this._spaces||[];return[t.length?{name:"space",selector:{select:{mode:"dropdown",options:t}}}:{name:"space",selector:{text:{}}},{name:"title",selector:{text:{}}},{name:"show_button",selector:{boolean:{}}},{name:"button_label",selector:{text:{}}},{name:"button_target",selector:{text:{}}},{name:"aspect_ratio",selector:{text:{}}},{name:"icon_size",selector:{number:{min:1,max:6,step:.1,mode:"box"}}}]}render(){if(!this.hass||!this._config)return V;this._loadSpaces();const t=this._lang,e={space:te(t,"editor.space"),title:te(t,"editor.title"),show_button:te(t,"editor.show_button"),button_label:te(t,"editor.button_label"),button_target:te(t,"editor.button_target"),aspect_ratio:te(t,"editor.aspect_ratio"),icon_size:te(t,"editor.icon_size")};return j`${_}${m}
+ ${m}${_}
${t}
${te(this._lang,"space_card.loading")}
${t}
${ri(this._lang,"space_card.loading")}
${o}
`:V}
+ ${o?H`${o}
`:W}
${i}
- ${a?j`
+ ${n?H`
`:W}
-
`:V}
+ this._stagePointerUp(t)}
@pointercancel=${t=>this._stagePointerUp(t)}>
+ >${t.name}
`}get _measureAnchor(){return this._markup&&this._cursorPt?"draw"===this._tool&&this._path.length&&!this._contourClosed?this._path[this._path.length-1]:"split"===this._tool&&this._splitSel?.a?this._splitSel.a:null:null}_renderMeasureLabel(t){const e=this._measureAnchor,i=this._cursorPt,s=(i[0]-t.x)/t.w*100,o=(i[1]-t.y)/t.h*100;return H`
-
-
- ${this._roomDialog?this._renderRoomDialog():V}
- ${this._spaceDialog?this._renderSpaceDialog():V}
- ${this._markerDialog?this._renderMarkerDialog():V}
- ${this._infoCard?this._renderInfoCard():V}
- ${this._rulesDialog?this._renderRulesDialog():V}
- ${this._importDialog?this._renderImportDialog():V}
- ${this._tip?j`
- ${s.map(t=>this._renderDevice(t,n))}
- ${o.showNames&&!this._markup?e.rooms.map(t=>this._renderRoomLabel(t,e,n,o)):V}
+
- ${this._zoom>1?j`
+ ${s.map(t=>this._renderDevice(t,a))}
+ ${o.showNames&&!this._markup?e.rooms.map(t=>this._renderRoomLabel(t,e,a,o)):W}
- ${this._markup&&"draw"===this._tool&&this._path.length&&this._cursorPt&&!this._contourClosed?j`${this._renderMeasureLabel(n)}
`:V}
+ ${this._measureAnchor?H`${this._renderMeasureLabel(a)}
`:W}
${Math.round(100*this._zoom)}%
`:V}
+ ${this._zoom>1?H`${Math.round(100*this._zoom)}%
`:W}
- ${this._tip.title}${this._tip.meta?j`${this._tip.meta}`:V}
- ${null!=this._tip.temp?j`${this._t("tip.temp_avg")} ${this._tip.temp}°`:V}
- ${null!=this._tip.lqi?j`${this._t("tip.lqi")}
- ${this._tip.lqi}`:V}
-
`:V}
- ${this._toast?j`${this._toast}
`:V}
+ ${this._roomDialog?this._renderRoomDialog():W}
+ ${this._mergeDialog?this._renderMergeDialog():W}
+ ${this._spaceDialog?this._renderSpaceDialog():W}
+ ${this._markerDialog?this._renderMarkerDialog():W}
+ ${this._infoCard?this._renderInfoCard():W}
+ ${this._rulesDialog?this._renderRulesDialog():W}
+ ${this._importDialog?this._renderImportDialog():W}
+ ${this._tip?H`
+ ${this._tip.title}${this._tip.meta?H`${this._tip.meta}`:W}
+ ${null!=this._tip.temp?H`${this._t("tip.temp_avg")} ${this._tip.temp}°`:W}
+ ${null!=this._tip.lqi?H`${this._t("tip.lqi")}
+ ${this._tip.lqi}`:W}
+
`:W}
+ ${this._toast?H`${this._toast}
`:W}
- `}_renderDevice(t,e){const i=this._pos(t),s=(i.x-e.x)/e.w*100,o=(i.y-e.y)/e.h*100,a=this._stateClass(t),r=this._liveTemp(t),n=this._liveHum(t),l=this._config?.show_signal&&!t.virtual?Ft(this.hass,t.entities):null;return j`this._clickDevice(e,t)}
- @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=r?" · "+r+"°":"")+(null!=n?" · "+n+"%":"")+(null!=l?" · LQI "+l:""))}
+ @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=r?" · "+r+"°":"")+(null!=a?" · "+a+"%":"")+(null!=l?" · LQI "+l:""))}
@mouseleave=${()=>this._tip=null}
@pointerdown=${e=>this._pointerDown(e,t)}
@pointermove=${e=>this._pointerMove(e,t)}
@@ -1163,67 +1169,80 @@ const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow
@pointercancel=${e=>this._pointerUp(e,t)}
>
`}_labelPos(t,e){const i=this._layout["rl_"+(t.id||"")];if(i&&i.s===e){const t=this._serverCfg.spaces.find(t=>t.id===e)?.aspect||1;return{x:i.x*ye,y:i.y*(ye/t)}}const s=this._roomCenter(t);return{x:s[0],y:s[1]}}_labelDown(t,e,i){if(this._markup)return;t.preventDefault(),t.stopPropagation();const s=this._labelPos(e,i);this._drag={id:"rl_"+(e.id||""),sx:t.clientX,sy:t.clientY,ox:s.x,oy:s.y,moved:!1},t.target.setPointerCapture(t.pointerId),this._tip=null}_labelMove(t,e,i){const s="rl_"+(e.id||"");if(!this._drag||this._drag.id!==s)return;const o=this._stageEl;if(!o)return;const a=this._spaceModel(i).vb,r=o.getBoundingClientRect(),n=this._viewOr(a),l=(t.clientX-this._drag.sx)/r.width*n.w,c=(t.clientY-this._drag.sy)/r.height*n.h;Math.abs(t.clientX-this._drag.sx)+Math.abs(t.clientY-this._drag.sy)>3&&(this._drag.moved=!0);const h=.008*Math.min(a[2],a[3]),d=Math.max(a[0]+h,Math.min(a[0]+a[2]-h,this._drag.ox+l)),p=Math.max(a[1]+h,Math.min(a[1]+a[3]-h,this._drag.oy+c));this._savePos({id:s,space:i},d,p)}_labelUp(t){const e="rl_"+(t.id||"");if(!this._drag||this._drag.id!==e)return;const i=this._drag.moved;this._drag=i?this._drag:null,i&&window.setTimeout(()=>this._drag=null,0)}_renderRoomLabel(t,e,i,s){if(!t.name)return V;const o=this._labelPos(t,e.id),a=(o.x-i.x)/i.w*100,r=(o.y-i.y)/i.h*100,n=Math.min(1,s.opacity+.25);return j`${r}°`:W}
+ ${null!=a?H`${a}%`:W}
+ ${null!=l?H`${l}`:W}
+
`}_labelPos(t,e){const i=this._layout["rl_"+(t.id||"")];if(i&&i.s===e){const t=this._serverCfg.spaces.find(t=>t.id===e)?.aspect||1;return{x:i.x*Ei,y:i.y*(Ei/t)}}const s=this._roomCenter(t);return{x:s[0],y:s[1]}}_labelDown(t,e,i){if(this._markup)return;t.preventDefault(),t.stopPropagation();const s=this._labelPos(e,i);this._drag={id:"rl_"+(e.id||""),sx:t.clientX,sy:t.clientY,ox:s.x,oy:s.y,moved:!1},t.target.setPointerCapture(t.pointerId),this._tip=null}_labelMove(t,e,i){const s="rl_"+(e.id||"");if(!this._drag||this._drag.id!==s)return;const o=this._stageEl;if(!o)return;const n=this._spaceModel(i).vb,r=o.getBoundingClientRect(),a=this._viewOr(n),l=(t.clientX-this._drag.sx)/r.width*a.w,c=(t.clientY-this._drag.sy)/r.height*a.h;Math.abs(t.clientX-this._drag.sx)+Math.abs(t.clientY-this._drag.sy)>3&&(this._drag.moved=!0);const h=.008*Math.min(n[2],n[3]),p=Math.max(n[0]+h,Math.min(n[0]+n[2]-h,this._drag.ox+l)),d=Math.max(n[1]+h,Math.min(n[1]+n[3]-h,this._drag.oy+c));this._savePos({id:s,space:i},p,d)}_labelUp(t){const e="rl_"+(t.id||"");if(!this._drag||this._drag.id!==e)return;const i=this._drag.moved;this._drag=i?this._drag:null,i&&window.setTimeout(()=>this._drag=null,0)}_renderRoomLabel(t,e,i,s){if(!t.name)return W;const o=this._labelPos(t,e.id),n=(o.x-i.x)/i.w*100,r=(o.y-i.y)/i.h*100,a=Math.min(1,s.opacity+.25);return H`this._labelDown(i,t,e.id)}
@pointermove=${i=>this._labelMove(i,t,e.id)}
@pointerup=${()=>this._labelUp(t)}
@pointercancel=${()=>this._labelUp(t)}
- >${t.name}
`}_renderMeasureLabel(t){const e=this._path[this._path.length-1],i=this._cursorPt,s=(i[0]-t.x)/t.w*100,o=(i[1]-t.y)/t.h*100;return j`${this._fmtLen(e,i)}
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return B`${this._fmtLen(e,i)}
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return j`
+ ${e.map(t=>j`
`}_renderRoomDialog(){const t=this._freeAreas;return j``}_renderMergeDialog(){const t=this._mergeDialog,e=this._spaceModel().rooms,i=(i,s)=>{const o=e.find(t=>t.id===i),n=o?.area?this.hass.areas[o.area]?.name:null;return H``};return H``}_renderRoomDialog(){const t=this._freeAreas;return H``}}xe.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_rulesDialog:{state:!0},_importDialog:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},xe.styles=ie,customElements.get("houseplan-card")||customElements.define("houseplan-card",xe),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Interactive house plan: spaces, rooms and devices with live states and drag layout."}),console.info("%c HOUSEPLAN-CARD %c v1.20.0 ","background:#3ea6ff;color:#04121f;font-weight:700","");
+ `}}Mi.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_mergeSel:{state:!0},_mergeDialog:{state:!0},_splitSel:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_rulesDialog:{state:!0},_importDialog:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},Mi.styles=li,customElements.get("houseplan-card")||customElements.define("houseplan-card",Mi),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Interactive house plan: spaces, rooms and devices with live states and drag layout."}),console.info("%c HOUSEPLAN-CARD %c v1.21.0 ","background:#3ea6ff;color:#04121f;font-weight:700","");
diff --git a/custom_components/houseplan/manifest.json b/custom_components/houseplan/manifest.json
index 26acc21..67e8d31 100755
--- a/custom_components/houseplan/manifest.json
+++ b/custom_components/houseplan/manifest.json
@@ -16,5 +16,5 @@
"issue_tracker": "https://github.com/Matysh/houseplan-card/issues",
"requirements": [],
"single_config_entry": true,
- "version": "1.20.0"
+ "version": "1.21.0"
}
diff --git a/dist/houseplan-card.js b/dist/houseplan-card.js
index f077119..17f16b9 100755
--- a/dist/houseplan-card.js
+++ b/dist/houseplan-card.js
@@ -1,10 +1,10 @@
-const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow)&&"adoptedStyleSheets"in Document.prototype&&"replace"in CSSStyleSheet.prototype,i=Symbol(),s=new WeakMap;let o=class{constructor(t,e,s){if(this._$cssResult$=!0,s!==i)throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");this.cssText=t,this.t=e}get styleSheet(){let t=this.o;const i=this.t;if(e&&void 0===t){const e=void 0!==i&&1===i.length;e&&(t=s.get(i)),void 0===t&&((this.o=t=new CSSStyleSheet).replaceSync(this.cssText),e&&s.set(i,t))}return t}toString(){return this.cssText}};const a=(t,...e)=>{const s=1===t.length?t[0]:e.reduce((e,i,s)=>e+(t=>{if(!0===t._$cssResult$)return t.cssText;if("number"==typeof t)return t;throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(i)+t[s+1],t[0]);return new o(s,t,i)},r=e?t=>t:t=>t instanceof CSSStyleSheet?(t=>{let e="";for(const i of t.cssRules)e+=i.cssText;return(t=>new o("string"==typeof t?t:t+"",void 0,i))(e)})(t):t,{is:n,defineProperty:l,getOwnPropertyDescriptor:c,getOwnPropertyNames:h,getOwnPropertySymbols:d,getPrototypeOf:p}=Object,u=globalThis,_=u.trustedTypes,m=_?_.emptyScript:"",g=u.reactiveElementPolyfillSupport,f=(t,e)=>t,v={toAttribute(t,e){switch(e){case Boolean:t=t?m:null;break;case Object:case Array:t=null==t?t:JSON.stringify(t)}return t},fromAttribute(t,e){let i=t;switch(e){case Boolean:i=null!==t;break;case Number:i=null===t?null:Number(t);break;case Object:case Array:try{i=JSON.parse(t)}catch(t){i=null}}return i}},b=(t,e)=>!n(t,e),y={attribute:!0,type:String,converter:v,reflect:!1,useDefault:!1,hasChanged:b};Symbol.metadata??=Symbol("metadata"),u.litPropertyMetadata??=new WeakMap;let w=class extends HTMLElement{static addInitializer(t){this._$Ei(),(this.l??=[]).push(t)}static get observedAttributes(){return this.finalize(),this._$Eh&&[...this._$Eh.keys()]}static createProperty(t,e=y){if(e.state&&(e.attribute=!1),this._$Ei(),this.prototype.hasOwnProperty(t)&&((e=Object.create(e)).wrapped=!0),this.elementProperties.set(t,e),!e.noAccessor){const i=Symbol(),s=this.getPropertyDescriptor(t,i,e);void 0!==s&&l(this.prototype,t,s)}}static getPropertyDescriptor(t,e,i){const{get:s,set:o}=c(this.prototype,t)??{get(){return this[e]},set(t){this[e]=t}};return{get:s,set(e){const a=s?.call(this);o?.call(this,e),this.requestUpdate(t,a,i)},configurable:!0,enumerable:!0}}static getPropertyOptions(t){return this.elementProperties.get(t)??y}static _$Ei(){if(this.hasOwnProperty(f("elementProperties")))return;const t=p(this);t.finalize(),void 0!==t.l&&(this.l=[...t.l]),this.elementProperties=new Map(t.elementProperties)}static finalize(){if(this.hasOwnProperty(f("finalized")))return;if(this.finalized=!0,this._$Ei(),this.hasOwnProperty(f("properties"))){const t=this.properties,e=[...h(t),...d(t)];for(const i of e)this.createProperty(i,t[i])}const t=this[Symbol.metadata];if(null!==t){const e=litPropertyMetadata.get(t);if(void 0!==e)for(const[t,i]of e)this.elementProperties.set(t,i)}this._$Eh=new Map;for(const[t,e]of this.elementProperties){const i=this._$Eu(t,e);void 0!==i&&this._$Eh.set(i,t)}this.elementStyles=this.finalizeStyles(this.styles)}static finalizeStyles(t){const e=[];if(Array.isArray(t)){const i=new Set(t.flat(1/0).reverse());for(const t of i)e.unshift(r(t))}else void 0!==t&&e.push(r(t));return e}static _$Eu(t,e){const i=e.attribute;return!1===i?void 0:"string"==typeof i?i:"string"==typeof t?t.toLowerCase():void 0}constructor(){super(),this._$Ep=void 0,this.isUpdatePending=!1,this.hasUpdated=!1,this._$Em=null,this._$Ev()}_$Ev(){this._$ES=new Promise(t=>this.enableUpdating=t),this._$AL=new Map,this._$E_(),this.requestUpdate(),this.constructor.l?.forEach(t=>t(this))}addController(t){(this._$EO??=new Set).add(t),void 0!==this.renderRoot&&this.isConnected&&t.hostConnected?.()}removeController(t){this._$EO?.delete(t)}_$E_(){const t=new Map,e=this.constructor.elementProperties;for(const i of e.keys())this.hasOwnProperty(i)&&(t.set(i,this[i]),delete this[i]);t.size>0&&(this._$Ep=t)}createRenderRoot(){const i=this.shadowRoot??this.attachShadow(this.constructor.shadowRootOptions);return((i,s)=>{if(e)i.adoptedStyleSheets=s.map(t=>t instanceof CSSStyleSheet?t:t.styleSheet);else for(const e of s){const s=document.createElement("style"),o=t.litNonce;void 0!==o&&s.setAttribute("nonce",o),s.textContent=e.cssText,i.appendChild(s)}})(i,this.constructor.elementStyles),i}connectedCallback(){this.renderRoot??=this.createRenderRoot(),this.enableUpdating(!0),this._$EO?.forEach(t=>t.hostConnected?.())}enableUpdating(t){}disconnectedCallback(){this._$EO?.forEach(t=>t.hostDisconnected?.())}attributeChangedCallback(t,e,i){this._$AK(t,i)}_$ET(t,e){const i=this.constructor.elementProperties.get(t),s=this.constructor._$Eu(t,i);if(void 0!==s&&!0===i.reflect){const o=(void 0!==i.converter?.toAttribute?i.converter:v).toAttribute(e,i.type);this._$Em=t,null==o?this.removeAttribute(s):this.setAttribute(s,o),this._$Em=null}}_$AK(t,e){const i=this.constructor,s=i._$Eh.get(t);if(void 0!==s&&this._$Em!==s){const t=i.getPropertyOptions(s),o="function"==typeof t.converter?{fromAttribute:t.converter}:void 0!==t.converter?.fromAttribute?t.converter:v;this._$Em=s;const a=o.fromAttribute(e,t.type);this[s]=a??this._$Ej?.get(s)??a,this._$Em=null}}requestUpdate(t,e,i,s=!1,o){if(void 0!==t){const a=this.constructor;if(!1===s&&(o=this[t]),i??=a.getPropertyOptions(t),!((i.hasChanged??b)(o,e)||i.useDefault&&i.reflect&&o===this._$Ej?.get(t)&&!this.hasAttribute(a._$Eu(t,i))))return;this.C(t,e,i)}!1===this.isUpdatePending&&(this._$ES=this._$EP())}C(t,e,{useDefault:i,reflect:s,wrapped:o},a){i&&!(this._$Ej??=new Map).has(t)&&(this._$Ej.set(t,a??e??this[t]),!0!==o||void 0!==a)||(this._$AL.has(t)||(this.hasUpdated||i||(e=void 0),this._$AL.set(t,e)),!0===s&&this._$Em!==t&&(this._$Eq??=new Set).add(t))}async _$EP(){this.isUpdatePending=!0;try{await this._$ES}catch(t){Promise.reject(t)}const t=this.scheduleUpdate();return null!=t&&await t,!this.isUpdatePending}scheduleUpdate(){return this.performUpdate()}performUpdate(){if(!this.isUpdatePending)return;if(!this.hasUpdated){if(this.renderRoot??=this.createRenderRoot(),this._$Ep){for(const[t,e]of this._$Ep)this[t]=e;this._$Ep=void 0}const t=this.constructor.elementProperties;if(t.size>0)for(const[e,i]of t){const{wrapped:t}=i,s=this[e];!0!==t||this._$AL.has(e)||void 0===s||this.C(e,void 0,i,s)}}let t=!1;const e=this._$AL;try{t=this.shouldUpdate(e),t?(this.willUpdate(e),this._$EO?.forEach(t=>t.hostUpdate?.()),this.update(e)):this._$EM()}catch(e){throw t=!1,this._$EM(),e}t&&this._$AE(e)}willUpdate(t){}_$AE(t){this._$EO?.forEach(t=>t.hostUpdated?.()),this.hasUpdated||(this.hasUpdated=!0,this.firstUpdated(t)),this.updated(t)}_$EM(){this._$AL=new Map,this.isUpdatePending=!1}get updateComplete(){return this.getUpdateComplete()}getUpdateComplete(){return this._$ES}shouldUpdate(t){return!0}update(t){this._$Eq&&=this._$Eq.forEach(t=>this._$ET(t,this[t])),this._$EM()}updated(t){}firstUpdated(t){}};w.elementStyles=[],w.shadowRootOptions={mode:"open"},w[f("elementProperties")]=new Map,w[f("finalized")]=new Map,g?.({ReactiveElement:w}),(u.reactiveElementVersions??=[]).push("2.1.2");const $=globalThis,x=t=>t,k=$.trustedTypes,S=k?k.createPolicy("lit-html",{createHTML:t=>t}):void 0,C="$lit$",A=`lit$${Math.random().toFixed(9).slice(2)}$`,M="?"+A,D=`<${M}>`,z=document,P=()=>z.createComment(""),E=t=>null===t||"object"!=typeof t&&"function"!=typeof t,T=Array.isArray,R="[ \t\n\f\r]",O=/<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g,N=/-->/g,I=/>/g,q=RegExp(`>|${R}(?:([^\\s"'>=/]+)(${R}*=${R}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`,"g"),U=/'/g,H=/"/g,L=/^(?:script|style|textarea|title)$/i,F=t=>(e,...i)=>({_$litType$:t,strings:e,values:i}),j=F(1),B=F(2),W=Symbol.for("lit-noChange"),V=Symbol.for("lit-nothing"),Z=new WeakMap,K=z.createTreeWalker(z,129);function Y(t,e){if(!T(t)||!t.hasOwnProperty("raw"))throw Error("invalid template strings array");return void 0!==S?S.createHTML(e):e}const J=(t,e)=>{const i=t.length-1,s=[];let o,a=2===e?"":3===e?"":"")),s]};class X{constructor({strings:t,_$litType$:e},i){let s;this.parts=[];let o=0,a=0;const r=t.length-1,n=this.parts,[l,c]=J(t,e);if(this.el=X.createElement(l,i),K.currentNode=this.el.content,2===e||3===e){const t=this.el.content.firstChild;t.replaceWith(...t.childNodes)}for(;null!==(s=K.nextNode())&&n.lengtht.stopPropagation()}>
- t.stopPropagation()}>
this._spaceDialog={...t,source:"file"}} />
${this._t("space.source_file")}
- ${"file"===t.source?j`
- ${t.planFile?j`${t.planFile.name}`:t.planUrl?j`
`:j`${this._t("space.no_plan")}`}
+ ${"file"===t.source?H`
`:W}
- ${"draw"===t.source&&"create"===t.mode?j`
+ ${"draw"===t.source&&"create"===t.mode?H`
`:V}
+ ${[["landscape","orient.landscape"],["portrait","orient.portrait"],["square","orient.square"]].map(([e,i])=>H``)}
+ `:W}
+ ${t.planFile?H`${t.planFile.name}`:t.planUrl?H``:H`${this._t("space.no_plan")}`}
-
`:V}
+
@@ -1373,26 +1392,26 @@ const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow
${Math.round(100*t.roomOpacity)}%
- ${[["none","fill.none"],["lqi","fill.lqi"],["light","fill.light"],["temp","fill.temp"]].map(([e,i])=>j`
- ${"edit"===t.mode?j``:W}
- ${this._importTotal>0&&"create"===t.mode?j``:V}
+ ${this._importTotal>0&&"create"===t.mode?H``:W}
+ `,ci=1e3;function hi(t){return t&&Array.isArray(t.spaces)?t.spaces.map(t=>{const e=ci/t.aspect;return{id:t.id,title:t.title,vb:[t.view_box[0]*ci,t.view_box[1]*e,t.view_box[2]*ci,t.view_box[3]*e],bg:t.plan_url?{href:t.plan_url,x:0,y:0,w:ci,h:e}:null,rooms:(t.rooms||[]).map(t=>({id:t.id,name:t.name,area:t.area??null,x:null!=t.x?t.x*ci:void 0,y:null!=t.y?t.y*e:void 0,w:null!=t.w?t.w*ci:void 0,h:null!=t.h?t.h*e:void 0,poly:t.poly?t.poly.map(t=>[t[0]*ci,t[1]*e]):void 0}))}}):[]}function pi(t){if(t.poly&&t.poly.length){const e=t.poly.map(t=>t[0]),i=t.poly.map(t=>t[1]),s=Math.min(...e),o=Math.min(...i);return{x:s,y:o,w:Math.max(...e)-s,h:Math.max(...i)-o}}return{x:t.x??0,y:t.y??0,w:t.w??0,h:t.h??0}}function di(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}function ui(t){const e=hi(t.cfg),i=e.find(e=>e.id===t.spaceId);if(!i)return null;const s=i.vb,o=He(t.cfg.spaces.find(e=>e.id===t.spaceId)),n=t.iconSize??2.5,r=n>8?2.5:n,a={};for(const e of t.cfg.spaces||[])for(const t of e.rooms||[])t.area&&(a[t.area]=e.id);const l=t.cfg.settings?.exclude_integrations?new Set(t.cfg.settings.exclude_integrations):ht,c=dt(t.cfg.settings?.icon_rules?.length?t.cfg.settings.icon_rules:pt),h=ti({hass:t.hass,areaToSpace:a,markers:t.cfg.markers||[],settings:t.cfg.settings||{},excluded:l,showAll:!!t.cfg.settings?.show_all,firstSpaceId:e[0]?.id||"",loc:e=>ri(t.lang,e),iconRules:c}),p=h.filter(e=>e.space===t.spaceId),d=function(t,e,i){const s={},o=i/100*ci*1.3;for(const i of e.rooms){if(!i.area)continue;const e=t.filter(t=>t.area===i.area);if(!e.length)continue;const n=pi(i),r=.1*Math.min(n.w,n.h),a=n.w-2*r,l=n.h-2*r,c=Math.max(1,Math.round(Math.sqrt(e.length*a/Math.max(l,1)))),h=a/c,p=l/Math.max(Math.ceil(e.length/c),1),d=e.map((t,e)=>({x:n.x+r+h*(e%c+.5),y:n.y+r+p*(Math.floor(e/c)+.5)}));Ie(d,n,o,.5*r),e.forEach((t,e)=>s[t.id]=d[e])}return s}(p,i,r),u=i.rooms.filter(t=>t.area||o.showBorders).map(e=>{let s="room "+(i.bg?"overlay":"yard"),n="";if(o.showBorders||"none"!==o.fill){s+=" styled";const i=[`--room-stroke:${o.color}`,`--room-stroke-op:${o.showBorders?o.opacity:0}`],r=e.area?je(o.fill,"lqi"===o.fill?function(t,e,i){const s=[];for(const o of e){if(o.area!==i||o.virtual)continue;const e=Ke(t,o.entities);null!=e&&s.push(e)}return Ne(s)}(t.hass,p,e.area):null,"light"===o.fill?ei(t.hass,p,e.area):"none","temp"===o.fill?ii(t.hass,p,e.area):null,o.tempMin,o.tempMax):null;r?(s+=" filled",i.push(`--room-fill:${r}`,`--room-fill-op:${(.3*o.opacity).toFixed(3)}`)):i.push("--room-fill:transparent","--room-fill-op:0"),n=i.join(";")}const r=!i.bg&&!o.showNames,a=di(e),l=e.poly?j`${e.name} `:W}`}),m=p.map(e=>{const o=function(t,e,i,s,o){const n=e[t.id];if(n&&n.s===t.space){const e=i.spaces.find(e=>e.id===t.space)?.aspect||1;return{x:n.x*ci,y:n.y*(ci/e)}}if(s[t.id])return s[t.id];const r=o.vb;return{x:r[0]+r[2]/2,y:r[1]+r[3]/2}}(e,t.layout,t.cfg,d,i),n=(o.x-s[0])/s[2]*100,r=(o.y-s[1])/s[3]*100;return H`
`}),_=o.showNames?i.rooms.filter(t=>t.name).map(e=>{const n=function(t,e,i,s){const o=i["rl_"+(t.id||"")];if(o&&o.s===e){const t=s.spaces.find(t=>t.id===e)?.aspect||1;return{x:o.x*ci,y:o.y*(ci/t)}}const n=di(t);return{x:n[0],y:n[1]}}(e,i.id,t.layout,t.cfg),r=(n.x-s[0])/s[2]*100,a=(n.y-s[1])/s[3]*100,l=Math.min(1,o.opacity+.25);return H`${e.name}
`}):[];return j`
+ ${e.name}
`}):[];return H`
-
- `}let le=null,ce=null,he=!1;const de=new Set;function pe(){if(le)return le;try{const t=JSON.parse(localStorage.getItem("houseplan_card_cfg_v1")||"null");if(t&&t.config&&Array.isArray(t.config.spaces))return{config:t.config,rev:t.rev||0,layout:t.layout||{}}}catch{}return null}function ue(t){return le?Promise.resolve(le):ce||(ce=async function(t){const[e,i]=await Promise.all([t.callWS({type:"houseplan/config/get"}),t.callWS({type:"houseplan/layout/get"})]);if(le={config:e?.config??null,rev:e?.rev??0,layout:i?.layout??{}},!he&&t.connection?.subscribeEvents){he=!0;try{await t.connection.subscribeEvents(()=>{le=null,de.forEach(t=>t())},"houseplan_config_updated")}catch{he=!1}}return le}(t).finally(()=>{ce=null}),ce)}class _e extends lt{constructor(){super(...arguments),this._spaces=null,this._spacesLoading=!1}setConfig(t){this._config=t}async _loadSpaces(){if(!this._spaces&&!this._spacesLoading&&this.hass){this._spacesLoading=!0;try{const t=await this.hass.callWS({type:"houseplan/config/get"});this._spaces=(t?.config?.spaces||[]).map(t=>({value:t.id,label:t.title||t.id}))}catch{this._spaces=[]}finally{this._spacesLoading=!1}}}get _lang(){return Qt(this.hass,this._config?.language)}get _schema(){const t=this._spaces||[];return[t.length?{name:"space",selector:{select:{mode:"dropdown",options:t}}}:{name:"space",selector:{text:{}}},{name:"title",selector:{text:{}}},{name:"show_button",selector:{boolean:{}}},{name:"button_label",selector:{text:{}}},{name:"button_target",selector:{text:{}}},{name:"aspect_ratio",selector:{text:{}}},{name:"icon_size",selector:{number:{min:1,max:6,step:.1,mode:"box"}}}]}render(){if(!this.hass||!this._config)return V;this._loadSpaces();const t=this._lang,e={space:te(t,"editor.space"),title:te(t,"editor.title"),show_button:te(t,"editor.show_button"),button_label:te(t,"editor.button_label"),button_target:te(t,"editor.button_target"),aspect_ratio:te(t,"editor.aspect_ratio"),icon_size:te(t,"editor.icon_size")};return j`${_}${m}
+ ${m}${_}
${t}
${te(this._lang,"space_card.loading")}
${t}
${ri(this._lang,"space_card.loading")}
${o}
`:V}
+ ${o?H`${o}
`:W}
${i}
- ${a?j`
+ ${n?H`
`:W}
-
`:V}
+ this._stagePointerUp(t)}
@pointercancel=${t=>this._stagePointerUp(t)}>
+ >${t.name}
`}get _measureAnchor(){return this._markup&&this._cursorPt?"draw"===this._tool&&this._path.length&&!this._contourClosed?this._path[this._path.length-1]:"split"===this._tool&&this._splitSel?.a?this._splitSel.a:null:null}_renderMeasureLabel(t){const e=this._measureAnchor,i=this._cursorPt,s=(i[0]-t.x)/t.w*100,o=(i[1]-t.y)/t.h*100;return H`
-
-
- ${this._roomDialog?this._renderRoomDialog():V}
- ${this._spaceDialog?this._renderSpaceDialog():V}
- ${this._markerDialog?this._renderMarkerDialog():V}
- ${this._infoCard?this._renderInfoCard():V}
- ${this._rulesDialog?this._renderRulesDialog():V}
- ${this._importDialog?this._renderImportDialog():V}
- ${this._tip?j`
- ${s.map(t=>this._renderDevice(t,n))}
- ${o.showNames&&!this._markup?e.rooms.map(t=>this._renderRoomLabel(t,e,n,o)):V}
+
- ${this._zoom>1?j`
+ ${s.map(t=>this._renderDevice(t,a))}
+ ${o.showNames&&!this._markup?e.rooms.map(t=>this._renderRoomLabel(t,e,a,o)):W}
- ${this._markup&&"draw"===this._tool&&this._path.length&&this._cursorPt&&!this._contourClosed?j`${this._renderMeasureLabel(n)}
`:V}
+ ${this._measureAnchor?H`${this._renderMeasureLabel(a)}
`:W}
${Math.round(100*this._zoom)}%
`:V}
+ ${this._zoom>1?H`${Math.round(100*this._zoom)}%
`:W}
- ${this._tip.title}${this._tip.meta?j`${this._tip.meta}`:V}
- ${null!=this._tip.temp?j`${this._t("tip.temp_avg")} ${this._tip.temp}°`:V}
- ${null!=this._tip.lqi?j`${this._t("tip.lqi")}
- ${this._tip.lqi}`:V}
-
`:V}
- ${this._toast?j`${this._toast}
`:V}
+ ${this._roomDialog?this._renderRoomDialog():W}
+ ${this._mergeDialog?this._renderMergeDialog():W}
+ ${this._spaceDialog?this._renderSpaceDialog():W}
+ ${this._markerDialog?this._renderMarkerDialog():W}
+ ${this._infoCard?this._renderInfoCard():W}
+ ${this._rulesDialog?this._renderRulesDialog():W}
+ ${this._importDialog?this._renderImportDialog():W}
+ ${this._tip?H`
+ ${this._tip.title}${this._tip.meta?H`${this._tip.meta}`:W}
+ ${null!=this._tip.temp?H`${this._t("tip.temp_avg")} ${this._tip.temp}°`:W}
+ ${null!=this._tip.lqi?H`${this._t("tip.lqi")}
+ ${this._tip.lqi}`:W}
+
`:W}
+ ${this._toast?H`${this._toast}
`:W}
- `}_renderDevice(t,e){const i=this._pos(t),s=(i.x-e.x)/e.w*100,o=(i.y-e.y)/e.h*100,a=this._stateClass(t),r=this._liveTemp(t),n=this._liveHum(t),l=this._config?.show_signal&&!t.virtual?Ft(this.hass,t.entities):null;return j`this._clickDevice(e,t)}
- @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=r?" · "+r+"°":"")+(null!=n?" · "+n+"%":"")+(null!=l?" · LQI "+l:""))}
+ @mousemove=${e=>this._showTip(e,t.name,t.model+(null!=r?" · "+r+"°":"")+(null!=a?" · "+a+"%":"")+(null!=l?" · LQI "+l:""))}
@mouseleave=${()=>this._tip=null}
@pointerdown=${e=>this._pointerDown(e,t)}
@pointermove=${e=>this._pointerMove(e,t)}
@@ -1163,67 +1169,80 @@ const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow
@pointercancel=${e=>this._pointerUp(e,t)}
>
`}_labelPos(t,e){const i=this._layout["rl_"+(t.id||"")];if(i&&i.s===e){const t=this._serverCfg.spaces.find(t=>t.id===e)?.aspect||1;return{x:i.x*ye,y:i.y*(ye/t)}}const s=this._roomCenter(t);return{x:s[0],y:s[1]}}_labelDown(t,e,i){if(this._markup)return;t.preventDefault(),t.stopPropagation();const s=this._labelPos(e,i);this._drag={id:"rl_"+(e.id||""),sx:t.clientX,sy:t.clientY,ox:s.x,oy:s.y,moved:!1},t.target.setPointerCapture(t.pointerId),this._tip=null}_labelMove(t,e,i){const s="rl_"+(e.id||"");if(!this._drag||this._drag.id!==s)return;const o=this._stageEl;if(!o)return;const a=this._spaceModel(i).vb,r=o.getBoundingClientRect(),n=this._viewOr(a),l=(t.clientX-this._drag.sx)/r.width*n.w,c=(t.clientY-this._drag.sy)/r.height*n.h;Math.abs(t.clientX-this._drag.sx)+Math.abs(t.clientY-this._drag.sy)>3&&(this._drag.moved=!0);const h=.008*Math.min(a[2],a[3]),d=Math.max(a[0]+h,Math.min(a[0]+a[2]-h,this._drag.ox+l)),p=Math.max(a[1]+h,Math.min(a[1]+a[3]-h,this._drag.oy+c));this._savePos({id:s,space:i},d,p)}_labelUp(t){const e="rl_"+(t.id||"");if(!this._drag||this._drag.id!==e)return;const i=this._drag.moved;this._drag=i?this._drag:null,i&&window.setTimeout(()=>this._drag=null,0)}_renderRoomLabel(t,e,i,s){if(!t.name)return V;const o=this._labelPos(t,e.id),a=(o.x-i.x)/i.w*100,r=(o.y-i.y)/i.h*100,n=Math.min(1,s.opacity+.25);return j`${r}°`:W}
+ ${null!=a?H`${a}%`:W}
+ ${null!=l?H`${l}`:W}
+
`}_labelPos(t,e){const i=this._layout["rl_"+(t.id||"")];if(i&&i.s===e){const t=this._serverCfg.spaces.find(t=>t.id===e)?.aspect||1;return{x:i.x*Ei,y:i.y*(Ei/t)}}const s=this._roomCenter(t);return{x:s[0],y:s[1]}}_labelDown(t,e,i){if(this._markup)return;t.preventDefault(),t.stopPropagation();const s=this._labelPos(e,i);this._drag={id:"rl_"+(e.id||""),sx:t.clientX,sy:t.clientY,ox:s.x,oy:s.y,moved:!1},t.target.setPointerCapture(t.pointerId),this._tip=null}_labelMove(t,e,i){const s="rl_"+(e.id||"");if(!this._drag||this._drag.id!==s)return;const o=this._stageEl;if(!o)return;const n=this._spaceModel(i).vb,r=o.getBoundingClientRect(),a=this._viewOr(n),l=(t.clientX-this._drag.sx)/r.width*a.w,c=(t.clientY-this._drag.sy)/r.height*a.h;Math.abs(t.clientX-this._drag.sx)+Math.abs(t.clientY-this._drag.sy)>3&&(this._drag.moved=!0);const h=.008*Math.min(n[2],n[3]),p=Math.max(n[0]+h,Math.min(n[0]+n[2]-h,this._drag.ox+l)),d=Math.max(n[1]+h,Math.min(n[1]+n[3]-h,this._drag.oy+c));this._savePos({id:s,space:i},p,d)}_labelUp(t){const e="rl_"+(t.id||"");if(!this._drag||this._drag.id!==e)return;const i=this._drag.moved;this._drag=i?this._drag:null,i&&window.setTimeout(()=>this._drag=null,0)}_renderRoomLabel(t,e,i,s){if(!t.name)return W;const o=this._labelPos(t,e.id),n=(o.x-i.x)/i.w*100,r=(o.y-i.y)/i.h*100,a=Math.min(1,s.opacity+.25);return H`this._labelDown(i,t,e.id)}
@pointermove=${i=>this._labelMove(i,t,e.id)}
@pointerup=${()=>this._labelUp(t)}
@pointercancel=${()=>this._labelUp(t)}
- >${t.name}
`}_renderMeasureLabel(t){const e=this._path[this._path.length-1],i=this._cursorPt,s=(i[0]-t.x)/t.w*100,o=(i[1]-t.y)/t.h*100;return j`${this._fmtLen(e,i)}
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return B`${this._fmtLen(e,i)}
`}_roomCenter(t){if(t.poly){const e=t.poly.length;return[t.poly.reduce((t,e)=>t+e[0],0)/e,t.poly.reduce((t,e)=>t+e[1],0)/e]}return[t.x+t.w/2,t.y+.1*Math.min(t.w,t.h)]}_renderMarkupDefs(t){const e=this._gridPitch,i=.14*e;return j`
+ ${e.map(t=>j`
`}_renderRoomDialog(){const t=this._freeAreas;return j``}_renderMergeDialog(){const t=this._mergeDialog,e=this._spaceModel().rooms,i=(i,s)=>{const o=e.find(t=>t.id===i),n=o?.area?this.hass.areas[o.area]?.name:null;return H``};return H``}_renderRoomDialog(){const t=this._freeAreas;return H``}}xe.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_rulesDialog:{state:!0},_importDialog:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},xe.styles=ie,customElements.get("houseplan-card")||customElements.define("houseplan-card",xe),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Interactive house plan: spaces, rooms and devices with live states and drag layout."}),console.info("%c HOUSEPLAN-CARD %c v1.20.0 ","background:#3ea6ff;color:#04121f;font-weight:700","");
+ `}}Mi.properties={hass:{attribute:!1},_config:{state:!0},_space:{state:!0},_layout:{state:!0},_devices:{state:!0},_tip:{state:!0},_selId:{state:!0},_toast:{state:!0},_serverCfg:{state:!0},_markup:{state:!0},_tool:{state:!0},_path:{state:!0},_cursorPt:{state:!0},_mergeSel:{state:!0},_mergeDialog:{state:!0},_splitSel:{state:!0},_areaSel:{state:!0},_nameSel:{state:!0},_roomDialog:{state:!0},_spaceDialog:{state:!0},_infoCard:{state:!0},_rulesDialog:{state:!0},_importDialog:{state:!0},_markerDialog:{state:!0},_zoom:{state:!0},_view:{state:!0}},Mi.styles=li,customElements.get("houseplan-card")||customElements.define("houseplan-card",Mi),window.customCards=window.customCards||[],window.customCards.find(t=>"houseplan-card"===t.type)||window.customCards.push({type:"houseplan-card",name:"House Plan Card",description:"Interactive house plan: spaces, rooms and devices with live states and drag layout."}),console.info("%c HOUSEPLAN-CARD %c v1.21.0 ","background:#3ea6ff;color:#04121f;font-weight:700","");
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index a9babc7..24b9d32 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,24 @@
# Changelog
+## v1.21.0 — 2026-07-16 (merge and split rooms)
+- **Merge** (toolbar "Merge"): click a room, then a neighbour. Only rooms that **share a wall**
+ can merge — and that is decided by the result rather than a heuristic: `mergeRooms` unions the
+ outlines and accepts the pair only when they collapse into ONE hole-free outline. A corner
+ touch, rooms apart, or a union enclosing a hole are refused. A dialog picks which name and
+ area survive; the kept room keeps its id, so its label position and devices stay put. The
+ dialog warns that the other area is released.
+- **Split** (toolbar "Split"): click the room, then two points on its walls — the chord cuts it
+ in two, with the live ruler on the cut. **The bigger part stays the room it was** (name, area,
+ devices); the smaller becomes a new room and its dialog asks for name/area. Cancelling the
+ dialog leaves the room whole — the cut is applied only on confirm. Cuts that do not run
+ wall-to-wall inside the room (ends off the wall, chord leaving a concave room, a chord along a
+ wall) are refused.
+- Boolean geometry via **polyclip-ts** (proper ESM + native types; `polygon-clipping` ships named
+ types but a default-only ESM build, which breaks either tsc or the runtime). Verified against
+ the real plan, where neighbouring walls overlap collinearly instead of matching exactly —
+ the case a hand-rolled union gets wrong. Bundle: 151 KB → 202 KB.
+- New pure helpers: `polygonArea`, `mergeRooms`, `splitRoom`. (+5 tests: 67 → 72.)
+
## v1.20.0 — 2026-07-16 (rooms may not overlap)
- **A click strictly inside an existing room is refused** while drawing (toast names the room).
Being *on* a wall stays legal — neighbouring rooms share walls, and real walls overlap
diff --git a/docs/STATUS.md b/docs/STATUS.md
index 2d5db8a..953c571 100644
--- a/docs/STATUS.md
+++ b/docs/STATUS.md
@@ -13,14 +13,14 @@
| Item | State |
|---|---|
-| Version | **v1.20.0** everywhere (manifest, const.py, package.json, CARD_VERSION) |
+| Version | **v1.21.0** everywhere (manifest, const.py, package.json, CARD_VERSION) |
| GitHub | https://github.com/Matysh/houseplan-card — branch `main`, releases v1.9.3…v1.11.2 |
| CI | `.github/workflows/validate.yml` (hacs + hassfest + frontend + backend) — **fully green** since v1.11.1; `release.yml` auto-attaches the card bundle (needs `permissions: contents: write`, fixed) |
| HACS | Works as custom repository (id 1290210112 on the home instance). **Inclusion PR: https://github.com/hacs/default/pull/9004** (queue ≈2 months as of 2026-07). Lesson: #8995 was auto-closed by hacs-bot — the PR body MUST be their exact template with every checkbox ticked and all 3 links (release, HACS action run, hassfest run); a custom body gets closed without discussion |
| Brands | Ships **inside the integration**: `custom_components/houseplan/brand/{icon,icon@2x,logo,logo@2x}.png` (HA ≥2026.3 local-brands mechanism). home-assistant/brands PR #10700 was auto-closed — that repo no longer accepts custom integrations |
| Home instance | ha.jbstudio.pro (SSH port 323, key `ha_jb`), deployed v1.11.2, installed *via HACS* (custom repo) — updates flow through HACS now |
| Localization | UI en/ru (`src/i18n.ts`), auto by `hass.locale` + `language` card option; codebase and docs are English-first (`README.ru.md` is the Russian copy) |
-| Tests | 67 frontend (node:test, incl. a 12-test buildDevices suite on a fake hass) + 10 pure backend (anywhere) + 12 HA-harness backend (CI only, py3.13; skipped locally — sandbox has py3.10) |
+| Tests | 72 frontend (node:test, incl. a 12-test buildDevices suite on a fake hass) + 10 pure backend (anywhere) + 12 HA-harness backend (CI only, py3.13; skipped locally — sandbox has py3.10) |
## Recent milestones (details in CHANGELOG.md)
diff --git a/docs/TESTING.md b/docs/TESTING.md
index 6ba0ba2..6d138c7 100644
--- a/docs/TESTING.md
+++ b/docs/TESTING.md
@@ -74,6 +74,11 @@ Run the *core flows* (marked ★ below) in each environment at least once per mi
- [ ] Rooms never overlap (v1.20.0): a click strictly inside an existing room is refused with a
toast; a click ON a shared wall (including mid-span of a longer neighbour wall) still works
- [ ] Closing an outline drawn AROUND an existing room is refused; the outline stays open
+- [ ] Merge (v1.21.0): two rooms sharing a wall merge into one; the dialog picks the surviving
+ name/area; rooms touching only at a corner or apart are refused with a toast
+- [ ] Split (v1.21.0): click a room, then two points on its walls — the bigger part keeps the
+ name/area/devices, the smaller opens the new-room dialog; Cancel leaves the room whole
+- [ ] Split: a cut with an end off the wall, or along a wall, is refused with a toast
- [ ] Esc / Ctrl+Z removes the last dot (and its line); Reset clears the path
- [ ] Closing the contour (click the first dot, ≥4 points) opens the room dialog
- [ ] Room dialog: area list shows only unassigned areas; picking an area prefills the name
diff --git a/package-lock.json b/package-lock.json
index cf2e7ea..96dfc15 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,16 @@
{
"name": "houseplan-card",
- "version": "1.15.0",
+ "version": "1.20.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "houseplan-card",
- "version": "1.15.0",
+ "version": "1.20.0",
"license": "MIT",
"dependencies": {
- "lit": "^3.1.3"
+ "lit": "^3.1.3",
+ "polyclip-ts": "^0.16.8"
},
"devDependencies": {
"@mdi/js": "^7.4.47",
@@ -597,6 +598,15 @@
"node": ">=0.4.0"
}
},
+ "node_modules/bignumber.js": {
+ "version": "9.3.1",
+ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
+ "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
+ "license": "MIT",
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/buffer-from": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -797,6 +807,16 @@
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
+ "node_modules/polyclip-ts": {
+ "version": "0.16.8",
+ "resolved": "https://registry.npmjs.org/polyclip-ts/-/polyclip-ts-0.16.8.tgz",
+ "integrity": "sha512-JPtKbDRuPEuAjuTdhR62Gph7Is2BS1Szx69CFOO3g71lpJDFo78k4tFyi+qFOMVPePEzdSKkpGU3NBXPHHjvKQ==",
+ "license": "MIT",
+ "dependencies": {
+ "bignumber.js": "^9.1.0",
+ "splaytree-ts": "^1.0.2"
+ }
+ },
"node_modules/randombytes": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -936,6 +956,12 @@
"source-map": "^0.6.0"
}
},
+ "node_modules/splaytree-ts": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/splaytree-ts/-/splaytree-ts-1.0.2.tgz",
+ "integrity": "sha512-0kGecIZNIReCSiznK3uheYB8sbstLjCZLiwcQwbmLhgHJj2gz6OnSPkVzJQCMnmEz1BQ4gPK59ylhBoEWOhGNA==",
+ "license": "BDS-3-Clause"
+ },
"node_modules/supports-preserve-symlinks-flag": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
diff --git a/package.json b/package.json
index 78d7398..54047ae 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "houseplan-card",
- "version": "1.20.0",
+ "version": "1.21.0",
"description": "Interactive house plan Lovelace card for Home Assistant",
"license": "MIT",
"type": "module",
@@ -22,6 +22,7 @@
"typescript": "^5.4.5"
},
"dependencies": {
- "lit": "^3.1.3"
+ "lit": "^3.1.3",
+ "polyclip-ts": "^0.16.8"
}
}
diff --git a/src/houseplan-card.ts b/src/houseplan-card.ts
index 25a9d96..cef6b6d 100755
--- a/src/houseplan-card.ts
+++ b/src/houseplan-card.ts
@@ -14,6 +14,7 @@ import {
import {
lqiColor, snapToGrid, samePoint, pointInPolygon, markerIdForBinding,
segmentCm, formatLength, roomEdges, roomPoly, pointStrictlyInside, roomsOverlap,
+ pointOnBoundary, mergeRooms, splitRoom, polygonArea,
averageLqi, fitView, declump, safeUrl, resolveTapAction, floorsOf, type FloorInfo,
spaceDisplayOf, roomFillColor, DEFAULT_ROOM_COLOR, DEFAULT_ROOM_OPACITY,
DEFAULT_TEMP_MIN, DEFAULT_TEMP_MAX, type SpaceDisplay,
@@ -27,14 +28,14 @@ import './space-card';
import { cardStyles } from './styles';
import { langOf, t, type I18nKey } from './i18n';
-const CARD_VERSION = '1.20.0';
+const CARD_VERSION = '1.21.0';
const LS_KEY = 'houseplan_card_layout_v1';
const LS_CFG = 'houseplan_card_cfg_v1'; // cache of the server config+layout for instant rendering
const LS_ZOOM = 'houseplan_card_zoom_v1';
const NORM_W = 1000; // width of the render space for normalized configs
const GRID_N = 240; // grid points across the plan width (half the previous step; old nodes are a subset of the new ones, positions are preserved)
-type MarkupTool = 'draw' | 'delroom';
+type MarkupTool = 'draw' | 'merge' | 'split' | 'delroom';
const fireEvent = (node: EventTarget, type: string, detail?: unknown) => {
const ev = new Event(type, { bubbles: true, composed: true }) as any;
@@ -81,6 +82,11 @@ class HouseplanCard extends LitElement {
private _tool: MarkupTool = 'draw';
private _path: number[][] = []; // current outline (render units, vertices snapped to the grid)
private _cursorPt: number[] | null = null;
+ private _mergeSel: string | null = null; // first room picked for a merge
+ private _mergeDialog: { aId: string; bId: string; poly: number[][]; pick: 'a' | 'b' } | null = null;
+ private _splitSel: { roomId: string; a: number[] | null } | null = null; // room being cut + first wall point
+ // a split is applied only when the new room's dialog is confirmed — cancel leaves the room intact
+ private _pendingSplit: { roomId: string; mainPoly: number[][]; newPoly: number[][] } | null = null;
private _areaSel = '';
private _nameSel = '';
private _roomDialog = false;
@@ -170,6 +176,9 @@ class HouseplanCard extends LitElement {
_tool: { state: true },
_path: { state: true },
_cursorPt: { state: true },
+ _mergeSel: { state: true },
+ _mergeDialog: { state: true },
+ _splitSel: { state: true },
_areaSel: { state: true },
_nameSel: { state: true },
_roomDialog: { state: true },
@@ -966,6 +975,10 @@ class HouseplanCard extends LitElement {
this._path = [];
this._cursorPt = null;
this._tool = 'draw';
+ this._mergeSel = null;
+ this._mergeDialog = null;
+ this._splitSel = null;
+ this._pendingSplit = null;
}
private _svgPoint(ev: MouseEvent): number[] {
@@ -1052,6 +1065,14 @@ class HouseplanCard extends LitElement {
this.requestUpdate();
return;
}
+ if (this._tool === 'merge') {
+ this._mergeClick(raw);
+ return;
+ }
+ if (this._tool === 'split') {
+ this._splitClick(raw);
+ return;
+ }
// draw: clicks on grid points build the outline. Nothing is written to the config
// until the contour closes — an abandoned outline leaves no lines behind.
const pt = this._snap(raw);
@@ -1088,14 +1109,103 @@ class HouseplanCard extends LitElement {
this._path = [...this._path, pt];
}
+ /** Merge: first click picks a room, second picks the room to merge it with. */
+ private _mergeClick(raw: number[]): void {
+ const rooms = this._spaceModel().rooms;
+ const hit = [...rooms].reverse().find((r) => this._pointInRoom(raw, r));
+ if (!hit?.id) return;
+ const hitId = hit.id;
+ if (!this._mergeSel || this._mergeSel === hitId) {
+ this._mergeSel = this._mergeSel === hitId ? null : hitId; // click again = deselect
+ return;
+ }
+ const a = rooms.find((r) => r.id === this._mergeSel);
+ const pa = a ? roomPoly(a) : null;
+ const pb = roomPoly(hit);
+ const merged = pa && pb ? mergeRooms(pa, pb) : null;
+ if (!merged) {
+ // only rooms sharing a wall collapse into one outline (see mergeRooms)
+ this._showToast(this._t('toast.merge_not_adjacent'));
+ this._mergeSel = null;
+ return;
+ }
+ this._mergeDialog = { aId: this._mergeSel, bId: hitId, poly: merged, pick: 'a' };
+ this._mergeSel = null;
+ }
+
+ private _commitMerge(): void {
+ const d = this._mergeDialog;
+ const sp = this._curSpaceCfg;
+ if (!d || !sp) return;
+ const H = this._spaceH;
+ const keepId = d.pick === 'a' ? d.aId : d.bId;
+ const dropId = d.pick === 'a' ? d.bId : d.aId;
+ const keep = sp.rooms.find((r: any) => r.id === keepId);
+ if (!keep) {
+ this._mergeDialog = null;
+ return;
+ }
+ // the kept room keeps its id, so its label position and devices stay put
+ keep.poly = d.poly.map((p) => [p[0] / NORM_W, p[1] / H]);
+ delete keep.x; delete keep.y; delete keep.w; delete keep.h; // a merged room is never a rect
+ sp.rooms = sp.rooms.filter((r: any) => r.id !== dropId);
+ this._saveConfig();
+ this._mergeDialog = null;
+ this._regSignature = '';
+ this._maybeRebuildDevices();
+ this._showToast(this._t('toast.rooms_merged', { name: keep.name || '' }));
+ }
+
+ /** Split: click the room, then two points on its walls. */
+ private _splitClick(raw: number[]): void {
+ const rooms = this._spaceModel().rooms;
+ if (!this._splitSel) {
+ const hit = [...rooms].reverse().find((r) => this._pointInRoom(raw, r));
+ if (!hit?.id) return;
+ this._splitSel = { roomId: hit.id, a: null };
+ return;
+ }
+ const room = rooms.find((r) => r.id === this._splitSel!.roomId);
+ const poly = room ? roomPoly(room) : null;
+ if (!room || !poly) {
+ this._splitSel = null;
+ return;
+ }
+ const eps = this._gridPitch * 0.02;
+ const pt = this._snap(raw);
+ if (!pointOnBoundary(pt, poly, eps)) {
+ this._showToast(this._t('toast.split_pick_wall'));
+ return;
+ }
+ if (!this._splitSel.a) {
+ this._splitSel = { ...this._splitSel, a: pt };
+ return;
+ }
+ const parts = splitRoom(poly, this._splitSel.a, pt, eps);
+ if (!parts) {
+ this._showToast(this._t('toast.split_bad_cut'));
+ return;
+ }
+ // the bigger part stays the room it was — name, area and devices go with it
+ const [p1, p2] = parts;
+ const main = polygonArea(p1) >= polygonArea(p2) ? p1 : p2;
+ const fresh = main === p1 ? p2 : p1;
+ this._pendingSplit = { roomId: room.id!, mainPoly: main, newPoly: fresh };
+ this._cursorPt = null;
+ this._nameSel = '';
+ this._areaSel = '';
+ this._roomDialog = true;
+ }
+
private get _contourClosed(): boolean {
return this._path.length >= 4 && this._samePt(this._path[0], this._path[this._path.length - 1]);
}
private _markupMove(ev: MouseEvent): void {
- if (!this._markup || this._tool !== 'draw' || !this._path.length || this._contourClosed) {
- return;
- }
+ if (!this._markup) return;
+ const drawing = this._tool === 'draw' && this._path.length && !this._contourClosed;
+ const cutting = this._tool === 'split' && !!this._splitSel?.a;
+ if (!drawing && !cutting) return;
this._cursorPt = this._snap(this._svgPoint(ev));
}
@@ -1113,11 +1223,26 @@ class HouseplanCard extends LitElement {
}
private _commitRoom(): void {
- if (!this._contourClosed) return;
const sp = this._curSpaceCfg;
if (!sp) return;
const H = this._spaceH;
- const verts = this._path.slice(0, -1); // without the duplicated closing vertex
+ let verts: number[][];
+ if (this._pendingSplit) {
+ // apply the cut now: the bigger part keeps the original room, this dialog names the rest
+ const main = sp.rooms.find((r: any) => r.id === this._pendingSplit!.roomId);
+ if (!main) {
+ this._pendingSplit = null;
+ this._splitSel = null;
+ this._roomDialog = false;
+ return;
+ }
+ main.poly = this._pendingSplit.mainPoly.map((p) => [p[0] / NORM_W, p[1] / H]);
+ delete main.x; delete main.y; delete main.w; delete main.h;
+ verts = this._pendingSplit.newPoly;
+ } else {
+ if (!this._contourClosed) return;
+ verts = this._path.slice(0, -1); // without the duplicated closing vertex
+ }
const areaName = this._areaSel ? this.hass.areas[this._areaSel]?.name : '';
sp.rooms.push({
id: 'r' + Date.now().toString(36),
@@ -1127,6 +1252,8 @@ class HouseplanCard extends LitElement {
});
this._saveConfig();
this._path = [];
+ this._pendingSplit = null;
+ this._splitSel = null;
const boundArea = this._areaSel;
this._areaSel = '';
this._nameSel = '';
@@ -1164,11 +1291,21 @@ class HouseplanCard extends LitElement {
this._path = [];
this._cursorPt = null;
this._roomDialog = false;
+ this._pendingSplit = null;
+ this._splitSel = null;
+ this._mergeSel = null;
+ this._mergeDialog = null;
}
/** Cancel in the dialog: the outline is open again (the closing point is removed). */
private _roomDialogCancel(): void {
this._roomDialog = false;
+ if (this._pendingSplit) {
+ // nothing was applied yet — drop the cut entirely, the room stays whole
+ this._pendingSplit = null;
+ this._splitSel = null;
+ return;
+ }
this._undoPoint();
}
@@ -1953,6 +2090,8 @@ class HouseplanCard extends LitElement {
: nothing}
${space.rooms.filter((r) => r.area || this._markup || disp.showBorders).map((r) => {
let cls = 'room ' + (space.bg ? 'overlay' : 'yard') + (this._markup ? ' outlined' : '');
+ if (this._markup && (r.id === this._mergeSel || r.id === this._splitSel?.roomId))
+ cls += ' picked';
let style = '';
if (!this._markup && (disp.showBorders || disp.fill !== 'none')) {
cls += ' styled';
@@ -1999,7 +2138,7 @@ class HouseplanCard extends LitElement {
? space.rooms.map((r) => this._renderRoomLabel(r, space, view, disp))
: nothing}
- ${this._markup && this._tool === 'draw' && this._path.length && this._cursorPt && !this._contourClosed
+ ${this._measureAnchor
? html`t.stopPropagation()}>
- t.stopPropagation()}>
this._spaceDialog={...t,source:"file"}} />
${this._t("space.source_file")}
- ${"file"===t.source?j`
- ${t.planFile?j`${t.planFile.name}`:t.planUrl?j``:j`${this._t("space.no_plan")}`}
+ ${"file"===t.source?H`
`:W}
- ${"draw"===t.source&&"create"===t.mode?j`
+ ${"draw"===t.source&&"create"===t.mode?H`
`:V}
+ ${[["landscape","orient.landscape"],["portrait","orient.portrait"],["square","orient.square"]].map(([e,i])=>H``)}
+ `:W}
+ ${t.planFile?H`${t.planFile.name}`:t.planUrl?H``:H`${this._t("space.no_plan")}`}
-
`:V}
+
@@ -1373,26 +1392,26 @@ const t=globalThis,e=t.ShadowRoot&&(void 0===t.ShadyCSS||t.ShadyCSS.nativeShadow
${Math.round(100*t.roomOpacity)}%
- ${[["none","fill.none"],["lqi","fill.lqi"],["light","fill.light"],["temp","fill.temp"]].map(([e,i])=>j`
- ${"edit"===t.mode?j``:W}
- ${this._importTotal>0&&"create"===t.mode?j``:V}
+ ${this._importTotal>0&&"create"===t.mode?H``:W}
${this._renderMeasureLabel(view)}
`
: nothing}
@@ -2009,6 +2148,7 @@ class HouseplanCard extends LitElement {
${this._roomDialog ? this._renderRoomDialog() : nothing}
+ ${this._mergeDialog ? this._renderMergeDialog() : nothing}
${this._spaceDialog ? this._renderSpaceDialog() : nothing}
${this._markerDialog ? this._renderMarkerDialog() : nothing}
${this._infoCard ? this._renderInfoCard() : nothing}
@@ -2122,9 +2262,18 @@ class HouseplanCard extends LitElement {
>${r.name}`;
}
- /** Length badge that follows the cursor while drawing the current segment. */
+ /** Where the live measurement starts: the last outline point, or the first split point. */
+ private get _measureAnchor(): number[] | null {
+ if (!this._markup || !this._cursorPt) return null;
+ if (this._tool === 'draw' && this._path.length && !this._contourClosed)
+ return this._path[this._path.length - 1];
+ if (this._tool === 'split' && this._splitSel?.a) return this._splitSel.a;
+ return null;
+ }
+
+ /** Length badge that follows the cursor while drawing a segment or a cut. */
private _renderMeasureLabel(view: { x: number; y: number; w: number; h: number }): TemplateResult {
- const a = this._path[this._path.length - 1];
+ const a = this._measureAnchor!;
const b = this._cursorPt!;
const left = ((b[0] - view.x) / view.w) * 100;
const top = ((b[1] - view.y) / view.h) * 100;
@@ -2167,6 +2316,13 @@ class HouseplanCard extends LitElement {
x2="${this._cursorPt[0]}" y2="${this._cursorPt[1]}">`
: nothing}
${path.map((p, i) => svg`