@orbat-mapper/tactical-draw 0.6.0 → 0.6.2

package/dist/index.d.mts

@@ -551,7 +551,7 @@ type SizeAnchor = "ground" | "screen";
 /**
  * The [[SizeAnchor]] a measure currently encodes (ADR-0020): `screen` when it
  * carries its kind's pixel-denominated size option, `ground` otherwise. Keys off
- * the same `PIXEL_SIZE_OPTIONS` table as the bake, so a consumer deciding how to
+ * the same metadata size pairs as the bake, so a consumer deciding how to
  * re-edit a graphic never has to re-derive the per-kind pixel-option knowledge
  * (e.g. via a fragile key-name heuristic). Accepts the minimal `{ kind, options }`
  * shape, mirroring [[measureUsesAdapterResolution]].

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { FILL_PATTERN_DEFINITIONS, NON_SOLID_FILL_PATTERNS, applyBoxTransformOptions, canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, dragControlMeasureOptionHandle, foldsBoxTransformOptions, freezeOrientationOptions, getControlMeasureMetadata, getControlMeasureOptionHandles, getDefaultOptions, normalizeTextAmplifiers, renderControlMeasure, resolveAmplifierPlacement, resolveStyleHints, roundToFixed } from "@orbat-mapper/control-measures";
+import { DEFAULT_LABEL_HEIGHT_CSS_PIXELS, FILL_PATTERN_DEFINITIONS, NON_SOLID_FILL_PATTERNS, applyBoxTransformOptions, canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, dragControlMeasureOptionHandle, foldsBoxTransformOptions, freezeOrientationOptions, getControlMeasureMetadata, getControlMeasureOptionHandles, getDefaultOptions, normalizeTextAmplifiers, renderControlMeasure, resolveAmplifierPlacement, resolveSizePair, resolveStyleHints, roundToFixed, switchSizePairUnit } from "@orbat-mapper/control-measures";
 function pickPointerType(originalEvent) {
 	if (typeof PointerEvent !== "undefined" && originalEvent instanceof PointerEvent) {
 		if (originalEvent.pointerType === "touch") return "touch";
@@ -1046,114 +1046,23 @@ function combineWithHostSignal(hostSignal) {
 }
 //#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
-* screen-anchored. Label sizing is not listed here: every `capturesLabelSize`
-* kind carries the shared `labelSizePixels` → `labelSize` pair implicitly
-* (ADR-0028) — see [[sizeOptionSpecs]]. Both the resolution gate
-* ([[measureUsesAdapterResolution]]) and the bake ([[bakePixelSizeToGround]])
-* derive from this table, so a new pixel-sized kind is one entry here
-* (ADR-0020).
-*/
-const PIXEL_SIZE_OPTIONS = {
-	boundary: {
-		pixels: "echelonSizePixels",
-		meters: "echelonSize"
-	},
-	"battle-position": {
-		pixels: "echelonSizePixels",
-		meters: "echelonSize"
-	},
-	"strong-point": {
-		pixels: "echelonSizePixels",
-		meters: "echelonSize"
-	},
-	"base-camp": {
-		pixels: "echelonSizePixels",
-		meters: "echelonSize"
-	},
-	"guerrilla-base": {
-		pixels: "echelonSizePixels",
-		meters: "echelonSize"
-	},
-	flot: {
-		pixels: "radiusPixels",
-		meters: "radius"
-	},
-	"fortified-line": {
-		pixels: "toothSizePixels",
-		meters: "toothSize"
-	},
-	"fortified-area": {
-		pixels: "toothSizePixels",
-		meters: "toothSize"
-	},
-	"antitank-ditch-under-construction": {
-		pixels: "toothHeightPixels",
-		meters: "toothHeight"
-	},
-	"antitank-ditch-completed": {
-		pixels: "toothHeightPixels",
-		meters: "toothHeight"
-	},
-	"antitank-wall": {
-		pixels: "toothHeightPixels",
-		meters: "toothHeight"
-	},
-	destroy: {
-		pixels: "sizePixels",
-		meters: "sizeMeters"
-	},
-	defeat: {
-		pixels: "sizePixels",
-		meters: "sizeMeters"
-	},
-	neutralize: {
-		pixels: "sizePixels",
-		meters: "sizeMeters"
-	},
-	suppress: {
-		pixels: "sizePixels",
-		meters: "sizeMeters"
-	},
-	minefield: {
-		pixels: "sizePixels",
-		meters: "sizeMeters"
-	},
-	text: {
-		pixels: "sizePixels",
-		meters: "sizeMeters"
-	}
-};
-/** The shared label-size pair every `capturesLabelSize` kind carries (ADR-0028). */
-const LABEL_SIZE_SPEC = {
-	pixels: "labelSizePixels",
-	meters: "labelSize"
-};
-/**
-* Every pixel/meter size-option pair `kind` can carry: its geometry entry from
-* [[PIXEL_SIZE_OPTIONS]] (if any) plus the shared label pair when the kind
-* captures a label size — a kind like Boundary can carry both anchor-bearing
-* dimensions at once (echelon glyph + labels).
-*/
+const DEFAULT_LABEL_SIZE_PIXELS = DEFAULT_LABEL_HEIGHT_CSS_PIXELS;
+/** An adapter resolution usable for pixel<->meter conversion. */
+function hasUsableResolution(mpp) {
+	return mpp !== void 0 && Number.isFinite(mpp) && mpp > 0;
+}
+/** Every supported dimension, including captured labels, comes from core metadata. */
 function sizeOptionSpecs(kind) {
-	const specs = [];
-	const geometry = PIXEL_SIZE_OPTIONS[kind];
-	if (geometry) specs.push(geometry);
-	if (getControlMeasureMetadata(kind).capturesLabelSize) specs.push(LABEL_SIZE_SPEC);
-	return specs;
+	return getControlMeasureMetadata(kind).sizePairs ?? [];
 }
 /**
 * Whether `kind` has at least one size that can be restored to its normal
 * pixel-authored appearance at the adapter's current resolution. Kept inside
-* tactical-draw with the private size-pair catalog so hosts never need to
+* tactical-draw using the core metadata catalog so hosts never need to
 * infer option names or special-case captured labels.
 */
 function canResetGroundSizes(measure, adapter) {
-	const mpp = adapter.getResolution();
-	return mpp !== void 0 && mpp > 0 && sizeOptionSpecs(measure.kind).length > 0;
+	return hasUsableResolution(adapter.getResolution()) && sizeOptionSpecs(measure.kind).length > 0;
 }
 /**
 * Return the complete option record produced by resetting every known size
@@ -1167,35 +1076,30 @@ function canResetGroundSizes(measure, adapter) {
 function resetGroundSizeOptions(measure, adapter) {
 	const mpp = adapter.getResolution();
 	const specs = sizeOptionSpecs(measure.kind);
-	if (mpp === void 0 || mpp <= 0 || specs.length === 0) return void 0;
+	if (!hasUsableResolution(mpp) || specs.length === 0) return void 0;
 	const defaults = getDefaultOptions(measure.kind);
 	const next = { ...measure.options ?? {} };
 	for (const spec of specs) {
-		const defaultPixels = spec === LABEL_SIZE_SPEC ? 14 : defaults[spec.pixels];
+		const defaultPixels = spec.defaultUnit === "px" && spec.defaultValue !== void 0 ? spec.defaultValue : defaults[spec.pixels];
 		if (typeof defaultPixels !== "number") continue;
+		const result = switchSizePairUnit({
+			kind: measure.kind,
+			dimension: spec.id,
+			options: {
+				...next,
+				[spec.pixels]: defaultPixels
+			},
+			unit: "m",
+			constructionMetersPerCssPixel: mpp
+		});
+		if (result.status !== "converted") return void 0;
 		delete next[spec.pixels];
-		next[spec.meters] = defaultPixels * mpp;
+		next[spec.meters] = result.value;
 	}
 	delete next.metersPerPixel;
 	return next;
 }
 /**
-* Whether `kind` authors `spec` in pixels — its defaults declare the pixel key
-* with no meter counterpart. A static property of the definition, but
-* `getDefaultOptions` deep-clones on every call, so it is memoised: the gate
-* below runs per measure per view-change frame.
-*/
-const pixelAuthoredCache = /* @__PURE__ */ new Map();
-function isPixelAuthored(kind, spec) {
-	const cacheKey = `${kind}:${spec.pixels}`;
-	const cached = pixelAuthoredCache.get(cacheKey);
-	if (cached !== void 0) return cached;
-	const defaults = getDefaultOptions(kind);
-	const authored = defaults[spec.pixels] !== void 0 && defaults[spec.meters] === void 0;
-	pixelAuthoredCache.set(cacheKey, authored);
-	return authored;
-}
-/**
 * Whether `measure` carries a pixel-denominated size option whose resolution
 * to meters depends on the live map (`metersPerPixel`) — i.e. it is
 * *screen-anchored*. Used both to inject the override
@@ -1209,7 +1113,7 @@ function measureUsesAdapterResolution(measure) {
 	return sizeOptionSpecs(measure.kind).some((spec) => {
 		if (options?.[spec.pixels] !== void 0) return true;
 		if (options?.[spec.meters] !== void 0) return false;
-		return isPixelAuthored(measure.kind, spec);
+		return !spec.captureOnDraw && spec.defaultUnit === "px";
 	});
 }
 /**
@@ -1241,7 +1145,7 @@ function measureRendersFromViewState(measure) {
 /**
 * The [[SizeAnchor]] a measure currently encodes (ADR-0020): `screen` when it
 * carries its kind's pixel-denominated size option, `ground` otherwise. Keys off
-* the same `PIXEL_SIZE_OPTIONS` table as the bake, so a consumer deciding how to
+* the same metadata size pairs as the bake, so a consumer deciding how to
 * re-edit a graphic never has to re-derive the per-kind pixel-option knowledge
 * (e.g. via a fragile key-name heuristic). Accepts the minimal `{ kind, options }`
 * shape, mirroring [[measureUsesAdapterResolution]].
@@ -1254,32 +1158,32 @@ function defaultSizeAnchor(measure) {
 	return getControlMeasureMetadata(measure.kind).uniformSizing ? getSizeAnchor(measure) : "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.
+* Materialize uncaptured pixel authoring defaults before commit, so the ground
+* bake sees an explicit value. Meter-default dimensions and authored values
+* remain unchanged; captured labels have their separate render/commit seam.
 */
 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: {
+	let options = measure.options ?? {};
+	let changed = false;
+	for (const spec of sizeOptionSpecs(measure.kind)) {
+		if (spec.captureOnDraw || spec.defaultUnit !== "px") continue;
+		if (options[spec.pixels] !== void 0 || options[spec.meters] !== void 0) continue;
+		const resolved = resolveSizePair({
+			kind: measure.kind,
+			dimension: spec.id,
+			options
+		});
+		if (resolved.status !== "resolved") continue;
+		options = {
 			...options,
-			[spec.pixels]: defaults[spec.pixels]
-		}
-	};
+			[spec.pixels]: resolved.value
+		};
+		changed = true;
+	}
+	return changed ? {
+		...measure,
+		options
+	} : measure;
 }
 /**
 * Bake a screen-anchored (pixel) size to a ground-anchored (meter) size at the
@@ -1291,17 +1195,26 @@ function withDefaultAuthoringSize(measure) {
 */
 function bakePixelSizeToGround(measure, adapter) {
 	const options = measure.options ?? {};
-	const specs = sizeOptionSpecs(measure.kind).filter((spec) => typeof options[spec.pixels] === "number");
+	const specs = sizeOptionSpecs(measure.kind).filter((spec) => options[spec.pixels] !== void 0);
 	if (specs.length === 0) return measure;
 	const mpp = adapter.getResolution();
-	if (mpp === void 0 || mpp <= 0) return measure;
-	const pixelKeys = new Set(specs.map((spec) => spec.pixels));
-	const rest = {};
-	for (const [key, value] of Object.entries(options)) if (!pixelKeys.has(key) && key !== "metersPerPixel") rest[key] = value;
-	for (const spec of specs) rest[spec.meters] = options[spec.pixels] * mpp;
+	if (!hasUsableResolution(mpp)) return measure;
+	let next = options;
+	for (const spec of specs) {
+		const result = switchSizePairUnit({
+			kind: measure.kind,
+			dimension: spec.id,
+			options: next,
+			unit: "m",
+			constructionMetersPerCssPixel: mpp
+		});
+		if (result.status !== "converted") return measure;
+		next = result.options;
+	}
+	delete next.metersPerPixel;
 	return {
 		...measure,
-		options: rest
+		options: next
 	};
 }
 /**
@@ -1322,7 +1235,7 @@ function withCommittedAdapterMeasureOptions(measure) {
 		...measure,
 		options: {
 			...measure.options,
-			labelSizePixels: 14
+			labelSizePixels: DEFAULT_LABEL_SIZE_PIXELS
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "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",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@orbat-mapper/control-measures": "^0.20.0"
+    "@orbat-mapper/control-measures": "^0.22.0"
   },
   "peerDependencies": {
     "vitest": ">=4.0.0"