@reekon-tools/boldr-cad 1.0.0 → 1.2.0

package/dist/tools/survey.js

@@ -0,0 +1,233 @@
+import { afterEdit, analyze, tryAddConstraint } from '../app/edit';
+import { ed } from '../app/state';
+import { measure } from '../model/constraints';
+import { hyp } from '../model/geom';
+import { pushHistory } from '../model/history';
+import { maybeRoom, roomGeom } from '../model/rooms';
+import { onSessionReset, sessionState } from '../model/session';
+import { addLine, addPoint, gc, lineBetween, pinnedPoints } from '../model/sketch';
+import { page, SK, store } from '../model/store';
+import { requestDraw, requestOverlayDraw, S, V } from '../render/view';
+import { fmtArea, fmtLen } from '../units';
+import { elevOpen } from '../editor/elevation';
+import { keypadOpen } from '../editor/keypad';
+import { drawsWalls, setMode } from '../editor/mode';
+import { toast, updateCtx, updateHint } from '../editor/ports';
+import { close3d } from '../editor/view3d';
+import { is3d } from '../editor/view3dState';
+import { anchorMark, setTool } from './registry';
+/*
+  The templator: points measured by a device in the host app (BOLDR's T1R) build the drawing directly. Each point joins
+  the last with a line (or a wall, with the Walls toggle on), and the drawing holds what was measured: a driving
+  length on every edge, and a driving angle at every corner. That fixes the shape's FORM — a later drag moves it
+  whole, it doesn't flex it — while leaving it free to be moved and turned into place. On a closed shape the last
+  edge and the corners either side of it are already set by the rest, so they come out as reference dimensions
+  (grey, in parentheses) rather than being refused: rule 3, and the closing edge's length still shows.
+
+  Where it lands: the device measures from itself, not from the page. The first point taken on a page puts its frame
+  there — that point at the middle of the screen — and every later point keeps its true place relative to it, for
+  the rest of the session. Kept per page and not per run on purpose: a cutout taken after its outline, from the same
+  setup, has to land where it really is relative to the outline, or templating it was pointless.
+
+  Points come in on the plan's own axes — x to the right, y up (render/view.ts's S) — and are placed as given. Which
+  way a device's angle turns is the host's business, not the editor's: the host turns its device's frame into this
+  one, and that's where a mirror gets in or doesn't. BOLDR's T1R turns clockwise, so the app negates y
+  (templatorPlanInches); passing its x = r·cos θ, y = r·sin θ straight in drew every template mirrored (seen on a device,
+  2026-10-28).
+*/
+/** How close a point has to land to the first one to close the shape: about 50 mm, inside the device's own error. */
+export const SURVEY_CLOSE_IN = 2;
+/** A point this close to the last one is the same point taken twice (a double press), not a new corner. */
+export const SURVEY_SAME_IN = 1 / 16;
+/** Each page's frame for the session: what's added to a device point to place it on the plan. */
+const frames = sessionState(() => ({ byPage: {} }));
+const fresh = () => ({ chain: [], captures: {} });
+const withCapture = (capture) => (capture !== undefined ? { capture } : {});
+/** A driving length on line `lid`, as the two points it joins are now (so nothing moves). */
+function holdLength(lid, a, b, capture) {
+    const sk = SK(), pa = sk.points[a], pb = sk.points[b];
+    if (!pa || !pb)
+        return;
+    tryAddConstraint({ type: 'dist', a, b, kind: 'al', value: hyp(pb.x - pa.x, pb.y - pa.y), line: lid, driving: true, off: 0, ...withCapture(capture) }, { silent: true });
+}
+/**
+ * A corner this close to dead straight (or folded right back) is held as Collinear, not as an angle: the angle's
+ * equation turns on |cross|, whose slope vanishes there, so the solver reads a 180° angle as adding nothing (a
+ * reference dimension) and the corner is left as a hinge. Collinear says the same thing and holds it. 1e-4° is far
+ * outside where that happens (about 2e-6°) and far inside any real capture's spread, so a measured corner is never
+ * squared off by it — over a 30" edge it's a micrometre.
+ */
+const STRAIGHT_DEG = 1e-4;
+/** A driving angle at the corner where `l1` and `l2` meet, as it is now (Collinear, if it's straight). */
+function holdAngle(l1, l2, capture) {
+    if (!l1 || !l2 || l1 === l2)
+        return;
+    const c = { type: 'angle', l1, l2, value: 0, driving: true };
+    c.value = measure(SK(), c);
+    if (c.value < STRAIGHT_DEG || c.value > 180 - STRAIGHT_DEG) {
+        tryAddConstraint({ type: 'col', l1, l2 }, { silent: true });
+        return;
+    }
+    tryAddConstraint({ ...c, ...withCapture(capture) }, { silent: true });
+}
+export const surveyTool = {
+    st: fresh(),
+    /** Picked up (by a point arriving with another tool in hand): a new run. */
+    enter() { this.st = fresh(); },
+    /**
+     * Put down by cancelTool. Deliberately NOT the end of the run: undo cancels the tool in hand before it steps back,
+     * and ending the run there would leave a gap after every bad point undone. The run ends on Finish, Close shape,
+     * Esc or Enter (key, below) — which also put the templator down — or when another tool is picked up; either way the
+     * next point starts a new run (enter).
+     */
+    reset() { ed.preview = null; },
+    busy() { return false; },
+    /** Esc and Enter finish the run here, before the generic Esc (which can't tell itself from undo's cancel). */
+    key(e) {
+        if ((e.key === 'Escape' || e.key === 'Enter') && this.st.chain.length) {
+            this.finish();
+            return true;
+        }
+        return false;
+    },
+    /**
+     * End the run: the shape stays as drawn, and the templator is put down (back to Select). Left in hand it would
+     * swallow every tap — it has no pointer handling, its points come from the device — so the shape just made couldn't
+     * be selected, and a phone's bar, which drops the "Templator" label, wouldn't even say why. The next point picks it
+     * up again, in the same frame. A run of one point leaves nothing (a point on its own isn't a shape).
+     */
+    finish() {
+        const first = this.st.chain[0];
+        if (first)
+            pinnedPoints.delete(first);
+        this.st = fresh();
+        ed.preview = null;
+        if (store.project) {
+            gc(SK());
+            analyze();
+        }
+        if (ed.tool === 'survey')
+            setTool('select');
+        updateCtx();
+        updateHint();
+        requestDraw();
+    },
+    /** Close the run back to its first point (the bar's Close shape, or a point taken there). */
+    closeShape() {
+        if (liveChain().length < 3)
+            return;
+        pushHistory();
+        closeRun(undefined);
+        afterEdit();
+    },
+    hint() {
+        return this.st.chain.length
+            ? 'Take the next point with your templator. Take one back at the first point to close the shape.'
+            : 'Take points with your templator: each one joins the last.';
+    },
+};
+/** The run's points that are still in the drawing (an undo since can have taken the last few back). */
+function liveChain() {
+    const sk = SK(), st = surveyTool.st;
+    const keep = st.chain.filter(id => sk.points[id]);
+    if (keep.length !== st.chain.length)
+        st.chain = keep;
+    return keep;
+}
+/** The run's first and last points, marked: where the next point joins, and where one would close the shape. */
+function showRun() {
+    const sk = SK(), ch = surveyTool.st.chain;
+    const ends = [ch[0], ch[ch.length - 1]].filter((id, i, a) => id && sk.points[id] && a.indexOf(id) === i);
+    ed.preview = ends.length ? (c, T) => { for (const id of ends) {
+        const p = sk.points[id];
+        if (p) {
+            const [x, y] = S(T, p.x, p.y);
+            anchorMark(c, x, y);
+        }
+    } } : null;
+    requestOverlayDraw();
+}
+/** Close the run: the last edge back to the first point, its length, the two corners it makes, and a space. */
+function closeRun(capture) {
+    const sk = SK(), st = surveyTool.st, ch = st.chain;
+    const first = ch[0], last = ch[ch.length - 1];
+    const lid = addLine(sk, last, first, { kind: drawsWalls() ? 'wall' : 'line', constr: !drawsWalls() && ed.drawConstr });
+    // (already set by the rest of the shape: these come out as reference dimensions)
+    holdLength(lid, last, first, capture ?? st.captures[first]);
+    holdAngle(lineBetween(sk, ch[ch.length - 2], last), lid, st.captures[last]);
+    holdAngle(lid, lineBetween(sk, first, ch[1]), st.captures[first]);
+    const n = ch.length, rid = drawsWalls() || !ed.drawConstr ? maybeRoom(sk, ch.slice()) : null;
+    surveyTool.finish();
+    toast(rid ? sk.rooms[rid].name + ' added — ' + fmtArea(roomGeom(sk, sk.rooms[rid]).area) : 'Closed shape, ' + n + ' sides');
+}
+/**
+ * A point from the host's device, in inches, on the plan's axes — y up (see the note at the top). Starts the
+ * templator if it isn't in hand, and the run's frame on a page with none yet. False when the drawing can't take it
+ * now (the toast says why).
+ */
+export function takeSurveyPoint(x, y, capture) {
+    if (ed.readOnly)
+        return false;
+    if (elevOpen()) {
+        toast('Back out of the wall view to take templator points on the plan.', { warn: true });
+        return false;
+    }
+    if (keypadOpen()) {
+        toast('Close the keypad, then take the point again.', { warn: true });
+        return false;
+    }
+    // (the templator works on the plan: from the 3D tab or Annotate, back to Draft)
+    if (is3d())
+        close3d();
+    if (ed.mode !== 'draft')
+        setMode('draft');
+    if (ed.tool !== 'survey')
+        setTool('survey');
+    const sk = SK(), st = surveyTool.st, ch = liveChain();
+    const pg = page().id;
+    if (!frames.byPage[pg]) {
+        const v = V();
+        frames.byPage[pg] = { dx: v.cx - x, dy: v.cy - y };
+    }
+    const f = frames.byPage[pg], wx = x + f.dx, wy = y + f.dy;
+    const last = ch.length ? sk.points[ch[ch.length - 1]] : null;
+    if (last && hyp(wx - last.x, wy - last.y) < SURVEY_SAME_IN) {
+        toast('Same point as the last one — move the templator, then take the next.', { warn: true });
+        return false;
+    }
+    if (ch.length >= 3) {
+        const p0 = sk.points[ch[0]];
+        if (hyp(wx - p0.x, wy - p0.y) < SURVEY_CLOSE_IN) {
+            pushHistory();
+            closeRun(capture);
+            afterEdit();
+            return true;
+        }
+    }
+    pushHistory();
+    const id = addPoint(sk, wx, wy);
+    if (capture !== undefined)
+        st.captures[id] = capture;
+    if (!ch.length) {
+        // (on its own until the next point, garbage collection would take it: kept until the run ends)
+        pinnedPoints.add(id);
+    }
+    else {
+        const prev = ch[ch.length - 1];
+        const lid = addLine(sk, prev, id, { kind: drawsWalls() ? 'wall' : 'line', constr: !drawsWalls() && ed.drawConstr });
+        holdLength(lid, prev, id, capture);
+        if (ch.length >= 2)
+            holdAngle(lineBetween(sk, ch[ch.length - 2], prev), lid, st.captures[prev]);
+    }
+    st.chain.push(id);
+    ed.sel = [];
+    afterEdit();
+    showRun();
+    updateHint();
+    const n = st.chain.length, a = sk.points[st.chain[n - 2]];
+    toast(n === 1 ? 'Templator: point 1, at the middle of the screen' : 'Point ' + n + ' · ' + fmtLen(hyp(wx - a.x, wy - a.y)));
+    return true;
+}
+// a new session (another drawing): every page's frame and the run start again
+onSessionReset(() => { surveyTool.st = fresh(); });
+//# sourceMappingURL=survey.js.map

