@orbat-mapper/tactical-draw 0.2.0-alpha.30 → 0.2.0-alpha.31

package/dist/index.d.mts

@@ -474,6 +474,38 @@ declare const DEFAULT_TEXT_SIZE_MAX_PIXELS = 24;
  * clamp inside its per-zoom-stop style expression.
  */
 declare function resolveGroundTextSizePixels(textSizeMeters: number, resolution: number, text?: Pick<TextStyleOptions, "textSizeMinPixels" | "textSizeMaxPixels">): number;
+/**
+ * The size properties a Text graphic's feature carries (see `text.ts` /
+ * `FeaturePartProps`). Mutually exclusive size anchors: `textSizePixels`
+ * (screen-anchored) or `textSizeMeters` (ground-anchored). `textMaxSizePixels`
+ * is the ADR-0037 hide threshold; the min/max band fields are the amplifier
+ * -label clamp bounds, applied only when no max-size threshold is present.
+ */
+interface TextSizeProps {
+  textSizeMeters?: number;
+  textSizePixels?: number;
+  textMaxSizePixels?: number;
+  textSizeMinPixels?: number;
+  textSizeMaxPixels?: number;
+}
+/**
+ * Resolve a Text graphic's on-screen size in pixels, honoring the
+ * `textMaxSizePixels` hide threshold (ADR-0037). Returns `null` — the "hidden"
+ * signal — when the graphic should render no text this frame; adapters emit no
+ * text style for a `null`. Distinct from [[resolveGroundTextSizePixels]], which
+ * keeps the 8–24 px clamp band for amplifier labels: this helper is the Text
+ * graphic's own sizing rule.
+ *
+ *  - screen-anchored (`textSizePixels`): the fixed pixel size, never scaled or
+ *    hidden by zoom.
+ *  - ground-anchored (`textSizeMeters`) with a `textMaxSizePixels` threshold:
+ *    *unclamped* `meters / resolution` (the 8–24 band does NOT apply), hidden
+ *    (`null`) once that exceeds the threshold — text shrinks freely zooming out
+ *    and vanishes rather than clamps zooming in.
+ *  - ground-anchored without a threshold: falls back to the clamped band.
+ *  - no usable size or resolution: `null`.
+ */
+declare function resolveTextSizePixels(props: TextSizeProps, resolution: number): number | null;
 //#endregion
 //#region src/gestures/hit-test.d.ts
 type ToPixel = (lonLat: Position) => PixelCoordinate | null;
