german/houseplan-card
1
0
Fork 0
mirror of https://github.com/Matysh/houseplan-card synced 2026-10-06 22:49:16 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

refactor: remove dead partition tool state

Browse Source 
Issue: #176
User-Visible: no
This commit is contained in:
Sergey Matyunin
2026-08-19 16:17:09 +03:00
parent 41e2cfffc6
commit f66e671b89
16 changed files with 142 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/houseplan-card.ts
+18 -55
View File
@@ -513,7 +513,7 @@ const unionRect = (a: Rect, b: Rect): Rect => {
return { x, y, w: Math.max(a.x + a.w, b.x + b.w) - x, h: Math.max(a.y + a.h, b.y + b.h) - y };
};
type MarkupTool = 'select' | 'draw' | 'partition' | 'column' | 'merge' | 'split' | 'resize' | 'opening' | 'boundary' | 'wallthick' | 'delroom';
type MarkupTool = 'select' | 'draw' | 'column' | 'merge' | 'split' | 'resize' | 'opening' | 'boundary' | 'wallthick' | 'delroom';
type RoomFillFrame = {
byRoom: Map<RoomCfg, ResolvedRoomFill | null>;
byId: Map<string, ResolvedRoomFill | null>;
@@ -544,7 +544,7 @@ type WallFaceBatch = {
*/
type GlowClipGeometry = { lit: string[] };
const MARKUP_TOOLS = new Set<MarkupTool>([
'select', 'draw', 'partition', 'column', 'merge', 'split', 'resize',
'select', 'draw', 'column', 'merge', 'split', 'resize',
'opening', 'boundary', 'wallthick', 'delroom',
]);
/** Warm viewport is page-memory, so it may contain a tool name from the old bundle. */
@@ -2238,7 +2238,7 @@ class HouseplanCard extends LitElement {
}
// A crash-safe segment is a real geometry command, but Undo keeps the
// surviving draft active so the visible contract remains “one point back”.
if ((this._tool === 'draw' || this._tool === 'partition') && this._path.length) {
if (this._tool === 'draw' && this._path.length) {
if (this._activeDraftId && this._path.length > 1) this._undoActiveDraftPoint();
else this._undoPoint();
return;
@@ -2267,11 +2267,6 @@ class HouseplanCard extends LitElement {
this._undoPoint();
return;
}
if (this._tool === 'partition' && this._path.length) {
e.preventDefault();
this._undoPoint();
return;
}
if (this._physicalSel) {
e.preventDefault();
this._physicalSel = null;
@@ -2320,7 +2315,7 @@ class HouseplanCard extends LitElement {
return;
}
if (this._tool === 'opening' || this._tool === 'wallthick' || this._tool === 'delroom'
|| this._tool === 'partition' || this._tool === 'column') {
|| this._tool === 'column') {
e.preventDefault();
if (this._tool === 'opening') this._clearOpeningPlacement(true);
this._tool = 'draw';
@@ -5359,7 +5354,7 @@ class HouseplanCard extends LitElement {
if (this._tool === 'opening') {
this._cursorPt = null;
this._clearOpeningPlacement(false);
} else if (this._tool === 'draw' || this._tool === 'partition') {
} else if (this._tool === 'draw') {
this._clearPlanSnapHover();
}
const pts = [...this._pointers.values()];
@@ -5426,7 +5421,7 @@ class HouseplanCard extends LitElement {
if (this._tool === 'opening') {
this._cursorPt = null;
this._clearOpeningPlacement(false);
} else if (this._tool === 'draw' || this._tool === 'partition') {
} else if (this._tool === 'draw') {
this._clearPlanSnapHover();
}
const pts = [...this._pointers.values()];
@@ -5447,7 +5442,7 @@ class HouseplanCard extends LitElement {
if (this._tool === 'opening') {
this._cursorPt = null;
this._clearOpeningPlacement(false);
} else if (this._tool === 'draw' || this._tool === 'partition') {
} else if (this._tool === 'draw') {
this._clearPlanSnapHover();
}
}
@@ -5484,7 +5479,7 @@ class HouseplanCard extends LitElement {
if (this._tool === 'opening') {
this._cursorPt = null;
this._clearOpeningPlacement(false);
} else if (this._tool === 'draw' || this._tool === 'partition') {
} else if (this._tool === 'draw') {
this._clearPlanSnapHover();
}
}
@@ -6361,7 +6356,7 @@ class HouseplanCard extends LitElement {
}
private get _activePlanSnapCandidate(): PlanSnapCandidate | null {
if (!this._markup || (this._tool !== 'draw' && this._tool !== 'partition')) return null;
if (!this._markup || this._tool !== 'draw') return null;
const hover = this._planSnapHover;
if (!hover) return null;
const snapshot = this._planSnapGeometrySnapshot();
@@ -6598,7 +6593,7 @@ class HouseplanCard extends LitElement {
if (this._tool === 'opening') {
this._cursorPt = null;
this._clearOpeningPlacement(false);
} else if (this._tool === 'draw' || this._tool === 'partition') {
} else if (this._tool === 'draw') {
this._clearPlanSnapHover();
}
const viewportGestureEnded = !!this._pinchStart || !!this._panStart;
@@ -6831,10 +6826,6 @@ class HouseplanCard extends LitElement {
this._splitClick(raw);
return;
}
if (this._tool === 'partition') {
this._partitionClick(raw, ev.shiftKey);
return;
}
if (this._tool === 'column') {
this._columnClick(raw);
return;
@@ -7140,29 +7131,6 @@ class HouseplanCard extends LitElement {
this._roomDialog = true;
}
private _partitionClick(raw: number[], lock45: boolean): void {
const pt = this._resolvePlanDrawPoint(raw, lock45).point;
if (!this._path.length) { this._path = [pt]; return; }
const a = this._path[0];
if (this._samePt(a, pt)) return;
const cm = this._drawWallCm;
if (cm == null) { this._showPhysicalRange(100); return; }
if (!this._curSpaceCfg || this._limitReached('partition')) return;
const before = this._geometrySnapshot();
const sp = this._curSpaceCfg as any;
sp.partitions ||= [];
const id = 'partition-' + Date.now().toString(36);
sp.partitions.push({ id, a: [a[0] / NORM_W, a[1] / NORM_W],
b: [pt[0] / NORM_W, pt[1] / NORM_W], cm });
this._path = [];
this._activeDraftId = null;
this._draftSegmentCms = [];
this._closingWallCm = null;
this._clearPlanSnapHover();
this._recordGeometry(this._t('history.partition_add'), before);
this._saveConfig();
}
private _columnClick(raw: number[]): void {
const center = this._snap(raw);
const cm = this._drawWallCm;
@@ -9556,7 +9524,6 @@ class HouseplanCard extends LitElement {
this._drawWallField = (e.target as HTMLInputElement).value;
}}
title=${this._t(this._tool === 'draw' ? 'markup.draw_wall_title'
: this._tool === 'partition' ? 'physical.partition_size_title'
: 'physical.column_size_title')} />
<span class="opl">${this._t(this._imperial ? 'wallthick.unit_in' : 'wallthick.unit_cm')}</span>
<span class="rangehint">${this._t('physical.allowed_range', {
@@ -9594,9 +9561,8 @@ class HouseplanCard extends LitElement {
};
}
const hasThickness = this._tool === 'draw' || this._tool === 'partition' || this._tool === 'column';
const hintKey = this._tool === 'partition' ? 'markup.hint_partition'
: this._tool === 'column' ? 'markup.hint_column'
const hasThickness = this._tool === 'draw' || this._tool === 'column';
const hintKey = this._tool === 'column' ? 'markup.hint_column'
: this._tool === 'resize' ? 'markup.hint_resize'
: this._tool === 'wallthick' ? 'markup.hint_wallthick'
: this._tool === 'boundary' ? this._boundaryHintKey
@@ -9613,7 +9579,6 @@ class HouseplanCard extends LitElement {
kind: operation ? 'operation' : 'tool',
ariaLabel: this._t('editor.tool_options', {
tool: this._t((this._tool === 'draw' ? 'markup.add'
: this._tool === 'partition' ? 'markup.partition'
: this._tool === 'column' ? 'markup.column'
: this._tool === 'resize' ? 'markup.resize'
: this._tool === 'wallthick' ? 'markup.wallthick'
@@ -11905,8 +11870,7 @@ class HouseplanCard extends LitElement {
this._cursorPt = this._svgPoint(ev);
return;
}
const architectural = (this._tool === 'draw' || this._tool === 'partition')
&& !this._contourClosed;
const architectural = this._tool === 'draw' && !this._contourClosed;
const cutting = this._tool === 'split' && !!this._splitSel?.pts?.length;
if (!architectural && !cutting) return;
const raw = this._svgPoint(ev);
@@ -17199,8 +17163,7 @@ class HouseplanCard extends LitElement {
/** 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._tool === 'partition')
&& this._path.length && !this._contourClosed)
if (this._tool === 'draw' && this._path.length && !this._contourClosed)
return this._path[this._path.length - 1];
if (this._tool === 'split' && this._splitSel?.pts?.length)
return this._splitSel.pts[this._splitSel.pts.length - 1];
@@ -17920,7 +17883,7 @@ class HouseplanCard extends LitElement {
}
private _renderPlanSnapOverlay(): TemplateResult {
if (!this._markup || (this._tool !== 'draw' && this._tool !== 'partition')) {
if (!this._markup || this._tool !== 'draw') {
return svg`` as unknown as TemplateResult;
}
const geometry = this._planSnapGeometrySnapshot().value;
@@ -18036,9 +17999,9 @@ class HouseplanCard extends LitElement {
const path = this._path;
const g = this._gridPitch;
const view = this._viewOr(this._baseVb());
const drawCm = this._tool === 'draw' || this._tool === 'partition' ? this._drawWallCm : null;
const drawCm = this._tool === 'draw' ? this._drawWallCm : null;
const previewPts = (() => {
if ((this._tool !== 'draw' && this._tool !== 'partition') || !path.length || !(drawCm != null && drawCm > 0)) return null;
if (this._tool !== 'draw' || !path.length || !(drawCm != null && drawCm > 0)) return null;
if (this._contourClosed) return path;
if (this._cursorPt) return [...path, this._cursorPt];
return path.length >= 2 ? path : null;
@@ -18088,7 +18051,7 @@ class HouseplanCard extends LitElement {
${path.length > 1
? svg`<polyline class="pathline" points="${path.map((p) => p.join(',')).join(' ')}"></polyline>`
: nothing}
${path.length && this._cursorPt && (this._tool === 'draw' || this._tool === 'partition') && !this._contourClosed
${path.length && this._cursorPt && this._tool === 'draw' && !this._contourClosed
? svg`<line class="preview" x1="${path[path.length - 1][0]}" y1="${path[path.length - 1][1]}"
x2="${this._cursorPt[0]}" y2="${this._cursorPt[1]}"></line>`
: nothing}
src/i18n/en.json
-3
View File
@@ -13,12 +13,10 @@
"color_picker.invalid_hex": "Enter a 3- or 6-digit hex color",
"btn.properties": "Properties",
"btn.keep_as_walls": "Keep as walls",
"title.markup_partition": "Partition: draw one independent physical wall",
"title.markup_select": "Select and edit walls, columns and saved outlines",
"title.markup_column": "Column: click a grid point to place a square column",
"markup.partition": "Partition",
"markup.column": "Column",
"markup.hint_partition": "two clicks draw one partition · Shift locks to 45°",
"markup.hint_column": "click a grid point to place a square column",
"history.draft_segment": "Add room-draft segment",
"history.draft_merge": "Join unfinished room outlines",
@@ -47,7 +45,6 @@
"physical.allowed_range": "Allowed: 1–{max} {unit}",
"physical.delete_segment": "Delete segment",
"physical.delete_draft": "Delete entire outline",
"physical.partition_size_title": "Thickness of the partition created by the second click (1–100 cm).",
"physical.column_size_title": "Outer side of the square column placed by the click (1–150 cm).",
"card.title": "House plan",
"count.devices": "{n} dev.",
src/i18n/ru.json
-3
View File
@@ -13,12 +13,10 @@
"color_picker.invalid_hex": "Введите цвет HEX из 3 или 6 цифр",
"btn.properties": "Свойства",
"btn.keep_as_walls": "Оставить стенами",
"title.markup_partition": "Перегородка: нарисуйте одну независимую физическую стену",
"title.markup_select": "Выбор и редактирование стен, колонн и сохранённых контуров",
"title.markup_column": "Колонна: кликните точку сетки для квадратной колонны",
"markup.partition": "Перегородка",
"markup.column": "Колонна",
"markup.hint_partition": "два клика рисуют одну перегородку · Shift фиксирует шаг 45°",
"markup.hint_column": "кликните точку сетки, чтобы поставить квадратную колонну",
"history.draft_segment": "Добавление сегмента черновика комнаты",
"history.draft_merge": "Соединение незавершённых контуров комнаты",
@@ -47,7 +45,6 @@
"physical.allowed_range": "Допустимо: 1–{max} {unit}",
"physical.delete_segment": "Удалить сегмент",
"physical.delete_draft": "Удалить весь контур",
"physical.partition_size_title": "Толщина перегородки, создаваемой вторым кликом (1–100 см).",
"physical.column_size_title": "Внешняя сторона квадратной колонны, создаваемой кликом (1–150 см).",
"card.title": "План дома",
"count.devices": "{n} устр.",