@mathscan/geometry-engine 0.1.0 → 0.1.1

package/dist/{studentStore-CEKTtMCh.js → studentStore-CyYa0N93.js}

@@ -1,39 +1,39 @@
-import { A as e, B as t, I as n, M as r, N as i, O as a, P as o, V as s, ft as c, ht as l, j as u, u as d, ut as f, z as p } from "./geometryState.schema-D0ixyGYE.js";
-import { a as m, d as h, s as g, u as _ } from "./goals-C3ZwbEh_.js";
+import { A as e, B as t, F as n, I as r, J as i, L as a, M as o, P as s, R as c, U as l, W as u, u as d, wt as f, xt as p, yt as m } from "./geometryState.schema-CKFPlX8j.js";
+import { c as h, d as g, f as _, o as ee } from "./goals-BlSeniyt.js";
 //#region src/geometry/hitTest.ts
-function v(t, r, i, a = {}) {
-	let o = new Set(a.exclude ?? []), s = a.types ? new Set(a.types) : null, c = [];
-	if (!s || s.has("point")) for (let [n, s] of r.points) {
-		if (o.has(n) || a.accepts && !a.accepts(n)) continue;
-		let r = e({
+function v(e, r, i, a = {}) {
+	let o = new Set(a.exclude ?? []), c = a.types ? new Set(a.types) : null, l = [];
+	if (!c || c.has("point")) for (let [t, n] of r.points) {
+		if (o.has(t) || a.accepts && !a.accepts(t)) continue;
+		let r = s({
 			kind: "point",
-			at: s
-		}, t);
-		r <= i && c.push({
-			id: n,
+			at: n
+		}, e);
+		r <= i && l.push({
+			id: t,
 			type: "point",
 			distance: r
 		});
 	}
-	for (let { id: l, definition: u } of r.objects) {
-		if (o.has(l) || a.accepts && !a.accepts(l) || s && !s.has(u.kind)) continue;
-		let d = n(u, r.points);
+	for (let { id: n, definition: u } of r.objects) {
+		if (o.has(n) || a.accepts && !a.accepts(n) || c && !c.has(u.kind)) continue;
+		let d = t(u, r.points);
 		if (!d) continue;
-		let f = e(d, t);
-		f <= i && c.push({
-			id: l,
+		let f = s(d, e);
+		f <= i && l.push({
+			id: n,
 			type: u.kind,
 			distance: f
 		});
 	}
-	return c.sort((e, t) => u(e.type) - u(t.type) || e.distance - t.distance);
+	return l.sort((e, t) => n(e.type) - n(t.type) || e.distance - t.distance);
 }
-function y(e, t, n, r = {}) {
+function te(e, t, n, r = {}) {
 	return v(e, t, n, r)[0] ?? null;
 }
 //#endregion
 //#region src/coordinates/transform.ts
-function b(e, t) {
+function y(e, t) {
 	let [n, r, i, a] = e, o = t.width / (i - n), s = t.height / (a - r), c = Math.min(o, s), l = t.projection === "stretch" ? o : c, u = t.projection === "stretch" ? s : c;
 	return {
 		scale: c,
@@ -43,26 +43,26 @@ function b(e, t) {
 		offsetY: (t.height - (a - r) * u) / 2
 	};
 }
-function ee(e, t, n, r = b(t, n)) {
+function ne(e, t, n, r = y(t, n)) {
 	let [i, a] = t, { scaleX: o, scaleY: s, offsetX: c, offsetY: l } = r;
 	return {
 		x: c + (e.x - i) * o,
 		y: n.height - l - (e.y - a) * s
 	};
 }
-function te(e, t, n, r = b(t, n)) {
+function re(e, t, n, r = y(t, n)) {
 	let [i, a] = t, { scaleX: o, scaleY: s, offsetX: c, offsetY: l } = r;
 	return {
 		x: (e.x - c) / o + i,
 		y: (n.height - l - e.y) / s + a
 	};
 }
-function ne(e, t) {
-	return c(e, Math.min(t.scaleX, t.scaleY));
+function ie(e, t) {
+	return p(e, Math.min(t.scaleX, t.scaleY));
 }
 //#endregion
 //#region src/coordinates/lineClipping.ts
-function re(e, t, n) {
+function ae(e, t, n) {
 	let r = t.x - e.x, i = t.y - e.y;
 	if (r === 0 && i === 0) return null;
 	let [a, o, s, c] = n, l = [
@@ -89,24 +89,24 @@ function re(e, t, n) {
 }
 //#endregion
 //#region src/coordinates/grid.ts
-function x(e) {
+function b(e) {
 	if (e >= 4 && e <= 20) return 1;
 	let t = e / 16, n = 10 ** Math.floor(Math.log10(t)), r = t / n;
 	return r <= 2 ? 2 * n : r <= 5 ? 5 * n : 10 * n;
 }
-function ie(e) {
+function x(e) {
 	let [t, n, r, i] = e;
 	return {
-		x: x(r - t),
-		y: x(i - n)
+		x: b(r - t),
+		y: b(i - n)
 	};
 }
 function S(e, t, n, r) {
 	let i = Math.ceil(n / t) * t, a = Math.floor(r / t) * t;
 	return Math.min(a, Math.max(i, Math.round(e / t) * t));
 }
-function C(e, t) {
-	let [n, r, i, a] = t, o = ie(t);
+function oe(e, t) {
+	let [n, r, i, a] = t, o = x(t);
 	return {
 		x: S(e.x, o.x, n, i),
 		y: S(e.y, o.y, r, a)
@@ -114,13 +114,13 @@ function C(e, t) {
 }
 //#endregion
 //#region src/snapping/computeSnap.ts
-var ae = [
+var se = [
 	"point",
 	"intersection",
 	"grid",
 	"onObject"
 ];
-function oe(e, t, n) {
+function ce(e, t, n) {
 	let r = v(e, t, n.tolerance, {
 		exclude: n.exclude,
 		types: ["point"],
@@ -135,37 +135,37 @@ function oe(e, t, n) {
 		distance: r.distance
 	} : null;
 }
-function se(e, t, r) {
-	let a = new Set(r.exclude ?? []), o = [];
-	for (let { id: e, definition: r } of t.objects) {
-		if (a.has(e) || t.isSnapTarget && !t.isSnapTarget(e)) continue;
-		let s = n(r, t.points), c = s && i(s);
-		c && o.push({
+function le(e, n, r) {
+	let o = new Set(r.exclude ?? []), s = [];
+	for (let { id: e, definition: r } of n.objects) {
+		if (o.has(e) || n.isSnapTarget && !n.isSnapTarget(e)) continue;
+		let i = t(r, n.points), c = i && a(i);
+		c && s.push({
 			id: e,
 			measured: c
 		});
 	}
 	let c = null;
-	for (let t = 0; t < o.length; t += 1) {
-		let n = o[t];
-		for (let i = t + 1; i < o.length; i += 1) {
-			let t = o[i];
-			for (let i of s(n.measured, t.measured)) {
-				let a = l(e, i);
-				a > r.tolerance || c && c.distance <= a || (c = {
-					position: i,
+	for (let t = 0; t < s.length; t += 1) {
+		let n = s[t];
+		for (let a = t + 1; a < s.length; a += 1) {
+			let t = s[a];
+			for (let a of i(n.measured, t.measured)) {
+				let i = f(e, a);
+				i > r.tolerance || c && c.distance <= i || (c = {
+					position: a,
 					kind: "intersection",
 					targetIds: [n.id, t.id],
-					distance: a
+					distance: i
 				});
 			}
 		}
 	}
 	return c;
 }
-function ce(e, t, n) {
+function ue(e, t, n) {
 	if (!t.showGrid) return null;
-	let r = C(e, t.viewport), i = l(e, r);
+	let r = oe(e, t.viewport), i = f(e, r);
 	return i > n.tolerance ? null : {
 		position: r,
 		kind: "grid",
@@ -173,47 +173,47 @@ function ce(e, t, n) {
 		distance: i
 	};
 }
-function le(e, r, i) {
-	let a = v(e, r, i.tolerance, {
-		exclude: i.exclude,
-		types: o,
-		accepts: r.isSnapTarget
+function de(e, n, r) {
+	let i = v(e, n, r.tolerance, {
+		exclude: r.exclude,
+		types: c,
+		accepts: n.isSnapTarget
 	})[0];
+	if (!i) return null;
+	let a = n.objects.find((e) => e.id === i.id);
 	if (!a) return null;
-	let s = r.objects.find((e) => e.id === a.id);
-	if (!s) return null;
-	let c = n(s.definition, r.points);
-	if (!c) return null;
-	let l = p(c, e);
-	if (l === null) return null;
-	let u = t(c, l);
-	return u ? {
-		position: u,
+	let o = t(a.definition, n.points);
+	if (!o) return null;
+	let s = l(o, e);
+	if (s === null) return null;
+	let d = u(o, s);
+	return d ? {
+		position: d,
 		kind: "onObject",
-		targetIds: [s.id],
-		parameter: l,
-		distance: a.distance
+		targetIds: [a.id],
+		parameter: s,
+		distance: i.distance
 	} : null;
 }
-var ue = {
-	point: oe,
-	intersection: se,
-	grid: ce,
-	onObject: le
+var fe = {
+	point: ce,
+	intersection: le,
+	grid: ue,
+	onObject: de
 };
-function w(e, t, n) {
+function pe(e, t, n) {
 	let r = n.kinds ? new Set(n.kinds) : null;
-	for (let i of ae) {
+	for (let i of se) {
 		if (r && !r.has(i)) continue;
-		let a = ue[i](e, t, n);
+		let a = fe[i](e, t, n);
 		if (a) return a;
 	}
 	return null;
 }
-function de(e, t, n) {
-	return w(e, t, n)?.position ?? e;
+function me(e, t, n) {
+	return pe(e, t, n)?.position ?? e;
 }
-function fe(e) {
+function he(e) {
 	let { snap: t, position: n } = e, r = {
 		kind: "point",
 		at: {
@@ -238,7 +238,7 @@ function fe(e) {
 }
 //#endregion
 //#region src/store/createStore.ts
-function T(e) {
+function C(e) {
 	let t = e, n = /* @__PURE__ */ new Set();
 	function r() {
 		return t;
@@ -260,50 +260,59 @@ function T(e) {
 		subscribe: a
 	};
 }
-function pe(e, t) {
+function w(e, t) {
 	let n = [...e, t];
 	return n.length > 100 ? n.slice(n.length - 100) : n;
 }
 //#endregion
+//#region src/store/constructionCommand.ts
+function T(e) {
+	return e.tool === "angle" ? [
+		e.from,
+		e.vertex,
+		e.to
+	] : [e.from, e.to];
+}
+//#endregion
 //#region src/store/constructionIdentity.ts
-var me = /* @__PURE__ */ new WeakMap();
+var ge = /* @__PURE__ */ new WeakMap();
 function E(e) {
-	let t = me.get(e);
-	return t === void 0 && (t = `${e.kind} ${r(e)}`, me.set(e, t)), t;
+	let t = ge.get(e);
+	return t === void 0 && (t = `${e.kind} ${r(e)}`, ge.set(e, t)), t;
 }
-var he = /* @__PURE__ */ new WeakMap();
-function D(e) {
-	let t = he.get(e);
+var _e = /* @__PURE__ */ new WeakMap();
+function ve(e) {
+	let t = _e.get(e);
 	if (!t) {
 		let n = /* @__PURE__ */ new Map();
 		for (let t of Object.keys(e)) {
-			let r = a(e, t);
+			let r = o(e, t);
 			if (!r) continue;
 			let i = E(r);
 			n.has(i) || n.set(i, t);
 		}
-		he.set(e, n), t = n;
+		_e.set(e, n), t = n;
 	}
 	return t;
 }
-function O(e, t, n) {
+function D(e, t, n) {
 	let r = E(t);
-	if (!n) return D(e).get(r) ?? null;
+	if (!n) return ve(e).get(r) ?? null;
 	for (let i of Object.keys(e)) {
-		let o = a(e, i);
-		if (!(o?.kind !== t.kind || !n(i)) && E(o) === r) return i;
+		let a = o(e, i);
+		if (!(a?.kind !== t.kind || !n(i)) && E(a) === r) return i;
 	}
 	return null;
 }
-function k(e, t, n = {}) {
+function ye(e, t, n = {}) {
 	let r = e.map((e) => e.kind === "create" ? E(e.origin) : null), i = r.map(() => null);
 	if (r.every((e) => e === null)) return i;
-	let o = !1;
+	let a = !1;
 	for (let e of Object.keys(n)) {
-		let s = a(n, e);
+		let s = o(n, e);
 		if (s?.kind !== "point") continue;
 		if (Object.prototype.hasOwnProperty.call(t, e)) {
-			o = !0;
+			a = !0;
 			continue;
 		}
 		let c = E(s);
@@ -313,15 +322,23 @@ function k(e, t, n = {}) {
 	}
 	return r.map((e, r) => {
 		if (e === null) return null;
-		if (!o) return D(t).get(e) ?? i[r] ?? null;
+		if (!a) return ve(t).get(e) ?? i[r] ?? null;
 		for (let r of Object.keys(t)) {
-			let i = a(n, r) ?? a(t, r);
+			let i = o(n, r) ?? o(t, r);
 			if (i && E(i) === e) return r;
 		}
 		return i[r] ?? null;
 	});
 }
-function A(e) {
+function O(e, t) {
+	let n = e.map((e, n) => {
+		if (e.kind === "existing") return `p${e.id}`;
+		let r = t[n];
+		return r ? `p${r}` : `n${E(e.origin)}`;
+	});
+	return new Set(n).size < n.length;
+}
+function k(e) {
 	return {
 		code: "duplicate-construction",
 		entityId: e
@@ -329,11 +346,12 @@ function A(e) {
 }
 //#endregion
 //#region src/store/teacherStore.ts
-function ge(e) {
-	return T({
+function be(e) {
+	return C({
 		exercise: e,
 		pendingObjectType: null,
 		pendingFirstPointId: null,
+		pendingVertexPointId: null,
 		selectedGivenId: null,
 		past: [],
 		future: [],
@@ -342,9 +360,17 @@ function ge(e) {
 		constructionNotice: null
 	});
 }
-function j(e) {
-	e.getState().constructionNotice && e.setState({ constructionNotice: null });
+function A(e) {
+	let t = e.getState();
+	(t.constructionNotice || t.pendingFirstPointId) && e.setState({
+		...j,
+		constructionNotice: null
+	});
 }
+var j = {
+	pendingFirstPointId: null,
+	pendingVertexPointId: null
+};
 function M(e, t, n = {}, r = {}) {
 	e.setState((e) => {
 		let i = t(e.exercise);
@@ -352,32 +378,32 @@ function M(e, t, n = {}, r = {}) {
 		let a = r.coalesceTag ?? null;
 		return {
 			exercise: i,
-			past: a !== null && a === e.coalesceTag ? e.past : pe(e.past, e.exercise),
+			past: a !== null && a === e.coalesceTag ? e.past : w(e.past, e.exercise),
 			future: [],
 			coalesceTag: a,
 			...n
 		};
 	});
 }
-function N(e) {
+function xe(e) {
 	let t = e + 1, n = "";
 	for (; t > 0;) --t, n = String.fromCharCode(65 + t % 26) + n, t = Math.floor(t / 26);
 	return n;
 }
-function P(e) {
+function Se(e) {
 	let t = 0;
-	for (; F(e, N(t));) t += 1;
-	return N(t);
+	for (; N(e, xe(t));) t += 1;
+	return xe(t);
 }
-function _e(e, t) {
+function Ce(e, t) {
 	let n = 1;
-	for (; F(e, `${t}-${n}`);) n += 1;
+	for (; N(e, `${t}-${n}`);) n += 1;
 	return `${t}-${n}`;
 }
-function F(e, t) {
+function N(e, t) {
 	return Object.prototype.hasOwnProperty.call(e.entities, t);
 }
-function I(e, t, n, r) {
+function P(e, t, n, r) {
 	return {
 		...e,
 		entities: {
@@ -390,11 +416,12 @@ function I(e, t, n, r) {
 		} : e.presentation
 	};
 }
-function ve(e, t) {
+function we(e, t) {
 	e.setState((e) => ({
 		exercise: t,
 		pendingObjectType: null,
 		pendingFirstPointId: null,
+		pendingVertexPointId: null,
 		selectedGivenId: null,
 		past: [],
 		future: [],
@@ -403,7 +430,7 @@ function ve(e, t) {
 		constructionNotice: null
 	}));
 }
-function ye(e) {
+function Te(e) {
 	e.setState((e) => {
 		let t = e.past[e.past.length - 1];
 		return t ? {
@@ -412,13 +439,14 @@ function ye(e) {
 			future: [e.exercise, ...e.future],
 			selectedGivenId: null,
 			pendingFirstPointId: null,
+			pendingVertexPointId: null,
 			coalesceTag: null,
 			interactionEpoch: (e.interactionEpoch ?? 0) + 1,
 			constructionNotice: null
 		} : {};
 	});
 }
-function be(e) {
+function Ee(e) {
 	e.setState((e) => {
 		let t = e.future[0];
 		return t ? {
@@ -427,40 +455,41 @@ function be(e) {
 			future: e.future.slice(1),
 			selectedGivenId: null,
 			pendingFirstPointId: null,
+			pendingVertexPointId: null,
 			coalesceTag: null,
 			interactionEpoch: (e.interactionEpoch ?? 0) + 1,
 			constructionNotice: null
 		} : {};
 	});
 }
-function xe(e, t) {
+function De(e, t) {
 	e.setState({ selectedGivenId: t });
 }
-function Se(e, t) {
+function Oe(e, t) {
 	M(e, (e) => ({
 		...e,
 		viewport: t
 	}));
 }
-function Ce(e, t) {
+function ke(e, t) {
 	M(e, (e) => ({
 		...e,
 		showGrid: t
 	}));
 }
-function we(e, t) {
+function Ae(e, t) {
 	M(e, (e) => ({
 		...e,
 		allowedObjects: t
 	}));
 }
-function Te(e, t) {
+function je(e, t) {
 	M(e, (e) => ({
 		...e,
 		tools: t
 	}));
 }
-function Ee(e, t) {
+function Me(e, t) {
 	M(e, (e) => {
 		if (t === "allow") {
 			if (e.grading === void 0) return e;
@@ -473,45 +502,45 @@ function Ee(e, t) {
 		};
 	});
 }
-function De(e, t) {
+function Ne(e, t) {
 	M(e, (e) => ({
 		...e,
 		goals: [...e.goals, t]
 	}));
 }
-function Oe(e, t) {
+function Pe(e, t) {
 	M(e, (e) => ({
 		...e,
 		goals: e.goals.map((e) => e.id === t.id ? t : e)
 	}));
 }
-function ke(e, t) {
+function Fe(e, t) {
 	M(e, (e) => ({
 		...e,
 		goals: e.goals.filter((e) => e.id !== t)
 	}));
 }
-function Ae(e, t, n = !1) {
+function Ie(e, t, n = !1) {
 	let { exercise: r } = e.getState(), i = "kind" in t ? t : {
 		kind: "point",
 		at: {
 			x: t.x,
 			y: t.y
 		}
-	}, a = O(r.entities, i);
-	if (a) return e.setState({ constructionNotice: A(a) }), a;
-	let o = P(r);
+	}, a = D(r.entities, i);
+	if (a) return e.setState({ constructionNotice: k(a) }), a;
+	let o = Se(r);
 	return M(e, (e) => {
-		let t = I(e, o, i);
+		let t = P(e, o, i);
 		return n ? {
 			...t,
 			draggableEntityIds: [...t.draggableEntityIds, o]
 		} : t;
 	}, { constructionNotice: null }), o;
 }
-function je(e, t) {
+function Le(e, t) {
 	let n = e.getState();
-	a(n.exercise.entities, t) && n.exercise.presentation[t]?.role === "implicit" && M(e, (e) => ({
+	o(n.exercise.entities, t) && n.exercise.presentation[t]?.role === "implicit" && M(e, (e) => ({
 		...e,
 		presentation: {
 			...e.presentation,
@@ -522,47 +551,57 @@ function je(e, t) {
 		}
 	}));
 }
-function Me(e, t) {
-	a(e.getState().exercise.entities, t)?.kind === "point" && je(e, t);
+function Re(e, t) {
+	o(e.getState().exercise.entities, t)?.kind === "point" && Le(e, t);
 }
-function Ne(e, t, n) {
+function ze(e, t, n) {
 	if (t.kind === "existing") return [e, t.id];
 	if (n) return [e, n];
-	let r = P(e);
-	return [I(e, r, t.origin, "implicit"), r];
+	let r = Se(e);
+	return [P(e, r, t.origin, "implicit"), r];
 }
-function Pe(e, t) {
-	let n = e.getState();
-	if (![t.from, t.to].every((e) => e.kind !== "existing" || a(n.exercise.entities, e.id)?.kind === "point") || t.from.kind === "existing" && t.to.kind === "existing" && t.from.id === t.to.id) {
-		j(e);
+function Be(e, t) {
+	let n = e.getState(), r = T(t);
+	if (r.flatMap((e) => e.kind === "existing" ? [e.id] : []).some((e) => o(n.exercise.entities, e)?.kind !== "point")) {
+		A(e);
 		return;
 	}
-	let [r = null, i = null] = k([t.from, t.to], n.exercise.entities), [o, s] = Ne(n.exercise, t.from, r), [c, l] = Ne(o, t.to, i), u = {
+	let i = ye(r, n.exercise.entities);
+	if (O(r, i)) {
+		A(e);
+		return;
+	}
+	let a = n.exercise, s = [];
+	for (let [e, t] of r.entries()) {
+		let [n, r] = ze(a, t, i[e] ?? null);
+		a = n, s.push(r);
+	}
+	let c = {
 		kind: t.tool,
-		parents: [s, l]
-	}, d = c === n.exercise ? O(n.exercise.entities, u) : null;
-	if (d) {
+		parents: s
+	}, l = a === n.exercise ? D(n.exercise.entities, c) : null;
+	if (l) {
 		e.setState({
-			pendingFirstPointId: null,
-			constructionNotice: A(d)
+			...j,
+			constructionNotice: k(l)
 		});
 		return;
 	}
-	let p = _e(c, t.tool), m = I(c, p, u, "explicit"), h = g(m), _ = h.points.get(s), v = h.points.get(l);
-	if (!_ || !v || f(_, v)) {
-		j(e);
+	let u = Ce(a, t.tool), d = P(a, u, c, "explicit"), f = h(d), p = s.map((e) => f.points.get(e)), g = p[1];
+	if (!g || !p.every((e, t) => e && (t === 1 || !m(e, g)))) {
+		A(e);
 		return;
 	}
-	M(e, () => m, {
-		pendingFirstPointId: null,
-		selectedGivenId: p,
+	M(e, () => d, {
+		...j,
+		selectedGivenId: u,
 		constructionNotice: null
 	});
 }
-function Fe(e, t, n) {
+function Ve(e, t, n) {
 	M(e, (e) => {
-		let r = a(e.entities, t);
-		return !r || r.kind !== "point" || !("at" in r) ? e : I(e, t, {
+		let r = o(e.entities, t);
+		return !r || r.kind !== "point" || !("at" in r) ? e : P(e, t, {
 			kind: "point",
 			at: {
 				x: n.x,
@@ -571,149 +610,182 @@ function Fe(e, t, n) {
 		});
 	}, {}, { coalesceTag: `move:${t}` });
 }
-function Ie(e, t) {
-	let n = a(e.exercise.entities, t);
+function He(e, t) {
+	let n = o(e.exercise.entities, t);
 	return n?.kind === "point" && "at" in n;
 }
-function Le(e) {
+function Ue(e) {
 	e.setState({ coalesceTag: null });
 }
-function Re(e, t, n) {
+function We(e, t, n) {
 	M(e, (e) => {
-		let r = a(e.entities, t);
+		let r = o(e.entities, t);
 		return !r || r.kind !== "point" || e.draggableEntityIds.includes(t) === n ? e : {
 			...e,
 			draggableEntityIds: n ? [...e.draggableEntityIds, t] : e.draggableEntityIds.filter((e) => e !== t)
 		};
 	});
 }
-function ze(e, t, n) {
+function Ge(e, t, n) {
 	M(e, (e) => {
-		if (!a(e.entities, t)) return e;
-		let r = a(e.presentation, t), i = n.trim();
+		if (!o(e.entities, t)) return e;
+		let r = o(e.presentation, t), i = n.trim();
 		if ((r?.label ?? "") === i) return e;
-		let o = r?.role ?? "explicit";
-		return {
+		let a = {
+			...r,
+			role: r?.role ?? "explicit"
+		};
+		return i ? a.label = i : delete a.label, {
 			...e,
 			presentation: {
 				...e.presentation,
-				[t]: i ? {
-					role: o,
-					label: i
-				} : { role: o }
+				[t]: a
 			}
 		};
 	}, {}, { coalesceTag: `label:${t}` });
 }
-function Be(e, t) {
-	if (!a(e.entities, t)) return {
+function Ke(e, t, n) {
+	M(e, (e) => {
+		if (o(e.entities, t)?.kind !== "angle") return e;
+		let r = o(e.presentation, t);
+		if (r?.measureLabel === "degrees" === n) return e;
+		let i = {
+			...r,
+			role: r?.role ?? "explicit"
+		};
+		return n ? i.measureLabel = "degrees" : delete i.measureLabel, {
+			...e,
+			presentation: {
+				...e.presentation,
+				[t]: i
+			}
+		};
+	});
+}
+function qe(e, t) {
+	if (!o(e.entities, t)) return {
 		dependentEntityIds: [],
 		dependentGoalIds: []
 	};
-	let n = g(e).removalClosureOf(t), r = new Set(n);
+	let n = h(e).removalClosureOf(t), r = new Set(n);
 	return {
 		dependentEntityIds: n.filter((e) => e !== t),
-		dependentGoalIds: e.goals.filter((e) => m(e).some((e) => r.has(e))).map((e) => e.id)
+		dependentGoalIds: e.goals.filter((e) => ee(e).some((e) => r.has(e))).map((e) => e.id)
 	};
 }
-function Ve(e, t) {
-	M(e, (e) => {
-		if (!F(e, t)) return e;
-		let n = Be(e, t), r = /* @__PURE__ */ new Set([t, ...n.dependentEntityIds]);
-		return {
-			...e,
-			entities: Object.fromEntries(Object.entries(e.entities).filter(([e]) => !r.has(e))),
-			presentation: Object.fromEntries(Object.entries(e.presentation).filter(([e]) => !r.has(e))),
-			draggableEntityIds: e.draggableEntityIds.filter((e) => !r.has(e)),
-			goals: e.goals.filter((e) => !n.dependentGoalIds.includes(e.id))
-		};
-	}, {
+function Je(e, t) {
+	let { exercise: n, pendingFirstPointId: r, pendingVertexPointId: i } = e.getState();
+	if (!N(n, t)) return De(e, null);
+	let a = qe(n, t), o = /* @__PURE__ */ new Set([t, ...a.dependentEntityIds]);
+	M(e, () => ({
+		...n,
+		entities: Object.fromEntries(Object.entries(n.entities).filter(([e]) => !o.has(e))),
+		presentation: Object.fromEntries(Object.entries(n.presentation).filter(([e]) => !o.has(e))),
+		draggableEntityIds: n.draggableEntityIds.filter((e) => !o.has(e)),
+		goals: n.goals.filter((e) => !a.dependentGoalIds.includes(e.id))
+	}), {
 		selectedGivenId: null,
-		pendingFirstPointId: null
+		...(o.has(r ?? "") || o.has(i ?? "")) && j
 	});
 }
-function L(e, t, n) {
-	if (n[0] === n[1]) return j(e), null;
+function F(e, t, n) {
+	if (n[0] === n[1]) return A(e), null;
 	let { exercise: r } = e.getState(), i = {
 		kind: t,
 		parents: n
-	}, a = O(r.entities, i);
-	if (a) return e.setState({ constructionNotice: A(a) }), null;
-	let o = _e(r, t);
-	return M(e, (e) => I(e, o, i), { constructionNotice: null }), o;
+	}, a = D(r.entities, i);
+	if (a) return e.setState({ constructionNotice: k(a) }), null;
+	let o = Ce(r, t);
+	return M(e, (e) => P(e, o, i), { constructionNotice: null }), o;
 }
-function He(e, t, n) {
-	return L(e, "segment", [t, n]);
+function Ye(e, t, n) {
+	return F(e, "segment", [t, n]);
 }
-function Ue(e, t, n) {
-	return L(e, "line", [t, n]);
+function Xe(e, t, n) {
+	return F(e, "line", [t, n]);
 }
-function We(e, t) {
+function Ze(e, t) {
 	e.setState((e) => ({
 		pendingObjectType: t,
 		pendingFirstPointId: null,
+		pendingVertexPointId: null,
 		selectedGivenId: null,
 		interactionEpoch: (e.interactionEpoch ?? 0) + 1,
 		constructionNotice: null
 	}));
 }
-function Ge(e) {
-	e.getState().pendingFirstPointId !== null && e.setState({ pendingFirstPointId: null });
+function Qe(e) {
+	e.getState().pendingFirstPointId !== null && e.setState(j);
 }
-function Ke(e, t) {
-	let { pendingObjectType: n, pendingFirstPointId: r } = e.getState();
-	if (n !== "segment" && n !== "line") return;
-	if (!r) {
-		e.setState({
+function $e(e, t) {
+	let { pendingObjectType: n, pendingFirstPointId: r, pendingVertexPointId: i } = e.getState();
+	if (n === "segment" || n === "line" || n === "angle") {
+		if (!r) e.setState({
 			pendingFirstPointId: t,
 			constructionNotice: null
 		});
-		return;
-	}
-	if (r === t) {
-		e.setState({
-			pendingFirstPointId: null,
+		else if (t === r || t === i) e.setState({
+			...j,
+			constructionNotice: null
+		});
+		else if (n !== "angle") {
+			let i = F(e, n, [r, t]);
+			e.setState(i ? {
+				...j,
+				selectedGivenId: i
+			} : j);
+		} else i ? Be(e, {
+			tool: n,
+			from: {
+				kind: "existing",
+				id: r
+			},
+			vertex: {
+				kind: "existing",
+				id: i
+			},
+			to: {
+				kind: "existing",
+				id: t
+			}
+		}) : e.setState({
+			pendingVertexPointId: t,
 			constructionNotice: null
 		});
-		return;
 	}
-	let i = L(e, n, [r, t]);
-	e.setState(i ? {
-		pendingFirstPointId: null,
-		selectedGivenId: i
-	} : { pendingFirstPointId: null });
 }
 //#endregion
 //#region src/store/attemptChange.ts
-function R(e, t) {
+function I(e, t) {
 	if (e === t) return !0;
 	if (typeof e != "object" || typeof t != "object" || e === null || t === null || Array.isArray(e) !== Array.isArray(t)) return !1;
 	let n = e, r = t, i = Object.keys(n);
-	return i.length === Object.keys(r).length && i.every((e) => Object.prototype.hasOwnProperty.call(r, e) && R(n[e], r[e]));
+	return i.length === Object.keys(r).length && i.every((e) => Object.prototype.hasOwnProperty.call(r, e) && I(n[e], r[e]));
 }
-function z(e, t) {
+function L(e, t) {
 	let n = new Set(e.answerEntityIds), r = new Set(t.answerEntityIds), i = /* @__PURE__ */ new Set();
 	for (let n of [e, t]) {
 		for (let e of Object.keys(n.entities)) i.add(e);
 		for (let e of Object.keys(n.presentation)) i.add(e);
 		for (let e of n.answerEntityIds) i.add(e);
 	}
-	return [...i].filter((i) => !R(a(e.entities, i), a(t.entities, i)) || !R(a(e.presentation, i), a(t.presentation, i)) || n.has(i) !== r.has(i));
+	return [...i].filter((i) => !I(o(e.entities, i), o(t.entities, i)) || !I(o(e.presentation, i), o(t.presentation, i)) || n.has(i) !== r.has(i));
 }
 //#endregion
 //#region src/store/studentStore.ts
-var B = {
+var R = {
 	schemaVersion: 2,
 	entities: {},
 	presentation: {},
 	answerEntityIds: []
 };
-function qe(e, t) {
-	return T({
+function et(e, t) {
+	return C({
 		exercise: d(e),
-		geometry: t ?? B,
+		geometry: t ?? R,
 		pendingObjectType: null,
 		pendingFirstPointId: null,
+		pendingVertexPointId: null,
 		selectedObjectId: null,
 		past: [],
 		future: [],
@@ -724,38 +796,38 @@ function qe(e, t) {
 		lastAttemptChange: null
 	});
 }
-function V(e, t) {
-	let n = a(e.geometry.entities, t) ?? a(e.exercise.entities, t);
+function z(e, t) {
+	let n = o(e.geometry.entities, t) ?? o(e.exercise.entities, t);
 	return n?.kind === "point" ? n : void 0;
 }
-function H(e, t) {
+function B(e, t) {
 	return {
 		...t,
 		sequence: (e.lastAttemptChange?.sequence ?? 0) + 1
 	};
 }
-var U = "move:";
-function W(e) {
+var V = "move:";
+function H(e) {
 	let t = e.coalesceTag;
-	if (!t?.startsWith(U)) return null;
-	let n = t.slice(5), r = e.past[e.past.length - 1], i = (t) => a(t.entities, n) ?? a(e.exercise.entities, n);
-	return r && R(i(r), i(e.geometry)) ? {
+	if (!t?.startsWith(V)) return null;
+	let n = t.slice(5), r = e.past[e.past.length - 1], i = (t) => o(t.entities, n) ?? o(e.exercise.entities, n);
+	return r && I(i(r), i(e.geometry)) ? {
 		coalesceTag: null,
 		geometry: r,
 		past: e.past.slice(0, -1)
 	} : {
 		coalesceTag: null,
-		lastAttemptChange: H(e, {
+		lastAttemptChange: B(e, {
 			action: "point-moved",
 			entityIds: [n]
 		})
 	};
 }
-function G(e) {
-	let t = W(e.getState());
+function U(e) {
+	let t = H(e.getState());
 	t && e.setState(t);
 }
-function K(e, t, n = {}) {
+function W(e, t, n = {}) {
 	let r = e.getState().geometry, i = t(r);
 	if (i === r) {
 		e.setState(n.extra ?? {});
@@ -764,17 +836,18 @@ function K(e, t, n = {}) {
 	let a = n.coalesceTag ?? null;
 	e.setState((e) => ({
 		geometry: i,
-		past: a !== null && a === e.coalesceTag ? e.past : pe(e.past, r),
+		past: a !== null && a === e.coalesceTag ? e.past : w(e.past, r),
 		future: [],
 		coalesceTag: a,
-		...n.receipt && { lastAttemptChange: H(e, n.receipt(r, i)) },
+		...n.receipt && { lastAttemptChange: B(e, n.receipt(r, i)) },
 		...n.extra
 	}));
 }
-function q(e) {
+function G(e) {
 	return {
 		pendingObjectType: null,
 		pendingFirstPointId: null,
+		pendingVertexPointId: null,
 		selectedObjectId: null,
 		past: [],
 		future: [],
@@ -783,7 +856,7 @@ function q(e) {
 		constructionNotice: null
 	};
 }
-function Je(e, t) {
+function tt(e, t) {
 	if ((e.getState().readOnly ?? !1) !== t) {
 		if (!t) {
 			e.setState((e) => ({
@@ -793,10 +866,11 @@ function Je(e, t) {
 			return;
 		}
 		e.setState((e) => ({
-			...W(e),
+			...H(e),
 			readOnly: !0,
 			pendingObjectType: null,
 			pendingFirstPointId: null,
+			pendingVertexPointId: null,
 			selectedObjectId: null,
 			coalesceTag: null,
 			interactionEpoch: (e.interactionEpoch ?? 0) + 1,
@@ -804,31 +878,39 @@ function Je(e, t) {
 		}));
 	}
 }
-function Ye(e, t) {
+function nt(e, t) {
 	e.setState((e) => ({
-		...q(e),
+		...G(e),
 		geometry: t
 	}));
 }
-function Xe(e, t, n) {
+function rt(e, t, n) {
 	e.setState((e) => ({
-		...q(e),
+		...G(e),
 		exercise: d(t),
-		geometry: n ?? { ...B }
+		geometry: n ?? { ...R }
 	}));
 }
-function J(e) {
+function K(e) {
 	return (t) => !Object.prototype.hasOwnProperty.call(e.entities, t);
 }
-function Ze(e) {
-	e.getState().constructionNotice && e.setState({ constructionNotice: null });
+var q = {
+	pendingFirstPointId: null,
+	pendingVertexPointId: null
+};
+function it(e) {
+	let t = e.getState();
+	(t.constructionNotice || t.pendingFirstPointId) && e.setState({
+		...q,
+		constructionNotice: null
+	});
 }
-function Y(e, t, n) {
+function J(e, t, n) {
 	let r = /* @__PURE__ */ new Set([...Object.keys(e.entities), ...Object.keys(t.entities)]), i = 1;
 	for (; r.has(`${n}-${i}`);) i += 1;
 	return `${n}-${i}`;
 }
-function X(e, t, n, { role: r, countsAsAnswer: i }) {
+function Y(e, t, n, { role: r, countsAsAnswer: i }) {
 	return {
 		...e,
 		entities: {
@@ -842,78 +924,81 @@ function X(e, t, n, { role: r, countsAsAnswer: i }) {
 		answerEntityIds: i ? [...e.answerEntityIds, t] : e.answerEntityIds
 	};
 }
-function Qe(e, t) {
+function at(e, t) {
 	let { exercise: n, readOnly: r } = e.getState();
 	t && (r || !n.allowedObjects.includes(t)) || e.setState((e) => ({
 		pendingObjectType: t,
 		pendingFirstPointId: null,
+		pendingVertexPointId: null,
 		interactionEpoch: (e.interactionEpoch ?? 0) + 1,
 		constructionNotice: null
 	}));
 }
-function $e(e) {
-	e.getState().pendingFirstPointId !== null && e.setState({ pendingFirstPointId: null });
+function ot(e) {
+	e.getState().pendingFirstPointId !== null && e.setState(q);
 }
-function et(e) {
+function st(e) {
 	let { readOnly: t, past: n } = e.getState();
-	t || n.length === 0 || (G(e), e.setState((e) => {
+	t || n.length === 0 || (U(e), e.setState((e) => {
 		let t = e.past[e.past.length - 1];
 		return t ? {
 			geometry: t,
 			past: e.past.slice(0, -1),
 			future: [e.geometry, ...e.future],
 			pendingFirstPointId: null,
+			pendingVertexPointId: null,
 			selectedObjectId: null,
 			coalesceTag: null,
 			interactionEpoch: (e.interactionEpoch ?? 0) + 1,
 			constructionNotice: null,
-			lastAttemptChange: H(e, {
+			lastAttemptChange: B(e, {
 				action: "undo",
-				entityIds: z(e.geometry, t)
+				entityIds: L(e.geometry, t)
 			})
 		} : {};
 	}));
 }
-function tt(e) {
+function ct(e) {
 	let { readOnly: t, future: n } = e.getState();
-	t || n.length === 0 || (G(e), e.setState((e) => {
+	t || n.length === 0 || (U(e), e.setState((e) => {
 		let t = e.future[0];
 		return t ? {
 			geometry: t,
 			past: [...e.past, e.geometry],
 			future: e.future.slice(1),
 			pendingFirstPointId: null,
+			pendingVertexPointId: null,
 			selectedObjectId: null,
 			coalesceTag: null,
 			interactionEpoch: (e.interactionEpoch ?? 0) + 1,
 			constructionNotice: null,
-			lastAttemptChange: H(e, {
+			lastAttemptChange: B(e, {
 				action: "redo",
-				entityIds: z(e.geometry, t)
+				entityIds: L(e.geometry, t)
 			})
 		} : {};
 	}));
 }
-function nt(e) {
-	e.getState().readOnly || (G(e), e.setState((e) => {
-		let t = { ...B };
+function lt(e) {
+	e.getState().readOnly || (U(e), e.setState((e) => {
+		let t = { ...R };
 		return {
-			...q(e),
+			...G(e),
 			geometry: t,
-			lastAttemptChange: H(e, {
+			lastAttemptChange: B(e, {
 				action: "reset",
-				entityIds: z(e.geometry, t)
+				entityIds: L(e.geometry, t)
 			})
 		};
 	}));
 }
-function rt(e, t, n = !0) {
+function ut(e, t, n = !0) {
 	if (e.getState().readOnly) return null;
-	G(e);
-	let { exercise: r, geometry: i } = e.getState(), a = O(i.entities, t, J(r));
-	if (a) return e.setState({ constructionNotice: A(a) }), a;
-	let o = Y(r, i, "student-point");
-	return K(e, (e) => X(e, o, t, {
+	U(e);
+	let { exercise: r, geometry: i } = e.getState(), a = D(i.entities, t, K(r));
+	if (a) return e.setState({ constructionNotice: k(a) }), a;
+	let o = J(r, i, "student-point");
+	return W(e, (e) => Y(e, o, t, {
 		role: "explicit",
 		countsAsAnswer: n
 	}), {
@@ -924,11 +1009,11 @@ function rt(e, t, n = !0) {
 		})
 	}), o;
 }
-function it(e, t) {
+function dt(e, t) {
 	if (e.getState().readOnly) return;
-	G(e);
+	U(e);
 	let n = e.getState();
-	a(n.geometry.entities, t)?.kind === "point" && n.geometry.presentation[t]?.role === "implicit" && K(e, (e) => ({
+	o(n.geometry.entities, t)?.kind === "point" && n.geometry.presentation[t]?.role === "implicit" && W(e, (e) => ({
 		...e,
 		presentation: {
 			...e.presentation,
@@ -942,11 +1027,11 @@ function it(e, t) {
 		entityIds: [t]
 	}) });
 }
-function at(e, t, n) {
+function ft(e, t, n) {
 	if (e.getState().readOnly) return;
-	e.getState().coalesceTag !== `${U}${t}` && G(e);
-	let r = e.getState(), i = V(r, t);
-	if (!i || "intersectionOf" in i || !Z(r, t)) return;
+	e.getState().coalesceTag !== `${V}${t}` && U(e);
+	let r = e.getState(), i = z(r, t);
+	if (!i || "intersectionOf" in i || !X(r, t)) return;
 	let a = {
 		kind: "point",
 		at: {
@@ -955,9 +1040,9 @@ function at(e, t, n) {
 		}
 	};
 	if ("on" in i) {
-		let e = h(r.exercise, r.geometry).resolvedOf(i.on);
+		let e = _(r.exercise, r.geometry).resolvedOf(i.on);
 		if (!e) return;
-		let t = p(e, n);
+		let t = l(e, n);
 		if (t === null) return;
 		a = {
 			kind: "point",
@@ -965,127 +1050,153 @@ function at(e, t, n) {
 			t
 		};
 	}
-	R(a, i) || K(e, (e) => ({
+	I(a, i) || W(e, (e) => ({
 		...e,
 		entities: {
 			...e.entities,
 			[t]: a
 		}
-	}), { coalesceTag: `${U}${t}` });
+	}), { coalesceTag: `${V}${t}` });
 }
-function Z(e, t) {
-	if (e.readOnly) return !1;
-	let n = V(e, t);
-	return !n || "intersectionOf" in n ? !1 : !Object.prototype.hasOwnProperty.call(e.exercise.entities, t) || e.exercise.draggableEntityIds.includes(t);
+function X(t, n) {
+	if (t.readOnly) return !1;
+	if (Object.prototype.hasOwnProperty.call(t.exercise.entities, n)) return e(t.exercise, n);
+	let r = z(t, n);
+	return r !== void 0 && !("intersectionOf" in r);
 }
-function ot(e) {
+function pt(e) {
 	let t = e.getState();
-	t.coalesceTag !== null && e.setState(W(t) ?? { coalesceTag: null });
+	t.coalesceTag !== null && e.setState(H(t) ?? { coalesceTag: null });
 }
-function st(e, t, n, r) {
+function mt(e, t, n, r) {
 	if (n.kind === "existing") return [t, n.id];
 	if (r) return [t, r];
-	let i = Y(e, t, "student-point");
-	return [X(t, i, n.origin, {
+	let i = J(e, t, "student-point");
+	return [Y(t, i, n.origin, {
 		role: "implicit",
 		countsAsAnswer: !1
 	}), i];
 }
-function ct(e, t) {
+function Z(e, t) {
 	if (e.getState().readOnly) return;
-	G(e);
-	let n = e.getState();
-	if (!n.exercise.allowedObjects.includes(t.tool) || t.from.kind === "existing" && t.to.kind === "existing" && t.from.id === t.to.id) {
-		Ze(e);
+	U(e);
+	let n = e.getState(), r = T(t).flatMap((e) => e.kind === "existing" ? [e.id] : []);
+	if (!n.exercise.allowedObjects.includes(t.tool) || r.some((e) => !z(n, e))) {
+		it(e);
 		return;
 	}
-	for (let r of [t.from, t.to]) if (r.kind === "existing" && !V(n, r.id)) {
-		Ze(e);
+	let i = ht(n.exercise, n.geometry, t);
+	if (!i) {
+		it(e);
 		return;
 	}
-	let [r = null, i = null] = k([t.from, t.to], n.exercise.entities, n.geometry.entities), [a, o] = st(n.exercise, n.geometry, t.from, r), [s, c] = st(n.exercise, a, t.to, i), l = {
-		kind: t.tool,
-		parents: [o, c]
-	}, u = s === n.geometry ? O(n.geometry.entities, l, J(n.exercise)) : null;
-	if (u) {
+	if ("duplicateId" in i) {
 		e.setState({
-			pendingFirstPointId: null,
-			constructionNotice: A(u)
+			...q,
+			constructionNotice: k(i.duplicateId)
 		});
 		return;
 	}
-	let d = Y(n.exercise, s, `student-${t.tool}`), p = X(s, d, l, {
-		role: "explicit",
-		countsAsAnswer: !0
-	}), m = h(n.exercise, p), g = m.points.get(o), _ = m.points.get(c), v = g && _ && !f(g, _), y = [...a === n.geometry ? [] : [o], ...s === a ? [] : [c]];
-	K(e, (e) => v ? p : e, {
+	W(e, () => i.geometry, {
 		extra: {
-			pendingFirstPointId: null,
+			...q,
 			constructionNotice: null
 		},
 		receipt: () => ({
-			action: t.tool === "segment" ? "segment-created" : "line-created",
-			entityIds: [d, ...y]
+			action: `${t.tool}-created`,
+			entityIds: [i.objectId, ...i.inventedIds]
 		})
 	});
 }
-function lt(e, t) {
+function ht(e, t, n) {
+	let r = T(n), i = ye(r, e.entities, t.entities);
+	if (O(r, i)) return null;
+	let a = t, o = [], s = [];
+	r.forEach((t, n) => {
+		let r = a, [c, l] = mt(e, r, t, i[n] ?? null);
+		a = c, o.push(l), c !== r && s.push(l);
+	});
+	let c = {
+		kind: n.tool,
+		parents: o
+	}, l = a === t ? D(t.entities, c, K(e)) : null;
+	if (l) return { duplicateId: l };
+	let u = J(e, a, `student-${n.tool}`), d = Y(a, u, c, {
+		role: "explicit",
+		countsAsAnswer: !0
+	}), f = _(e, d), p = o.map((e) => f.points.get(e)), h = p[1];
+	return {
+		geometry: h && p.every((e, t) => e && (t === 1 || !m(e, h))) ? d : t,
+		objectId: u,
+		inventedIds: s
+	};
+}
+function gt(e, t) {
 	let n = e.getState();
 	if (n.readOnly) return;
 	let r = n.pendingObjectType;
-	if (r === "segment" || r === "line") {
-		if (!n.pendingFirstPointId) {
-			e.setState({
-				pendingFirstPointId: t,
-				constructionNotice: null
-			});
-			return;
+	if (r !== "segment" && r !== "line" && r !== "angle") return;
+	let i = n.pendingFirstPointId, a = n.pendingVertexPointId;
+	i ? t === i || t === a ? e.setState({
+		...q,
+		constructionNotice: null
+	}) : r === "angle" ? a ? Z(e, {
+		tool: r,
+		from: {
+			kind: "existing",
+			id: i
+		},
+		vertex: {
+			kind: "existing",
+			id: a
+		},
+		to: {
+			kind: "existing",
+			id: t
 		}
-		if (n.pendingFirstPointId === t) {
-			e.setState({
-				pendingFirstPointId: null,
-				constructionNotice: null
-			});
-			return;
+	}) : e.setState({
+		pendingVertexPointId: t,
+		constructionNotice: null
+	}) : Z(e, {
+		tool: r,
+		from: {
+			kind: "existing",
+			id: i
+		},
+		to: {
+			kind: "existing",
+			id: t
 		}
-		ct(e, {
-			tool: r,
-			from: {
-				kind: "existing",
-				id: n.pendingFirstPointId
-			},
-			to: {
-				kind: "existing",
-				id: t
-			}
-		});
-	}
+	}) : e.setState({
+		pendingFirstPointId: t,
+		constructionNotice: null
+	});
 }
-function ut(e, t) {
+function _t(e, t) {
 	e.setState({ selectedObjectId: t });
 }
 function Q(e, t) {
 	return Object.prototype.hasOwnProperty.call(e.geometry.entities, t) ? !Object.prototype.hasOwnProperty.call(e.exercise.entities, t) : !1;
 }
-function dt(e, t) {
+function vt(e, t) {
 	if (!Q(e, t)) return {
 		constructionIds: [],
 		pointIds: []
 	};
-	let n = new Set(h(e.exercise, e.geometry).removalClosureOf(t)), r = [], i = [];
+	let n = new Set(_(e.exercise, e.geometry).removalClosureOf(t)), r = [], i = [];
 	for (let [t, a] of Object.entries(e.geometry.entities)) n.has(t) && (a.kind === "point" ? i.push(t) : r.push(t));
 	return {
 		constructionIds: r,
 		pointIds: i
 	};
 }
-function ft(e, t) {
+function yt(e, t) {
 	if (e.getState().readOnly) return;
-	G(e);
+	U(e);
 	let n = e.getState();
 	if (!Q(n, t)) return;
-	let r = dt(n, t), i = /* @__PURE__ */ new Set([...r.constructionIds, ...r.pointIds.filter((e) => Q(n, e))]), a = (e) => Object.fromEntries(Object.entries(e).filter(([e]) => !i.has(e)));
-	K(e, (e) => ({
+	let r = vt(n, t), i = /* @__PURE__ */ new Set([...r.constructionIds, ...r.pointIds.filter((e) => Q(n, e))]), a = (e) => Object.fromEntries(Object.entries(e).filter(([e]) => !i.has(e)));
+	W(e, (e) => ({
 		schemaVersion: e.schemaVersion,
 		entities: a(e.entities),
 		presentation: a(e.presentation),
@@ -1093,7 +1204,7 @@ function ft(e, t) {
 	}), {
 		extra: {
 			selectedObjectId: null,
-			pendingFirstPointId: n.pendingFirstPointId && i.has(n.pendingFirstPointId) ? null : n.pendingFirstPointId
+			...(i.has(n.pendingFirstPointId ?? "") || i.has(n.pendingVertexPointId ?? "")) && q
 		},
 		receipt: (e) => ({
 			action: "deleted",
@@ -1102,15 +1213,15 @@ function ft(e, t) {
 	});
 }
 function $(e, t) {
-	for (let [n, r] of e) if (f(r, t)) return n;
+	for (let [n, r] of e) if (m(r, t)) return n;
 	return null;
 }
-function pt(e, t, n, r) {
+function bt(e, t, n, r) {
 	let i = $(n, r);
 	return i && Object.prototype.hasOwnProperty.call(t.entities, i) && !Object.prototype.hasOwnProperty.call(e.entities, i) ? t.answerEntityIds.includes(i) ? [t, i] : [{
 		...t,
 		answerEntityIds: [...t.answerEntityIds, i]
-	}, i] : [X(t, Y(e, t, "student-point"), {
+	}, i] : [Y(t, J(e, t, "student-point"), {
 		kind: "point",
 		at: r
 	}, {
@@ -1118,45 +1229,66 @@ function pt(e, t, n, r) {
 		countsAsAnswer: !0
 	}), null];
 }
-var mt = {
+var xt = {
 	role: "explicit",
 	countsAsAnswer: !1
 };
-function ht(e, t) {
+function St(e, t) {
 	if (e.getState().readOnly) return;
-	G(e);
-	let { exercise: n, geometry: r } = e.getState(), [i, a] = gt(n, r, t);
-	K(e, () => i, {
-		extra: { constructionNotice: a ? A(a) : null },
+	U(e);
+	let { exercise: n, geometry: r } = e.getState(), [i, a] = Ct(n, r, t);
+	W(e, () => i, {
+		extra: { constructionNotice: a ? k(a) : null },
 		receipt: (e, t) => ({
 			action: "revealed",
-			entityIds: z(e, t)
+			entityIds: L(e, t)
 		})
 	});
 }
-function gt(e, t, n) {
-	let r = new Map(_(e, t));
-	if (n.type === "point") return pt(e, t, r, n.at);
+function Ct(e, t, n) {
+	let r = new Map(g(e, t));
+	if (n.type === "point") return bt(e, t, r, n.at);
+	if (n.type === "angle") {
+		let i = (e) => {
+			let t = $(r, e);
+			return t ? {
+				kind: "existing",
+				id: t
+			} : {
+				kind: "create",
+				origin: {
+					kind: "point",
+					at: e
+				}
+			};
+		}, a = ht(e, t, {
+			tool: "angle",
+			from: i(n.arms[0]),
+			vertex: i(n.vertex),
+			to: i(n.arms[1])
+		});
+		return a ? "duplicateId" in a ? [t, a.duplicateId] : [a.geometry, null] : [t, null];
+	}
 	let [i, a] = n.type === "segment" ? [n.from, n.to] : n.through, o = t, s = $(r, i);
-	s || (s = Y(e, o, "student-point"), o = X(o, s, {
+	s || (s = J(e, o, "student-point"), o = Y(o, s, {
 		kind: "point",
 		at: i
-	}, mt), r.set(s, i));
+	}, xt), r.set(s, i));
 	let c = $(r, a);
-	if (c || (c = Y(e, o, "student-point"), o = X(o, c, {
+	if (c || (c = J(e, o, "student-point"), o = Y(o, c, {
 		kind: "point",
 		at: a
-	}, mt), r.set(c, a)), s === c) return [t, null];
+	}, xt), r.set(c, a)), s === c) return [t, null];
 	let l = {
 		kind: n.type,
 		parents: [s, c]
-	}, u = O(o.entities, l, J(e));
-	return u ? [t, u] : [X(o, Y(e, o, `student-${n.type}`), l, {
+	}, u = D(o.entities, l, K(e));
+	return u ? [t, u] : [Y(o, J(e, o, `student-${n.type}`), l, {
 		role: "explicit",
 		countsAsAnswer: !0
 	}), null];
 }
 //#endregion
-export { fe as $, Be as A, Oe as B, Ae as C, ge as D, Ge as E, je as F, ze as G, We as H, Me as I, Te as J, Re as K, be as L, ve as M, Fe as N, Le as O, Ke as P, w as Q, Ve as R, Ue as S, De as T, we as U, xe as V, Ee as W, ye as X, Se as Y, T as Z, ht as _, ot as a, b as at, Je as b, Q as c, te as ct, lt as d, de as et, it as f, nt as g, Xe as h, ft as i, re as it, Ie as j, Pe as k, Z as l, y as lt, Ye as m, $e as n, ie as nt, ct as o, ee as ot, tt as p, Ce as q, qe as r, C as rt, dt as s, ne as st, rt as t, x as tt, at as u, v as ut, ut as v, He as w, et as x, Qe as y, ke as z };
+export { pe as $, qe as A, Pe as B, Ie as C, be as D, Qe as E, Le as F, Ge as G, Ze as H, Re as I, ke as J, Ke as K, Ee as L, we as M, Ve as N, Ue as O, $e as P, C as Q, Je as R, Xe as S, Ne as T, Ae as U, De as V, Me as W, Oe as X, je as Y, Te as Z, St as _, pt as a, ae as at, tt as b, Q as c, ie as ct, gt as d, v as dt, he as et, dt as f, lt as g, rt as h, yt as i, oe as it, He as j, Be as k, X as l, re as lt, nt as m, ot as n, b as nt, Z as o, y as ot, ct as p, We as q, et as r, x as rt, vt as s, ne as st, ut as t, me as tt, ft as u, te as ut, _t as v, Ye as w, st as x, at as y, Fe as z };
 
-//# sourceMappingURL=studentStore-CEKTtMCh.js.map
+//# sourceMappingURL=studentStore-CyYa0N93.js.map