@orbat-mapper/tactical-draw 0.2.0-alpha.2 → 0.2.0-alpha.4

package/dist/index.mjs

@@ -1006,6 +1006,7 @@ function runVariableLengthDraw(options) {
 	const max = metadata.maxCoordinates;
 	const rule = metadata.rule;
 	const trailingFixed = rule?.trailingFixedSlots ?? 0;
+	const closedRing = rule?.closedRing ?? false;
 	const ruleMin = rule?.minimumUserPoints;
 	const guideEnabled = (guideOpt ?? true) && !shouldSuppressGuide(metadata);
 	const isAreaKind = metadata.geometry === "area";
@@ -1097,20 +1098,20 @@ function runVariableLengthDraw(options) {
 		if (ctx.settled) return;
 		const pos = roundControlPoint(event.coordinate);
 		const lastSpineIdx = committed.length - 1 - trailingFixed;
+		const finishIndices = closedRing && lastSpineIdx > 0 ? [lastSpineIdx, 0] : [lastSpineIdx];
 		for (let i = 0; i < committed.length; i++) if (positionsEqual(pos, committed[i])) {
-			if (i === lastSpineIdx && canCommitNow()) ctx.commit(buildSnapshot);
+			if (finishIndices.includes(i) && canCommitNow()) ctx.commit(buildSnapshot);
 			return;
 		}
-		if (lastSpineIdx >= 0 && canCommitNow()) {
-			const lastPixel = adapter.getPixelFromCoordinate(committed[lastSpineIdx]);
-			if (lastPixel) {
-				const tol = mapEventHitTolerance(event.originalEvent);
-				const dx = event.pixel[0] - lastPixel[0];
-				const dy = event.pixel[1] - lastPixel[1];
-				if (dx * dx + dy * dy <= tol * tol) {
-					ctx.commit(buildSnapshot);
-					return;
-				}
+		if (lastSpineIdx >= 0 && canCommitNow()) for (const finishIndex of finishIndices) {
+			const finishPixel = adapter.getPixelFromCoordinate(committed[finishIndex]);
+			if (!finishPixel) continue;
+			const tol = mapEventHitTolerance(event.originalEvent);
+			const dx = event.pixel[0] - finishPixel[0];
+			const dy = event.pixel[1] - finishPixel[1];
+			if (dx * dx + dy * dy <= tol * tol) {
+				ctx.commit(buildSnapshot);
+				return;
 			}
 		}
 		if (typeof max === "number" && committed.length >= max) return;
@@ -1351,7 +1352,7 @@ function segmentMidpoint(a, b) {
 * are emitted for it here. Returns `[]` for an empty control-point list.
 */
 function buildHandleSet(controlPoints, modes, options = {}) {
-	const { includeMidpoints = true, trailingFixedSlots = 0 } = options;
+	const { includeMidpoints = true, trailingFixedSlots = 0, closedRing = false } = options;
 	const handles = [];
 	const wantsReshape = modes.includes("reshape");
 	if (wantsReshape || modes.includes("delete")) {
@@ -1361,12 +1362,15 @@ function buildHandleSet(controlPoints, modes, options = {}) {
 			position: [...controlPoints[i]]
 		});
 		if (wantsReshape && includeMidpoints) {
-			const midpointLimit = controlPoints.length - 1 - trailingFixedSlots;
-			for (let i = 0; i < midpointLimit; i++) handles.push({
-				kind: "midpoint",
-				index: i,
-				position: segmentMidpoint(controlPoints[i], controlPoints[i + 1])
-			});
+			const edgeCount = closedRing && trailingFixedSlots === 0 && controlPoints.length >= 3 ? controlPoints.length : controlPoints.length - 1 - trailingFixedSlots;
+			for (let i = 0; i < edgeCount; i++) {
+				const end = (i + 1) % controlPoints.length;
+				handles.push({
+					kind: "midpoint",
+					index: i,
+					position: segmentMidpoint(controlPoints[i], controlPoints[end])
+				});
+			}
 		}
 	}
 	if (modes.includes("translate")) {
@@ -1552,7 +1556,8 @@ function beginHandleDrag(args) {
 	if (hit.kind === "vertex") return begun("vertex", preDragPoints, dragOnePoint(preDragPoints, hit.index));
 	if (hit.kind === "midpoint") {
 		const insertIndex = hit.index + 1;
-		const mid = segmentMidpoint(preDragPoints[hit.index], preDragPoints[hit.index + 1]);
+		const segmentEndIndex = (hit.index + 1) % preDragPoints.length;
+		const mid = segmentMidpoint(preDragPoints[hit.index], preDragPoints[segmentEndIndex]);
 		const insertedBase = [
 			...preDragPoints.slice(0, insertIndex),
 			mid,
@@ -1662,6 +1667,7 @@ function runEdit(opts) {
 	const rule = metadata.rule;
 	const midpointHandlesEnabled = rule?.canonicalPointCount === void 0;
 	const trailingFixedSlots = rule?.trailingFixedSlots ?? 0;
+	const closedRing = rule?.closedRing ?? false;
 	const guideEnabled = (guideOpt ?? true) && !shouldSuppressGuide(metadata);
 	const isAreaKind = metadata.geometry === "area";
 	const requestedModes = normaliseModes(initialModes);
@@ -1732,7 +1738,8 @@ function runEdit(opts) {
 		if (ctx.settled) return;
 		let handles = buildHandleSet(workingPoints, modes, {
 			includeMidpoints: midpointHandlesEnabled,
-			trailingFixedSlots
+			trailingFixedSlots,
+			closedRing
 		});
 		if (activeDrag?.fsm.kind === "rotate" && rotateHandleOverride) {
 			const override = rotateHandleOverride;
@@ -2083,7 +2090,8 @@ function runEdit(opts) {
 		const tol = info?.hitTolerance ?? HANDLE_HIT_TOLERANCE_PX;
 		const hit = pickHandle(buildHandleSet(workingPoints, modes, {
 			includeMidpoints: midpointHandlesEnabled,
-			trailingFixedSlots
+			trailingFixedSlots,
+			closedRing
 		}), pixel, tol, (lonLat) => driver.toPixel(lonLat));
 		if (!hit) return;
 		if (modes.includes("delete")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.2.0-alpha.2",
+  "version": "0.2.0-alpha.4",
   "description": "Engine-agnostic draw/edit core for tactical control measures (MIL-STD-2525 / APP-6). The MapAdapter ABI and bring-your-own-engine entry point for the tactical-draw package family.",
   "license": "MIT",
   "author": "Orbat Mapper",
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@orbat-mapper/control-measures": "^0.2.0-alpha.3"
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.5"
   },
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.3",