@mathscan/geometry-engine 0.1.0 → 0.1.1

package/dist/{react-BEcdx1f6.js → react-B5cGaxH8.js}

@@ -1,12 +1,12 @@
-import { I as e, O as t, R as n, k as r } from "./geometryState.schema-D0ixyGYE.js";
-import { c as i, d as a, s as o } from "./goals-C3ZwbEh_.js";
-import { $ as s, C as c, E as l, H as u, I as d, N as f, O as p, P as m, Q as h, V as g, a as _, at as v, b as y, c as b, ct as x, d as S, f as C, g as w, h as T, i as E, it as D, j as O, k, l as A, m as j, n as M, nt as ee, o as N, ot as P, p as te, r as ne, st as re, t as ie, u as ae, v as F, x as oe, y as se } from "./studentStore-CEKTtMCh.js";
-import { c as ce, o as le, r as ue, s as de, t as fe, u as pe } from "./geometryAttemptStatus-5L_q6-9l.js";
-import { useEffect as I, useLayoutEffect as L, useMemo as me, useRef as R, useState as z, useSyncExternalStore as he } from "react";
-import { Arc as ge, Circle as B, Ellipse as _e, Group as V, Layer as ve, Line as H, Rect as U, Stage as ye, Text as W } from "react-konva";
+import { B as e, G as t, H as n, M as r, N as i, Z as a, q as o, wt as s } from "./geometryState.schema-CKFPlX8j.js";
+import { c, f as l, l as u } from "./goals-BlSeniyt.js";
+import { $ as d, C as f, E as p, H as m, I as h, N as g, O as _, P as v, V as y, a as b, at as x, b as S, c as C, ct as w, d as T, et as E, f as D, g as O, h as k, i as A, j as ee, k as te, l as j, lt as M, m as N, n as ne, o as re, ot as P, p as ie, r as ae, rt as oe, st as F, t as se, u as ce, v as le, x as ue, y as de } from "./studentStore-CyYa0N93.js";
+import { c as fe, i as pe, o as me, s as he, t as ge, u as _e } from "./exerciseLoad-DgeDXYbf.js";
+import { useEffect as I, useLayoutEffect as L, useMemo as ve, useRef as R, useState as z, useSyncExternalStore as ye } from "react";
+import { Arc as be, Circle as B, Ellipse as xe, Group as V, Layer as Se, Line as H, Rect as U, Stage as Ce, Text as W } from "react-konva";
 import { Fragment as G, jsx as K, jsxs as q } from "react/jsx-runtime";
 //#region src/geometry/entityCapabilities.ts