@@ -2031,4 +2063,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_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, type DrawMeasureDraft, type DrawOptions, type DrawPointSymbolDraft, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type Graphic, type GraphicEditChangeEvent, type GraphicEditSession, type GraphicGeometrySnappingOptions, type GraphicRender, type GraphicSnapshot, type GuideStyle, HATCH_PATTERNS, type HandleStyle, type HatchPattern, type IconResource, type InteractionHit, type InteractionStyle, type LayerId, type MapAdapter, type MapCursor, type MapEvent, type MapEventHandler, type NativeEventEntry, type PickEvent, type PickHandler, type PickOptions, type PixelCoordinate, type PointSymbol, type PointSymbolAnchor, type PointSymbolCapability, PointSymbolCapabilityRequiredError, type PointSymbolColors, type PointSymbolFootprint, type PointSymbolGraphicModifiers, type PointSymbolRender, type PointSymbolSize, type PointSymbolStyle, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SessionChangeSource, type SessionHistory, type SessionHistoryState, type SettleReason, type SizeAnchor, type SnapCandidate, type SnapCandidateProvider, type SnapCandidateRequest, type SnapInteraction, type SnapResult, type SnappingOptions, 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, type TransientChangeEvent, type TransientPhase, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, effectivePointSymbolPixelSize, fillPatternImageDimension, fillPatternImageId, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, makeFillPatternImage, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resizePointSymbolSize, 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 DrawPointSymbolDraft, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type Graphic, type GraphicEditChangeEvent, type GraphicEditSession, type GraphicGeometrySnappingOptions, type GraphicRender, type GraphicSnapshot, type GuideStyle, HATCH_PATTERNS, type HandleStyle, type HatchPattern, type IconResource, type InteractionHit, type InteractionStyle, type LayerId, type MapAdapter, type MapCursor, type MapEvent, type MapEventHandler, type NativeEventEntry, type PickEvent, type PickHandler, type PickOptions, type PixelCoordinate, type PointSymbol, type PointSymbolAnchor, type PointSymbolCapability, PointSymbolCapabilityRequiredError, type PointSymbolColors, type PointSymbolFootprint, type PointSymbolGraphicModifiers, type PointSymbolRender, type PointSymbolSize, type PointSymbolStyle, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SessionChangeSource, type SessionHistory, type SessionHistoryState, type SettleReason, type SizeAnchor, type SnapCandidate, type SnapCandidateProvider, type SnapCandidateRequest, type SnapInteraction, type SnapResult, type SnappingOptions, type StyleOptions, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, type TacticalDrawAbortReason, TacticalDrawDestroyedError, type TacticalDrawLayerOptions, type TacticalDrawOptions, type TextSizeProps, type TextStyleOptions, type ToPixel, type TransformBox, type TransformChangeEvent, type TransformSession, type TransientChangeEvent, type TransientPhase, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, effectivePointSymbolPixelSize, fillPatternImageDimension, fillPatternImageId, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, makeFillPatternImage, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resizePointSymbolSize, resolveGroundTextSizePixels, resolveTextSizePixels, tryControlMeasureIdFromFeature };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, freezeOrientationOptions, getControlMeasureMetadata, renderControlMeasure, resolveAmplifierPlacement, resolveStyleHints, roundToFixed } from "@orbat-mapper/control-measures";
+import { applyBoxTransformOptions, canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, freezeOrientationOptions, getControlMeasureMetadata, getDefaultOptions, renderControlMeasure, resolveAmplifierPlacement, resolveStyleHints, roundToFixed } from "@orbat-mapper/control-measures";
 //#region src/base-map-adapter.ts
 /**
 * Abstract base class shared by all `MapAdapter` implementations.
@@ -296,6 +296,33 @@ function resolveGroundTextSizePixels(textSizeMeters, resolution, text) {
 	const max = text?.textSizeMaxPixels ?? 24;
 	return Math.min(max, Math.max(min, textSizeMeters / resolution));
 }
+/**
+* Resolve a Text graphic's on-screen size in pixels, honoring the
+* `textMaxSizePixels` hide threshold (ADR-0037). Returns `null` — the "hidden"
+* signal — when the graphic should render no text this frame; adapters emit no
+* text style for a `null`. Distinct from [[resolveGroundTextSizePixels]], which
+* keeps the 8–24 px clamp band for amplifier labels: this helper is the Text
+* graphic's own sizing rule.
+*
+*  - screen-anchored (`textSizePixels`): the fixed pixel size, never scaled or
+*    hidden by zoom.
+*  - ground-anchored (`textSizeMeters`) with a `textMaxSizePixels` threshold:
+*    *unclamped* `meters / resolution` (the 8–24 band does NOT apply), hidden
+*    (`null`) once that exceeds the threshold — text shrinks freely zooming out
+*    and vanishes rather than clamps zooming in.
+*  - ground-anchored without a threshold: falls back to the clamped band.
+*  - no usable size or resolution: `null`.
+*/
+function resolveTextSizePixels(props, resolution) {
+	if (typeof props.textSizePixels === "number") return props.textSizePixels;
+	const meters = props.textSizeMeters;
+	if (typeof meters !== "number" || !(resolution > 0)) return null;
+	if (typeof props.textMaxSizePixels === "number") {
+		const px = meters / resolution;
+		return px > props.textMaxSizePixels ? null : px;
+	}
+	return resolveGroundTextSizePixels(meters, resolution, props);
+}
 //#endregion
 //#region src/gestures/hit-test.ts
 /** Clamped parameter t ∈ [0, 1] of `pixel` projected onto the segment a→b in pixel space, or null for a zero-length segment. */
@@ -684,6 +711,10 @@ const PIXEL_SIZE_OPTIONS = {
 	"antitank-wall": {
 		pixels: "toothHeightPixels",
 		meters: "toothHeight"
+	},
+	text: {
+		pixels: "sizePixels",
+		meters: "sizeMeters"
 	}
 };
 /** The shared label-size pair every `capturesLabelSize` kind carries (ADR-0028). */