package/dist/tools/survey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"survey.js","sourceRoot":"","sources":["../../src/tools/survey.ts"],"names":[],"mappings":"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"}

package/dist/units/format.d.ts

@@ -9,7 +9,7 @@ export declare const hostUnits: () => UnitPrefs | null;
 /** Lengths read the host's way, rather than in units picked in the editor. */
 export declare const followingHostUnits: () => boolean;
 export declare function setOwnUnits(v: boolean): void;
-/** Format a length in inches: 150.5 → 12'-6 1/2" (ft-in), 150 1/2" (in), 3,823 mm (mm). */
+/** Format a length in inches: 150.5 → 12'-6 1/2" (ft-in), 150 1/2" (in), 12.54' (ft), 3,823 mm (mm), 382.27 cm (cm), 3.823 m (m). */
 export declare function fmtLen(v: number, u?: UnitPrefs): string;
 /** Format an area given in square inches. */
 export declare function fmtArea(sqin: number, u?: UnitPrefs): string;

package/dist/units/format.js

@@ -1,4 +1,4 @@
-import { getUnitPrefs } from './prefs';
+import { getUnitPrefs, isMetric } from './prefs';
 let custom = null;
 let hostPrefs = null;
 /** The person picked the editor's own units in Settings over the host's. */
@@ -17,13 +17,19 @@ export const hostUnits = () => (custom ? hostPrefs ?? { unit: 'ftin', denom: 16
 /** Lengths read the host's way, rather than in units picked in the editor. */
 export const followingHostUnits = () => !!custom && !own;
 export function setOwnUnits(v) { own = v; }
-/** Format a length in inches: 150.5 → 12'-6 1/2" (ft-in), 150 1/2" (in), 3,823 mm (mm). */
+/** Format a length in inches: 150.5 → 12'-6 1/2" (ft-in), 150 1/2" (in), 12.54' (ft), 3,823 mm (mm), 382.27 cm (cm), 3.823 m (m). */
 export function fmtLen(v, u = getUnitPrefs()) {
     v = Math.abs(v);
     if (custom && !own && u === getUnitPrefs())
         return custom(v);
     if (u.unit === 'mm')
         return Math.round(v * 25.4).toLocaleString() + ' mm';
+    if (u.unit === 'cm')
+        return (v * 2.54).toFixed(2) + ' cm';
+    if (u.unit === 'm')
+        return (v * 0.0254).toFixed(3) + ' m';
+    if (u.unit === 'ft')
+        return (v / 12).toFixed(2) + "'";
     const d = u.denom;
     const t = Math.round(v * d) / d;
     let ft = u.unit === 'ftin' ? Math.floor(t / 12 + 1e-9) : 0;
@@ -50,7 +56,7 @@ export function fmtLen(v, u = getUnitPrefs()) {
 }
 /** Format an area given in square inches. */
 export function fmtArea(sqin, u = getUnitPrefs()) {
-    if (u.unit === 'mm')
+    if (isMetric(u.unit))
         return (sqin * 0.00064516).toFixed(2) + ' m²';
     return (sqin / 144).toFixed(1) + ' sq ft';
 }

package/dist/units/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/units/format.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/units/format.ts"],"names":[],"mappings":"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"}

package/dist/units/parse.d.ts

@@ -4,7 +4,8 @@ export declare function evalExpr(src: string): number;
 /**
  * Parse a length and return inches, or null if it can't be read.
  * Accepts 12' 6 1/2", 12ft 6in, 150.5, 3.2m, 25mm, and arithmetic (10'+6).
- * Bare numbers are inches in ft-in / in mode and millimetres in mm mode.
+ * Bare numbers are read in the current unit: inches in ft-in and in modes, feet in ft, millimetres, centimetres or
+ * metres in those.
  */
 export declare function parseLen(str: string | null | undefined, u?: UnitPrefs): number | null;
 /** Parse a plain number (degrees etc.), allowing arithmetic and a trailing °. */

package/dist/units/parse.js

@@ -1,4 +1,4 @@
-import { getUnitPrefs } from './prefs';
+import { bareScale, getUnitPrefs } from './prefs';
 /** Tiny recursive-descent evaluator for + - * / and parentheses. Throws on bad input. */
 export function evalExpr(src) {
     const t = src.replace(/\s+/g, '');
@@ -56,7 +56,8 @@ export function evalExpr(src) {
 /**
  * Parse a length and return inches, or null if it can't be read.
  * Accepts 12' 6 1/2", 12ft 6in, 150.5, 3.2m, 25mm, and arithmetic (10'+6).
- * Bare numbers are inches in ft-in / in mode and millimetres in mm mode.
+ * Bare numbers are read in the current unit: inches in ft-in and in modes, feet in ft, millimetres, centimetres or
+ * metres in those.
  */
 export function parseLen(str, u = getUnitPrefs()) {
     if (str == null)
@@ -82,8 +83,8 @@ export function parseLen(str, u = getUnitPrefs()) {
     }
     if (!isFinite(v))
         return null;
-    if (u.unit === 'mm' && !hasUnit)
-        v /= 25.4;
+    if (!hasUnit)
+        v *= bareScale(u.unit);
     return v;
 }
 /** Parse a plain number (degrees etc.), allowing arithmetic and a trailing °. */

package/dist/units/parse.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/units/parse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/units/parse.ts"],"names":[],"mappings":"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"}

package/dist/units/prefs.d.ts

@@ -1,10 +1,18 @@
-export type Unit = 'ftin' | 'in' | 'mm';
+export type Unit = 'ftin' | 'in' | 'ft' | 'mm' | 'cm' | 'm';
 /** Display preferences. Geometry is always stored in inches; these only change how values read. */
 export interface UnitPrefs {
     unit: Unit;
     /** Fraction precision for imperial display: 16 → 1/16". */
     denom: number;
+    /** Whether lengths are typed and read with fractions (the fraction keys, Precision). Unset: feet-inches and inches are. */
+    fractions?: boolean;
 }
 /** Point the formatters at a live prefs object (the app passes its settings object). */
 export declare function useUnitPrefs(p: UnitPrefs): void;
 export declare function getUnitPrefs(): UnitPrefs;
+/** Metric units: bare numbers, the grid and areas are metric. */
+export declare const isMetric: (unit: Unit) => boolean;
+/** Inches per unit typed as a bare number: what a number with no unit means in `unit`. */
+export declare const bareScale: (unit: Unit) => number;
+/** Whether lengths read with fractions (the fraction keys, Precision): as the prefs say, else for feet-inches and inches. */
+export declare const showFractions: (u?: UnitPrefs) => boolean;

package/dist/units/prefs.js

@@ -6,4 +6,10 @@ export function useUnitPrefs(p) {
 export function getUnitPrefs() {
     return current;
 }
+/** Metric units: bare numbers, the grid and areas are metric. */
+export const isMetric = (unit) => unit === 'mm' || unit === 'cm' || unit === 'm';
+/** Inches per unit typed as a bare number: what a number with no unit means in `unit`. */
+export const bareScale = (unit) => unit === 'ft' ? 12 : unit === 'mm' ? 1 / 25.4 : unit === 'cm' ? 1 / 2.54 : unit === 'm' ? 1 / 0.0254 : 1;
+/** Whether lengths read with fractions (the fraction keys, Precision): as the prefs say, else for feet-inches and inches. */
+export const showFractions = (u = getUnitPrefs()) => u.fractions ?? (u.unit === 'ftin' || u.unit === 'in');
 //# sourceMappingURL=prefs.js.map

package/dist/units/prefs.js.map

@@ -1 +1 @@
-{"version":3,"file":"prefs.js","sourceRoot":"","sources":["../../src/units/prefs.ts"],"names":[],"mappings":"AASA,IAAI,OAAO,GAAc,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAErD,wFAAwF;AACxF,MAAM,UAAU,YAAY,CAAC,CAAY;IACvC,OAAO,GAAG,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"prefs.js","sourceRoot":"","sources":["../../src/units/prefs.ts"],"names":[],"mappings":"AAWA,IAAI,OAAO,GAAc,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAErD,wFAAwF;AACxF,MAAM,UAAU,YAAY,CAAC,CAAY;IACvC,OAAO,GAAG,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,iEAAiE;AACjE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAW,EAAE,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,GAAG,CAAC;AAEhG,0FAA0F;AAC1F,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAU,EAAU,EAAE,CAC9C,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3G,6HAA6H;AAC7H,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,GAAc,YAAY,EAAE,EAAW,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reekon-tools/boldr-cad",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "BOLDR's 2D layout editor (React Native, iOS/Android/web) and how its drawings are kept in BOLDR.",
   "author": "REEKON Tools",
   "license": "MIT",

package/src/data/memory.ts

@@ -4,17 +4,20 @@ import type { CadDataProvider, CadFileMeta, CadMeasurementValue, CadPageDoc } fr
 
 const copy = <T,>(v: T): T => JSON.parse(JSON.stringify(v)) as T;
 
-export function memoryProvider(name = 'Test drawing', meta: CadFileMeta | null = null, pages: Record<string, CadPageDoc> = {}) {
-  const fileSubs = new Set<(f: { name: string; meta: CadFileMeta | null } | null) => void>();
-  const pageSubs = new Set<(p: Record<string, CadPageDoc>) => void>();
+export function memoryProvider(name = 'Test drawing', meta: CadFileMeta | null = null, pages: Record<string, CadPageDoc> = {}, opts: { fromCache?: boolean } = {}) {
+  // (fromCache: what's here is the cache's word, as a device offline hears it, until confirm() brings the server's)
+  let fromCache = !!opts.fromCache;
+  const snap = () => ({ fromCache });
+  const fileSubs = new Set<(f: { name: string; meta: CadFileMeta | null } | null, m?: { fromCache: boolean }) => void>();
+  const pageSubs = new Set<(p: Record<string, CadPageDoc>, m?: { fromCache: boolean }) => void>();
   const state = { name, meta: meta && copy(meta), pages: copy(pages), writes: 0, uploads: 0, thumbnail: null as string | null, files: {} as Record<string, string>, measurements: {} as Record<string, CadMeasurementValue>, placed: [] as string[], placedLinked: [] as { groupId: string; id: string; columnId?: string }[] };
   const measSubs = new Set<(v: Record<string, CadMeasurementValue>) => void>();
   const emitMeas = () => measSubs.forEach(cb => cb(copy(state.measurements)));
-  const emitFile = () => fileSubs.forEach(cb => cb({ name: state.name, meta: state.meta && copy(state.meta) }));
-  const emitPages = () => pageSubs.forEach(cb => cb(copy(state.pages)));
+  const emitFile = () => fileSubs.forEach(cb => cb({ name: state.name, meta: state.meta && copy(state.meta) }, snap()));
+  const emitPages = () => pageSubs.forEach(cb => cb(copy(state.pages), snap()));
   const provider: CadDataProvider = {
-    subscribeFile(cb) { fileSubs.add(cb); queueMicrotask(() => cb({ name: state.name, meta: state.meta && copy(state.meta) })); return () => { fileSubs.delete(cb); }; },
-    subscribePages(cb) { pageSubs.add(cb); queueMicrotask(() => cb(copy(state.pages))); return () => { pageSubs.delete(cb); }; },
+    subscribeFile(cb) { fileSubs.add(cb); queueMicrotask(() => cb({ name: state.name, meta: state.meta && copy(state.meta) }, snap())); return () => { fileSubs.delete(cb); }; },
+    subscribePages(cb) { pageSubs.add(cb); queueMicrotask(() => cb(copy(state.pages), snap())); return () => { pageSubs.delete(cb); }; },
     async writeMeta(m) { state.meta = copy(m); state.writes++; emitFile(); },
     async writePage(id, p) { state.pages[id] = copy(p); state.writes++; emitPages(); },
     async deletePage(id) { delete state.pages[id]; state.writes++; emitPages(); },
@@ -33,5 +36,7 @@ export function memoryProvider(name = 'Test drawing', meta: CadFileMeta | null =
   const remote = (id: string, p: CadPageDoc) => { state.pages[id] = copy(p); emitPages(); };
   /** Change a measurement as someone else would (e.g. in the job's measurement list). */
   const remoteMeasurement = (id: string, value: number) => { state.measurements[id] = { ...state.measurements[id], value }; emitMeas(); };
-  return { provider, state, remote, remoteMeasurement };
+  /** The server's word after a start from the cache: everything is sent again, confirmed. */
+  const confirm = () => { fromCache = false; emitFile(); emitPages(); };
+  return { provider, state, remote, remoteMeasurement, confirm };
 }

package/src/data/provider.ts

@@ -31,11 +31,18 @@ export interface CadPageDoc {
   rev?: { clientId: string; seq: number };
 }
 
+/**
+ * Where a snapshot came from: the local cache, which may be stale and, offline, empty for what was never read on this
+ * device, or the server. Unset: the server. Firestore delivers the cache's answer first when it's offline; subscribe
+ * with metadata changes included, so the server's confirmation of an empty collection still arrives.
+ */
+export interface CadSnapshotMeta { fromCache: boolean }
+
 export interface CadDataProvider {
-  /** The file's name and drawing record (null record: not a drawing yet). Returns an unsubscribe function. */
-  subscribeFile(cb: (file: { name: string; meta: CadFileMeta | null } | null) => void): () => void;
+  /** The file's name and drawing record (null record: not a drawing yet; null file: no such file). Returns an unsubscribe function. */
+  subscribeFile(cb: (file: { name: string; meta: CadFileMeta | null } | null, meta?: CadSnapshotMeta) => void): () => void;
   /** Every page of the drawing, by id. Returns an unsubscribe function. */
-  subscribePages(cb: (pages: Record<string, CadPageDoc>) => void): () => void;
+  subscribePages(cb: (pages: Record<string, CadPageDoc>, meta?: CadSnapshotMeta) => void): () => void;
   writeMeta(meta: CadFileMeta): Promise<void>;
   writePage(id: string, page: CadPageDoc): Promise<void>;
   deletePage(id: string): Promise<void>;

package/src/data/sync.ts

@@ -30,10 +30,16 @@ export class NotACadDrawing extends Error {
 }
 
 export interface CadSyncOptions {
-  /** start a new drawing when the file has no drawing record yet (a file just created for it) */
+  /**
+   * The file was just created here: start its first page without waiting for the server's word on its pages (offline,
+   * the cache says there are none, as it says of any drawing never opened on this device). Also starts a new drawing
+   * when the file has no drawing record yet.
+   */
   initialize?: boolean;
   /** a write or upload failed */
   onError?: (e: unknown) => void;
+  /** closes the drawing while it's still opening (the person left): the promise rejects and nothing is written */
+  signal?: AbortSignal;
 }
 
 export interface CadSync {
@@ -72,6 +78,8 @@ const newClientId = () => Date.now().toString(36) + '-' + Math.floor(Math.random
 export function openCadDrawing(provider: CadDataProvider, opts: CadSyncOptions = {}): Promise<CadSync> {
   const clientId = newClientId();
   let seq = 0, file: { name: string; meta: CadFileMeta | null } | null | undefined, pages: Record<string, CadPageDoc> | undefined;
+  /** whether the latest file and pages snapshots are the cache's word rather than the server's */
+  let fileFromCache = false, pagesFromCache = false;
   /** what each page looked like when last saved or taken in (to tell local edits from remote ones) */
   const saved = new Map<string, string>();
   /** removed pages whose delete is queued or in flight */
@@ -245,6 +253,11 @@ export function openCadDrawing(provider: CadDataProvider, opts: CadSyncOptions =
     let ready = false;
     const tryOpen = () => {
       if (ready || file === undefined || pages === undefined) return;
+      // the cache's word isn't final: a file it hasn't got, or a drawing whose pages it hasn't got, may well be on the
+      // server — wait for its answer (a file just created here is fresh: its first page is made without waiting)
+      if (file === null && fileFromCache) return;
+      const fresh = !!opts.initialize && !file?.meta?.pageOrder.length;
+      if (file && !Object.keys(pages).length && pagesFromCache && !fresh) return;
       ready = true;
       if (file === null) { stop(); reject(new NotACadDrawing('missing')); return; }
       if (!file.meta && !opts.initialize) { stop(); reject(new NotACadDrawing('legacy')); return; }
@@ -277,9 +290,13 @@ export function openCadDrawing(provider: CadDataProvider, opts: CadSyncOptions =
         failures: () => failures,
       });
     };
-    const unsubFile = provider.subscribeFile(f => { file = f; if (ready) takeIn(); else tryOpen(); });
-    const unsubPages = provider.subscribePages(p => { pages = p; if (ready) takeIn(); else tryOpen(); });
+    const unsubFile = provider.subscribeFile((f, m) => { file = f; fileFromCache = !!m?.fromCache; if (ready) takeIn(); else tryOpen(); });
+    const unsubPages = provider.subscribePages((p, m) => { pages = p; pagesFromCache = !!m?.fromCache; if (ready) takeIn(); else tryOpen(); });
     unsubMeas = meas ? meas.subscribe(takeInMeasurements) : null;
     function stop() { stopped = true; unsubFile(); unsubPages(); unsubMeas?.(); }
+    // left while still opening: let go of the drawing, nothing written
+    const abort = () => { if (ready) return; ready = true; stop(); reject(new Error('closed')); };
+    if (opts.signal?.aborted) abort();
+    else opts.signal?.addEventListener('abort', abort, { once: true });
   });
 }

package/src/editor/actions.ts

@@ -13,6 +13,7 @@ import { convertNote } from '../tools/annotate';
 import { cornerAngle, dimCurve, dimEdges, dimLine, dimPointLine, dimPoints, dimTwoLines, editDim, faceChoices, onChoice, setDimFace, toggleRef } from '../tools/dim';
 import { edgeLabel, edgeOf } from '../model/planGeom';
 import type { LineTool } from '../tools/line';
+import type { SurveyTool } from '../tools/survey';
 import { offsetPrompt, splitLine } from '../tools/modify';
 import { filletable, filletPrompt } from '../tools/fillet';
 import { chamferPrompt } from '../tools/chamfer';
@@ -128,6 +129,15 @@ function ctxItems(): CtxEntry[] {
     // drawing: no bar (tap the last point again to finish, the first to close the shape; Esc or Enter on a keyboard)
     if (st.start) return items;
   }
+  if (ed.tool === 'survey') {
+    // The templator: its points come from the device, not from taps on the drawing — so unlike Line, nothing on the
+    // canvas can finish or close a run, and the bar has to. (A phone's bar drops the label; the toasts name it there.)
+    const n = (tools.survey as SurveyTool).st.chain.length;
+    items.push({ lbl: 'Templator' });
+    if (n >= 3) add('closeShape', 'Close shape', 'closeShape');
+    if (n >= 1) add('finish', 'Finish', 'finish');
+    return items;
+  }
   if (ed.tool === 'dim') { add('dim', 'Driving', 'dimDrive', { on: ed.dimLayer === 'drive' }); add('ref', 'Print', 'dimPrint', { on: ed.dimLayer === 'print' }); return items; }
   // nothing selected: the bar stays empty (Fit and Icons live in the top bar; grid snap and auto-constrain in Settings).
   // Just placed a door, window or cabinet (its tool still on): its bar, for its sizes
@@ -258,7 +268,7 @@ function thicknessPrompt(walls: { thick?: number }[]): void {
   const sk = SK();
   if (!walls.length) return;
   openKeypad({
-    title: 'Wall thickness', sub: 'Finished face to face', initial: fmtLen(walls[0].thick || 4.5), selectAll: true,
+    title: 'Wall thickness', sub: 'Finished face to face', initial: fmtLen(walls[0].thick || 4.5), value: walls[0].thick || 4.5, selectAll: true,
     onDone: v => {
       if (v <= 0) return;
       // a thicker wall's faces are shorter (its corners come in): not shorter than what's on them — and what's measured
@@ -455,8 +465,9 @@ export function applyCtxAction(act: string, anchor?: unknown): void {
       break;
     case 'showcons': settings.showCons = !settings.showCons; updateTopBar(); break;
     case 'typelen': (tools[ed.tool] as LineTool).typeLength(''); return;
-    case 'closeShape': (tools[ed.tool] as LineTool).closeShape(); updateCtx(); return;
-    case 'finish': (tools[ed.tool] as LineTool).finish(); updateCtx(); return;
+    // (the Line tool's, or the templator's: both close and finish a run of points)
+    case 'closeShape': (tools[ed.tool] as LineTool | SurveyTool).closeShape(); updateCtx(); return;
+    case 'finish': (tools[ed.tool] as LineTool | SurveyTool).finish(); updateCtx(); return;
     case 'dimDrive': ed.dimLayer = 'drive'; break;
     case 'dimPrint': ed.dimLayer = 'print'; break;
     case 'h': case 'v': case 'par': case 'perp': case 'col': case 'eq': case 'mid': case 'online': case 'oncircle': case 'tan': case 'eqr': case 'conc':

package/src/editor/elevation.ts

@@ -646,7 +646,7 @@ export const heightTool = placingTool({
   },
   place: (_u, z) => {
     const q = 1 / settings.denom, start = clamp(Math.round(z / q) * q, 0, elev.frame!.H);
-    openKeypad({ title: 'Height line', sub: 'Floor to the line — it runs across the whole wall', initial: fmtLen(start), selectAll: true, laser: true, onDone: v => { addHeightLine(v); } });
+    openKeypad({ title: 'Height line', sub: 'Floor to the line — it runs across the whole wall', initial: fmtLen(start), value: start, selectAll: true, laser: true, onDone: v => { addHeightLine(v); } });
   },
   hint: 'Tap the wall at a height, then enter it: a level line across the wall (a counter, a rail).',
 });

package/src/editor/face.ts

@@ -157,7 +157,7 @@ export function dimensionFace(kind: 'h' | 'v', a: string, b: string, title: stri
   if (!face.points[a] || !face.points[b]) return;
   const cur = measure(face, { type: 'dist', kind, a, b });
   openKeypad({
-    title, initial: fmtLen(cur), selectAll: true, laser: true,
+    title, initial: fmtLen(cur), value: cur, selectAll: true, laser: true,
     onDone: v => {
       if (v < 0) return;
       const face = curFace(), pa = face.points[a], pb = face.points[b];
@@ -204,7 +204,7 @@ export function editCabinetDepth(cabId: string): void {
   const cb = curFace().cabs?.[cabId];
   if (!cb) return;
   openKeypad({
-    title: 'Cabinet depth', sub: 'From the wall out into the room', initial: fmtLen(cb.depth), selectAll: true, laser: true,
+    title: 'Cabinet depth', sub: 'From the wall out into the room', initial: fmtLen(cb.depth), value: cb.depth, selectAll: true, laser: true,
     onDone: v => { if (v <= 0) return; pushHistory(); cb.depth = v; cb.depthSet = true; afterEdit(); },
   });
 }