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

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ControlMeasure, ControlMeasureKind, ControlMeasureSnapshot, ControlMeasureStyle, TextAmplifiers } from "@orbat-mapper/control-measures";
+import { AmplifierPlacements, ControlMeasure, ControlMeasureKind, ControlMeasureSnapshot, ControlMeasureStyle, TextAmplifiers } from "@orbat-mapper/control-measures";
 import { Feature, Position } from "geojson";
 
 //#region src/gestures/types.d.ts
@@ -461,6 +461,7 @@ interface CombinedAbort {
 declare function combineWithHostSignal(hostSignal?: AbortSignal): CombinedAbort;
 //#endregion
 //#region src/tactical-draw/measure-options.d.ts
+declare const DEFAULT_LABEL_SIZE_PIXELS = 14;
 /**
  * Where a control measure's size is anchored (ADR-0020). `ground` (the
  * default) means a meter size fixed to the terrain — static, never re-rendered
@@ -502,6 +503,8 @@ interface InteractionStyle {
   guide?: GuideStyle;
   vertexHandle?: HandleStyle;
   midpointHandle?: HandleStyle;
+  /** Visible grab target for a draggable rendered text label. */
+  labelHandle?: HandleStyle;
   scaleHandle?: HandleStyle;
   rotateHandle?: HandleStyle;
   boxOutline?: GuideStyle;
@@ -519,12 +522,13 @@ interface InteractionStyle {
  * `reshape` renders vertex/midpoint handles; `transform` renders the oriented
  * selection box (4 corner scale handles + a rotate grip + drag-anywhere
  * body translate) via `transform-box.ts`. The two can be combined freely —
- * single-measure edits show both by default. `delete` is an explicit
+ * single-measure edits show both by default. `labeldrag` enables dragging
+ * rendered text labels. `delete` is an explicit
  * destructive mode: it renders the vertex handles (so they can be tapped to
  * remove) but no midpoints or box, and the edit controller deletes the tapped
  * vertex instead of dragging it.
  */
-type EditMode = "reshape" | "transform" | "delete";
+type EditMode = "reshape" | "transform" | "labeldrag" | "delete";
 //#endregion
 //#region src/tactical-draw/session-events.d.ts
 /**
@@ -570,6 +574,8 @@ interface EditSession {
    * doctrinal field codes happens in the core render seam, not here.
    */
   readonly textAmplifiers: TextAmplifiers | undefined;
+  /** Live user-adjusted anchors for individually rendered text amplifiers. */
+  readonly amplifierPlacements: AmplifierPlacements | undefined;
   /** `true` after the first working-copy mutation; back to `false` within tolerance. */
   readonly dirty: boolean;
   readonly modes: readonly EditMode[];
@@ -614,6 +620,8 @@ interface EditSession {
    * silent no-op after the session has settled (like [[setOptions]]).
    */
   setTextAmplifiers(partial: Record<string, string | undefined>): void;
+  /** Merge field-keyed label anchors; `undefined` resets a field to its doctrinal position. */
+  setAmplifierPlacements(partial: Record<string, Position | undefined>): void;
   /**
    * Subscribe to working-copy changes. The listener receives an
    * [[EditChangeEvent]] for each completed gesture (drag end, insert/delete
@@ -1009,7 +1017,8 @@ interface EditOptions {
    * renders vertex / midpoint handles; `transform` renders the oriented
    * selection box — 4 corner scale handles, a rotate grip above the top edge,
    * and drag-anywhere-inside-the-box translate (ADR-0017). The two can be
-   * combined freely (the default does). `"delete"` is exclusive: it collapses
+   * combined freely (the default does). `"labeldrag"` opt-in enables repositioning
+   * rendered text labels. `"delete"` is exclusive: it collapses
    * the set to vertex-tap removal only. An unknown mode throws `TypeError`.
    */
   modes?: readonly EditMode[];
@@ -1516,4 +1525,4 @@ declare function nearestWorldCopyLng(lng: number, refLng: number): number;
 /** `nearestWorldCopyLng` applied to a lon/lat position. */
 declare function nearestWorldCopyPosition(position: Position, refLng: number): Position;
 //#endregion
-export { BaseMapAdapter, type CombinedAbort, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, type DrawMeasureDraft, type DrawOptions, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type GuideStyle, type HandleStyle, type InteractionStyle, type LayerId, type MapAdapter, type MapCursor, type MapEvent, type MapEventHandler, type NativeEventEntry, type PickEvent, type PickHandler, type PickOptions, type PixelCoordinate, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SettleReason, type SizeAnchor, type StyleOptions, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, type TacticalDrawAbortReason, TacticalDrawDestroyedError, type TacticalDrawLayerOptions, type TacticalDrawOptions, type TextStyleOptions, type ToPixel, type TransformBox, type TransformChangeEvent, type TransformSession, bindAbortable, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, ignoreAbort, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };
+export { BaseMapAdapter, type CombinedAbort, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, type DrawMeasureDraft, type DrawOptions, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type GuideStyle, type HandleStyle, type InteractionStyle, type LayerId, type MapAdapter, type MapCursor, type MapEvent, type MapEventHandler, type NativeEventEntry, type PickEvent, type PickHandler, type PickOptions, type PixelCoordinate, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SettleReason, type SizeAnchor, type StyleOptions, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, type TacticalDrawAbortReason, TacticalDrawDestroyedError, type TacticalDrawLayerOptions, type TacticalDrawOptions, type TextStyleOptions, type ToPixel, type TransformBox, type TransformChangeEvent, type TransformSession, bindAbortable, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, ignoreAbort, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };

package/dist/index.mjs

@@ -521,6 +521,9 @@ function combineWithHostSignal(hostSignal) {
 		dispose
 	};
 }
+//#endregion
+//#region src/tactical-draw/measure-options.ts
+const DEFAULT_LABEL_SIZE_PIXELS = 14;
 /**
 * Per-kind pixel-denominated *geometry* size option and the meter option it
 * bakes into — the single source of which geometry option makes a measure
@@ -2031,18 +2034,23 @@ function boxOutlineFeature(box, fromPixel, featureId, style) {
 */
 const DIRTY_EPSILON$1 = 1e-9;
 const HANDLE_HIT_TOLERANCE_PX$1 = 12;
+/** Screen-space clearance between a label's anchor and its visible drag grip. */
+const LABEL_HANDLE_OFFSET_PX = 14;
 /**
 * A body drag (drag-anywhere-inside-the-box translate) whose release pixel
 * lands within this many pixels of the down pixel is treated as a plain
 * click, not a gesture: it is not committed (geometry restored, no
-* `EditChangeEvent`, `dirty` untouched) but the click-away listener is
-* suppressed so the click doesn't close the edit. Corner/rotate drags commit
-* even at zero movement (matches the pre-ADR-0017 translate/rotate seams).
+* `EditChangeEvent`, `dirty` untouched). The click-away's *empty-map* close is
+* suppressed so the click doesn't end the edit, but a pick on another
+* graphics-layer measure inside the box still closes-then-selects it.
+* Corner/rotate drags commit even at zero movement (matches the pre-ADR-0017
+* translate/rotate seams).
 */
 const CLICK_SLOP_PX$1 = 3;
 const ALLOWED_EDIT_MODES = new Set([
 	"reshape",
 	"transform",
+	"labeldrag",
 	"delete"
 ]);
 /**
@@ -2072,6 +2080,10 @@ function runEdit(opts) {
 	const workingPoints = editStartPoints.map((p) => [...p]);
 	let workingOptions = { ...measure.options ?? {} };
 	let workingTextAmplifiers = measure.textAmplifiers && Object.keys(measure.textAmplifiers).length > 0 ? { ...measure.textAmplifiers } : void 0;
+	let workingAmplifierPlacements = measure.amplifierPlacements && Object.keys(measure.amplifierPlacements).length > 0 ? structuredClone(measure.amplifierPlacements) : void 0;
+	function snapshotAmplifierPlacements() {
+		return workingAmplifierPlacements ? structuredClone(workingAmplifierPlacements) : void 0;
+	}
 	let modes = requestedModes;
 	let dirty = false;
 	let nonGeometryDirty = false;
@@ -2083,6 +2095,15 @@ function runEdit(opts) {
 	*/
 	let suppressClickAway = false;
 	/**
+	* Set when a zero-movement body drag (a plain click inside the transform
+	* box) released this pointer cycle. Unlike {@link suppressClickAway} it only
+	* suppresses the *empty-map* close in `handleClick` — a stashed pick on
+	* another graphics-layer measure still closes-then-re-dispatches, so
+	* measures sitting inside a large box stay selectable. Consumed by the next
+	* `handleClick`.
+	*/
+	let bodyClickPending = false;
+	/**
 	* Mutable style snapshot. Initialised from the edit-start input; replaced
 	* when the façade routes an external style change to us via
 	* `notifyExternalMeasure`. `EditSession.measure` stays the immutable
@@ -2162,6 +2183,8 @@ function runEdit(opts) {
 		};
 		if (workingTextAmplifiers) working.textAmplifiers = workingTextAmplifiers;
 		else delete working.textAmplifiers;
+		if (workingAmplifierPlacements) working.amplifierPlacements = workingAmplifierPlacements;
+		else delete working.amplifierPlacements;
 		let features;
 		try {
 			features = renderMeasureForAdapter(adapter, working, renderOpts).features;
@@ -2191,6 +2214,31 @@ function runEdit(opts) {
 			trailingFixedSlots,
 			closedRing
 		}), handleIdPrefix, interactionStyle);
+		if (modes.includes("labeldrag")) {
+			const style = interactionStyle?.labelHandle;
+			let index = 0;
+			for (const feature of lastPreviewFeatures) {
+				const key = feature.properties?.labelPlacementKey;
+				if (typeof key !== "string" || feature.geometry?.type !== "Point") continue;
+				const pixel = driver.toPixel(feature.geometry.coordinates);
+				if (!pixel) continue;
+				features.push({
+					type: "Feature",
+					id: `${handleIdPrefix}:label-handle:${index}`,
+					geometry: {
+						type: "Point",
+						coordinates: driver.fromPixel([pixel[0], pixel[1] - LABEL_HANDLE_OFFSET_PX])
+					},
+					properties: {
+						handle: "label",
+						index,
+						labelPlacementKey: key,
+						...style ? { style: { ...style } } : {}
+					}
+				});
+				index += 1;
+			}
+		}
 		if (modes.includes("transform")) {
 			const liveBox = activeBoxDrag ? activeBoxDrag.lastSnapshot.box : box;
 			if (liveBox) {
@@ -2215,6 +2263,8 @@ function runEdit(opts) {
 		};
 		if (workingTextAmplifiers) working.textAmplifiers = workingTextAmplifiers;
 		else delete working.textAmplifiers;
+		if (workingAmplifierPlacements) working.amplifierPlacements = workingAmplifierPlacements;
+		else delete working.amplifierPlacements;
 		const committed = sizeAnchor === "screen" ? working : bakePixelSizeToGround(working, adapter);
 		return {
 			measure: cloneControlMeasure(committed),
@@ -2266,7 +2316,7 @@ function runEdit(opts) {
 	*  - Reject restores the working state to the pre-gesture snapshot and
 	*    recomputes `dirty`. Close/abort settle the session as normal.
 	*/
-	function emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers) {
+	function emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements) {
 		if (ctx.settled) return;
 		let rejectRequested = false;
 		let closeRequested = false;
@@ -2299,6 +2349,7 @@ function runEdit(opts) {
 			currentStyle = previousStyle;
 			sizeAnchor = previousSizeAnchor;
 			workingTextAmplifiers = previousTextAmplifiers;
+			workingAmplifierPlacements = previousAmplifierPlacements;
 			nonGeometryDirty = previousNonGeometryDirty;
 			renderPreview();
 			renderHandlesLayer();
@@ -2317,20 +2368,23 @@ function runEdit(opts) {
 	* queued during the drag are applied after the listener emission (so the
 	* post-gesture render reflects the requested mode set).
 	*/
-	function commitGesture(nextPoints, preGestureOptions) {
+	function commitGesture(nextPoints, preGestureOptions, nextAmplifierPlacements) {
 		if (ctx.settled) return;
 		const previousPoints = workingPoints.map((p) => [...p]);
 		const previousOptions = { ...preGestureOptions ?? workingOptions ?? {} };
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
 		const previousTextAmplifiers = workingTextAmplifiers;
+		const previousAmplifierPlacements = snapshotAmplifierPlacements();
 		const previousRendered = rebuildRenderedWith(previousOptions);
 		replaceWorkingPoints(nextPoints);
+		if (nextAmplifierPlacements !== void 0) workingAmplifierPlacements = structuredClone(nextAmplifierPlacements);
 		let currentRendered;
 		try {
 			currentRendered = rebuildRendered();
 		} catch (err) {
 			replaceWorkingPoints(previousPoints);
+			workingAmplifierPlacements = previousAmplifierPlacements;
 			if (preGestureOptions !== void 0) replaceWorkingOptions(previousOptions);
 			dragInFlight = false;
 			drainPendingModes();
@@ -2341,7 +2395,7 @@ function runEdit(opts) {
 		recomputeDirty();
 		dragInFlight = false;
 		drainPendingModes();
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
 	}
 	function setOptions(partial) {
 		if (ctx.settled) return;
@@ -2350,6 +2404,7 @@ function runEdit(opts) {
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
 		const previousTextAmplifiers = workingTextAmplifiers;
+		const previousAmplifierPlacements = snapshotAmplifierPlacements();
 		const previousRendered = rebuildRendered();
 		replaceWorkingOptions({
 			...workingOptions ?? {},
@@ -2365,7 +2420,7 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
 	}
 	function setStyle(partial) {
 		if (ctx.settled) return;
@@ -2374,6 +2429,7 @@ function runEdit(opts) {
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
 		const previousTextAmplifiers = workingTextAmplifiers;
+		const previousAmplifierPlacements = snapshotAmplifierPlacements();
 		const previousRendered = rebuildRendered();
 		currentStyle = {
 			...currentStyle ?? {},
@@ -2389,7 +2445,7 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
 	}
 	/**
 	* Shallow-merge into the live working text amplifiers. Mirrors
@@ -2413,6 +2469,7 @@ function runEdit(opts) {
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
 		const previousTextAmplifiers = workingTextAmplifiers;
+		const previousAmplifierPlacements = snapshotAmplifierPlacements();
 		const previousRendered = rebuildRendered();
 		const merged = { ...workingTextAmplifiers ?? {} };
 		for (const [key, value] of Object.entries(partial)) {
@@ -2433,7 +2490,26 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
+	}
+	function setAmplifierPlacements(partial) {
+		if (ctx.settled) return;
+		const previousPoints = workingPoints.map((p) => [...p]);
+		const previousOptions = { ...workingOptions ?? {} };
+		const previousStyle = currentStyle;
+		const previousNonGeometryDirty = nonGeometryDirty;
+		const previousTextAmplifiers = workingTextAmplifiers;
+		const previousAmplifierPlacements = snapshotAmplifierPlacements();
+		const previousRendered = rebuildRendered();
+		const next = { ...workingAmplifierPlacements ?? {} };
+		for (const [field, position] of Object.entries(partial)) if (position === void 0) delete next[field];
+		else next[field] = [...position];
+		workingAmplifierPlacements = Object.keys(next).length > 0 ? next : void 0;
+		const currentRendered = rebuildRendered();
+		renderPreview();
+		nonGeometryDirty = true;
+		dirty = true;
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
 	}
 	/**
 	* Flip the size anchor for the measure under edit (ADR-0020). Re-renders the
@@ -2450,12 +2526,13 @@ function runEdit(opts) {
 		const previousNonGeometryDirty = nonGeometryDirty;
 		const previousSizeAnchor = sizeAnchor;
 		const previousTextAmplifiers = workingTextAmplifiers;
+		const previousAmplifierPlacements = snapshotAmplifierPlacements();
 		const previousRendered = rebuildRendered();
 		sizeAnchor = next;
 		const currentRendered = rebuildRendered();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements);
 	}
 	/** Apply a translate gesture by shifting every working point by `delta`. */
 	function commitTranslate(delta) {
@@ -2516,6 +2593,9 @@ function runEdit(opts) {
 		get textAmplifiers() {
 			return workingTextAmplifiers ? { ...workingTextAmplifiers } : void 0;
 		},
+		get amplifierPlacements() {
+			return snapshotAmplifierPlacements();
+		},
 		get dirty() {
 			return dirty;
 		},
@@ -2550,6 +2630,9 @@ function runEdit(opts) {
 		setTextAmplifiers(partial) {
 			setTextAmplifiers(partial);
 		},
+		setAmplifierPlacements(partial) {
+			setAmplifierPlacements(partial);
+		},
 		setSizeAnchor(next) {
 			setSizeAnchor(next);
 		},
@@ -2587,6 +2670,31 @@ function runEdit(opts) {
 		}
 	};
 	let activeDrag = null;
+	let activeAmplifierDrag = null;
+	function pickLabel(pixel, tolerance) {
+		for (const feature of lastPreviewFeatures) {
+			const key = feature.properties?.labelPlacementKey;
+			if (typeof key !== "string" || feature.geometry?.type !== "Point") continue;
+			const projected = driver.toPixel(feature.geometry.coordinates);
+			if (!projected) continue;
+			for (const handle of [false, true]) {
+				const targetY = projected[1] - (handle ? LABEL_HANDLE_OFFSET_PX : 0);
+				if (Math.hypot(projected[0] - pixel[0], targetY - pixel[1]) <= tolerance) return {
+					key,
+					handle
+				};
+			}
+		}
+		return null;
+	}
+	/**
+	* The label anchor a pointer pixel maps to: 1:1 for a grab on the label
+	* itself, offset back down by the grip clearance when the drag rides the
+	* visible handle, so the label lands where the anchor (not the grip) points.
+	*/
+	function labelAnchorFromPointer(pixel, handle) {
+		return driver.fromPixel([pixel[0], pixel[1] + (handle ? LABEL_HANDLE_OFFSET_PX : 0)]);
+	}
 	/**
 	* A live transform-box gesture (corner scale, box rotate, or body
 	* translate — ADR-0017). `lastSnapshot` starts as the pre-drag points/box
@@ -2596,6 +2704,24 @@ 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
@@ -2635,6 +2761,18 @@ function runEdit(opts) {
 	const onDriverDown = (pixel, info) => {
 		if (ctx.settled || dragInFlight) return;
 		const tol = info?.hitTolerance ?? HANDLE_HIT_TOLERANCE_PX$1;
+		const labelHit = modes.includes("labeldrag") ? pickLabel(pixel, tol) : null;
+		if (labelHit) {
+			activeAmplifierDrag = {
+				field: labelHit.key,
+				handle: labelHit.handle,
+				previous: snapshotAmplifierPlacements(),
+				downPixel: pixel
+			};
+			dragInFlight = true;
+			driver.setDragPanEnabled(false);
+			return;
+		}
 		const hit = pickHandle(buildHandleSet(workingPoints, modes, {
 			includeMidpoints: midpointHandlesEnabled,
 			trailingFixedSlots,
@@ -2694,6 +2832,7 @@ function runEdit(opts) {
 						cornerIndex: boxHit.kind === "scale" ? boxHit.index : void 0
 					}),
 					preDragPoints,
+					preDragAmplifierPlacements: snapshotAmplifierPlacements(),
 					preDragBox: box,
 					downPixel: pixel,
 					lastSnapshot: {
@@ -2720,13 +2859,23 @@ 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);
 		renderPreview();
 		renderHandlesLayer();
 		recomputeDirty();
 	}
 	const onDriverMove = (pixel) => {
 		if (ctx.settled) return;
-		if (activeDrag) paintDragSnapshot(pixel);
+		if (activeAmplifierDrag) {
+			const position = labelAnchorFromPointer(pixel, activeAmplifierDrag.handle);
+			if (!position) return;
+			workingAmplifierPlacements = {
+				...workingAmplifierPlacements ?? {},
+				[activeAmplifierDrag.field]: position
+			};
+			renderPreview();
+			renderHandlesLayer();
+		} else if (activeDrag) paintDragSnapshot(pixel);
 		else if (activeBoxDrag) paintBoxDragSnapshot(pixel);
 	};
 	/** Reset drag-in-flight bookkeeping shared by every "gesture ended" path. */
@@ -2736,6 +2885,19 @@ function runEdit(opts) {
 		drainPendingModes();
 	}
 	const onDriverUp = (pixel) => {
+		if (activeAmplifierDrag) {
+			const { field, handle, previous, downPixel } = activeAmplifierDrag;
+			activeAmplifierDrag = null;
+			const position = labelAnchorFromPointer(pixel, handle);
+			workingAmplifierPlacements = previous;
+			endDragBookkeeping();
+			if (position && Math.hypot(pixel[0] - downPixel[0], pixel[1] - downPixel[1]) > CLICK_SLOP_PX$1) setAmplifierPlacements({ [field]: position });
+			else {
+				renderPreview();
+				renderHandlesLayer();
+			}
+			return;
+		}
 		if (activeDrag) {
 			if (ctx.settled) {
 				activeDrag = null;
@@ -2758,23 +2920,25 @@ function runEdit(opts) {
 				driver.setDragPanEnabled(true);
 				return;
 			}
-			const { fsm, preDragPoints, preDragBox, downPixel, preDragOptions } = activeBoxDrag;
+			const { fsm, preDragPoints, preDragAmplifierPlacements, preDragBox, downPixel, preDragOptions } = 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$1) {
 				replaceWorkingPoints(preDragPoints);
+				workingAmplifierPlacements = preDragAmplifierPlacements;
 				renderPreview();
 				renderHandlesLayer();
 				recomputeDirty();
 				endDragBookkeeping();
-				suppressClickAway = true;
+				bodyClickPending = true;
 				return;
 			}
 			const finalSnapshot = fsm.move(pixel);
 			replaceWorkingPoints(preDragPoints);
+			workingAmplifierPlacements = preDragAmplifierPlacements;
 			if (fsm.kind === "rotate") boxAngle += finalSnapshot.box.angle - preDragBox.angle;
-			commitGesture(finalSnapshot.points, preDragOptions);
+			commitGesture(finalSnapshot.points, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box));
 			return;
 		}
 	};
@@ -2794,21 +2958,25 @@ function runEdit(opts) {
 		const localPreview = pickPreview;
 		const localHandles = pickHandles;
 		const localGraphics = pickGraphics;
+		const wasBodyClick = bodyClickPending;
 		pickPreview = void 0;
 		pickHandles = void 0;
 		pickGraphics = void 0;
+		bodyClickPending = false;
 		if (ctx.settled) return;
 		if (!closeOnClickAway) return;
 		if (suppressClickAway) {
 			suppressClickAway = false;
 			return;
 		}
-		if (localPreview || localHandles) return;
+		if (localHandles) return;
 		if (localGraphics && localGraphics.id !== measure.id) {
 			ctx.commit(rebuildRendered);
 			if (onClickAwayGraphicsPick) onClickAwayGraphicsPick(localGraphics);
 			return;
 		}
+		if (localPreview) return;
+		if (wasBodyClick) return;
 		ctx.commit(rebuildRendered);
 	};
 	const core = runInteraction({
@@ -2843,10 +3011,11 @@ function runEdit(opts) {
 				unsubDown();
 				unsubMove();
 				unsubUp();
-				if (activeDrag !== null || activeBoxDrag !== null) {
+				if (activeDrag !== null || activeBoxDrag !== null || activeAmplifierDrag !== null) {
 					driver.setDragPanEnabled(true);
 					activeDrag = null;
 					activeBoxDrag = null;
+					activeAmplifierDrag = null;
 					dragInFlight = false;
 				}
 				driver.dispose();
@@ -3015,6 +3184,8 @@ function runGroupTransform(opts) {
 	let dragInFlight = false;
 	/** Same click-away suppression role as `edit-controller.ts`'s flag of the same name. */
 	let suppressClickAway = false;
+	/** Same body-click role as `edit-controller.ts`'s flag of the same name. */
+	let bodyClickPending = false;
 	const changeListeners = /* @__PURE__ */ new Set();
 	const commitEmitter = createCommitEmitter("TransformSession.onCommit listener errors");
 	const settleEmitter = createSettleEmitter("TransformSession.onSettled listener errors");
@@ -3448,7 +3619,7 @@ function runGroupTransform(opts) {
 			renderHandlesLayer();
 			recomputeDirty();
 			dragInFlight = false;
-			suppressClickAway = true;
+			bodyClickPending = true;
 			return;
 		}
 		const finalSnapshot = fsm.move(pixel);
@@ -3472,22 +3643,26 @@ function runGroupTransform(opts) {
 		const localPreview = pickPreview;
 		const localHandles = pickHandles;
 		const localGraphics = pickGraphics;
+		const wasBodyClick = bodyClickPending;
 		pickPreview = void 0;
 		pickHandles = void 0;
 		pickGraphics = void 0;
+		bodyClickPending = false;
 		if (ctx.settled) return;
 		if (!closeOnClickAway) return;
 		if (suppressClickAway) {
 			suppressClickAway = false;
 			return;
 		}
-		if (localPreview || localHandles) return;
+		if (localHandles) return;
 		const isMember = localGraphics ? members.some((m) => m.measure.id === localGraphics.id) : false;
 		if (localGraphics && !isMember) {
 			commitClose();
 			if (onClickAwayGraphicsPick) onClickAwayGraphicsPick(localGraphics);
 			return;
 		}
+		if (localPreview) return;
+		if (wasBodyClick) return;
 		commitClose();
 	};
 	const core = runInteraction({
@@ -4303,6 +4478,12 @@ const BUILT_IN_INTERACTION_STYLE = {
 		strokeColor: "#6b7280",
 		strokeWidth: 1.5
 	},
+	labelHandle: {
+		pointRadius: 6,
+		fillColor: "#7c3aed",
+		strokeColor: "#ffffff",
+		strokeWidth: 2
+	},
 	scaleHandle: {
 		pointRadius: 5,
 		fillColor: "#ffffff",
@@ -4319,6 +4500,7 @@ const BUILT_IN_INTERACTION_STYLE = {
 const HANDLE_SLOTS = [
 	"vertexHandle",
 	"midpointHandle",
+	"labelHandle",
 	"scaleHandle",
 	"rotateHandle"
 ];
@@ -4382,4 +4564,4 @@ function nearestWorldCopyPosition(position, refLng) {
 	return [nearestWorldCopyLng(position[0], refLng), ...position.slice(1)];
 }
 //#endregion
-export { BaseMapAdapter, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, TacticalDrawDestroyedError, bindAbortable, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, ignoreAbort, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };
+export { BaseMapAdapter, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, TacticalDrawDestroyedError, bindAbortable, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, ignoreAbort, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };

package/package.json

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