-var be = {
+var we = {
 	implicit: {
 		rendered: !1,
 		selectable: !1,
@@ -18,13 +18,20 @@ var be = {
 		snapTarget: !0
 	}
 };
-function xe(e) {
-	return be[e];
+function Te(e) {
+	return we[e];
+}
+function Ee(e, t) {
+	if (e.presentationOf(t).measureLabel !== "degrees") return;
+	let n = e.resolvedOf(t);
+	if (n?.kind !== "angle") return;
+	let r = Number((n.sweepTurn * 360).toFixed(0));
+	return `${(r >= 360 ? 0 : r).toFixed(0)}°`;
 }
 //#endregion
 //#region src/renderer/deriveRenderableGeometry.ts
-function Se(e) {
-	let t = o(e.exercise), n = t.points, r = /* @__PURE__ */ new Map(), i = [];
+function De(e) {
+	let t = c(e.exercise), n = t.points, r = /* @__PURE__ */ new Map(), i = [];
 	for (let [t, a] of Object.entries(e.exercise.entities)) {
 		if (a.kind !== "point") {
 			i.push({
@@ -36,117 +43,131 @@ function Se(e) {
 		let e = n.get(t);
 		e && r.set(t, e);
 	}
-	return we(r, i, t);
+	return ke(r, i, t);
 }
-function Ce(e, t) {
-	let n = a(e, t);
-	return we(n.points, [...i(e, t).values()], n);
+function Oe(e, t) {
+	let n = l(e, t);
+	return ke(n.points, [...u(e, t).values()], n);
 }
-function we(e, t, n) {
-	let r = (e) => xe(n.presentationOf(e).role);
+function ke(e, t, n) {
+	let r = (e) => Te(n.presentationOf(e).role), i = (e) => n.presentationOf(e).role === "explicit" ? Ee(n, e) : void 0;
 	return {
 		points: e,
 		objects: t,
 		capabilitiesOf: r,
 		labelOf: (e) => {
 			let t = n.presentationOf(e);
-			return t.role === "explicit" ? t.label : void 0;
+			if (t.role !== "explicit") return;
+			let r = i(e);
+			return r === void 0 ? t.label : t.label === void 0 ? r : `${t.label} = ${r}`;
 		},
+		measureOf: i,
 		isSnapTarget: (e) => r(e).snapTarget
 	};
 }
 //#endregion
 //#region src/renderer/useConnectionPreview.ts
-var Te = {
+var Ae = {
 	gestureFrom: null,
 	pointer: null,
 	snap: null
 };
-function Ee({ points: e, viewport: t, canvas: n, pendingObjectType: r, pendingFirstPointId: i, connect: a, pick: o, objects: c = [], isSnapTarget: l, canCreatePoints: u = !1, preserveCreatedPointOrigins: d = !0 }) {
-	let f = R(null), p = R(null), m = R(null), [g, _] = z(Te), y = r === "segment" || r === "line", b = v(t, n), S = re(32, b), C = {
+function je(t, r, i, a) {
+	let o = e({
+		kind: "angle",
+		parents: [
+			r,
+			i,
+			a
+		]
+	}, t);
+	return o && n(o);
+}
+function Me({ points: e, viewport: t, canvas: n, pendingObjectType: r, pendingFirstPointId: i, pendingVertexPointId: a = null, connect: o, pick: s, objects: c = [], isSnapTarget: l, canCreatePoints: u = !1, preserveCreatedPointOrigins: f = !0 }) {
+	let p = R(null), m = R(null), h = R(null), [g, _] = z(Ae), v = r === "angle", y = v || r === "segment" || r === "line", b = P(t, n), S = w(32, b), C = {
 		points: e,
 		objects: c,
 		viewport: t,
 		isSnapTarget: l
-	}, w = g.snap?.kind === "point" ? g.snap.targetIds[0] ?? null : null;
-	function T() {
-		let e = f.current;
+	}, T = g.snap?.kind === "point" ? g.snap.targetIds[0] ?? null : null;
+	function D() {
+		let e = p.current;
 		_(e ? {
 			gestureFrom: e.fromPoint,
 			pointer: e.pointer,
-			snap: m.current
+			snap: h.current
 		} : {
 			gestureFrom: null,
-			pointer: p.current,
-			snap: m.current
+			pointer: m.current,
+			snap: h.current
 		});
 	}
-	function E(e) {
-		return x(e, t, n, b);
+	function O(e) {
+		return M(e, t, n, b);
 	}
-	function O(t) {
+	function k(t) {
 		return e.has(t) && (!l || l(t));
 	}
-	function k(e, t) {
-		return h(E(e), C, {
+	function A(e, t) {
+		return d(O(e), C, {
 			tolerance: S,
 			exclude: t?.kind === "existing" ? [t.id] : [],
-			kinds: u ? [
+			kinds: u && !v ? [
 				"point",
 				"intersection",
 				"onObject"
 			] : ["point"]
 		});
 	}
-	let A = (() => {
-		let a = g.gestureFrom ?? (i ? e.get(i) ?? null : null), { pointer: o } = g;
-		if (!y || !a || !o) return null;
-		let s = g.snap ? P(g.snap.position, t, n) : o;
+	let ee = (() => {
+		let o = g.gestureFrom ?? (i ? e.get(i) ?? null : null), { pointer: s } = g;
+		if (!y || !o || !s || a) return null;
+		let c = g.snap ? F(g.snap.position, t, n) : s;
 		if (r !== "line") {
-			let e = P(a, t, n);
+			let e = F(o, t, n);
 			return [
 				e.x,
 				e.y,
-				s.x,
-				s.y
+				c.x,
+				c.y
 			];
 		}
-		let c = D(a, E(s), t);
-		if (!c) return null;
-		let l = P(c[0], t, n), u = P(c[1], t, n);
+		let l = x(o, O(c), t);
+		if (!l) return null;
+		let u = F(l[0], t, n), d = F(l[1], t, n);
 		return [
-			l.x,
-			l.y,
 			u.x,
-			u.y
+			u.y,
+			d.x,
+			d.y
 		];
-	})();
+	})(), te = v && i && a && T ? je(e, i, a, T) : null;
 	function j(t, n) {
-		if (f.current = null, p.current = null, m.current = null, !y) return;
+		if (p.current = null, m.current = null, h.current = null, !y) return;
 		if (i) {
 			let n = {
 				kind: "existing",
 				id: i
 			};
-			f.current = {
+			p.current = {
 				from: n,
-				fromPoint: e.get(i) ?? E(t),
+				fromPoint: e.get(i) ?? O(t),
 				completing: !0,
 				pointer: t
-			}, m.current = k(t, n), T();
+			}, h.current = A(t, n), D();
 			return;
 		}
-		let r = n && O(n) ? n : null, a = E(t), o = null;
-		if (!r && (!u || (o = h(a, C, {
+		let r = n && k(n) ? n : null, a = O(t), o = null;
+		if (!r && (!u || (o = d(a, C, {
 			tolerance: S,
 			kinds: [
 				"point",
 				"intersection",
 				"onObject"
 			]
-		}), o?.kind === "point" && (r = o.targetIds[0] ?? null, !r || !O(r))))) return;
+		}), o?.kind === "point" && (r = o.targetIds[0] ?? null, !r || !k(r))))) return;
 		if (r) {
-			f.current = {
+			p.current = {
 				from: {
 					kind: "existing",
 					id: r
@@ -157,44 +178,45 @@ function Ee({ points: e, viewport: t, canvas: n, pendingObjectType: r, pendingFi
 			};
 			return;
 		}
-		let c = o?.position ?? a, l = o && d ? s({
-			position: c,
+		if (v) return;
+		let s = o?.position ?? a, c = o && f ? E({
+			position: s,
 			snap: o
 		}) : null;
-		f.current = {
+		p.current = {
 			from: {
 				kind: "create",
-				origin: l ?? {
+				origin: c ?? {
 					kind: "point",
-					at: c
+					at: s
 				}
 			},
-			fromPoint: c,
+			fromPoint: s,
 			completing: !1,
 			pointer: null
 		};
 	}
-	function M(e) {
-		let t = f.current;
-		t && (m.current = k(e, t.from), f.current = {
+	function N(e) {
+		let t = p.current;
+		!t || v || (h.current = A(e, t.from), p.current = {
 			...t,
 			pointer: e
-		}, T());
+		}, D());
 	}
-	function ee(e) {
-		if (!f.current) {
+	function ne(e) {
+		if (!p.current) {
 			if (!y || !i || !e) {
-				if (!p.current && !m.current) return;
-				p.current = null, m.current = null, T();
+				if (!m.current && !h.current) return;
+				m.current = null, h.current = null, D();
 				return;
 			}
-			p.current = e, m.current = k(e, {
+			m.current = e, h.current = A(e, {
 				kind: "existing",
 				id: i
-			}), T();
+			}), D();
 		}
 	}
-	function N(e, t, n) {
+	function re(e, t, n) {
 		let r = e ? {
 			kind: "existing",
 			id: e
@@ -214,14 +236,14 @@ function Ee({ points: e, viewport: t, canvas: n, pendingObjectType: r, pendingFi
 			} : r;
 		}
 		if (!u) return r;
-		if (!d) return {
+		if (!f) return {
 			kind: "create",
 			origin: {
 				kind: "point",
 				at: n.position
 			}
 		};
-		let i = s({
+		let i = E({
 			position: n.position,
 			snap: n
 		});
@@ -230,70 +252,72 @@ function Ee({ points: e, viewport: t, canvas: n, pendingObjectType: r, pendingFi
 			origin: i
 		} : r;
 	}
-	function te(e, t, n) {
-		let r = f.current;
-		if (f.current = null, m.current = null, T(), !r || !y) return !1;
-		let i = t && O(t) ? t : null;
+	function ie(e, t, n) {
+		let r = p.current;
+		if (p.current = null, h.current = null, D(), !r || !y) return !1;
+		let i = t && k(t) ? t : null;
 		if (!n) {
-			let t = r.completing ? i ?? ne(e) : r.from.kind === "existing" ? r.from.id : null;
-			return t ? (o(t), !0) : !1;
+			let t = r.completing ? i ?? ae(e) : r.from.kind === "existing" ? r.from.id : null;
+			return t ? (s(t), !0) : !1;
 		}
-		let s = N(i, E(e), k(e, r.from));
-		return s && a(r.from, s), !0;
+		if (v) return !0;
+		let a = re(i, O(e), A(e, r.from));
+		return a && o(r.from, a), !0;
 	}
-	function ne(e) {
-		let t = h(E(e), C, {
+	function ae(e) {
+		let t = d(O(e), C, {
 			tolerance: S,
 			kinds: ["point"]
 		}), n = t?.kind === "point" ? t.targetIds[0] : void 0;
-		return n && O(n) ? n : null;
+		return n && k(n) ? n : null;
 	}
-	function ie() {
-		!f.current && !p.current && !m.current || (f.current = null, p.current = null, m.current = null, T());
+	function oe() {
+		!p.current && !m.current && !h.current || (p.current = null, m.current = null, h.current = null, D());
 	}
 	return {
 		connecting: y,
-		previewPoints: A,
-		snapTargetId: y ? w : null,
+		previewPoints: ee,
+		previewAngle: te,
+		snapTargetId: y ? T : null,
 		snapPreview: y && g.snap && g.snap.kind !== "point" ? g.snap : null,
 		press: j,
-		drag: M,
-		hover: ee,
-		release: te,
-		cancel: ie
+		drag: N,
+		hover: ne,
+		release: ie,
+		cancel: oe
 	};
 }
 //#endregion
 //#region src/renderer/usePlacementSnap.ts
-function De({ points: e, objects: t, viewport: n, canvas: r, showGrid: i, isSnapTarget: a, active: o }) {
-	let [s, c] = z(null), l = v(n, r), u = {
+function Ne({ points: e, objects: t, viewport: n, canvas: r, showGrid: i, isSnapTarget: a, active: o }) {
+	let [s, c] = z(null), l = P(n, r), u = {
 		points: e,
 		objects: t,
 		viewport: n,
 		showGrid: i,
 		isSnapTarget: a
-	}, d = { tolerance: re(24, l) };
-	function f(e) {
+	}, f = { tolerance: w(24, l) };
+	function p(e) {
 		if (!o) {
 			s && c(null);
 			return;
 		}
-		c(h(x(e, n, r, l), u, d));
+		c(d(M(e, n, r, l), u, f));
 	}
-	function p(e) {
+	function m(e) {
 		let t = e.target.getStage()?.getPointerPosition();
-		t ? f(t) : !o && s && c(null);
+		t ? p(t) : !o && s && c(null);
 	}
-	function m() {
+	function h() {
 		s && c(null);
 	}
 	function g(e) {
-		let t = x(e, n, r, l);
+		let t = M(e, n, r, l);
 		if (!o) return {
 			position: t,
 			snap: null
 		};
-		let i = h(t, u, d);
+		let i = d(t, u, f);
 		return {
 			position: i?.position ?? t,
 			snap: i
@@ -301,25 +325,91 @@ function De({ points: e, objects: t, viewport: n, canvas: r, showGrid: i, isSnap
 	}
 	return {
 		snap: o ? s : null,
-		trackAt: f,
-		trackPointer: p,
-		clearPointer: m,
+		trackAt: p,
+		trackPointer: m,
+		clearPointer: h,
 		resolvePlacement: g
 	};
 }
+function Pe(e) {
+	let t = /* @__PURE__ */ new Set();
+	for (let n of e) switch (n.type) {
+		case "create":
+		case "throughPoints":
+		case "perpendicular":
+		case "parallel":
+		case "segmentLength":
+		case "midpoint":
+		case "angleMeasure":
+		case "angleBisector": break;
+		case "givenAngle": t.add(n.angleId);
+	}
+	return t;
+}
+function Fe(t) {
+	let { scene: n, pointId: r, pointer: i, start: c, judgedAngleIds: l, isExerciseEntity: u } = t;
+	if (!t.free) return i;
+	let f = null, p = (e) => (l.has(e) ? 2 : 0) + +!!u(e);
+	for (let { id: t, definition: i } of n.objects) {
+		if (i.kind !== "angle") continue;
+		let [a, o, s] = i.parents;
+		if (o === r || a !== r && s !== r) continue;
+		if (f) {
+			let e = p(t) - p(f.id);
+			if (e < 0 || e === 0 && f.id < t) continue;
+		}
+		let c = e(i, n.points);
+		c?.kind === "angle" && (f = {
+			id: t,
+			definition: i,
+			resolved: c
+		});
+	}
+	if (!f) return d(i, n, {
+		tolerance: t.tolerance,
+		kinds: ["grid"]
+	})?.position ?? i;
+	let [m, , h] = f.definition.parents, { vertex: g, startTurn: _, sweepTurn: v } = f.resolved, y = o(g, i);
+	if (y === null) return null;
+	let b = m === r ? y : _, x = h === r ? y : _ + v, S = Math.round(a(b, x) * 360 / 1) * 1 % 360 / 360, C = m === r ? x - S : b + S, w = s(c, g), T = C * 2 * Math.PI;
+	return {
+		x: g.x + w * Math.cos(T),
+		y: g.y + w * Math.sin(T)
+	};
+}
+//#endregion
+//#region src/renderer/dragSnap.ts
+function Ie({ exercise: e, attempt: t = {}, points: n, objects: i, canvas: a }, o, s, c) {
+	let { viewport: l, entities: u } = e, d = P(l, a), f = r(t, o) ?? r(u, o);
+	return Fe({
+		scene: {
+			points: n,
+			objects: i,
+			viewport: l,
+			showGrid: e.showGrid
+		},
+		pointId: o,
+		pointer: M(s, l, a, d),
+		start: M(c, l, a, d),
+		free: f?.kind === "point" && "at" in f,
+		tolerance: w(24, d),
+		judgedAngleIds: Pe(e.goals),
+		isExerciseEntity: (e) => r(u, e) !== void 0
+	});
+}
 //#endregion
 //#region src/renderer/gesturePolicy.ts
-function Oe(e, t, n) {
+function Le(e, t, n) {
 	let r = n.width > 0 && t.width / n.width || 1, i = n.height > 0 && t.height / n.height || 1;
 	return {
 		x: (e.x - t.left) / r,
 		y: (e.y - t.top) / i
 	};
 }
-function ke(e) {
+function Re(e) {
 	return e === "touch" ? 8 : 4;
 }
-function Ae(e, t, n) {
+function ze(e, t, n) {
 	return {
 		pointerId: e,
 		pointerType: t,
@@ -328,44 +418,44 @@ function Ae(e, t, n) {
 		dragging: !1
 	};
 }
-function je(e, t) {
+function Be(e, t) {
 	let n = Math.hypot(t.x - e.origin.x, t.y - e.origin.y), r = Math.max(e.maxDisplacement, n);
 	return {
 		...e,
 		maxDisplacement: r,
-		dragging: e.dragging || r >= ke(e.pointerType)
+		dragging: e.dragging || r >= Re(e.pointerType)
 	};
 }
-function Me(e) {
+function Ve(e) {
 	return e.isPrimary ? e.pointerType !== "mouse" || e.button === 0 : !1;
 }
-var Ne = {
+var He = {
 	touchAction: "none",
 	userSelect: "none",
 	WebkitUserSelect: "none"
 };
-function Pe(e, t) {
+function Ue(e, t) {
 	return e.x >= 0 && e.y >= 0 && e.x <= t.width && e.y <= t.height;
 }
-var Fe = "geometry-point-", Ie = "geometry-object-";
-function Le(e) {
-	return `${Fe}${e}`;
+var We = "geometry-point-", Ge = "geometry-object-";
+function Ke(e) {
+	return `${We}${e}`;
 }
-function Re(e) {
-	return `${Ie}${e}`;
+function qe(e) {
+	return `${Ge}${e}`;
 }
-function ze(e) {
-	return e.startsWith(Fe) ? {
+function Je(e) {
+	return e.startsWith(We) ? {
 		kind: "point",
 		id: e.slice(15)
-	} : e.startsWith(Ie) ? {
+	} : e.startsWith(Ge) ? {
 		kind: "object",
 		id: e.slice(16)
 	} : null;
 }
 //#endregion
 //#region src/renderer/usePointerGestures.ts
-function Be(e, t, n, r) {
+function Ye(e, t, n, r) {
 	let i = R({
 		handlers: r,
 		canvas: t,
@@ -385,7 +475,7 @@ function Be(e, t, n, r) {
 		let n = t.container();
 		function r(e) {
 			let n = t.content;
-			return Oe({
+			return Le({
 				x: e.clientX,
 				y: e.clientY
 			}, n.getBoundingClientRect(), {
@@ -403,7 +493,7 @@ function Be(e, t, n, r) {
 		function l(e) {
 			let n = t.getIntersection(e);
 			if (!n) return { kind: "stage" };
-			let r = ze(n.id());
+			let r = Je(n.id());
 			return r?.kind === "point" && !i.current.handlers.pointOnScreen(r.id) ? { kind: "foreign" } : r ?? { kind: "foreign" };
 		}
 		function u(e) {
@@ -430,15 +520,15 @@ function Be(e, t, n, r) {
 			return !t || t.pointerId !== e.pointerId ? null : p(t) ? (f("invalidated"), null) : t;
 		}
 		function h(e) {
-			if (a.current || !Me(e) || c.size > 1) return;
+			if (a.current || !Ve(e) || c.size > 1) return;
 			let t = r(e), o = l(t);
 			if (o.kind === "foreign") return;
-			let { handlers: u, store: d } = i.current, f = u.tool === "segment" || u.tool === "line" ? "connect" : o.kind, p = f === "point" && o.kind === "point" && u.canDragPoint(o.id) ? u.pointOnScreen(o.id) : null, m = !1;
+			let { handlers: u, store: d } = i.current, f = u.tool === "segment" || u.tool === "line" || u.tool === "angle" ? "connect" : o.kind, p = f === "point" && o.kind === "point" && u.canDragPoint(o.id) ? u.pointOnScreen(o.id) : null, m = !1;
 			try {
 				n.setPointerCapture(e.pointerId), m = !0;
 			} catch {}
 			a.current = {
-				...Ae(e.pointerId, e.pointerType, s(e)),
+				...ze(e.pointerId, e.pointerType, s(e)),
 				store: d,
 				epoch: d.getState().interactionEpoch ?? 0,
 				handlers: u,
@@ -464,24 +554,24 @@ function Be(e, t, n, r) {
 			if (!t) return;
 			let n = r(e), o = {
 				...t,
-				...je(t, s(e))
+				...Be(t, s(e))
 			};
 			if (a.current = o, !o.dragging) return;
 			let { handlers: l } = i.current;
 			o.role === "connect" ? l.connection.drag(n) : o.role === "point" && o.dragFrom ? l.dragPoint(o.target.id, {
 				x: o.dragFrom.x + n.x - o.stageOrigin.x,
 				y: o.dragFrom.y + n.y - o.stageOrigin.y
-			}) : o.role === "stage" && !t.dragging && l.placement.clearPointer();
+			}, o.dragFrom) : o.role === "stage" && !t.dragging && l.placement.clearPointer();
 		}
 		function y(e) {
 			let t = m(e);
 			if (!t) return;
 			let n = r(e);
-			if (!Pe(n, i.current.canvas)) {
+			if (!Ue(n, i.current.canvas)) {
 				f("outside-release");
 				return;
 			}
-			let { dragging: a } = je(t, s(e));
+			let { dragging: a } = Be(t, s(e));
 			d(t);
 			let { handlers: o } = i.current, { target: c } = t;
 			switch (t.role) {
@@ -546,20 +636,20 @@ function Be(e, t, n, r) {
 }
 //#endregion
 //#region src/renderer/shapes/SnapMarker.tsx
-var Ve = "#786af5", He = {
+var Xe = "#786af5", Ze = {
 	point: "point",
 	intersection: "intersection",
 	grid: "grid",
 	onObject: "on object"
 };
-function Ue({ snap: e, viewport: t, canvas: n }) {
-	let r = P(e.position, t, n);
+function Qe({ snap: e, viewport: t, canvas: n }) {
+	let r = F(e.position, t, n);
 	return /* @__PURE__ */ q(G, { children: [
 		/* @__PURE__ */ K(B, {
 			x: r.x,
 			y: r.y,
 			radius: 12,
-			stroke: Ve,
+			stroke: Xe,
 			strokeWidth: 2,
 			dash: [4, 3],
 			listening: !1
@@ -568,25 +658,25 @@ function Ue({ snap: e, viewport: t, canvas: n }) {
 			x: r.x,
 			y: r.y,
 			radius: 3.5,
-			fill: Ve,
+			fill: Xe,
 			listening: !1
 		}),
 		/* @__PURE__ */ K(W, {
 			x: r.x + 15,
 			y: r.y + 8,
-			text: He[e.kind],
+			text: Ze[e.kind],
 			fontSize: 13,
 			fontStyle: "bold",
-			fill: Ve,
+			fill: Xe,
 			listening: !1
 		})
 	] });
 }
 //#endregion
 //#region src/renderer/shapes/PointShape.tsx
-var We = 22;
+var $e = 22;
 function J({ id: e, position: t, viewport: n, canvas: r, selected: i = !1, connectable: a = !1, snapTarget: o = !1, label: s, color: c = "#24304a", feedbackRingColor: l, feedbackRingDashed: u = !1 }) {
-	let d = P(t, n, r), f = o || i ? 13 : a ? 10 : 9;
+	let d = F(t, n, r), f = o || i ? 13 : a ? 10 : 9;
 	return /* @__PURE__ */ q(G, { children: [
 		l && /* @__PURE__ */ K(B, {
 			x: d.x,
@@ -609,14 +699,14 @@ function J({ id: e, position: t, viewport: n, canvas: r, selected: i = !1, conne
 			listening: !1
 		}),
 		/* @__PURE__ */ K(B, {
-			id: Le(e),
+			id: Ke(e),
 			x: d.x,
 			y: d.y,
 			radius: f,
 			fill: o || i ? "#6d5dfc" : c,
 			stroke: a && !i && !o ? "#a69df8" : "#fff",
 			strokeWidth: 3,
-			hitStrokeWidth: 2 * (We - f),
+			hitStrokeWidth: 2 * ($e - f),
 			shadowColor: "#24304a",
 			shadowBlur: i ? 12 : 4
 		}),
@@ -633,10 +723,10 @@ function J({ id: e, position: t, viewport: n, canvas: r, selected: i = !1, conne
 }
 //#endregion
 //#region src/renderer/shapes/StrokedLine.tsx
-var Ge = 44;
-function Ke({ id: e, a: t, b: n, color: r, strokeWidth: i, dashed: a, selected: o, opacity: s, listening: c }) {
+var et = 44;
+function tt({ id: e, a: t, b: n, color: r, strokeWidth: i, dashed: a, selected: o, opacity: s, listening: c }) {
 	return /* @__PURE__ */ K(H, {
-		id: Re(e),
+		id: qe(e),
 		points: [
 			t.x,
 			t.y,
@@ -647,16 +737,16 @@ function Ke({ id: e, a: t, b: n, color: r, strokeWidth: i, dashed: a, selected:
 		strokeWidth: o ? i + 3 : i,
 		lineCap: "round",
 		dash: a ? [10, 6] : void 0,
-		hitStrokeWidth: Ge,
+		hitStrokeWidth: et,
 		opacity: s,
 		listening: c
 	});
 }
 //#endregion
 //#region src/renderer/shapes/SegmentShape.tsx
-function qe({ id: e, from: t, to: n, viewport: r, canvas: i, color: a = "#6d5dfc", strokeWidth: o = 5, dashed: s = !1, selected: c = !1, opacity: l = 1, listening: u = !0 }) {
-	let d = P(t, r, i), f = P(n, r, i);
-	return /* @__PURE__ */ K(Ke, {
+function nt({ id: e, from: t, to: n, viewport: r, canvas: i, color: a = "#6d5dfc", strokeWidth: o = 5, dashed: s = !1, selected: c = !1, opacity: l = 1, listening: u = !0 }) {
+	let d = F(t, r, i), f = F(n, r, i);
+	return /* @__PURE__ */ K(tt, {
 		id: e,
 		a: d,
 		b: f,
@@ -670,11 +760,11 @@ function qe({ id: e, from: t, to: n, viewport: r, canvas: i, color: a = "#6d5dfc
 }
 //#endregion
 //#region src/renderer/shapes/LineShape.tsx
-function Je({ id: e, through: t, viewport: n, canvas: r, color: i = "#6d5dfc", strokeWidth: a = 4, dashed: o = !1, selected: s = !1, opacity: c = 1, listening: l = !0 }) {
-	let u = D(t[0], t[1], n);
+function rt({ id: e, through: t, viewport: n, canvas: r, color: i = "#6d5dfc", strokeWidth: a = 4, dashed: o = !1, selected: s = !1, opacity: c = 1, listening: l = !0 }) {
+	let u = x(t[0], t[1], n);
 	if (!u) return null;
-	let d = P(u[0], n, r), f = P(u[1], n, r);
-	return /* @__PURE__ */ K(Ke, {
+	let d = F(u[0], n, r), f = F(u[1], n, r);
+	return /* @__PURE__ */ K(tt, {
 		id: e,
 		a: d,
 		b: f,
@@ -687,12 +777,50 @@ function Je({ id: e, through: t, viewport: n, canvas: r, color: i = "#6d5dfc", s
 	});
 }
 //#endregion
+//#region src/renderer/shapes/AngleShape.tsx
+var it = 44, at = 48;
+function ot({ id: e, vertex: n, startTurn: r, sweepTurn: i, radius: a, viewport: o, canvas: s, color: c = "#6d5dfc", strokeWidth: l = 4, dashed: u = !1, selected: d = !1, opacity: f = 1, listening: p = !0 }) {
+	let m = [], h = (e) => {
+		let t = F(e, o, s);
+		m.push(t.x, t.y);
+	}, g = (e, t) => ({
+		x: t * Math.cos(2 * Math.PI * e),
+		y: t * Math.sin(2 * Math.PI * e)
+	}), _ = t({
+		vertex: n,
+		startTurn: r,
+		sweepTurn: i,
+		markRadius: a
+	});
+	if (_) _.forEach(h);
+	else for (let e = 0; e <= at; e += 1) {
+		let t = g(r + i * e / at, a);
+		h({
+			x: n.x + t.x,
+			y: n.y + t.y
+		});
+	}
+	return /* @__PURE__ */ K(H, {
+		id: qe(e),
+		points: m,
+		stroke: c,
+		strokeWidth: d ? l + 3 : l,
+		dash: u ? [10, 6] : void 0,
+		hitStrokeWidth: it,
+		opacity: f,
+		listening: p,
+		lineCap: "round",
+		lineJoin: "round",
+		closed: !1
+	});
+}
+//#endregion
 //#region src/renderer/shapes/CircleShape.tsx
-var Ye = 44;
-function Xe({ id: e, center: t, radius: n, viewport: r, canvas: i, color: a = "#6d5dfc", strokeWidth: o = 4, dashed: s = !1, selected: c = !1, opacity: l = 1, listening: u = !0 }) {
-	let d = v(r, i), f = P(t, r, i, d);
-	return /* @__PURE__ */ K(_e, {
-		id: Re(e),
+var st = 44;
+function ct({ id: e, center: t, radius: n, viewport: r, canvas: i, color: a = "#6d5dfc", strokeWidth: o = 4, dashed: s = !1, selected: c = !1, opacity: l = 1, listening: u = !0 }) {
+	let d = P(r, i), f = F(t, r, i, d);
+	return /* @__PURE__ */ K(xe, {
+		id: qe(e),
 		x: f.x,
 		y: f.y,
 		radiusX: n * d.scaleX,
@@ -700,45 +828,72 @@ function Xe({ id: e, center: t, radius: n, viewport: r, canvas: i, color: a = "#
 		stroke: a,
 		strokeWidth: c ? o + 3 : o,
 		dash: s ? [10, 6] : void 0,
-		hitStrokeWidth: Ye,
+		hitStrokeWidth: st,
 		opacity: l,
 		listening: u
 	});
 }
 //#endregion
 //#region src/renderer/shapes/EntityLabel.tsx
-var Ze = {
+var lt = {
 	point: () => null,
-	segment: (e) => et(e.from, e.to),
+	segment: (e) => pt(e.from, e.to),
 	line: (e, t) => {
-		let n = D(e.through[0], e.through[1], t);
-		return n ? et(n[0], n[1]) : null;
+		let n = x(e.through[0], e.through[1], t);
+		return n ? pt(n[0], n[1]) : null;
 	},
 	circle: (e) => ({
 		x: e.center.x,
 		y: e.center.y + e.radius
-	})
+	}),
+	angle: (e) => {
+		let t = 2 * Math.PI * (e.startTurn + e.sweepTurn / 2);
+		return {
+			x: e.vertex.x + e.radius * Math.cos(t),
+			y: e.vertex.y + e.radius * Math.sin(t)
+		};
+	}
 };
-function Qe(e, t) {
-	let n = Ze[e.shape];
+function ut(e, t) {
+	let n = lt[e.shape];
 	return n(e, t);
 }
-function $e({ text: e, descriptor: t, viewport: n, canvas: r, color: i = "#24304a", opacity: a = 1 }) {
-	let o = Qe(t, n);
-	if (!o) return null;
-	let s = P(o, n, r);
-	return /* @__PURE__ */ K(W, {
-		x: s.x + 10,
-		y: s.y - 24,
+function dt({ text: e, measured: t = !1, descriptor: n, viewport: r, canvas: i, color: a = "#24304a", opacity: o = 1 }) {
+	let s = ut(n, r);
+	if (!s) return null;
+	let c = F(s, r, i), l = {
 		text: e,
 		fontSize: 18,
 		fontStyle: "bold",
-		fill: i,
-		opacity: a,
+		fill: a,
+		opacity: o,
 		listening: !1
+	};
+	if (t && n.shape === "angle") {
+		let e = F(n.vertex, r, i), t = 2 * Math.PI * (n.startTurn + n.sweepTurn / 2), a = F({
+			x: n.vertex.x + Math.cos(t),
+			y: n.vertex.y + Math.sin(t)
+		}, r, i), o = Math.hypot(a.x - e.x, a.y - e.y);
+		return /* @__PURE__ */ K(W, {
+			...l,
+			x: c.x + (a.x - e.x) / o * 40,
+			y: c.y + (a.y - e.y) / o * 40,
+			ref: (e) => ft(e)
+		});
+	}
+	return /* @__PURE__ */ K(W, {
+		...l,
+		x: c.x + 10,
+		y: c.y - 24
+	});
+}
+function ft(e) {
+	e?.offset({
+		x: e.width() / 2,
+		y: e.height() / 2
 	});
 }
-function et(e, t) {
+function pt(e, t) {
 	return {
 		x: (e.x + t.x) / 2,
 		y: (e.y + t.y) / 2
@@ -746,47 +901,55 @@ function et(e, t) {
 }
 //#endregion
 //#region src/renderer/shapes/EntityShape.tsx
-var tt = {
+var mt = {
 	point: () => null,
-	segment: (e, t) => /* @__PURE__ */ K(qe, {
+	segment: (e, t) => /* @__PURE__ */ K(nt, {
 		...t,
 		from: e.from,
 		to: e.to
 	}),
-	line: (e, t) => /* @__PURE__ */ K(Je, {
+	line: (e, t) => /* @__PURE__ */ K(rt, {
 		...t,
 		through: [e.through[0], e.through[1]]
 	}),
-	circle: (e, t) => /* @__PURE__ */ K(Xe, {
+	circle: (e, t) => /* @__PURE__ */ K(ct, {
 		...t,
 		center: e.center,
 		radius: e.radius
+	}),
+	angle: (e, t) => /* @__PURE__ */ K(ot, {
+		...t,
+		vertex: e.vertex,
+		startTurn: e.startTurn,
+		sweepTurn: e.sweepTurn,
+		radius: e.radius
 	})
 };
-function nt({ descriptor: e, label: t, ...n }) {
-	let r = tt[e.shape], i = r(e, n);
-	return !i || t === void 0 ? i : /* @__PURE__ */ q(G, { children: [i, /* @__PURE__ */ K($e, {
+function Y({ descriptor: e, label: t, measured: n, ...r }) {
+	let i = mt[e.shape], a = i(e, r);
+	return !a || t === void 0 ? a : /* @__PURE__ */ q(G, { children: [a, /* @__PURE__ */ K(dt, {
 		text: t,
+		measured: n,
 		descriptor: e,
-		viewport: n.viewport,
-		canvas: n.canvas,
-		color: n.color,
-		opacity: n.opacity
+		viewport: r.viewport,
+		canvas: r.canvas,
+		color: r.color,
+		opacity: r.opacity
 	})] });
 }
 //#endregion
 //#region src/renderer/GeometryGrid.tsx
-function rt({ viewport: e, canvas: t, visible: n }) {
-	let [r, i, a, o] = e, s = v(e, t), c = P({
+function ht({ viewport: e, canvas: t, visible: n }) {
+	let [r, i, a, o] = e, s = P(e, t), c = F({
 		x: r,
 		y: o
-	}, e, t, s), l = P({
+	}, e, t, s), l = F({
 		x: a,
 		y: i
-	}, e, t, s), { x: u, y: d } = ee(e), f = [], p = [];
+	}, e, t, s), { x: u, y: d } = oe(e), f = [], p = [];
 	if (n) {
 		for (let n = Math.ceil(r / u) * u; n <= a; n += u) {
-			let r = P({
+			let r = F({
 				x: n,
 				y: 0
 			}, e, t, s);
@@ -803,7 +966,7 @@ function rt({ viewport: e, canvas: t, visible: n }) {
 			}, `grid-x-${n}`));
 		}
 		for (let n = Math.ceil(i / d) * d; n <= o; n += d) {
-			let r = P({
+			let r = F({
 				x: 0,
 				y: n
 			}, e, t, s);
@@ -836,8 +999,8 @@ function rt({ viewport: e, canvas: t, visible: n }) {
 }
 //#endregion
 //#region src/renderer/GeometryInstruments.tsx
-var Y = "#5b6b82", it = "rgba(211, 225, 242, 0.58)", X = "#6558e8";
-function at(e, t) {
+var X = "#5b6b82", gt = "rgba(211, 225, 242, 0.58)", Z = "#6558e8";
+function _t(e, t) {
 	return e === "ruler" ? {
 		x: t.width * .5,
 		y: t.height * .72,
@@ -855,7 +1018,7 @@ function at(e, t) {
 		flipped: !1
 	};
 }
-function ot() {
+function vt() {
 	let e = Array.from({ length: 21 }, (e, t) => t);
 	return /* @__PURE__ */ q(V, {
 		listening: !1,
@@ -866,8 +1029,8 @@ function ot() {
 				width: 300,
 				height: 60,
 				cornerRadius: 5,
-				fill: it,
-				stroke: Y,
+				fill: gt,
+				stroke: X,
 				strokeWidth: 2
 			}),
 			e.map((e) => {
@@ -879,7 +1042,7 @@ function ot() {
 						t,
 						-29 + (n ? 17 : 10)
 					],
-					stroke: Y,
+					stroke: X,
 					strokeWidth: n ? 1.5 : 1
 				}, e);
 			}),
@@ -890,12 +1053,12 @@ function ot() {
 				align: "center",
 				text: String(e / 2),
 				fontSize: 10,
-				fill: Y
+				fill: X
 			}, `label-${e}`))
 		]
 	});
 }
-function st() {
+function yt() {
 	return /* @__PURE__ */ q(V, {
 		listening: !1,
 		children: [
@@ -909,8 +1072,8 @@ function st() {
 					-75
 				],
 				closed: !0,
-				fill: it,
-				stroke: Y,
+				fill: gt,
+				stroke: X,
 				strokeWidth: 2,
 				lineJoin: "round"
 			}),
@@ -925,7 +1088,7 @@ function st() {
 				],
 				closed: !0,
 				fill: "#fbfcff",
-				stroke: Y,
+				stroke: X,
 				strokeWidth: 1.5,
 				lineJoin: "round"
 			}),
@@ -936,26 +1099,26 @@ function st() {
 					-91 + t * 18,
 					t % 5 == 0 ? 54 : 60
 				],
-				stroke: Y,
+				stroke: X,
 				strokeWidth: 1
 			}, t))
 		]
 	});
 }
-function ct() {
+function bt() {
 	let e = Array.from({ length: 37 }, (e, t) => t * 5);
 	return /* @__PURE__ */ q(V, {
 		listening: !1,
 		children: [
-			/* @__PURE__ */ K(ge, {
+			/* @__PURE__ */ K(be, {
 				x: 0,
 				y: 0,
 				innerRadius: 38,
 				outerRadius: 112,
 				angle: 180,
 				rotation: 180,
-				fill: it,
-				stroke: Y,
+				fill: gt,
+				stroke: X,
 				strokeWidth: 2
 			}),
 			/* @__PURE__ */ K(H, {
@@ -965,7 +1128,7 @@ function ct() {
 					112,
 					0
 				],
-				stroke: Y,
+				stroke: X,
 				strokeWidth: 2
 			}),
 			e.map((e) => {
@@ -977,7 +1140,7 @@ function ct() {
 						Math.cos(Math.PI - t) * r,
 						-Math.sin(t) * r
 					],
-					stroke: Y,
+					stroke: X,
 					strokeWidth: n ? 1.4 : .8
 				}, e);
 			}),
@@ -985,22 +1148,22 @@ function ct() {
 				x: 0,
 				y: 0,
 				radius: 3,
-				fill: Y
+				fill: X
 			})
 		]
 	});
 }
-function lt({ tool: e }) {
-	return K(e === "ruler" ? ot : e === "setSquare" ? st : ct, {});
+function xt({ tool: e }) {
+	return K(e === "ruler" ? vt : e === "setSquare" ? yt : bt, {});
 }
-function ut(e, t, n) {
+function St(e, t, n) {
 	let r = n * Math.PI / 180;
 	return {
 		x: e * Math.cos(r) - t * Math.sin(r),
 		y: e * Math.sin(r) + t * Math.cos(r)
 	};
 }
-function dt(e, t) {
+function Ct(e, t) {
 	let n = e === "ruler" ? {
 		x: 0,
 		y: 19
@@ -1016,22 +1179,22 @@ function dt(e, t) {
 		y: n.y
 	};
 }
-function ft({ tools: e, canvas: t }) {
-	let [n, r] = z(() => Object.fromEntries(e.map((e) => [e, at(e, t)]))), [i, a] = z(null), o = i && e.includes(i) ? i : null;
+function wt({ tools: e, canvas: t }) {
+	let [n, r] = z(() => Object.fromEntries(e.map((e) => [e, _t(e, t)]))), [i, a] = z(null), o = i && e.includes(i) ? i : null;
 	function s(e, n) {
 		r((r) => ({
 			...r,
 			[e]: {
-				...r[e] ?? at(e, t),
+				...r[e] ?? _t(e, t),
 				...n
 			}
 		}));
 	}
 	return /* @__PURE__ */ K(G, { children: e.map((e) => {
-		let r = n[e] ?? at(e, t), i = o === e, c = dt(e, r.flipped), l = ut(c.x, c.y, r.rotation), u = {
+		let r = n[e] ?? _t(e, t), i = o === e, c = Ct(e, r.flipped), l = St(c.x, c.y, r.rotation), u = {
 			x: r.x + l.x,
 			y: r.y + l.y
-		}, d = ut(0, -105, r.rotation), f = ut(0, e === "setSquare" ? 96 : e === "ruler" ? 50 : 48, r.rotation);
+		}, d = St(0, -105, r.rotation), f = St(0, e === "setSquare" ? 96 : e === "ruler" ? 50 : 48, r.rotation);
 		return /* @__PURE__ */ q(V, { children: [
 			/* @__PURE__ */ K(V, {
 				x: r.x,
@@ -1039,7 +1202,7 @@ function ft({ tools: e, canvas: t }) {
 				rotation: r.rotation,
 				scaleX: r.flipped ? -1 : 1,
 				listening: !1,
-				children: /* @__PURE__ */ K(lt, { tool: e })
+				children: /* @__PURE__ */ K(xt, { tool: e })
 			}),
 			i && /* @__PURE__ */ q(G, { children: [
 				/* @__PURE__ */ K(H, {
@@ -1049,7 +1212,7 @@ function ft({ tools: e, canvas: t }) {
 						r.x + d.x,
 						r.y + d.y
 					],
-					stroke: X,
+					stroke: Z,
 					strokeWidth: 1.5,
 					dash: [4, 4],
 					listening: !1
@@ -1059,7 +1222,7 @@ function ft({ tools: e, canvas: t }) {
 					y: r.y + d.y,
 					radius: 11,
 					fill: "#fff",
-					stroke: X,
+					stroke: Z,
 					strokeWidth: 2.5,
 					draggable: !0,
 					onDragMove: (t) => {
@@ -1083,7 +1246,7 @@ function ft({ tools: e, canvas: t }) {
 					verticalAlign: "middle",
 					fontSize: 14,
 					fontStyle: "bold",
-					fill: X,
+					fill: Z,
 					listening: !1
 				}),
 				/* @__PURE__ */ K(U, {
@@ -1093,7 +1256,7 @@ function ft({ tools: e, canvas: t }) {
 					height: 22,
 					cornerRadius: 11,
 					fill: "#fff",
-					stroke: X,
+					stroke: Z,
 					strokeWidth: 1.5,
 					onClick: (t) => {
 						t.cancelBubble = !0, s(e, { flipped: !r.flipped });
@@ -1112,7 +1275,7 @@ function ft({ tools: e, canvas: t }) {
 					verticalAlign: "middle",
 					fontSize: 10,
 					fontStyle: "600",
-					fill: X,
+					fill: Z,
 					listening: !1
 				})
 			] }),
@@ -1122,7 +1285,7 @@ function ft({ tools: e, canvas: t }) {
 				y: u.y,
 				radius: i ? 8 : 12,
 				fill: i ? "rgba(255, 255, 255, 0.94)" : "rgba(255, 255, 255, 0.01)",
-				stroke: X,
+				stroke: Z,
 				strokeWidth: i ? 1.5 : 0,
 				shadowColor: "#24304a",
 				shadowBlur: i ? 2 : 0,
@@ -1161,13 +1324,13 @@ function ft({ tools: e, canvas: t }) {
 				verticalAlign: "middle",
 				fontSize: 9,
 				fontStyle: "bold",
-				fill: X,
+				fill: Z,
 				listening: !1
 			}) : /* @__PURE__ */ K(B, {
 				x: u.x,
 				y: u.y,
 				radius: 2.5,
-				fill: Y,
+				fill: X,
 				opacity: .65,
 				listening: !1
 			})
@@ -1176,169 +1339,207 @@ function ft({ tools: e, canvas: t }) {
 }
 //#endregion
 //#region src/store/useStoreState.ts
-function Z(e) {
-	return he((t) => e.subscribe(t), () => e.getState());
+function Q(e) {
+	return ye((t) => e.subscribe(t), () => e.getState());
 }
 //#endregion
 //#region src/renderer/GeometryCanvas.tsx
-function pt({ store: t, size: r, onExerciseChange: i, onGivenSelect: a, highlightedGivenIds: o = [], goalPreviews: h = [] }) {
-	let _ = Z(t), { points: v, objects: y, capabilitiesOf: b, labelOf: S, isSnapTarget: C } = Se(_), { viewport: w } = _.exercise, T = R(null), E = Ee({
-		points: v,
-		viewport: w,
+function Tt({ store: t, size: r, onExerciseChange: i, onGivenSelect: a, highlightedGivenIds: o = [], goalPreviews: s = [] }) {
+	let c = Q(t), { points: l, objects: u, capabilitiesOf: d, labelOf: b, measureOf: x, isSnapTarget: S } = De(c), { viewport: C } = c.exercise, w = R(null), T = Me({
+		points: l,
+		viewport: C,
 		canvas: r,
-		pendingObjectType: _.pendingObjectType,
-		pendingFirstPointId: _.pendingFirstPointId,
+		pendingObjectType: c.pendingObjectType,
+		pendingFirstPointId: c.pendingFirstPointId,
+		pendingVertexPointId: c.pendingVertexPointId,
 		connect: (e, n) => {
-			(_.pendingObjectType === "segment" || _.pendingObjectType === "line") && k(t, {
-				tool: _.pendingObjectType,
+			(c.pendingObjectType === "segment" || c.pendingObjectType === "line") && te(t, {
+				tool: c.pendingObjectType,
 				from: e,
 				to: n
 			});
 		},
 		pick: (e) => {
-			m(t, e), a?.(e);
+			v(t, e), a?.(e);
 		},
-		objects: y,
-		isSnapTarget: C,
+		objects: u,
+		isSnapTarget: S,
 		canCreatePoints: !0,
 		preserveCreatedPointOrigins: !1
-	}), { connecting: D, previewPoints: A, snapTargetId: j } = E, M = De({
-		points: v,
-		objects: y,
-		viewport: w,
+	}), { connecting: D, previewPoints: O, previewAngle: k, snapTargetId: A } = T, j = Ne({
+		points: l,
+		objects: u,
+		viewport: C,
 		canvas: r,
-		showGrid: !!_.exercise.showGrid,
-		isSnapTarget: C,
-		active: _.pendingObjectType === "point"
+		showGrid: !!c.exercise.showGrid,
+		isSnapTarget: S,
+		active: c.pendingObjectType === "point"
 	});
 	I(() => {
 		if (i) return t.subscribe((e) => i(e.exercise));
 	}, [t, i]);
-	function ee(e) {
-		if (_.pendingObjectType !== "point") {
-			g(t, null);
+	function M(e) {
+		if (c.pendingObjectType !== "point") {
+			y(t, null);
 			return;
 		}
-		let n = M.resolvePlacement(e);
+		let n = j.resolvePlacement(e);
 		if (n.snap?.kind === "point") {
 			let e = n.snap.targetIds[0];
-			e && d(t, e);
+			e && h(t, e);
 			return;
 		}
-		let r = s(n);
-		r && c(t, r, "at" in r);
+		let r = E(n);
+		r && f(t, r, "at" in r);
 	}
 	function N(e) {
-		g(t, e), a?.(e);
+		y(t, e), a?.(e);
 	}
-	return Be(T, r, t, {
-		tool: _.pendingObjectType,
-		connection: E,
-		placement: M,
+	return Ye(w, r, t, {
+		tool: c.pendingObjectType,
+		connection: T,
+		placement: j,
 		pointOnScreen: (e) => {
-			let t = v.get(e);
-			return t ? P(t, w, r) : null;
+			let t = l.get(e);
+			return t ? F(t, C, r) : null;
 		},
-		canDragPoint: (e) => O(_, e),
-		dragPoint: (e, n) => f(t, e, x(n, w, r)),
-		endPointDrag: () => p(t),
+		canDragPoint: (e) => ee(c, e),
+		dragPoint: (e, n, i) => {
+			let a = Ie({
+				exercise: c.exercise,
+				points: l,
+				objects: u,
+				canvas: r
+			}, e, n, i);
+			a && g(t, e, a);
+		},
+		endPointDrag: () => _(t),
 		tapPoint: (e) => {
-			b(e).selectable && N(e);
+			d(e).selectable && N(e);
 		},
 		tapObject: N,
-		tapStage: ee,
-		abandonConstruction: () => l(t),
-		disarmTool: () => u(t, null)
-	}), /* @__PURE__ */ K(ye, {
-		ref: T,
+		tapStage: M,
+		abandonConstruction: () => p(t),
+		disarmTool: () => m(t, null)
+	}), /* @__PURE__ */ K(Ce, {
+		ref: w,
 		width: r.width,
 		height: r.height,
 		style: {
-			...Ne,
-			cursor: _.pendingObjectType === "point" || D ? "crosshair" : "default"
+			...He,
+			cursor: c.pendingObjectType === "point" || D ? "crosshair" : "default"
 		},
-		children: /* @__PURE__ */ q(ve, { children: [
+		children: /* @__PURE__ */ q(Se, { children: [
 			/* @__PURE__ */ K(U, {
 				width: r.width,
 				height: r.height,
 				fill: "#fbfcff",
 				listening: !1
 			}),
-			/* @__PURE__ */ K(rt, {
-				viewport: w,
+			/* @__PURE__ */ K(ht, {
+				viewport: C,
 				canvas: r,
-				visible: !!_.exercise.showGrid
+				visible: !!c.exercise.showGrid
 			}),
-			A && /* @__PURE__ */ K(H, {
-				points: A,
+			O && /* @__PURE__ */ K(H, {
+				points: O,
 				stroke: "#786af5",
 				strokeWidth: 3,
 				dash: [9, 6],
 				lineCap: "round",
 				listening: !1
 			}),
-			y.map(({ id: t, definition: i }) => {
-				let a = b(t);
+			k && /* @__PURE__ */ K(Y, {
+				id: "angle-preview",
+				descriptor: k,
+				viewport: C,
+				canvas: r,
+				color: "#786af5",
+				dashed: !0,
+				listening: !1
+			}),
+			u.map(({ id: t, definition: i }) => {
+				let a = d(t);
 				if (!a.rendered) return null;
-				let s = e(i, v);
-				return s ? /* @__PURE__ */ K(nt, {
+				let s = e(i, l);
+				return s ? /* @__PURE__ */ K(Y, {
 					id: t,
 					descriptor: n(s),
-					viewport: w,
+					viewport: C,
 					canvas: r,
-					label: S(t),
-					selected: t === _.selectedGivenId || o.includes(t),
-					listening: a.selectable && !_.pendingObjectType
+					label: b(t),
+					measured: x(t) !== void 0,
+					selected: t === c.selectedGivenId || o.includes(t),
+					listening: a.selectable && !c.pendingObjectType
 				}, t) : null;
 			}),
-			h.map((e) => e.shape ? e.shape.type === "segment" ? /* @__PURE__ */ K(qe, {
-				id: `goal-preview-${e.id}`,
-				from: e.shape.from,
-				to: e.shape.to,
-				viewport: w,
-				canvas: r,
-				color: "#f59e0b",
-				strokeWidth: 4,
-				dashed: !0,
-				opacity: .72,
-				listening: !1
-			}, `goal-preview-${e.id}`) : e.shape.type === "point" ? /* @__PURE__ */ K(J, {
-				id: `goal-preview-${e.id}`,
-				position: e.shape.at,
-				viewport: w,
-				canvas: r,
-				color: "#f59e0b"
-			}, `goal-preview-${e.id}`) : /* @__PURE__ */ K(Je, {
-				id: `goal-preview-${e.id}`,
-				through: e.shape.through,
-				viewport: w,
-				canvas: r,
-				color: "#f59e0b",
-				strokeWidth: 3,
-				dashed: !0,
-				opacity: .72,
-				listening: !1
-			}, `goal-preview-${e.id}`) : null),
-			[...v].map(([e, t]) => {
-				let n = b(e);
+			s.map((e) => {
+				if (!e.shape) return null;
+				if (e.shape.type === "segment") return /* @__PURE__ */ K(nt, {
+					id: `goal-preview-${e.id}`,
+					from: e.shape.from,
+					to: e.shape.to,
+					viewport: C,
+					canvas: r,
+					color: "#f59e0b",
+					strokeWidth: 4,
+					dashed: !0,
+					opacity: .72,
+					listening: !1
+				}, `goal-preview-${e.id}`);
+				if (e.shape.type === "angle") {
+					let { vertex: t, arms: n } = e.shape;
+					return n.map((n, i) => /* @__PURE__ */ K(nt, {
+						id: `goal-preview-${e.id}-${i}`,
+						from: t,
+						to: n,
+						viewport: C,
+						canvas: r,
+						color: "#f59e0b",
+						strokeWidth: 4,
+						dashed: !0,
+						opacity: .72,
+						listening: !1
+					}, `goal-preview-${e.id}-${i}`));
+				}
+				return e.shape.type === "point" ? /* @__PURE__ */ K(J, {
+					id: `goal-preview-${e.id}`,
+					position: e.shape.at,
+					viewport: C,
+					canvas: r,
+					color: "#f59e0b"
+				}, `goal-preview-${e.id}`) : /* @__PURE__ */ K(rt, {
+					id: `goal-preview-${e.id}`,
+					through: e.shape.through,
+					viewport: C,
+					canvas: r,
+					color: "#f59e0b",
+					strokeWidth: 3,
+					dashed: !0,
+					opacity: .72,
+					listening: !1
+				}, `goal-preview-${e.id}`);
+			}),
+			[...l].map(([e, t]) => {
+				let n = d(e);
 				return n.rendered ? /* @__PURE__ */ K(J, {
 					id: e,
 					position: t,
-					viewport: w,
+					viewport: C,
 					canvas: r,
-					label: S(e) ?? e,
-					selected: e === _.pendingFirstPointId || e === _.selectedGivenId || o.includes(e),
+					label: b(e) ?? e,
+					selected: e === c.pendingFirstPointId || e === c.pendingVertexPointId || e === c.selectedGivenId || o.includes(e),
 					connectable: D && n.snapTarget,
-					snapTarget: e === j
+					snapTarget: e === A
 				}, e) : null;
 			}),
-			M.snap && /* @__PURE__ */ K(Ue, {
-				snap: M.snap,
-				viewport: w,
+			j.snap && /* @__PURE__ */ K(Qe, {
+				snap: j.snap,
+				viewport: C,
 				canvas: r
 			}),
-			/* @__PURE__ */ K(ft, {
-				tools: _.exercise.tools,
+			/* @__PURE__ */ K(wt, {
+				tools: c.exercise.tools,
 				canvas: r
 			})
 		] })
@@ -1346,144 +1547,164 @@ function pt({ store: t, size: r, onExerciseChange: i, onGivenSelect: a, highligh
 }
 //#endregion
 //#region src/renderer/entityDisplayName.ts
-var mt = /^student-(.+)-(\d+)$/;
-function Q(e, t, n) {
+var Et = /^student-(.+)-(\d+)$/;
+function $(e, t, n) {
 	if (t) return t;
 	if (n === "given") return e;
-	let r = mt.exec(e);
+	let r = Et.exec(e);
 	return !r?.[1] || !r[2] ? e : r[1] === "point" ? `P${r[2]}` : `${r[1]} ${r[2]}`;
 }
 //#endregion
 //#region src/renderer/StudentGeometryCanvas.tsx
-var ht = "#1683ff", gt = "#159a68", _t = "#d64555";
-function vt(e) {
-	return e === "correct" ? gt : e === "incorrect" ? _t : void 0;
-}
-function yt({ store: r, size: i, validationFeedback: a = null, focusedGoalId: o = null }) {
-	let c = Z(r), { exercise: l, geometry: u } = c, { points: d, objects: f, capabilitiesOf: p, labelOf: m, isSnapTarget: h } = Ce(l, u), g = ce(a, u, o), v = R(null), y = Ee({
-		points: d,
-		viewport: l.viewport,
+var Dt = "#1683ff", Ot = "#159a68", kt = "#d64555";
+function At(e) {
+	return e === "correct" ? Ot : e === "incorrect" ? kt : void 0;
+}
+function jt({ store: t, size: i, validationFeedback: a = null, focusedGoalId: o = null }) {
+	let s = Q(t), { exercise: c, geometry: l } = s, { points: u, objects: d, capabilitiesOf: f, labelOf: p, measureOf: m, isSnapTarget: h } = Oe(c, l), g = fe(a, l, o), _ = R(null), v = Me({
+		points: u,
+		viewport: c.viewport,
 		canvas: i,
-		pendingObjectType: c.pendingObjectType,
-		pendingFirstPointId: c.pendingFirstPointId,
-		connect: (e, t) => {
-			(c.pendingObjectType === "segment" || c.pendingObjectType === "line") && N(r, {
-				tool: c.pendingObjectType,
+		pendingObjectType: s.pendingObjectType,
+		pendingFirstPointId: s.pendingFirstPointId,
+		pendingVertexPointId: s.pendingVertexPointId,
+		connect: (e, n) => {
+			(s.pendingObjectType === "segment" || s.pendingObjectType === "line") && re(t, {
+				tool: s.pendingObjectType,
 				from: e,
-				to: t
+				to: n
 			});
 		},
-		pick: (e) => S(r, e),
-		objects: f,
+		pick: (e) => T(t, e),
+		objects: d,
 		isSnapTarget: h,
 		canCreatePoints: !0
-	}), { connecting: w, previewPoints: T, snapTargetId: E, snapPreview: D } = y, O = De({
-		points: d,
-		objects: f,
-		viewport: l.viewport,
+	}), { connecting: y, previewPoints: x, previewAngle: S, snapTargetId: w, snapPreview: O } = v, k = Ne({
+		points: u,
+		objects: d,
+		viewport: c.viewport,
 		canvas: i,
-		showGrid: !!l.showGrid,
+		showGrid: !!c.showGrid,
 		isSnapTarget: h,
-		active: c.pendingObjectType === "point"
+		active: s.pendingObjectType === "point"
 	});
-	function k(e) {
-		if (c.selectedObjectId && F(r, null), c.pendingObjectType !== "point") return;
-		let t = O.resolvePlacement(e);
-		if (t.snap?.kind === "point") {
-			let e = t.snap.targetIds[0];
-			e && C(r, e);
+	function A(e) {
+		if (s.selectedObjectId && le(t, null), s.pendingObjectType !== "point") return;
+		let n = k.resolvePlacement(e);
+		if (n.snap?.kind === "point") {
+			let e = n.snap.targetIds[0];
+			e && D(t, e);
 			return;
 		}
-		let n = s(t);
-		n && ie(r, n, !0);
+		let r = E(n);
+		r && se(t, r, !0);
 	}
-	return Be(v, i, r, {
-		tool: c.pendingObjectType,
-		connection: y,
-		placement: O,
+	return Ye(_, i, t, {
+		tool: s.pendingObjectType,
+		connection: v,
+		placement: k,
 		pointOnScreen: (e) => {
-			let t = d.get(e);
-			return t ? P(t, l.viewport, i) : null;
+			let t = u.get(e);
+			return t ? F(t, c.viewport, i) : null;
+		},
+		canDragPoint: (e) => j(s, e),
+		dragPoint: (e, n, r) => {
+			let a = Ie({
+				exercise: c,
+				attempt: l.entities,
+				points: u,
+				objects: d,
+				canvas: i
+			}, e, n, r);
+			a && ce(t, e, a);
 		},
-		canDragPoint: (e) => A(c, e),
-		dragPoint: (e, t) => ae(r, e, x(t, l.viewport, i)),
-		endPointDrag: () => _(r),
+		endPointDrag: () => b(t),
 		tapPoint: (e) => {
-			let t = p(e).selectable && b(c, e);
-			F(r, t ? e : null);
+			let n = f(e).selectable && C(s, e);
+			le(t, n ? e : null);
 		},
-		tapObject: (e) => F(r, e),
-		tapStage: k,
-		abandonConstruction: () => M(r),
-		disarmTool: () => se(r, null)
-	}), /* @__PURE__ */ K(ye, {
-		ref: v,
+		tapObject: (e) => le(t, e),
+		tapStage: A,
+		abandonConstruction: () => ne(t),
+		disarmTool: () => de(t, null)
+	}), /* @__PURE__ */ K(Ce, {
+		ref: _,
 		width: i.width,
 		height: i.height,
-		style: Ne,
-		children: /* @__PURE__ */ q(ve, { children: [
+		style: He,
+		children: /* @__PURE__ */ q(Se, { children: [
 			/* @__PURE__ */ K(U, {
 				width: i.width,
 				height: i.height,
 				fill: "#fbfcff",
 				listening: !1
 			}),
-			/* @__PURE__ */ K(rt, {
-				viewport: l.viewport,
+			/* @__PURE__ */ K(ht, {
+				viewport: c.viewport,
 				canvas: i,
-				visible: !!l.showGrid
+				visible: !!c.showGrid
 			}),
-			T && /* @__PURE__ */ K(H, {
-				points: T,
+			x && /* @__PURE__ */ K(H, {
+				points: x,
 				stroke: "#786af5",
 				strokeWidth: 3,
 				dash: [9, 6],
 				lineCap: "round",
 				listening: !1
 			}),
-			f.map(({ id: r, definition: a }) => {
-				let o = Object.prototype.hasOwnProperty.call(u.entities, r), s = p(r);
-				if (!s.rendered) return null;
-				let f = t(g.constructions, r), h = vt(f), _ = e(a, d);
-				if (!_) return null;
-				let v = s.selectable && o;
-				return /* @__PURE__ */ K(nt, {
-					id: r,
-					descriptor: n(_),
-					viewport: l.viewport,
+			S && /* @__PURE__ */ K(Y, {
+				id: "angle-preview",
+				descriptor: S,
+				viewport: c.viewport,
+				canvas: i,
+				color: "#786af5",
+				dashed: !0,
+				listening: !1
+			}),
+			d.map(({ id: t, definition: a }) => {
+				let o = Object.prototype.hasOwnProperty.call(l.entities, t), d = f(t);
+				if (!d.rendered) return null;
+				let h = r(g.constructions, t), _ = At(h), v = e(a, u);
+				if (!v) return null;
+				let y = d.selectable && o;
+				return /* @__PURE__ */ K(Y, {
+					id: t,
+					descriptor: n(v),
+					viewport: c.viewport,
 					canvas: i,
-					label: m(r),
-					color: o ? h ?? ht : void 0,
-					dashed: f === "incorrect",
-					selected: v && r === c.selectedObjectId,
-					listening: v && !c.pendingObjectType
-				}, r);
+					label: p(t),
+					measured: m(t) !== void 0,
+					color: o ? _ ?? Dt : void 0,
+					dashed: h === "incorrect",
+					selected: y && t === s.selectedObjectId,
+					listening: y && !s.pendingObjectType
+				}, t);
 			}),
-			[...d].map(([e, n]) => {
-				let r = p(e);
-				if (!r.rendered) return null;
-				let a = Object.prototype.hasOwnProperty.call(l.entities, e), o = !a, s = t(g.points, e), u = vt(s);
+			[...u].map(([e, t]) => {
+				let n = f(e);
+				if (!n.rendered) return null;
+				let a = Object.prototype.hasOwnProperty.call(c.entities, e), o = !a, l = r(g.points, e), u = At(l);
 				return /* @__PURE__ */ K(J, {
 					id: e,
-					position: n,
-					viewport: l.viewport,
+					position: t,
+					viewport: c.viewport,
 					canvas: i,
-					label: Q(e, m(e), a ? "given" : "student"),
-					color: o ? u ?? ht : void 0,
+					label: $(e, p(e), a ? "given" : "student"),
+					color: o ? u ?? Dt : void 0,
 					feedbackRingColor: u,
-					feedbackRingDashed: s === "incorrect",
-					selected: e === c.pendingFirstPointId || e === c.selectedObjectId,
-					connectable: w && r.snapTarget,
-					snapTarget: e === E
+					feedbackRingDashed: l === "incorrect",
+					selected: e === s.pendingFirstPointId || e === s.pendingVertexPointId || e === s.selectedObjectId,
+					connectable: y && n.snapTarget,
+					snapTarget: e === w
 				}, e);
 			}),
-			(O.snap ?? D) && /* @__PURE__ */ K(Ue, {
-				snap: O.snap ?? D,
-				viewport: l.viewport,
+			(k.snap ?? O) && /* @__PURE__ */ K(Qe, {
+				snap: k.snap ?? O,
+				viewport: c.viewport,
 				canvas: i
 			}),
-			/* @__PURE__ */ K(ft, {
-				tools: l.tools,
+			/* @__PURE__ */ K(wt, {
+				tools: c.tools,
 				canvas: i
 			})
 		] })
@@ -1491,45 +1712,45 @@ function yt({ store: r, size: i, validationFeedback: a = null, focusedGoalId: o
 }
 //#endregion
 //#region src/renderer/deriveSemanticScene.ts
-function bt(e, n = null, r = null) {
-	let { exercise: i, geometry: o } = e, s = a(i, o), c = ce(n, o, r), l = wt(s), u = St(s, s.entityIds, {
-		nameOf: l,
+function Mt(e, t = null, n = null) {
+	let { exercise: i, geometry: a } = e, o = l(i, a), s = fe(t, a, n), c = It(o), u = Pt(o, o.entityIds, {
+		nameOf: c,
 		selectedId: e.selectedObjectId,
-		isSelectable: (e, t) => t && !s.isGiven(e),
-		statusOf: (e, n) => t(n === "point" ? c.points : c.constructions, e) ?? null
+		isSelectable: (e, t) => t && !o.isGiven(e),
+		statusOf: (e, t) => r(t === "point" ? s.points : s.constructions, e) ?? null
 	});
 	return {
-		toolLine: Et(e.pendingObjectType),
-		pendingLine: Dt(e.pendingObjectType, e.pendingFirstPointId, l),
-		answerLine: Ot(n),
+		toolLine: Rt(e.pendingObjectType),
+		pendingLine: zt(e, c),
+		answerLine: Bt(t),
 		entities: u,
 		selectedId: e.selectedObjectId
 	};
 }
-function xt(e) {
-	let t = o(e.exercise), n = wt(t), r = St(t, Object.keys(e.exercise.entities), {
+function Nt(e) {
+	let t = c(e.exercise), n = It(t), r = Pt(t, Object.keys(e.exercise.entities), {
 		nameOf: n,
 		selectedId: e.selectedGivenId,
 		isSelectable: (e, t) => t,
 		statusOf: () => null
 	});
 	return {
-		toolLine: Et(e.pendingObjectType),
-		pendingLine: Dt(e.pendingObjectType, e.pendingFirstPointId, n),
+		toolLine: Rt(e.pendingObjectType),
+		pendingLine: zt(e, n),
 		answerLine: null,
 		entities: r,
 		selectedId: e.selectedGivenId
 	};
 }
-function St(e, t, n) {
-	let i = [];
+function Pt(e, t, n) {
+	let r = [];
 	for (let a of t) {
 		let t = e.presentationOf(a);
-		if (!xe(t.role).rendered) continue;
+		if (!Te(t.role).rendered) continue;
 		let o = e.definitionOf(a), s = e.kindOf(a);
 		if (!o || !s) continue;
-		let c = e.isGiven(a) ? "given" : "student", l = Q(a, t.label, c), u = r(o, n.nameOf), d = e.resolvedOf(a) !== void 0, f = n.statusOf(a, s);
-		i.push({
+		let c = e.isGiven(a) ? "given" : "student", l = $(a, t.label, c), u = i(o, n.nameOf), d = e.resolvedOf(a) !== void 0, f = n.statusOf(a, s);
+		r.push({
 			id: a,
 			kind: s,
 			owner: c,
@@ -1537,41 +1758,43 @@ function St(e, t, n) {
 			description: u,
 			placed: d,
 			selected: a === n.selectedId,
-			selectable: n.isSelectable(a, xe(t.role).selectable),
+			selectable: n.isSelectable(a, Te(t.role).selectable),
 			status: f,
-			text: Ct(l, u, d, f)
+			text: Ft(l, u, Ee(e, a), d, f)
 		});
 	}
-	return i;
+	return r;
 }
-function Ct(e, t, n, r) {
-	return `${e}: ${t}${`${n ? "" : ", not on screen"}${r ? `, ${r}` : ""}`}`;
+function Ft(e, t, n, r, i) {
+	return `${e}: ${t}${`${n ? `, measures ${n}` : ""}${r ? "" : ", not on screen"}${i ? `, ${i}` : ""}`}`;
 }
-function wt(e) {
-	return (t) => Q(t, Tt(e, t), e.isGiven(t) ? "given" : "student");
+function It(e) {
+	return (t) => $(t, Lt(e, t), e.isGiven(t) ? "given" : "student");
 }
-function Tt(e, t) {
+function Lt(e, t) {
 	let n = e.presentationOf(t);
 	return n.role === "explicit" ? n.label : void 0;
 }
-function Et(e) {
+function Rt(e) {
 	return `Tool: ${e ?? "none"}`;
 }
-function Dt(e, t, n) {
-	return !e || !t ? "Building: nothing" : `Building: ${e} from ${n(t)}`;
+function zt({ pendingObjectType: e, pendingFirstPointId: t, pendingVertexPointId: n }, r) {
+	if (!e || !t) return "Building: nothing";
+	let i = n ? ` at ${r(n)}` : "";
+	return `Building: ${e} from ${r(t)}${i}`;
 }
-function Ot(e) {
+function Bt(e) {
 	return e ? `Answer: ${e.result.goals.filter((e) => e.status === "correct").length} of ${e.result.goals.length} goals correct` : "Answer: not checked";
 }
-function kt(e, t) {
+function Vt(e, t) {
 	if (!e) return null;
 	let n = new Map(e.entities.map((e) => [e.id, e])), r = new Map(t.entities.map((e) => [e.id, e])), i = t.entities.filter((e) => !n.has(e.id)), a = e.entities.filter((e) => !r.has(e.id)), o = [];
 	return i.length === 1 && i[0] ? o.push(`Added ${i[0].text}`) : i.length > 1 && o.push(`Added ${i.length} objects`), a.length === 1 && a[0] ? o.push(`Removed ${a[0].text}`) : a.length > 1 && o.push(`Removed ${a.length} objects`), t.answerLine && t.answerLine !== e.answerLine && o.push(t.answerLine), o.length === 0 && t.toolLine !== e.toolLine && o.push(t.toolLine), o.length ? `${o.join(". ")}.` : null;
 }
 //#endregion
 //#region src/renderer/GeometryCompanion.tsx
-function At({ scene: e, onSelect: t, label: n = "Figure contents", className: r }) {
-	let i = Nt(e);
+function Ht({ scene: e, onSelect: t, label: n = "Figure contents", className: r }) {
+	let i = Gt(e);
 	return /* @__PURE__ */ q("section", {
 		"aria-label": n,
 		className: r,
@@ -1597,31 +1820,31 @@ function At({ scene: e, onSelect: t, label: n = "Figure contents", className: r
 		]
 	});
 }
-function jt({ store: e, validationFeedback: t = null, focusedGoalId: n = null, label: r, className: i }) {
-	let a = bt(Z(e), t, n);
-	return /* @__PURE__ */ K(At, {
+function Ut({ store: e, validationFeedback: t = null, focusedGoalId: n = null, label: r, className: i }) {
+	let a = Mt(Q(e), t, n);
+	return /* @__PURE__ */ K(Ht, {
 		scene: a,
-		onSelect: (t) => F(e, t),
+		onSelect: (t) => le(e, t),
 		label: r,
 		className: i
 	});
 }
-function Mt({ store: e, label: t, className: n }) {
-	let r = xt(Z(e));
-	return /* @__PURE__ */ K(At, {
+function Wt({ store: e, label: t, className: n }) {
+	let r = Nt(Q(e));
+	return /* @__PURE__ */ K(Ht, {
 		scene: r,
-		onSelect: (t) => g(e, t),
+		onSelect: (t) => y(e, t),
 		label: t,
 		className: n
 	});
 }
-function Nt(e) {
+function Gt(e) {
 	let t = R(null), [n, r] = z({
 		message: "",
 		tick: 0
 	});
 	return I(() => {
-		let n = kt(t.current, e);
+		let n = Vt(t.current, e);
 		t.current = e, n !== null && r((e) => ({
 			message: n,
 			tick: e.tick + 1
@@ -1630,8 +1853,8 @@ function Nt(e) {
 }
 //#endregion
 //#region src/renderer/studentExerciseSession.ts
-function Pt(e, t) {
-	let n = ue(e);
+function Kt(e, t) {
+	let n = ge(e);
 	if (!n.success) return {
 		success: !1,
 		issues: n.errors.map((e) => ({
@@ -1641,14 +1864,14 @@ function Pt(e, t) {
 	};
 	let r = t == null ? {
 		success: !0,
-		data: fe()
-	} : pe(t, n.data);
+		data: pe()
+	} : _e(t, n.data);
 	return r.success ? {
 		success: !0,
 		exercise: n.data,
 		attempt: r.data,
-		exerciseFingerprint: de(n.data),
-		attemptFingerprint: le(r.data)
+		exerciseFingerprint: he(n.data),
+		attemptFingerprint: me(r.data)
 	} : {
 		success: !1,
 		issues: r.errors.map((e) => ({
@@ -1657,28 +1880,28 @@ function Pt(e, t) {
 		}))
 	};
 }
-function Ft(e, t) {
-	let n = pe(t, e);
-	return n.success ? le(n.data) : null;
+function qt(e, t) {
+	let n = _e(t, e);
+	return n.success ? me(n.data) : null;
 }
-function It(e) {
+function Jt(e) {
 	return {
-		store: ne(e.exercise, e.attempt),
+		store: ae(e.exercise, e.attempt),
 		exercise: e.exerciseFingerprint,
 		value: e.attemptFingerprint
 	};
 }
-function Lt(e, t) {
+function Yt(e, t) {
 	if (t.exerciseFingerprint !== e.exercise) {
-		e.exercise = t.exerciseFingerprint, e.value = t.attemptFingerprint, T(e.store, t.exercise, t.attempt);
+		e.exercise = t.exerciseFingerprint, e.value = t.attemptFingerprint, k(e.store, t.exercise, t.attempt);
 		return;
 	}
 	if (t.attemptFingerprint === e.value) return;
 	e.value = t.attemptFingerprint;
 	let { exercise: n, geometry: r } = e.store.getState();
-	Ft(n, r) !== t.attemptFingerprint && j(e.store, t.attempt);
+	qt(n, r) !== t.attemptFingerprint && N(e.store, t.attempt);
 }
-function Rt(e, t) {
+function Xt(e, t) {
 	return e.subscribe((e, n) => {
 		let r = e.lastAttemptChange;
 		r && r !== n.lastAttemptChange && t().onChange(JSON.parse(JSON.stringify(e.geometry)), {
@@ -1689,27 +1912,29 @@ function Rt(e, t) {
 		i && i !== n.constructionNotice && t().onNotice?.(i);
 	});
 }
-function zt(e, t, n) {
-	return !e?.success || e.fingerprints.exercise !== de(t) ? null : e.fingerprints.attempt === Ft(t, n) ? e.data : null;
+function Zt(e, t, n) {
+	return !e?.success || e.fingerprints.exercise !== he(t) ? null : e.fingerprints.attempt === qt(t, n) ? e.data : null;
 }
 //#endregion
 //#region src/renderer/Toolbar.tsx
-var Bt = [
+var Qt = [
 	"point",
 	"segment",
-	"line"
-], Vt = {
+	"line",
+	"angle"
+], $t = {
 	minWidth: 44,
 	minHeight: 44
 };
-function Ht({ selected: e, onSelect: t, available: n = Bt }) {
+function en({ selected: e, onSelect: t, available: n = Qt }) {
+	let r = n.filter((e) => Qt.includes(e));
 	return /* @__PURE__ */ K("div", {
 		role: "toolbar",
 		"aria-label": "Geometry tools",
-		children: n.map((n) => /* @__PURE__ */ K("button", {
+		children: r.map((n) => /* @__PURE__ */ K("button", {
 			type: "button",
 			"aria-pressed": e === n,
-			style: Vt,
+			style: $t,
 			onClick: () => t(e === n ? null : n),
 			children: n
 		}, n))
@@ -1717,27 +1942,27 @@ function Ht({ selected: e, onSelect: t, available: n = Bt }) {
 }
 //#endregion
 //#region src/renderer/StudentGeometryExercise.tsx
-var $ = {
+var tn = {
 	minWidth: 44,
 	minHeight: 44
-}, Ut = {
+}, nn = {
 	border: 0,
 	margin: 0,
 	padding: 0,
 	minWidth: 0
 };
-function Wt(e) {
-	let { exercise: t, value: n, readOnly: r = !1, validationFeedback: i = null, focusedGoalId: a = null, controls: o, className: s } = e, c = Pt(t, n), [l, u] = z(null), d = R(e), f = R(null);
-	return !l && c.success && u(It(c)), L(() => {
+function rn(e) {
+	let { exercise: t, value: n, readOnly: r = !1, validationFeedback: i = null, focusedGoalId: a = null, controls: o, className: s } = e, c = Kt(t, n), [l, u] = z(null), d = R(e), f = R(null);
+	return !l && c.success && u(Jt(c)), L(() => {
 		d.current = e;
 	}), L(() => {
-		l && c.success && Lt(l, c);
-	}, [c, l]), L(() => l ? Rt(l.store, () => d.current) : void 0, [l]), L(() => {
-		l && y(l.store, r);
+		l && c.success && Yt(l, c);
+	}, [c, l]), L(() => l ? Xt(l.store, () => d.current) : void 0, [l]), L(() => {
+		l && S(l.store, r);
 	}, [l, r]), L(() => {
 		let e = c.success ? null : JSON.stringify(c.issues);
 		!c.success && e !== f.current && d.current.onError?.(c.issues), f.current = e;
-	}, [c]), c.success ? l ? /* @__PURE__ */ K(Gt, {
+	}, [c]), c.success ? l ? /* @__PURE__ */ K(an, {
 		store: l.store,
 		validationFeedback: i,
 		focusedGoalId: a,
@@ -1749,12 +1974,12 @@ function Wt(e) {
 		children: "This exercise cannot be displayed."
 	});
 }
-function Gt({ store: e, validationFeedback: n, focusedGoalId: r, controls: i, className: a }) {
-	let o = Z(e), { exercise: s, geometry: c, selectedObjectId: l, constructionNotice: u } = o, d = me(() => zt(n, s, c), [
-		n,
+function an({ store: e, validationFeedback: t, focusedGoalId: n, controls: i, className: a }) {
+	let o = Q(e), { exercise: s, geometry: c, selectedObjectId: l, constructionNotice: u } = o, d = ve(() => Zt(t, s, c), [
+		t,
 		s,
 		c
-	]), f = d ? r : null, p = R(null), [m, h] = z({
+	]), f = d ? n : null, p = R(null), [m, h] = z({
 		width: 0,
 		height: 0
 	}), [g, _, v, y] = s.viewport;
@@ -1772,43 +1997,43 @@ function Gt({ store: e, validationFeedback: n, focusedGoalId: r, controls: i, cl
 		let n = new ResizeObserver(([e]) => e && t(e.contentRect));
 		return n.observe(e), () => n.disconnect();
 	}, []);
-	let b = (e) => i?.[e] !== !1, x = u && `This construction already exists: ${Q(u.entityId, t(c.presentation, u.entityId)?.label, "student")}`;
+	let b = (e) => i?.[e] !== !1, x = u && `This construction already exists: ${$(u.entityId, r(c.presentation, u.entityId)?.label, "student")}`;
 	return /* @__PURE__ */ q("div", {
 		className: a,
 		children: [
 			/* @__PURE__ */ q("fieldset", {
 				disabled: o.readOnly,
-				style: Ut,
+				style: nn,
 				children: [
-					b("toolbar") && /* @__PURE__ */ K(Ht, {
+					b("toolbar") && /* @__PURE__ */ K(en, {
 						selected: o.pendingObjectType,
 						available: s.allowedObjects,
-						onSelect: (t) => se(e, t)
+						onSelect: (t) => de(e, t)
 					}),
 					b("history") && /* @__PURE__ */ q(G, { children: [/* @__PURE__ */ K("button", {
 						type: "button",
-						style: $,
+						style: tn,
 						disabled: !o.past.length,
-						onClick: () => oe(e),
+						onClick: () => ue(e),
 						children: "Undo"
 					}), /* @__PURE__ */ K("button", {
 						type: "button",
-						style: $,
+						style: tn,
 						disabled: !o.future.length,
-						onClick: () => te(e),
+						onClick: () => ie(e),
 						children: "Redo"
 					})] }),
 					b("delete") && /* @__PURE__ */ K("button", {
 						type: "button",
-						style: $,
+						style: tn,
 						disabled: !l,
-						onClick: () => l && E(e, l),
+						onClick: () => l && A(e, l),
 						children: "Delete"
 					}),
 					b("reset") && /* @__PURE__ */ K("button", {
 						type: "button",
-						style: $,
-						onClick: () => w(e),
+						style: tn,
+						onClick: () => O(e),
 						children: "Reset"
 					})
 				]
@@ -1825,7 +2050,7 @@ function Gt({ store: e, validationFeedback: n, focusedGoalId: r, controls: i, cl
 						position: "absolute",
 						inset: 0
 					},
-					children: /* @__PURE__ */ K(yt, {
+					children: /* @__PURE__ */ K(jt, {
 						store: e,
 						size: m,
 						validationFeedback: d,
@@ -1837,7 +2062,7 @@ function Gt({ store: e, validationFeedback: n, focusedGoalId: r, controls: i, cl
 				role: "status",
 				children: x
 			}),
-			/* @__PURE__ */ K(jt, {
+			/* @__PURE__ */ K(Ut, {
 				store: e,
 				validationFeedback: d,
 				focusedGoalId: f
@@ -1846,6 +2071,6 @@ function Gt({ store: e, validationFeedback: n, focusedGoalId: r, controls: i, cl
 	});
 }
 //#endregion
-export { Ce as C, Se as S, Je as _, Mt as a, Ue as b, xt as c, pt as d, Z as f, Xe as g, nt as h, jt as i, yt as l, rt as m, Ht as n, kt as o, ft as p, At as r, bt as s, Wt as t, Q as u, qe as v, De as x, J as y };
+export { Oe as C, De as S, rt as _, Wt as a, Qe as b, Nt as c, Tt as d, Q as f, ct as g, Y as h, Ut as i, jt as l, ht as m, en as n, Vt as o, wt as p, Ht as r, Mt as s, rn as t, $ as u, nt as v, Ne as x, J as y };
 
-//# sourceMappingURL=react-BEcdx1f6.js.map
+//# sourceMappingURL=react-B5cGaxH8.js.map