@orbat-mapper/tactical-draw 0.2.0-alpha.16 → 0.2.0-alpha.17

package/dist/index.mjs

@@ -2024,6 +2024,31 @@ function boxOutlineFeature(box, fromPixel, featureId, style) {
 	};
 }
 //#endregion
+//#region src/tactical-draw/transform-amplifier-placements.ts
+/**
+* Carry user-adjusted label anchors through a transform-box gesture. Anchors
+* are transformed in pixel space alongside the control points so the result
+* remains visually rigid across map projections.
+*/
+function transformAmplifierPlacements(placements, from, to, projection) {
+	if (!placements) return void 0;
+	const scaleX = to.halfWidth / from.halfWidth;
+	const scaleY = to.halfHeight / from.halfHeight;
+	const transformed = {};
+	for (const [field, position] of Object.entries(placements)) {
+		if (position === void 0) continue;
+		const pixel = projection.toPixel(position);
+		if (!pixel) {
+			transformed[field] = [...position];
+			continue;
+		}
+		const [localX, localY] = rotate(pixel[0] - from.center[0], pixel[1] - from.center[1], -from.angle);
+		const [outX, outY] = rotate(localX * scaleX, localY * scaleY, to.angle);
+		transformed[field] = projection.fromPixel([to.center[0] + outX, to.center[1] + outY]);
+	}
+	return transformed;
+}
+//#endregion
 //#region src/tactical-draw/edit-controller.ts
 /**
 * Coordinate-space tolerance for `EditSession.dirty`. The working copy is
@@ -2704,24 +2729,6 @@ function runEdit(opts) {
 	* `boxAngle`.
 	*/
 	let activeBoxDrag = null;
-	function transformAmplifierPlacements(placements, from, to) {
-		if (!placements) return void 0;
-		const scaleX = to.halfWidth / from.halfWidth;
-		const scaleY = to.halfHeight / from.halfHeight;
-		const transformed = {};
-		for (const [field, position] of Object.entries(placements)) {
-			if (position === void 0) continue;
-			const pixel = driver.toPixel(position);
-			if (!pixel) {
-				transformed[field] = [...position];
-				continue;
-			}
-			const [localX, localY] = rotate(pixel[0] - from.center[0], pixel[1] - from.center[1], -from.angle);
-			const [outX, outY] = rotate(localX * scaleX, localY * scaleY, to.angle);
-			transformed[field] = driver.fromPixel([to.center[0] + outX, to.center[1] + outY]);
-		}
-		return transformed;
-	}
 	/**
 	* Whether the vertex at `index` may be deleted (via Alt+click or in the
 	* exclusive `delete` mode). Deletion is
@@ -2859,7 +2866,7 @@ function runEdit(opts) {
 		const snapshot = activeBoxDrag.fsm.move(pixel);
 		activeBoxDrag.lastSnapshot = snapshot;
 		workingPoints.splice(0, workingPoints.length, ...snapshot.points);
-		workingAmplifierPlacements = transformAmplifierPlacements(activeBoxDrag.preDragAmplifierPlacements, activeBoxDrag.preDragBox, snapshot.box);
+		workingAmplifierPlacements = transformAmplifierPlacements(activeBoxDrag.preDragAmplifierPlacements, activeBoxDrag.preDragBox, snapshot.box, driver);
 		renderPreview();
 		renderHandlesLayer();
 		recomputeDirty();
@@ -2938,7 +2945,7 @@ function runEdit(opts) {
 			replaceWorkingPoints(preDragPoints);
 			workingAmplifierPlacements = preDragAmplifierPlacements;
 			if (fsm.kind === "rotate") boxAngle += finalSnapshot.box.angle - preDragBox.angle;
-			commitGesture(finalSnapshot.points, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box));
+			commitGesture(finalSnapshot.points, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box, driver));
 			return;
 		}
 	};
@@ -3126,6 +3133,7 @@ function runGroupTransform(opts) {
 			measure,
 			editStartPoints,
 			workingPoints: editStartPoints.map((p) => [...p]),
+			workingAmplifierPlacements: measure.amplifierPlacements ? structuredClone(measure.amplifierPlacements) : void 0,
 			optionsOverride: null,
 			box: null,
 			lastPreviewFeatures: []
@@ -3157,7 +3165,8 @@ function runGroupTransform(opts) {
 		const working = {
 			...member.measure,
 			options: mergeOptions(member.measure.options, override),
-			controlPoints: member.workingPoints.map((p) => [...p])
+			controlPoints: member.workingPoints.map((p) => [...p]),
+			...member.workingAmplifierPlacements ? { amplifierPlacements: member.workingAmplifierPlacements } : {}
 		};
 		const committed = sizeAnchor === "screen" ? working : bakePixelSizeToGround(working, adapter);
 		return {
@@ -3171,7 +3180,8 @@ function runGroupTransform(opts) {
 		return {
 			...member.measure,
 			options: effectiveOptions(i),
-			controlPoints: member.workingPoints.map((p) => [...p])
+			controlPoints: member.workingPoints.map((p) => [...p]),
+			...member.workingAmplifierPlacements ? { amplifierPlacements: member.workingAmplifierPlacements } : {}
 		};
 	}
 	let dirty = false;
@@ -3338,6 +3348,21 @@ function runGroupTransform(opts) {
 			member.workingPoints.splice(0, member.workingPoints.length, ...snapshot[i]);
 		});
 	}
+	function cloneAmplifierPlacementsByMember() {
+		return members.map((member) => member.workingAmplifierPlacements ? structuredClone(member.workingAmplifierPlacements) : void 0);
+	}
+	/**
+	* Adopts `placements[i]` by reference — callers hand over ownership (the
+	* sources are freshly built transforms or snapshot arrays that are dead
+	* after the restore), and working placements are only ever replaced
+	* wholesale, never mutated in place. This runs on every pointermove of a
+	* box drag, so it must not deep-clone.
+	*/
+	function applyAmplifierPlacementsByMember(placements) {
+		members.forEach((member, i) => {
+			member.workingAmplifierPlacements = placements[i];
+		});
+	}
 	function cloneOptionsOverrideByMember() {
 		return members.map((m) => m.optionsOverride ? { ...m.optionsOverride } : null);
 	}