@@ -745,6 +776,34 @@ function getSizeAnchor(measure) {
 	return measureUsesAdapterResolution(measure) ? "screen" : "ground";
 }
 /**
+* Materialise a *pixel-authored* kind's default pixel size onto a measure that
+* carries neither size key, so the ADR-0020 ground bake has a pixel value to
+* resolve to meters at commit. A kind is pixel-authored when its default
+* options declare the pixel-size option but no meter counterpart (e.g. Text's
+* `sizePixels: 24` with no `sizeMeters`) — such a fresh draw is authored in
+* pixels and must bake to meters, but a default draw commits with no options,
+* so the pixel size would otherwise never land and the graphic would persist
+* screen-anchored forever. No-op when the measure already carries a size key,
+* the kind has no pixel-size option, or the kind's default is meter-denominated
+* (e.g. FLOT, whose meter default governs a default draw without any bake) —
+* so this never changes the committed size of the pre-existing pixel kinds.
+*/
+function withDefaultAuthoringSize(measure) {
+	const spec = PIXEL_SIZE_OPTIONS[measure.kind];
+	if (!spec) return measure;
+	const options = measure.options ?? {};
+	if (options[spec.pixels] !== void 0 || options[spec.meters] !== void 0) return measure;
+	const defaults = getDefaultOptions(measure.kind);
+	if (defaults[spec.meters] !== void 0 || defaults[spec.pixels] === void 0) return measure;
+	return {
+		...measure,
+		options: {
+			...options,
+			[spec.pixels]: defaults[spec.pixels]
+		}
+	};
+}
+/**
 * Bake a screen-anchored (pixel) size to a ground-anchored (meter) size at the
 * adapter's current resolution, then strip the pixel + `metersPerPixel` keys so
 * the result is an ordinary meters graphic carrying no pixel intent — afterward
@@ -1535,7 +1594,7 @@ function runFixedLengthDraw(options) {
 	}
 	function buildSnapshot() {
 		const finalPoints = roundControlPoints(rule ? rule.derive(committed) : committed);
-		const captured = withCommittedAdapterMeasureOptions({
+		const sized = withDefaultAuthoringSize(withCommittedAdapterMeasureOptions({
 			id: generateId(),
 			kind,
 			controlPoints: finalPoints,
@@ -1543,8 +1602,8 @@ function runFixedLengthDraw(options) {
 			...measureStyle !== void 0 ? { style: measureStyle } : {},
 			...measureProperties !== void 0 ? { properties: measureProperties } : {},
 			...measureTextAmplifiers !== void 0 ? { textAmplifiers: measureTextAmplifiers } : {}
-		});
-		const measure = sizeAnchor === "screen" ? captured : bakePixelSizeToGround(captured, adapter);
+		}));
+		const measure = sizeAnchor === "screen" ? sized : bakePixelSizeToGround(sized, adapter);
 		return {
 			graphic: cloneControlMeasure(measure),
 			render: renderMeasureForAdapter(adapter, measure, renderOpts)
@@ -1815,7 +1874,7 @@ function runVariableLengthDraw(options) {
 		renderPreview();
 	}
 	function buildSnapshot() {
-		const built = withCommittedAdapterMeasureOptions({
+		const sized = withDefaultAuthoringSize(withCommittedAdapterMeasureOptions({
 			id: generateId(),
 			kind,
 			controlPoints: committed.map((p) => [...p]),
@@ -1823,8 +1882,8 @@ function runVariableLengthDraw(options) {
 			...measureStyle !== void 0 ? { style: measureStyle } : {},
 			...measureProperties !== void 0 ? { properties: measureProperties } : {},
 			...measureTextAmplifiers !== void 0 ? { textAmplifiers: measureTextAmplifiers } : {}
-		});
-		const measure = sizeAnchor === "screen" ? built : bakePixelSizeToGround(built, adapter);
+		}));
+		const measure = sizeAnchor === "screen" ? sized : bakePixelSizeToGround(sized, adapter);
 		return {
 			graphic: cloneControlMeasure(measure),
 			render: renderMeasureForAdapter(adapter, measure, renderOpts)
@@ -2182,6 +2241,21 @@ function normalizeRotation(angle) {
 function constrainRotation(angle) {
 	return Math.round(angle / CONSTRAINED_ROTATION_STEP) * CONSTRAINED_ROTATION_STEP;
 }
+//#endregion
+//#region src/tactical-draw/transform-box.ts
+/**
+* The uniform scale factor and rotation delta a box implies relative to a
+* pre-drag box, given the gesture kind. A `body` translate reports neither
+* (1, 0). Consumed both by point symbols (size/rotation) and by Text graphics
+* (folding the delta into rotation/size options); the delta is pivot-
+* independent so either can apply it without knowing the box center.
+*/
+function boxScaleRotation(kind, box, preDragBox) {
+	return {
+		scale: kind === "scale" ? Math.max(box.halfWidth / preDragBox.halfWidth, box.halfHeight / preDragBox.halfHeight) : 1,
+		rotation: kind === "rotate" ? box.angle - preDragBox.angle : 0
+	};
+}
 function rotate(x, y, angle) {
 	const cos = Math.cos(angle);
 	const sin = Math.sin(angle);
@@ -2720,12 +2794,16 @@ function normalizeAngle(angle) {
 *   grows away from the anchor) or local −x for `"end"` (text grows back
 *   toward the anchor) — `rotate()` (`transform-box.ts`) already uses the
 *   screen (y-down) convention this offset needs.
+* - **Hidden**: a ground-anchored size past `textMaxSizePixels` (ADR-0037)
+*   returns `null` — the box tracks `resolveTextSizePixels`'s hide rule
+*   rather than keep boxing text that no adapter is drawing.
 */
 function fitLabelTransformBox(input) {
-	const { text, rotation, textAnchor, textSizePixels, textSizeMeters, anchor, resolution, bearing } = input;
+	const { text, rotation, textAnchor, textSizePixels, textSizeMeters, anchor, resolution, bearing, unclamped, textMaxSizePixels } = input;
 	if (!text) return null;
+	if (typeof textMaxSizePixels === "number" && textSizePixels === void 0 && typeof textSizeMeters === "number" && typeof resolution === "number" && resolution > 0 && textSizeMeters / resolution > textMaxSizePixels) return null;
 	const angle = normalizeAngle(Math.PI - (rotation ?? 0) - (bearing ?? 0));
-	const h = textSizePixels !== void 0 ? Math.max(1, textSizePixels) : textSizeMeters !== void 0 && resolution !== void 0 && resolution > 0 ? resolveGroundTextSizePixels(textSizeMeters, resolution) : 16;
+	const h = textSizePixels !== void 0 ? Math.max(1, textSizePixels) : textSizeMeters !== void 0 && resolution !== void 0 && resolution > 0 ? unclamped ? Math.max(1, textSizeMeters / resolution) : resolveGroundTextSizePixels(textSizeMeters, resolution) : 16;
 	const lines = text.split("\n");
 	const width = lines.reduce((max, line) => Math.max(max, line.length), 0) * CHAR_WIDTH_FACTOR * h;
 	const height = lines.length * LINE_HEIGHT_FACTOR * h;
@@ -2760,12 +2838,47 @@ function fitLabelBoxFromFeature(feature, anchorPixel, view) {
 		textAnchor: props.textAnchor === "start" || props.textAnchor === "end" ? props.textAnchor : void 0,
 		textSizePixels: typeof props.textSizePixels === "number" ? props.textSizePixels : void 0,
 		textSizeMeters: typeof props.textSizeMeters === "number" ? props.textSizeMeters : void 0,
+		textMaxSizePixels: typeof props.textMaxSizePixels === "number" ? props.textMaxSizePixels : void 0,
 		anchor: anchorPixel,
 		resolution: view.resolution,
-		bearing: view.bearing
+		bearing: view.bearing,
+		unclamped: view.unclamped
 	});
 }
 /**
+* Fit a `TransformBox` around a rendered **Text generic graphic** feature — the
+* Text analogue of the point-symbol footprint (ADR-0031): a rotated logical
+* rectangle centered on / shifted from the anchor per `textAlign` (via the
+* feature's `textAnchor` prop), sized from the text's line count and longest
+* line at the actual rendered height (screen `textSizePixels` as-is; ground
+* `textSizeMeters / resolution` unclamped). Drives the Text edit/transform box
+* outline, its corner-scale handles, and the pick extent, and updates live as a
+* rotate/scale gesture folds new rotation/size into the feature. Returns `null`
+* when the feature carries no text. Rotation pivots at the anchor, so the box
+* orbits the anchor when the text rotates — matching how the adapters render a
+* `textAnchor`-shifted, rotated label.
+*/
+function fitTextGraphicFootprint(feature, anchorPixel, view) {
+	return fitLabelBoxFromFeature(feature, anchorPixel, {
+		...view,
+		unclamped: true
+	});
+}
+/**
+* Locate the single Text `Point` feature in `features`, project its anchor, and
+* return its {@link fitTextGraphicFootprint} box — the shared body behind the
+* edit controller's Text box and the group transform-controller's Text member
+* footprint. Returns `null` when there is no text feature or its anchor is
+* off-screen.
+*/
+function fitTextFootprintFromFeatures(features, toPixel, view) {
+	const f = features.find((feat) => feat.geometry?.type === "Point" && typeof feat.properties?.text === "string");
+	if (!f || f.geometry?.type !== "Point") return null;
+	const anchorPixel = toPixel(f.geometry.coordinates);
+	if (!anchorPixel) return null;
+	return fitTextGraphicFootprint(f, anchorPixel, view);
+}
+/**
 * Carry user-adjusted label anchors (and rotation overrides) through a
 * transform-box gesture. Anchors are transformed in pixel space alongside the
 * control points so the result remains visually rigid across map
@@ -3123,6 +3236,7 @@ function runEdit(opts) {
 	const closedRing = rule?.closedRing ?? false;
 	const guideEnabled = (guideOpt ?? true) && !shouldSuppressGuide(metadata);
 	const isAreaKind = metadata.geometry === "area";
+	const isTextGraphic = measure.kind === "text";
 	const requestedModes = normaliseModes(initialModes);
 	const editStartPoints = measure.controlPoints.map((p) => [...p]);
 	const workingPoints = editStartPoints.map((p) => [...p]);
@@ -3252,6 +3366,7 @@ function runEdit(opts) {
 	* projects (e.g. the working copy renders no features this frame).
 	*/
 	function fitBoxFromFeatures(features) {
+		if (isTextGraphic) return fitTextBox(features);
 		const positions = [];
 		for (const f of features) if (f.geometry) collectFeaturePositions(f.geometry, positions);
 		const pixels = [];
@@ -3262,13 +3377,28 @@ function runEdit(opts) {
 		return fitTransformBox(pixels, boxAngle, interactionStyle?.boxPadding ?? 0);
 	}
 	/**
+	* The Text footprint box (rotated rectangle hugging the rendered text),
+	* derived from the single Point feature's text props. Unlike geometry-fit
+	* boxes it carries the text's own on-screen angle (so it tilts with the
+	* rotation option) and honors `textAnchor` alignment; the session `boxAngle`
+	* is not used for Text.
+	*/
+	function fitTextBox(features) {
+		return fitTextFootprintFromFeatures(features, driver.toPixel, {
+			resolution: adapter.getResolution(),
+			bearing: adapter.getBearing()
+		});
+	}
+	/**
 	* Re-fit `box` from `lastPreviewFeatures`. A no-op while a box gesture is
 	* in flight — that drag paints the box rigidly from its own snapshot
 	* (`BoxDragSnapshot.box`) instead of a re-fit, so a corner/rotate/body drag
-	* doesn't fight its own paint.
+	* doesn't fight its own paint. Text is the exception: its box follows the
+	* rendered footprint live (a rotate/scale gesture changes the rendered text),
+	* so it re-fits every frame, drag included.
 	*/
 	function refitBox() {
-		if (activeBoxDrag) return;
+		if (activeBoxDrag && !isTextGraphic) return;
 		box = fitBoxFromFeatures(lastPreviewFeatures);
 	}
 	function liftOriginalFromGraphics() {
@@ -3319,7 +3449,7 @@ function runEdit(opts) {
 		}), handleIdPrefix, interactionStyle);
 		if (modes.includes("labeldrag")) features.push(...labels.handleFeatures());
 		if (modes.includes("transform")) {
-			const liveBox = activeBoxDrag ? activeBoxDrag.lastSnapshot.box : box;
+			const liveBox = activeBoxDrag && !isTextGraphic ? activeBoxDrag.lastSnapshot.box : box;
 			if (liveBox) {
 				features.push(boxOutlineFeature(liveBox, dragProjection.fromPixel, `${handleIdPrefix}:box-outline`, interactionStyle?.boxOutline));
 				features.push(...toFeatures(boxToHandles(liveBox, dragProjection.fromPixel), handleIdPrefix, interactionStyle));
@@ -3328,6 +3458,19 @@ function runEdit(opts) {
 		ctx.writeLayer(handlesLayer, features);
 	}
 	/**
+	* Repaint the preview and, in lockstep, the handles. `renderPreview` re-fits
+	* `box` (for Text, the footprint depends on options — size/rotation/
+	* alignment/text), so the transform-box outline and its corner/rotate handles
+	* must repaint to match; otherwise they stay where the old options placed them
+	* and the pick target (`box`) drifts out from under the visible handles
+	* (#scale-handle desync). Used by the non-geometry option/style/amplifier
+	* setters, which change what the preview renders without moving a point.
+	*/
+	function renderPreviewAndHandles() {
+		renderPreview();
+		renderHandlesLayer();
+	}
+	/**
 	* Builds the committed snapshot against explicit `options` rather than the
 	* live `workingOptions` — used to render a gesture's "previous" snapshot
 	* against pre-freeze options when a rotate has already merged its
@@ -3472,7 +3615,7 @@ function runEdit(opts) {
 			replaceWorkingOptions(previousOptions);
 			throw err;
 		}
-		renderPreview();
+		renderPreviewAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change options");
@@ -3498,7 +3641,7 @@ function runEdit(opts) {
 			currentStyle = previousStyle;
 			throw err;
 		}
-		renderPreview();
+		renderPreviewAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change style");
@@ -3544,7 +3687,7 @@ function runEdit(opts) {
 			workingTextAmplifiers = previousTextAmplifiers;
 			throw err;
 		}
-		renderPreview();
+		renderPreviewAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, "programmatic", "Change text");
@@ -3571,7 +3714,7 @@ function runEdit(opts) {
 		workingAmplifierPlacements = Object.keys(next).length > 0 ? next : void 0;
 		if (JSON.stringify(workingAmplifierPlacements) === JSON.stringify(previousAmplifierPlacements)) return;
 		const currentRendered = rebuildRendered();
-		renderPreview();
+		renderPreviewAndHandles();
 		nonGeometryDirty = true;
 		dirty = true;
 		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers, previousAmplifierPlacements, source, historyLabel);
@@ -3917,11 +4060,40 @@ function runEdit(opts) {
 		recomputeDirty();
 		emitTransient("move", snapshot.points, activeDrag.controlPointIndex);
 	}
+	/**
+	* Fold a box gesture's delta (the box `to` relative to `from`, given the
+	* gesture `kind`) into a Text graphic's `rotation`/size options, on top of
+	* `base`. A `scale` grows the active size anchor; a `rotate` adds to the
+	* rotation. Returns `base` unchanged when the kind produces no patch. The
+	* delta (uniform scale ratio, angle difference) is pivot-independent, so
+	* folding it keeps the anchor point fixed while the glyph turns/grows.
+	*/
+	function foldTextTransform(from, to, kind, base) {
+		const { scale, rotation } = boxScaleRotation(kind, to, from);
+		const patch = applyBoxTransformOptions(measure.kind, base ?? {}, {
+			scale,
+			rotationRadians: rotation
+		});
+		return patch ? {
+			...base ?? {},
+			...patch
+		} : base;
+	}
 	function paintBoxDragSnapshot(pixel, info, constrainRotation = false) {
 		if (!activeBoxDrag) return;
 		const resolvedPixel = translatedBoxPixel(pixel, info, activeBoxDrag);
 		const snapshot = activeBoxDrag.fsm.move(resolvedPixel, { constrainRotation });
 		activeBoxDrag.lastSnapshot = snapshot;
+		if (isTextGraphic && (activeBoxDrag.fsm.kind === "rotate" || activeBoxDrag.fsm.kind === "scale")) {
+			workingPoints.splice(0, workingPoints.length, ...activeBoxDrag.preDragPoints);
+			workingOptions = foldTextTransform(activeBoxDrag.preDragBox, snapshot.box, activeBoxDrag.fsm.kind, activeBoxDrag.preDragOptions);
+			nonGeometryDirty = true;
+			renderPreview();
+			renderHandlesLayer();
+			recomputeDirty();
+			emitTransient("move", activeBoxDrag.preDragPoints, null);
+			return;
+		}
 		workingPoints.splice(0, workingPoints.length, ...snapshot.points);
 		workingAmplifierPlacements = transformAmplifierPlacements(activeBoxDrag.preDragAmplifierPlacements, activeBoxDrag.preDragBox, snapshot.box, driver);
 		renderPreview();
@@ -4012,9 +4184,15 @@ function runEdit(opts) {
 			const finalSnapshot = fsm.move(finalPixel, { constrainRotation: info?.shiftKey });
 			replaceWorkingPoints(preDragPoints);
 			workingAmplifierPlacements = preDragAmplifierPlacements;
-			if (fsm.kind === "rotate") boxAngle += finalSnapshot.box.angle - preDragBox.angle;
-			emitTransient("end", finalSnapshot.points, null);
-			commitGesture(finalSnapshot.points, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box, driver), preDragBox.angle);
+			const textOptionFold = isTextGraphic && (fsm.kind === "rotate" || fsm.kind === "scale");
+			if (fsm.kind === "rotate" && !isTextGraphic) boxAngle += finalSnapshot.box.angle - preDragBox.angle;
+			if (textOptionFold) {
+				workingOptions = foldTextTransform(preDragBox, finalSnapshot.box, fsm.kind, preDragOptions);
+				nonGeometryDirty = true;
+			}
+			const committedPoints = textOptionFold ? preDragPoints : finalSnapshot.points;
+			emitTransient("end", committedPoints, null);
+			commitGesture(committedPoints, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box, driver), preDragBox.angle);
 			return;
 		}
 	};
