@reekon-tools/boldr-cad 1.6.0 → 1.8.0

package/dist/render/navigate.js

@@ -46,43 +46,57 @@ export function shiftTo(s, ox, oy, to, W, H) {
 export const NAV_DOWN = 0, NAV_MOVE = 1, NAV_UP = 2, NAV_CANCEL = 3;
 /**
  * One touch event, as the UI thread sees it: the fingers after it, and the view (moved if `moved`). Fingers navigate —
- * pan, and zoom about their middle — once two are down, or any one once a pen has been seen or when the drawing is
- * view only (editor/gestures.ts decides the same on its side), until the last one lifts. A pen or a mouse never
- * navigates. `type` is NAV_DOWN… ; `allIds`, every pointer still down (on a down event: a finger that went without
- * a word, a lost touch-up, is dropped so it can't hold a gesture open).
+ * pan, and zoom about their middle — once two are down, or a finger lands while a Pencil is down or when the drawing is
+ * view only (editor/gestures.ts decides the same on its side), until the last one lifts. A finger already down and not
+ * navigating when a Pencil lands is set aside until it lifts. A pen or a mouse never navigates. `type` is NAV_DOWN… ;
+ * `kind` is the event's pointer, for a touch that doesn't say what it is itself; `allIds`, every pointer still down (on
+ * a down event: a finger that went without a word, a lost touch-up, is dropped so it can't hold a gesture open).
  */
 export function navTouch(st, type, kind, changed, allIds, readOnly, view, drawn) {
     'worklet';
-    const pen = st.pen || kind === 'pen';
-    if (kind !== 'touch')
-        return { st: { ...st, pen }, view, moved: false };
+    const lost = (id) => type === NAV_DOWN && !!allIds && !allIds.includes(id);
     const fingers = {};
-    for (const k in st.fingers) {
-        const id = Number(k);
-        if (type !== NAV_DOWN || !allIds || allIds.includes(id))
-            fingers[id] = st.fingers[id];
-    }
+    for (const k in st.fingers)
+        if (!lost(Number(k)))
+            fingers[Number(k)] = st.fingers[Number(k)];
+    let pens = st.pens.filter(id => !lost(id)), landed = false, moved = false;
     for (const t of changed) {
-        if (type === NAV_UP || type === NAV_CANCEL)
+        const k = t.kind ?? kind;
+        if (type === NAV_UP || type === NAV_CANCEL) {
             delete fingers[t.id];
-        else
+            pens = pens.filter(id => id !== t.id);
+        }
+        else if (type === NAV_DOWN && k === 'pen') {
+            if (!pens.includes(t.id))
+                pens = [...pens, t.id];
+            // (fingers down and not navigating are let go of: their moves and lifts are no finger's from here)
+            if (!st.navigating)
+                for (const f in fingers)
+                    delete fingers[f];
+        }
+        else if (type === NAV_DOWN ? k === 'touch' : t.id in fingers) {
             fingers[t.id] = { x: t.x, y: t.y };
+            if (type === NAV_DOWN)
+                landed = true;
+            else
+                moved = true;
+        }
     }
     const pts = Object.keys(fingers).map(k => fingers[Number(k)]);
     if (!pts.length)
-        return { st: { fingers, navigating: false, last: null, pen }, view, moved: false };
+        return { st: { fingers, navigating: false, last: null, pens }, view, moved: false };
     let navigating = st.navigating, v = view;
     if (!navigating) {
-        if (pts.length < 2 && !(type === NAV_DOWN && (pen || readOnly)))
-            return { st: { fingers, navigating: false, last: null, pen }, view, moved: false };
+        if (pts.length < 2 && !(landed && (pens.length > 0 || readOnly)))
+            return { st: { fingers, navigating: false, last: null, pens }, view, moved: false };
         navigating = true;
         // start from the view the drawing on screen was drawn at, unless the fingers' own is newer
         if (drawn && v.seq <= drawn.seq)
             v = { s: drawn.view.s, cx: drawn.view.cx, cy: drawn.view.cy, seq: drawn.seq };
     }
-    const now = pinchOf(pts), was = st.last, next = { fingers, navigating, last: now, pen };
-    // a finger came or went: carry on from here, no jump
-    if (type !== NAV_MOVE || !now || !was || was.n !== now.n || !drawn)
+    const now = pinchOf(pts), was = st.last, next = { fingers, navigating, last: now, pens };
+    // a finger came or went: carry on from here, no jump (and a Pencil's move alone moves no view)
+    if (type !== NAV_MOVE || !moved || !now || !was || was.n !== now.n || !drawn)
         return { st: next, view: v, moved: false };
     const to = navStep(v, was, now, drawn.W, drawn.H);
     return { st: next, view: { s: to.s, cx: to.cx, cy: to.cy, seq: v.seq + 1 }, moved: true };

package/dist/render/navigate.js.map

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

package/dist/tools/dim.d.ts

@@ -26,6 +26,12 @@ export declare const dimTool: {
  * along its centerline where there's no space; the keypad can switch it.
  */
 export declare function dimLine(lid: string, side?: 1 | -1): void;
+/**
+ * Whether giving dimension `c` the value `v` replaces a value measured there: a driving one, entered (not a default
+ * nobody measured), changed by it. Not one linked to a measurement of the job: that's asked about anyway
+ * (askLinkedChange). What a host warns about before a reading overwrites (laserReadingOverwrites).
+ */
+export declare const replacesMeasured: (c: Constraint | undefined, v: number) => boolean;
 /** Why a measurement of the job can't drive a line the drawing already sets the length of. */
 export declare const LENGTH_SET_ALREADY = "The drawing already sets that line\u2019s length. Free it first (make one of its dimensions a reference), then pick the measurement.";
 /** Why a measurement of the job can't drive an angle the drawing already sets. */
@@ -52,6 +58,15 @@ export declare function onChoice(c: Constraint, ch: FaceChoice): boolean;
 export declare function setDimFace(id: string, ch: FaceChoice): void;
 /** From a wall's edge to a point: square to the wall, from that face. */
 export declare function dimEdgePoint(lid: string, side: 1 | -1, p: string): void;
+/**
+ * What the yellow + measures for the selection, as the dimension it would make (`c`, its value unset), with the one
+ * already there for it (`existing`), which the + edits instead. Null where it makes no dimension of the plan: nothing it
+ * measures, a door's or window's sizes (their own dimensions), a wall's thickness, the wall view (wallPlus).
+ */
+export declare function selectionDim(): {
+    c: Constraint;
+    existing?: string;
+} | null;
 /**
  * Two things picked, at least one a wall's edge: the distance between them — two edges of one wall, its thickness
  * (`thickness` opens it); of two walls, face to face; an edge and a line, from that face; an edge and a point, from it.

package/dist/tools/dim.js

@@ -20,7 +20,8 @@ import { solver } from '../solver';
 import { fmtAng, fmtLen } from '../units';
 import { addOpeningDim } from './openings';
 import { keypadFresh, keypadOpen, keypadSetReading } from '../editor/keypad';
-import { cornerLines } from '../editor/selection';
+import { advanceAfterReading } from '../editor/advance';
+import { cornerLines, edgePair, selInfo } from '../editor/selection';
 import { closeKeypad, kpTyped, openKeypad, showConflict, toast, updateCtx, updateHint } from '../editor/ports';
 import { noScaleYet, pendingLabel, startingValue } from '../editor/scaleGate';
 export const dimTool = {
@@ -237,7 +238,7 @@ export function dimLine(lid, side) {
         editDim(ex, undefined, false, wall && side ? { face: side } : undefined);
         return;
     }
-    let face = wall ? side ?? defaultFace(sk, lid, ed.wallTap?.id === lid ? ed.wallTap.side : undefined) ?? 0 : 0;
+    let face = wall ? firstFace(sk, lid, side) : 0;
     const len = () => (face ? faceLength(sk, lid, face) : lineLen(sk, l));
     // (while it's being entered, what it measures is what's highlighted: the edge, or the wall)
     const was = ed.sel;
@@ -251,8 +252,13 @@ export function dimLine(lid, side) {
                 keypadSetReading(len()); },
         })) : undefined,
         onClose: () => { ed.sel = was; updateCtx(); requestDraw(); },
-        onDone: (v, capture) => { if (v > 0)
-            addLength(v, capture !== undefined ? { capture } : {}); },
+        onDone: (v, capture) => {
+            if (!(v > 0))
+                return;
+            // a laser reading's (it comes with its record) moves on to the next line clockwise; a typed one stays
+            if (addLength(v, capture !== undefined ? { capture } : {}) && capture !== undefined)
+                advanceAfterReading(lid, side);
+        },
         // (or a length of the job's, from its list: the line takes it, linked to it)
         measurements: offersJobMeasurements() ? {
             kind: 'length', pick: t => {
@@ -264,22 +270,31 @@ export function dimLine(lid, side) {
             },
         } : undefined,
     };
-    /** The line's length dimension, driving, measured where the keypad says (`extra`: what it's from). */
+    /** The line's length dimension, driving, measured where the keypad says (`extra`: what it's from). Whether it took. */
     function addLength(v, extra) {
         pushHistory();
-        const r = tryAddConstraint({ type: 'dist', a: l.a, b: l.b, kind: 'al', value: v, line: lid, driving: true, off: face ? (face * 30) / V().s : 0, ...(face ? { face } : {}), ...extra });
+        const r = tryAddConstraint({ ...lengthDim(sk, lid, face), value: v, ...extra });
         // a measurement of the job drives a line, or nothing: not one whose length the drawing already sets
+        let took = r.ok;
         if (r.ok && r.ref && extra.measurementRef) {
             delete SK().cons[r.id];
             dropHistory();
             toast(LENGTH_SET_ALREADY, { warn: true });
+            took = false;
         }
         else if (!r.ok)
             dropHistory();
         afterEdit();
+        return took;
     }
     openKeypad(spec);
 }
+/**
+ * Whether giving dimension `c` the value `v` replaces a value measured there: a driving one, entered (not a default
+ * nobody measured), changed by it. Not one linked to a measurement of the job: that's asked about anyway
+ * (askLinkedChange). What a host warns about before a reading overwrites (laserReadingOverwrites).
+ */
+export const replacesMeasured = (c, v) => !!c && c.driving !== false && !c.auto && !c.measurementRef && changesValue(c, v);
 /** Why a measurement of the job can't drive a line the drawing already sets the length of. */
 export const LENGTH_SET_ALREADY = 'The drawing already sets that line’s length. Free it first (make one of its dimensions a reference), then pick the measurement.';
 /** Why a measurement of the job can't drive an angle the drawing already sets. */
@@ -452,8 +467,96 @@ export function dimEdgePoint(lid, side, p) {
         toast('Pick a point off the wall to measure from its edge.', { warn: true });
         return;
     }
-    dimPointLine(p, lid, { faces: [faceToward(sk, lid, sk.points[p], side), 0], title: 'Distance from the edge' });
+    dimPointLine(p, lid, { faces: edgePointFaces(sk, lid, side, p), title: 'Distance from the edge' });
+}
+/** From a wall's edge to a point: measured from that face of the wall. */
+const edgePointFaces = (sk, lid, side, p) => [faceToward(sk, lid, sk.points[p], side), 0];
+/* What the + measures, as a dimension not made yet: the builders above make these, and the grey number shows them. */
+/**
+ * The face a wall's length (a curved wall's diameter) is first measured on: `side`, the edge picked; picked whole, the
+ * side a space is on (the side it was tapped on, between two); its centreline with no space beside it.
+ */
+const firstFace = (sk, id, side) => side ?? defaultFace(sk, id, ed.wallTap?.id === id ? ed.wallTap.side : undefined) ?? 0;
+/** Line `lid`'s length, measured on `face` (a wall's; 0 along the line). Its label sits off the side it's measured on. */
+function lengthDim(sk, lid, face) {
+    const l = sk.lines[lid];
+    return { type: 'dist', a: l.a, b: l.b, kind: 'al', line: lid, driving: true, off: face ? (face * 30) / V().s : 0, ...(face ? { face } : {}) };
+}
+/** A circle's or arc's diameter, across `face` (a curved wall's; 0 its centreline). */
+const diamDim = (id, face) => ({ type: 'diam', c: id, driving: true, ...(face ? { face } : {}) });
+/** A circle's or arc's diameter dimension, if it has one. */
+const diamDimOf = (sk, id) => Object.keys(sk.cons).find(k => sk.cons[k].type === 'diam' && sk.cons[k].c === id);
+/** The angle between two lines. */
+const angleDim = (l1, l2) => ({ type: 'angle', l1, l2, value: 0, driving: true });
+/** The straight distance between two points. */
+const pointsDim = (a, b) => ({ type: 'dist', a, b, kind: 'al', driving: true, off: 0 });
+/**
+ * Point `p`'s distance from line `lid`, square to it, on its side of it. On a wall, from `faces[0]` (see dimPointLine) —
+ * by default the face toward the point where a space is against it; `l2`, the wall the point is the end of.
+ */
+function pointLineDim(sk, p, lid, opts = {}) {
+    const l = sk.lines[lid], P = sk.points[p], A = sk.points[l.a], B = sk.points[l.b];
+    const sd = ((B.x - A.x) * (P.y - A.y) - (B.y - A.y) * (P.x - A.x)) / (hyp(B.x - A.x, B.y - A.y) || 1);
+    const c = { type: 'pldist', p, l: lid, value: 0, sign: sd < 0 ? -1 : 1, driving: true, ...(opts.l2 ? { l2: opts.l2 } : {}) };
+    applyFace(c, { faces: opts.faces ?? [faceToward(sk, lid, P), 0] });
+    return c;
+}
+/**
+ * What the yellow + measures for the selection, as the dimension it would make (`c`, its value unset), with the one
+ * already there for it (`existing`), which the + edits instead. Null where it makes no dimension of the plan: nothing it
+ * measures, a door's or window's sizes (their own dimensions), a wall's thickness, the wall view (wallPlus).
+ */
+export function selectionDim() {
+    const sk = SK(), s = selInfo();
+    if (s.dims.length || s.odims.length || s.openings.length || s.oanchors.length)
+        return null;
+    if (s.wfaces.length === 1 && s.n === 1) {
+        const [id, side] = edgeOf(s.wfaces[0]);
+        if (sk.lines[id])
+            return { c: lengthDim(sk, id, side), existing: lengthDimOf(sk, id) ?? undefined };
+        return { c: diamDim(id, side), existing: diamDimOf(sk, id) };
+    }
+    if (edgePair(s)) {
+        const edges = s.wfaces.map(edgeOf), other = ed.sel.find(x => x.type !== 'wface');
+        if (edges.length === 2) {
+            const [[a, sa], [b, sb]] = edges;
+            return a !== b && sk.lines[a] && sk.lines[b] ? twoLinesDim(sk, a, b, { [a]: sa, [b]: sb }) : null;
+        }
+        const [lid, side] = edges[0], l = sk.lines[lid];
+        if (other?.type === 'line')
+            return twoLinesDim(sk, lid, other.id, { [lid]: side });
+        if (other?.type !== 'point' || !l || other.id === l.a || other.id === l.b)
+            return null;
+        return { c: pointLineDim(sk, other.id, lid, { faces: edgePointFaces(sk, lid, side, other.id) }), existing: pointLineDimOf(sk, other.id, lid) };
+    }
+    if (s.lines.length === 1 && s.n === 1) {
+        const lid = s.lines[0];
+        return { c: lengthDim(sk, lid, faced(sk, lid) ? firstFace(sk, lid) : 0), existing: lengthDimOf(sk, lid) ?? undefined };
+    }
+    if (s.curves.length === 1 && s.n === 1) {
+        const id = s.curves[0];
+        return { c: diamDim(id, wallOf(sk, id) ? firstFace(sk, id) : 0), existing: diamDimOf(sk, id) };
+    }
+    if (s.points.length === 1 && s.n === 1)
+        return cornerDim(sk, s.points[0]);
+    if (s.n === 2 && s.lines.length === 2)
+        return twoLinesDim(sk, s.lines[0], s.lines[1]);
+    if (s.n === 2 && s.points.length === 2) {
+        const [a, b] = s.points;
+        const existing = Object.keys(sk.cons).find(id => { const c = sk.cons[id]; return c.type === 'dist' && !c.line && ((c.a === a && c.b === b) || (c.a === b && c.b === a)); });
+        return { c: pointsDim(a, b), existing };
+    }
+    if (s.n === 2 && s.points.length === 1 && s.lines.length === 1) {
+        const [p] = s.points, [lid] = s.lines, l = sk.lines[lid];
+        // (one of the line's own ends is no distance from it)
+        if (!l || p === l.a || p === l.b)
+            return null;
+        return { c: pointLineDim(sk, p, lid), existing: pointLineDimOf(sk, p, lid) };
+    }
+    return null;
 }
+/** A distance from point `p` to line `lid` already in the drawing. */
+const pointLineDimOf = (sk, p, lid) => Object.keys(sk.cons).find(id => sk.cons[id].type === 'pldist' && sk.cons[id].p === p && sk.cons[id].l === lid);
 /**
  * Two things picked, at least one a wall's edge: the distance between them — two edges of one wall, its thickness
  * (`thickness` opens it); of two walls, face to face; an edge and a line, from that face; an edge and a point, from it.
@@ -491,7 +594,7 @@ export function dimPoints(a, b) {
         title: 'Distance', ...startingValue(L), selectAll: true, laser: true,
         onDone: (v, capture) => {
             pushHistory();
-            const r = tryAddConstraint({ type: 'dist', a, b, kind: 'al', value: v, driving: true, off: 0, ...(capture !== undefined ? { capture } : {}) });
+            const r = tryAddConstraint({ ...pointsDim(a, b), value: v, ...(capture !== undefined ? { capture } : {}) });
             if (!r.ok)
                 dropHistory();
             ed.sel = [];
@@ -506,9 +609,32 @@ export function dimPoints(a, b) {
  * or, picked whole, each wall's room side (see faceToward).
  */
 export function dimTwoLines(l1, l2, sides = {}) {
-    const sk = SK(), L1 = sk.lines[l1], L2 = sk.lines[l2];
-    if (!L1 || !L2)
+    const sk = SK(), d = twoLinesDim(sk, l1, l2, sides);
+    if (!d)
         return;
+    if (d.existing) {
+        const c = sk.cons[d.existing];
+        // (the edges picked: it's measured between them now)
+        editDim(d.existing, undefined, false, c.type === 'pldist' && Object.keys(sides).length ? d.facesFrom(c.l, c.p) : undefined);
+        return;
+    }
+    if (d.c.type === 'angle') {
+        dimAngle(l1, l2);
+        return;
+    }
+    const f = d.facesFrom(l1, d.c.p);
+    dimPointLine(d.c.p, l1, { keepParallel: l2, title: 'Distance between lines', faces: f.faces, l2: f.l2 });
+}
+/**
+ * What the + measures between two lines: their distance if they're parallel — square to the first, from the end of the
+ * second that sits most squarely across from it, between the faces `sides` says (see dimTwoLines) — otherwise the angle
+ * between them. `existing`: a dimension already between them; `facesFrom`: the faces between line `l` and the other,
+ * from point `p` on the other.
+ */
+function twoLinesDim(sk, l1, l2, sides = {}) {
+    const L1 = sk.lines[l1], L2 = sk.lines[l2];
+    if (!L1 || !L2)
+        return null;
     const [ax, ay] = norm2(sk.points[L1.b].x - sk.points[L1.a].x, sk.points[L1.b].y - sk.points[L1.a].y);
     const [bx, by] = norm2(sk.points[L2.b].x - sk.points[L2.a].x, sk.points[L2.b].y - sk.points[L2.a].y);
     const parallel = Math.abs(ax * by - ay * bx) < 0.02; // within about a degree
@@ -521,27 +647,17 @@ export function dimTwoLines(l1, l2, sides = {}) {
             return (c.l1 === l1 && c.l2 === l2) || (c.l1 === l2 && c.l2 === l1);
         return (c.l === l1 && (c.p === L2.a || c.p === L2.b)) || (c.l === l2 && (c.p === L1.a || c.p === L1.b));
     });
-    /** The faces between line `l` (the one measured square to) and the other, from point `p` on the other. */
     const facesFrom = (l, p) => {
         const o = l === l1 ? l2 : l1, ol = sk.lines[o], on = sk.lines[l];
         return { faces: [faceToward(sk, l, sk.points[p], sides[l], true), faceToward(sk, o, sk.points[on.a], sides[o], true)], ...(faced(sk, o) && ol ? { l2: o } : {}) };
     };
-    if (existing) {
-        const c = sk.cons[existing];
-        // (the edges picked: it's measured between them now)
-        editDim(existing, undefined, false, c.type === 'pldist' && Object.keys(sides).length ? facesFrom(c.l, c.p) : undefined);
-        return;
-    }
-    if (!parallel) {
-        dimAngle(l1, l2);
-        return;
-    }
-    // measure from the end of the second line that sits most squarely across from the first
+    if (!parallel)
+        return { c: angleDim(l1, l2), existing, facesFrom };
     const A = sk.points[L1.a], B = sk.points[L1.b], len2 = (B.x - A.x) ** 2 + (B.y - A.y) ** 2 || 1;
     const t = (pid) => { const P = sk.points[pid]; return ((P.x - A.x) * (B.x - A.x) + (P.y - A.y) * (B.y - A.y)) / len2; };
     const p = Math.abs(t(L2.a) - 0.5) <= Math.abs(t(L2.b) - 0.5) ? L2.a : L2.b;
     const f = facesFrom(l1, p);
-    dimPointLine(p, l1, { keepParallel: l2, title: 'Distance between lines', faces: f.faces, l2: f.l2 });
+    return { c: pointLineDim(sk, p, l1, { faces: f.faces, l2: f.l2 }), existing, facesFrom };
 }
 /**
  * The distance from point `p` to line `lid`, square to it. On a wall it's measured from `faces[0]`, its face toward
@@ -550,11 +666,7 @@ export function dimTwoLines(l1, l2, sides = {}) {
  * switch them.
  */
 export function dimPointLine(p, lid, opts = {}) {
-    const sk = SK(), l = sk.lines[lid], P = sk.points[p], A = sk.points[l.a], B = sk.points[l.b];
-    const sd = ((B.x - A.x) * (P.y - A.y) - (B.y - A.y) * (P.x - A.x)) / (hyp(B.x - A.x, B.y - A.y) || 1);
-    const sign = sd < 0 ? -1 : 1;
-    const c = { type: 'pldist', p, l: lid, value: 0, sign, driving: true, ...(opts.l2 ? { l2: opts.l2 } : {}) };
-    applyFace(c, { faces: opts.faces ?? [faceToward(sk, lid, P), 0] });
+    const sk = SK(), c = pointLineDim(sk, p, lid, opts);
     const choices = faceChoices(sk, c);
     ed.sel = [];
     ed.preview = (cx, T) => { const e = dimEnds(sk, c); if (e)
@@ -590,15 +702,13 @@ export function dimPointLine(p, lid, opts = {}) {
  */
 export function dimCurve(id, side) {
     const sk = SK(), wall = !!wallOf(sk, id);
-    for (const k in sk.cons) {
-        const c = sk.cons[k];
-        if (c.type === 'diam' && c.c === id) {
-            editDim(k, undefined, false, wall && side ? { face: side } : undefined);
-            return;
-        }
+    const ex = diamDimOf(sk, id);
+    if (ex) {
+        editDim(ex, undefined, false, wall && side ? { face: side } : undefined);
+        return;
     }
-    let face = wall ? side ?? defaultFace(sk, id, ed.wallTap?.id === id ? ed.wallTap.side : undefined) ?? 0 : 0;
-    const now = () => measure(sk, { type: 'diam', c: id, ...(face ? { face } : {}) });
+    let face = wall ? firstFace(sk, id, side) : 0;
+    const now = () => measure(sk, diamDim(id, face));
     // (while it's being entered, what it measures across is what's highlighted: the edge, or the wall)
     const was = ed.sel, type = sk.circles[id] ? 'circle' : 'arc';
     const show = () => { ed.sel = face ? [{ type: 'wface', id: edgeId(id, face) }] : [{ type, id }]; requestDraw(); };
@@ -615,7 +725,7 @@ export function dimCurve(id, side) {
             if (v <= 0)
                 return;
             pushHistory();
-            const r = tryAddConstraint({ type: 'diam', c: id, value: v, driving: true, ...(face ? { face } : {}) });
+            const r = tryAddConstraint({ ...diamDim(id, face), value: v });
             if (!r.ok)
                 dropHistory();
             // (as a length: the dimension made, nothing left highlighted)
@@ -627,19 +737,26 @@ export function dimCurve(id, side) {
 }
 /** A corner's angle (two lines meeting at `pid`): its angle dimension's keypad, or a new one's. False if it isn't a corner. */
 export function cornerAngle(pid, done, modeless = false) {
-    const sk = SK(), pair = cornerLines(sk, pid);
-    if (!pair)
+    const sk = SK(), d = cornerDim(sk, pid);
+    if (!d)
         return false;
     // edit the corner's existing angle dimension rather than stacking a second one
-    const ex = Object.keys(sk.cons).find(id => { const c = sk.cons[id]; return c.type === 'angle' && ((c.l1 === pair[0] && c.l2 === pair[1]) || (c.l1 === pair[1] && c.l2 === pair[0])); });
-    if (ex)
-        editDim(ex, done, modeless);
+    if (d.existing)
+        editDim(d.existing, done, modeless);
     else
-        dimAngle(pair[0], pair[1], done, modeless);
+        dimAngle(d.c.l1, d.c.l2, done, modeless);
     return true;
 }
+/** A corner's angle (two lines meeting at `pid`), as the + measures it; `existing`, its angle dimension. Null if it isn't a corner. */
+function cornerDim(sk, pid) {
+    const pair = cornerLines(sk, pid);
+    if (!pair)
+        return null;
+    const existing = Object.keys(sk.cons).find(id => { const c = sk.cons[id]; return c.type === 'angle' && ((c.l1 === pair[0] && c.l2 === pair[1]) || (c.l1 === pair[1] && c.l2 === pair[0])); });
+    return { c: angleDim(pair[0], pair[1]), existing };
+}
 export function dimAngle(l1, l2, done, modeless = false) {
-    const c = { type: 'angle', l1, l2, value: 0, driving: true };
+    const c = angleDim(l1, l2);
     const cur = measure(SK(), c);
     /** The angle dimension, driving, at `v` degrees (`extra`: what it's from). */
     const addAngle = (v, extra) => {
@@ -700,7 +817,16 @@ export function editDim(id, done, modeless = false, pick) {
             onPress: () => { face = onChoice(c, ch) ? null : { ...ch, l2: face?.l2 ?? ch.l2 }; if (keypadFresh())
                 keypadSetReading(now()); },
         })),
-        onDone: (v, capture) => { setDimValue(id, v * k, face ?? undefined, { capture }); done?.(); },
+        onDone: (v, capture) => {
+            const took = setDimValue(id, v * k, face ?? undefined, { capture });
+            done?.();
+            // a laser reading's (it comes with its record) on a line's length or a curve's diameter moves on to the next
+            // line clockwise; a typed one, or one the drawing refused or asked about, stays
+            const of = c.type === 'dist' ? c.line : c.type === 'diam' ? c.c : undefined;
+            if (took && capture !== undefined && of)
+                advanceAfterReading(of, pick?.face || undefined);
+        },
+        overwrites: v => replacesMeasured(SK().cons[id], v * k),
         // a line's length or an angle: or one of the job's, from its list — the dimension takes it, linked to it (a
         // dimension already linked to another, re-linked)
         measurements: ((c.type === 'dist' && c.line) || isAng) && offersJobMeasurements() ? {