@@ -3369,7 +3394,7 @@ function runGroupTransform(opts) {
 	* instance to all listeners in order, deferred `reject`/`close`/`abort`
 	* (close/abort override reject), exception collection with `AggregateError`.
 	*/
-	function emitChange(previousRendered, previousPointsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered) {
+	function emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered) {
 		if (ctx.settled) return;
 		let rejectRequested = false;
 		let closeRequested = false;
@@ -3399,6 +3424,7 @@ function runGroupTransform(opts) {
 		else if (closeRequested) commitClose();
 		else if (rejectRequested && !ctx.settled && members === membersAtEmission) {
 			restorePointsByMember(previousPointsByMember);
+			applyAmplifierPlacementsByMember(previousAmplifierPlacementsByMember);
 			sizeAnchor = previousSizeAnchor;
 			nonGeometryDirty = previousNonGeometryDirty;
 			applyOptionsOverrides(previousOptionsOverrideByMember);
@@ -3431,17 +3457,20 @@ function runGroupTransform(opts) {
 		}
 		return snapshots;
 	}
-	function commitGesture(nextConcatPoints, preGestureOptionsOverrideByMember) {
+	function commitGesture(nextConcatPoints, preGestureOptionsOverrideByMember, nextAmplifierPlacementsByMember) {
 		if (ctx.settled) return;
 		const previousPointsByMember = clonePointsByMember();
+		const previousAmplifierPlacementsByMember = cloneAmplifierPlacementsByMember();
 		const previousOptionsOverrideByMember = preGestureOptionsOverrideByMember ?? cloneOptionsOverrideByMember();
 		const previousRendered = rebuildRenderedAllWith(previousOptionsOverrideByMember);
 		applyConcatenatedPoints(nextConcatPoints);
+		if (nextAmplifierPlacementsByMember) applyAmplifierPlacementsByMember(nextAmplifierPlacementsByMember);
 		let currentRendered;
 		try {
 			currentRendered = rebuildRenderedAll();
 		} catch (err) {
 			restorePointsByMember(previousPointsByMember);
+			applyAmplifierPlacementsByMember(previousAmplifierPlacementsByMember);
 			dragInFlight = false;
 			throw err;
 		}
@@ -3449,7 +3478,7 @@ function runGroupTransform(opts) {
 		renderHandlesLayer();
 		recomputeDirty();
 		dragInFlight = false;
-		emitChange(previousRendered, previousPointsByMember, sizeAnchor, nonGeometryDirty, previousOptionsOverrideByMember, currentRendered);
+		emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, sizeAnchor, nonGeometryDirty, previousOptionsOverrideByMember, currentRendered);
 	}
 	function setSizeAnchor(next) {
 		if (ctx.settled || sizeAnchor === next) return;
@@ -3457,12 +3486,13 @@ function runGroupTransform(opts) {
 		const previousSizeAnchor = sizeAnchor;
 		const previousNonGeometryDirty = nonGeometryDirty;
 		const previousOptionsOverrideByMember = cloneOptionsOverrideByMember();
+		const previousAmplifierPlacementsByMember = cloneAmplifierPlacementsByMember();
 		const previousRendered = rebuildRenderedAll();
 		sizeAnchor = next;
 		const currentRendered = rebuildRenderedAll();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPointsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered);
+		emitChange(previousRendered, previousPointsByMember, previousAmplifierPlacementsByMember, previousSizeAnchor, previousNonGeometryDirty, previousOptionsOverrideByMember, currentRendered);
 	}
 	/**
 	* Cancel an in-flight box drag without committing it: restore the pre-drag
@@ -3474,10 +3504,11 @@ function runGroupTransform(opts) {
 	*/
 	function cancelActiveBoxDrag() {
 		if (!activeBoxDrag) return;
-		const { preDragPoints, preDragOptionsOverrideByMember } = activeBoxDrag;
+		const { preDragPoints, preDragAmplifierPlacementsByMember, preDragOptionsOverrideByMember } = activeBoxDrag;
 		activeBoxDrag = null;
 		driver.setDragPanEnabled(true);
 		applyConcatenatedPoints(preDragPoints);
+		applyAmplifierPlacementsByMember(preDragAmplifierPlacementsByMember);
 		applyOptionsOverrides(preDragOptionsOverrideByMember);
 		dragInFlight = false;
 	}
@@ -3567,6 +3598,7 @@ function runGroupTransform(opts) {
 			renderHandlesLayer();
 		}
 		const preDragPoints = concatWorkingPoints();
+		const preDragAmplifierPlacementsByMember = cloneAmplifierPlacementsByMember();
 		activeBoxDrag = {
 			fsm: beginBoxDrag({
 				kind: boxHit.kind,
@@ -3583,7 +3615,8 @@ function runGroupTransform(opts) {
 				points: preDragPoints,
 				box: groupBox
 			},
-			preDragOptionsOverrideByMember
+			preDragOptionsOverrideByMember,
+			preDragAmplifierPlacementsByMember
 		};
 		dragInFlight = true;
 		driver.setDragPanEnabled(false);
@@ -3593,6 +3626,7 @@ function runGroupTransform(opts) {
 		const snapshot = activeBoxDrag.fsm.move(pixel);
 		activeBoxDrag.lastSnapshot = snapshot;
 		applyConcatenatedPoints(snapshot.points);
+		applyAmplifierPlacementsByMember(activeBoxDrag.preDragAmplifierPlacementsByMember.map((placements) => transformAmplifierPlacements(placements, activeBoxDrag.preDragBox, snapshot.box, driver)));
 		renderAllPreviews();
 		renderHandlesLayer();
 		recomputeDirty();
@@ -3609,12 +3643,13 @@ function runGroupTransform(opts) {
 			driver.setDragPanEnabled(true);
 			return;
 		}
-		const { fsm, preDragPoints, preDragBox, downPixel, preDragOptionsOverrideByMember } = activeBoxDrag;
+		const { fsm, preDragPoints, preDragBox, downPixel, preDragOptionsOverrideByMember, preDragAmplifierPlacementsByMember } = activeBoxDrag;
 		activeBoxDrag = null;
 		driver.setDragPanEnabled(true);
 		const distance = Math.hypot(pixel[0] - downPixel[0], pixel[1] - downPixel[1]);
 		if (fsm.kind === "body" && distance <= CLICK_SLOP_PX) {
 			applyConcatenatedPoints(preDragPoints);
+			applyAmplifierPlacementsByMember(preDragAmplifierPlacementsByMember);
 			renderAllPreviews();
 			renderHandlesLayer();
 			recomputeDirty();
@@ -3624,8 +3659,9 @@ function runGroupTransform(opts) {
 		}
 		const finalSnapshot = fsm.move(pixel);
 		applyConcatenatedPoints(preDragPoints);
+		applyAmplifierPlacementsByMember(preDragAmplifierPlacementsByMember);
 		if (fsm.kind === "rotate") boxAngle += finalSnapshot.box.angle - preDragBox.angle;
-		commitGesture(finalSnapshot.points, preDragOptionsOverrideByMember);
+		commitGesture(finalSnapshot.points, preDragOptionsOverrideByMember, preDragAmplifierPlacementsByMember.map((placements) => transformAmplifierPlacements(placements, preDragBox, finalSnapshot.box, driver)));
 	};
 	let pickPreview;
 	let pickHandles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.2.0-alpha.16",
+  "version": "0.2.0-alpha.17",
   "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.12"
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.13"
   },
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.3",