@@ -4223,18 +4401,6 @@ function boundProperty(key, value) {
 //#region src/tactical-draw/transform-controller.ts
 /** No point symbol may scale below this factor of its own size — mirrors the box-drag floor. */
 const MIN_POINT_SYMBOL_SIZE = .1;
-/**
-* The uniform scale factor and rotation delta a box implies relative to a
-* pre-drag box, given the gesture kind. Body translate reports neither (1, 0);
-* measures ignore this and take their geometry straight from the transformed
-* anchor points — only point symbols consume it.
-*/
-function boxScaleRotation(kind, box, preDragBox) {
-	return {
-		scale: kind === "scale" ? Math.max(box.halfWidth / preDragBox.halfWidth, box.halfHeight / preDragBox.halfHeight) : 1,
-		rotation: kind === "rotate" ? box.angle - preDragBox.angle : 0
-	};
-}
 /** Apply a box's scale/rotation deltas to each member's pre-drag point-symbol state. */
 function scalePointSymbolStates(pre, scale, rotation) {
 	return pre.map((state) => state ? {
@@ -4444,6 +4610,40 @@ function runGroupTransform(opts) {
 		}
 		return pixels;
 	}
+	/** The rotated-text footprint corners for a Text member's rendered feature, or `null`. */
+	function textFootprintCorners(features) {
+		const box = fitTextFootprintFromFeatures(features, driver.toPixel, {
+			resolution: adapter.getResolution(),
+			bearing: adapter.getBearing()
+		});
+		return box ? boxCorners(box) : null;
+	}
+	/**
+	* Fold a box gesture's delta (`box` vs the pre-drag box) into each measure
+	* member that persists orientation/size as options (e.g. Text), off the
+	* per-member `baseOverrides` so live ticks recompute rather than compound.
+	* Only members whose kind returns a patch (Text) are touched — members that
+	* carry an orientation *freeze* (Battle Position's echelon anchor) return no
+	* patch and keep their live override untouched. Point-symbol members take the
+	* delta through their own working state, not here.
+	*/
+	function applyMeasureTransformForBox(box, fromBox, kind, baseOverrides) {
+		const { scale, rotation } = boxScaleRotation(kind, box, fromBox);
+		if (scale === 1 && rotation === 0) return;
+		members.forEach((member, i) => {
+			if (isPointSymbolMember(member)) return;
+			const base = baseOverrides[i] ?? null;
+			const effective = mergeOptions(member.graphic.options, base);
+			const patch = applyBoxTransformOptions(member.graphic.kind, effective, {
+				scale,
+				rotationRadians: rotation
+			});
+			if (patch) member.optionsOverride = {
+				...base ?? {},
+				...patch
+			};
+		});
+	}
 	/** The live box angle: the in-flight drag's rigidly-transformed angle, or the committed `boxAngle`. */
 	function currentAngle() {
 		return activeBoxDrag ? activeBoxDrag.lastSnapshot.box.angle : boxAngle;
@@ -4483,8 +4683,9 @@ function runGroupTransform(opts) {
 					const footprint = pointSymbolFootprint(symbol, plan.render, adapter);
 					if (footprint) boxPixels = footprint.corners;
 				} else {
-					features = renderMeasureForAdapter(adapter, workingGraphicFor(i), renderOpts).features;
-					boxPixels = pixelsFromFeatures(features);
+					const working = workingGraphicFor(i);
+					features = renderMeasureForAdapter(adapter, working, renderOpts).features;
+					boxPixels = (working.kind === "text" ? textFootprintCorners(features) : null) ?? pixelsFromFeatures(features);
 				}
 			} catch {
 				features = [];
@@ -4883,6 +5084,7 @@ function runGroupTransform(opts) {
 		activeBoxDrag.lastSnapshot = snapshot;
 		applyConcatenatedPoints(snapshot.points);
 		applyPointSymbolStateByMember(pointSymbolStateForBox(snapshot.box));
+		applyMeasureTransformForBox(snapshot.box, activeBoxDrag.preDragBox, activeBoxDrag.fsm.kind, activeBoxDrag.preDragOptionsOverrideByMember);
 		applyAmplifierPlacementsByMember(activeBoxDrag.preDragAmplifierPlacementsByMember.map((placements) => transformAmplifierPlacements(placements, activeBoxDrag.preDragBox, snapshot.box, driver)));
 		renderAllPreviews();
 		renderHandlesLayer();
@@ -4922,6 +5124,7 @@ function runGroupTransform(opts) {
 		applyAmplifierPlacementsByMember(preDragAmplifierPlacementsByMember);
 		if (members.some(isPointSymbolMember)) shell.suppressNextClickAway();
 		if (fsm.kind === "rotate") boxAngle += finalSnapshot.box.angle - preDragBox.angle;
+		applyMeasureTransformForBox(finalSnapshot.box, preDragBox, fsm.kind, preDragOptionsOverrideByMember);
 		commitGesture(finalSnapshot.points, preDragOptionsOverrideByMember, preDragAmplifierPlacementsByMember.map((placements) => transformAmplifierPlacements(placements, preDragBox, finalSnapshot.box, driver)), preDragBox.angle, nextPointSymbolStateByMember);
 	};
 	const core = runEditInteraction({
@@ -6390,4 +6593,4 @@ function nearestWorldCopyPosition(position, refLng) {
 	return [nearestWorldCopyLng(position[0], refLng), ...position.slice(1)];
 }
 //#endregion
-export { BaseMapAdapter, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, HATCH_PATTERNS, PointSymbolCapabilityRequiredError, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, TacticalDrawDestroyedError, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, effectivePointSymbolPixelSize, fillPatternImageDimension, fillPatternImageId, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, makeFillPatternImage, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resizePointSymbolSize, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };
+export { BaseMapAdapter, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, HATCH_PATTERNS, PointSymbolCapabilityRequiredError, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, TacticalDrawDestroyedError, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, effectivePointSymbolPixelSize, fillPatternImageDimension, fillPatternImageId, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, makeFillPatternImage, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resizePointSymbolSize, resolveGroundTextSizePixels, resolveTextSizePixels, tryControlMeasureIdFromFeature };

package/package.json

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