@orbat-mapper/tactical-draw 0.2.0-alpha.11 → 0.2.0-alpha.12

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ControlMeasure, ControlMeasureKind, ControlMeasureSnapshot, ControlMeasureStyle } from "@orbat-mapper/control-measures";
+import { ControlMeasure, ControlMeasureKind, ControlMeasureSnapshot, ControlMeasureStyle, TextAmplifiers } from "@orbat-mapper/control-measures";
 import { Feature, Position } from "geojson";
 
 //#region src/gestures/types.d.ts
@@ -54,6 +54,13 @@ interface StyleOptions {
   pointRadius?: number;
   text?: TextStyleOptions;
 }
+/**
+ * Text (label) style for a layer. When `labelProperty` is set, adapters also
+ * read per-feature label properties: `rotation` (radians, rendered as
+ * `π − rotation`), `textSizePixels`/`textSizeZoom`/`textSizeResolution`
+ * (ADR-0020), and `textAnchor` (`"start"` = text begins at the label point,
+ * `"end"` = text ends there; absent = centered).
+ */
 interface TextStyleOptions {
   text?: string;
   labelProperty?: string;
@@ -527,6 +534,13 @@ interface EditSession {
   readonly options: ControlMeasure["options"];
   /** Live working style. Copy on read. */
   readonly style: ControlMeasureStyle | undefined;
+  /**
+   * Live working text amplifiers (MIL-STD-2525E Appendix L Table L-II). Copy
+   * on read. `undefined` when the edit-start measure carried none and none
+   * have been set since. Keys are stored as given — canonicalisation to
+   * doctrinal field codes happens in the core render seam, not here.
+   */
+  readonly textAmplifiers: TextAmplifiers | undefined;
   /** `true` after the first working-copy mutation; back to `false` within tolerance. */
   readonly dirty: boolean;
   readonly modes: readonly EditMode[];
@@ -564,6 +578,13 @@ interface EditSession {
   setSizeAnchor(anchor: SizeAnchor): void;
   /** Shallow-merge per-measure style into the live working copy. */
   setStyle(partial: ControlMeasureStyle): void;
+  /**
+   * Shallow-merge into the live working text amplifiers. A value of
+   * `undefined` or an empty/whitespace-only string deletes that key; the
+   * working record collapses back to `undefined` once it holds no keys. A
+   * silent no-op after the session has settled (like [[setOptions]]).
+   */
+  setTextAmplifiers(partial: Record<string, string | undefined>): void;
   /**
    * Subscribe to working-copy changes. The listener receives an
    * [[EditChangeEvent]] for each completed gesture (drag end, insert/delete

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { cloneControlMeasure, controlMeasureIdFromFeature, freezeOrientationOptions, getControlMeasureMetadata, renderControlMeasure, resolveStyleHints, roundToFixed } from "@orbat-mapper/control-measures";
+import { canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, freezeOrientationOptions, getControlMeasureMetadata, renderControlMeasure, resolveStyleHints, roundToFixed } from "@orbat-mapper/control-measures";
 //#region src/base-map-adapter.ts
 /**
 * Abstract base class shared by all `MapAdapter` implementations.
@@ -876,7 +876,7 @@ const PREVIEW_CURSOR$1 = "crosshair";
 * kinds need no host UI.
 */
 function runFixedLengthDraw(options) {
-	const { adapter, kind, previewLayer, guideLayer, graphicsStyle, generateId, signal, measureOptions, measureStyle, measureProperties, guide: guideOpt, sizeAnchor, onSettled } = options;
+	const { adapter, kind, previewLayer, guideLayer, graphicsStyle, generateId, signal, measureOptions, measureStyle, measureProperties, measureTextAmplifiers, guide: guideOpt, sizeAnchor, onSettled } = options;
 	const metadata = getControlMeasureMetadata(kind);
 	const rule = metadata.rule;
 	const min = metadata.minCoordinates;
@@ -916,7 +916,7 @@ function runFixedLengthDraw(options) {
 			return;
 		}
 		const previewThreshold = rule?.minimumPreviewPoints ?? required;
-		const features = buildPreviewFeatures$1(adapter, kind, rule && raw.length >= previewThreshold ? rule.derive(raw) : raw, measureOptions, measureStyle, renderOpts);
+		const features = buildPreviewFeatures$1(adapter, kind, rule && raw.length >= previewThreshold ? rule.derive(raw) : raw, measureOptions, measureStyle, measureTextAmplifiers, renderOpts);
 		ctx.writeLayer(previewLayer, features);
 		const guidePoints = rule?.guidePoints ? rule.guidePoints(raw) : raw;
 		const guideFeatures = guideEnabled ? buildGuideFeatures(guidePoints, isAreaKind) : [];
@@ -937,7 +937,8 @@ function runFixedLengthDraw(options) {
 			controlPoints: finalPoints,
 			...measureOptions !== void 0 ? { options: measureOptions } : {},
 			...measureStyle !== void 0 ? { style: measureStyle } : {},
-			...measureProperties !== void 0 ? { properties: measureProperties } : {}
+			...measureProperties !== void 0 ? { properties: measureProperties } : {},
+			...measureTextAmplifiers !== void 0 ? { textAmplifiers: measureTextAmplifiers } : {}
 		}, adapter);
 		const measure = sizeAnchor === "screen" ? captured : bakePixelSizeToGround(captured, adapter);
 		return {
@@ -970,13 +971,14 @@ function runFixedLengthDraw(options) {
 * falls back to a plain Point/LineString outline when the kind's generator
 * cannot produce a shape yet (under-min count).
 */
-function buildPreviewFeatures$1(adapter, kind, points, measureOptions, measureStyle, renderOpts) {
+function buildPreviewFeatures$1(adapter, kind, points, measureOptions, measureStyle, measureTextAmplifiers, renderOpts) {
 	const measure = {
 		id: PREVIEW_CM_ID$1,
 		kind,
 		controlPoints: points,
 		...measureOptions !== void 0 ? { options: measureOptions } : {},
-		...measureStyle !== void 0 ? { style: measureStyle } : {}
+		...measureStyle !== void 0 ? { style: measureStyle } : {},
+		...measureTextAmplifiers !== void 0 ? { textAmplifiers: measureTextAmplifiers } : {}
 	};
 	try {
 		return renderMeasureForAdapter(adapter, measure, {
@@ -1129,7 +1131,7 @@ const PREVIEW_CURSOR = "crosshair";
 * added point again" as additional gesture-level commit triggers.
 */
 function runVariableLengthDraw(options) {
-	const { adapter, kind, previewLayer, guideLayer, graphicsStyle, generateId, signal, onSession, seed, measureOptions, measureStyle, measureProperties, guide: guideOpt, sizeAnchor, onSettled } = options;
+	const { adapter, kind, previewLayer, guideLayer, graphicsStyle, generateId, signal, onSession, seed, measureOptions, measureStyle, measureProperties, measureTextAmplifiers, guide: guideOpt, sizeAnchor, onSettled } = options;
 	const metadata = getControlMeasureMetadata(kind);
 	if (typeof metadata.minCoordinates !== "number") throw new Error(`runVariableLengthDraw: kind "${kind}" has no minCoordinates metadata`);
 	const min = metadata.minCoordinates;
@@ -1164,7 +1166,8 @@ function runVariableLengthDraw(options) {
 			kind,
 			controlPoints: initialPoints.map((p) => [...p]),
 			...measureOptions !== void 0 ? { options: measureOptions } : {},
-			...measureStyle !== void 0 ? { style: measureStyle } : {}
+			...measureStyle !== void 0 ? { style: measureStyle } : {},
+			...measureTextAmplifiers !== void 0 ? { textAmplifiers: measureTextAmplifiers } : {}
 		}, {
 			...renderOpts,
 			validationMode: "throw"
@@ -1287,7 +1290,7 @@ function runVariableLengthDraw(options) {
 			points.splice(idx, 0, rubberBand);
 		} else points = [...committed];
 		if (rule) points = rule.derive(points);
-		const previewFeatures = points.length === 0 ? [] : buildPreviewFeatures(adapter, kind, points, measureOptions, measureStyle, renderOpts);
+		const previewFeatures = points.length === 0 ? [] : buildPreviewFeatures(adapter, kind, points, measureOptions, measureStyle, measureTextAmplifiers, renderOpts);
 		ctx.writeLayer(previewLayer, previewFeatures);
 		const guideFeatures = points.length === 0 || !guideEnabled ? [] : buildGuideFeatures(points, isAreaKind, trailingFixed);
 		ctx.writeLayer(guideLayer, guideFeatures);
@@ -1306,7 +1309,8 @@ function runVariableLengthDraw(options) {
 			controlPoints: committed.map((p) => [...p]),
 			...measureOptions !== void 0 ? { options: measureOptions } : {},
 			...measureStyle !== void 0 ? { style: measureStyle } : {},
-			...measureProperties !== void 0 ? { properties: measureProperties } : {}
+			...measureProperties !== void 0 ? { properties: measureProperties } : {},
+			...measureTextAmplifiers !== void 0 ? { textAmplifiers: measureTextAmplifiers } : {}
 		}, adapter);
 		const measure = sizeAnchor === "screen" ? built : bakePixelSizeToGround(built, adapter);
 		return {
@@ -1357,13 +1361,14 @@ function isValidPosition(value) {
 	}
 	return true;
 }
-function buildPreviewFeatures(adapter, kind, points, measureOptions, measureStyle, renderOpts) {
+function buildPreviewFeatures(adapter, kind, points, measureOptions, measureStyle, measureTextAmplifiers, renderOpts) {
 	const measure = {
 		id: PREVIEW_CM_ID,
 		kind,
 		controlPoints: points,
 		...measureOptions !== void 0 ? { options: measureOptions } : {},
-		...measureStyle !== void 0 ? { style: measureStyle } : {}
+		...measureStyle !== void 0 ? { style: measureStyle } : {},
+		...measureTextAmplifiers !== void 0 ? { textAmplifiers: measureTextAmplifiers } : {}
 	};
 	try {
 		return renderMeasureForAdapter(adapter, measure, renderOpts).features;
@@ -1996,6 +2001,7 @@ function runEdit(opts) {
 	const editStartPoints = measure.controlPoints.map((p) => [...p]);
 	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 modes = requestedModes;
 	let dirty = false;
 	let nonGeometryDirty = false;
@@ -2084,6 +2090,8 @@ function runEdit(opts) {
 			options: workingOptions,
 			controlPoints: workingPoints.map((p) => [...p])
 		};
+		if (workingTextAmplifiers) working.textAmplifiers = workingTextAmplifiers;
+		else delete working.textAmplifiers;
 		let features;
 		try {
 			features = renderMeasureForAdapter(adapter, working, renderOpts).features;
@@ -2135,6 +2143,8 @@ function runEdit(opts) {
 			options,
 			controlPoints: workingPoints.map((p) => [...p])
 		};
+		if (workingTextAmplifiers) working.textAmplifiers = workingTextAmplifiers;
+		else delete working.textAmplifiers;
 		const committed = sizeAnchor === "screen" ? working : bakePixelSizeToGround(working, adapter);
 		return {
 			measure: cloneControlMeasure(committed),
@@ -2186,7 +2196,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) {
+	function emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers) {
 		if (ctx.settled) return;
 		let rejectRequested = false;
 		let closeRequested = false;
@@ -2218,6 +2228,7 @@ function runEdit(opts) {
 			replaceWorkingOptions(previousOptions);
 			currentStyle = previousStyle;
 			sizeAnchor = previousSizeAnchor;
+			workingTextAmplifiers = previousTextAmplifiers;
 			nonGeometryDirty = previousNonGeometryDirty;
 			renderPreview();
 			renderHandlesLayer();
@@ -2242,6 +2253,7 @@ function runEdit(opts) {
 		const previousOptions = { ...preGestureOptions ?? workingOptions ?? {} };
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
+		const previousTextAmplifiers = workingTextAmplifiers;
 		const previousRendered = rebuildRenderedWith(previousOptions);
 		replaceWorkingPoints(nextPoints);
 		let currentRendered;
@@ -2259,7 +2271,7 @@ function runEdit(opts) {
 		recomputeDirty();
 		dragInFlight = false;
 		drainPendingModes();
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
 	}
 	function setOptions(partial) {
 		if (ctx.settled) return;
@@ -2267,6 +2279,7 @@ function runEdit(opts) {
 		const previousOptions = { ...workingOptions ?? {} };
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
+		const previousTextAmplifiers = workingTextAmplifiers;
 		const previousRendered = rebuildRendered();
 		replaceWorkingOptions({
 			...workingOptions ?? {},
@@ -2282,7 +2295,7 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
 	}
 	function setStyle(partial) {
 		if (ctx.settled) return;
@@ -2290,6 +2303,7 @@ function runEdit(opts) {
 		const previousOptions = { ...workingOptions ?? {} };
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
+		const previousTextAmplifiers = workingTextAmplifiers;
 		const previousRendered = rebuildRendered();
 		currentStyle = {
 			...currentStyle ?? {},
@@ -2305,7 +2319,51 @@ function runEdit(opts) {
 		renderPreview();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
+	}
+	/**
+	* Shallow-merge into the live working text amplifiers. Mirrors
+	* [[setOptions]] exactly (dirty tracking, re-render, change emission) —
+	* see that function for the shared shape. A merge value of `undefined` or
+	* an empty/whitespace-only string deletes the key; the record collapses to
+	* `undefined` once empty so `renderPreview`/`rebuildRenderedWith` omit the
+	* key rather than persist `{}`.
+	*
+	* Each patch key resolves to its canonical field key and evicts every
+	* working entry for the same field + suffix — including friendly-alias
+	* twins (`uniqueDesignation` for `T`) — so clearing or replacing via a
+	* canonical key cannot be undone by an alias-backed value surviving in the
+	* working record. Non-empty values are stored under the canonical key;
+	* unknown keys keep literal behavior.
+	*/
+	function setTextAmplifiers(partial) {
+		if (ctx.settled) return;
+		const previousPoints = workingPoints.map((p) => [...p]);
+		const previousOptions = { ...workingOptions ?? {} };
+		const previousStyle = currentStyle;
+		const previousNonGeometryDirty = nonGeometryDirty;
+		const previousTextAmplifiers = workingTextAmplifiers;
+		const previousRendered = rebuildRendered();
+		const merged = { ...workingTextAmplifiers ?? {} };
+		for (const [key, value] of Object.entries(partial)) {
+			const canonicalKey = canonicalTextAmplifierKey(key);
+			if (canonicalKey) {
+				for (const existing of Object.keys(merged)) if (canonicalTextAmplifierKey(existing) === canonicalKey) delete merged[existing];
+			} else delete merged[key];
+			if (value !== void 0 && value.trim() !== "") merged[canonicalKey ?? key] = value;
+		}
+		workingTextAmplifiers = Object.keys(merged).length > 0 ? merged : void 0;
+		let currentRendered;
+		try {
+			currentRendered = rebuildRendered();
+		} catch (err) {
+			workingTextAmplifiers = previousTextAmplifiers;
+			throw err;
+		}
+		renderPreview();
+		nonGeometryDirty = true;
+		dirty = true;
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, sizeAnchor, currentRendered, previousTextAmplifiers);
 	}
 	/**
 	* Flip the size anchor for the measure under edit (ADR-0020). Re-renders the
@@ -2321,12 +2379,13 @@ function runEdit(opts) {
 		const previousStyle = currentStyle;
 		const previousNonGeometryDirty = nonGeometryDirty;
 		const previousSizeAnchor = sizeAnchor;
+		const previousTextAmplifiers = workingTextAmplifiers;
 		const previousRendered = rebuildRendered();
 		sizeAnchor = next;
 		const currentRendered = rebuildRendered();
 		nonGeometryDirty = true;
 		dirty = true;
-		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered);
+		emitChange(previousRendered, previousPoints, previousOptions, previousStyle, previousNonGeometryDirty, previousSizeAnchor, currentRendered, previousTextAmplifiers);
 	}
 	/** Apply a translate gesture by shifting every working point by `delta`. */
 	function commitTranslate(delta) {
@@ -2384,6 +2443,9 @@ function runEdit(opts) {
 		get style() {
 			return currentStyle ? { ...currentStyle } : void 0;
 		},
+		get textAmplifiers() {
+			return workingTextAmplifiers ? { ...workingTextAmplifiers } : void 0;
+		},
 		get dirty() {
 			return dirty;
 		},
@@ -2415,6 +2477,9 @@ function runEdit(opts) {
 		setStyle(partial) {
 			setStyle(partial);
 		},
+		setTextAmplifiers(partial) {
+			setTextAmplifiers(partial);
+		},
 		setSizeAnchor(next) {
 			setSizeAnchor(next);
 		},
@@ -3761,6 +3826,7 @@ var TacticalDraw = class {
 			measureOptions: draft.options,
 			measureStyle: draft.style,
 			measureProperties: draft.properties,
+			measureTextAmplifiers: draft.textAmplifiers,
 			guide: options?.guide,
 			sizeAnchor: options?.sizeAnchor,
 			onSettled
@@ -3777,6 +3843,7 @@ var TacticalDraw = class {
 			measureOptions: draft.options,
 			measureStyle: draft.style,
 			measureProperties: draft.properties,
+			measureTextAmplifiers: draft.textAmplifiers,
 			guide: options?.guide,
 			sizeAnchor: options?.sizeAnchor,
 			onSettled

package/package.json

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