@orbat-mapper/tactical-draw 0.6.2 → 0.7.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { C as EditPointerDriver, S as makeFillPatternImage, T as PointerEventInfo, _ as HatchPattern, a as LayerId, b as fillPatternImageId, c as MapEvent, d as PickHandler, f as PickOptions, g as HATCH_PATTERNS, h as TextStyleOptions, i as ImageOverlayResource, l as MapEventHandler, m as StyleOptions, n as HandleStyle, o as MapAdapter, p as PixelCoordinate, r as IconResource, s as MapCursor, t as FeatureGroup, u as PickEvent, v as MINE_PATTERN_TILE_SIZE, w as PointerCallback, x as isMinePattern, y as fillPatternImageDimension } from "./map-adapter-BWvKku2P.mjs";
-import { AmplifierPlacement, AmplifierPlacements, ControlMeasure, ControlMeasureKind, ControlMeasureRender, ControlMeasureStyle, TextAmplifiers } from "@orbat-mapper/control-measures";
+import { AmplifierPlacement, AmplifierPlacements, ControlMeasure, ControlMeasureKind, ControlMeasureRender, ControlMeasureStyle, SymbolColors, TextAmplifiers } from "@orbat-mapper/control-measures";
 import { Feature, Position } from "geojson";
 
 //#region src/base-map-adapter.d.ts
@@ -1333,6 +1333,8 @@ interface TacticalDrawOptions {
    * appearance when neither the host nor the measure supplies a style.
    */
   graphicsStyle?: ControlMeasureStyle;
+  /** Doctrinal defaults; explicit style colors take precedence. */
+  symbolColors?: SymbolColors;
   /**
    * Façade-level default interaction-affordance style. Per-slot, per-property
    * merged with `DrawOptions.interactionStyle` / `EditOptions.interactionStyle`
@@ -1498,6 +1500,7 @@ declare class TacticalDraw {
   private readonly handlesLayer;
   private readonly ownedLayers;
   private readonly graphicsStyle;
+  private readonly symbolColors;
   private readonly defaultInteractionStyle;
   private readonly generateId;
   private readonly pointSymbols;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-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";
+import { DEFAULT_LABEL_HEIGHT_CSS_PIXELS, DEFAULT_SYMBOL_COLOR, 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";
@@ -1878,7 +1878,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, measureTextAmplifiers, guide: guideOpt, sizeAnchor, onSettled, onSession, seed, snap } = options;
+	const { adapter, kind, previewLayer, guideLayer, graphicsStyle, symbolColors, generateId, signal, measureOptions, measureStyle, measureProperties, measureTextAmplifiers, guide: guideOpt, sizeAnchor, onSettled, onSession, seed, snap } = options;
 	const metadata = getControlMeasureMetadata(kind);
 	const rule = metadata.rule;
 	const min = metadata.minCoordinates;
@@ -1887,7 +1887,10 @@ function runFixedLengthDraw(options) {
 	if (rule) required = rule.minimumUserPoints;
 	else if (typeof min === "number" && typeof max === "number" && min === max) required = min;
 	else throw new Error(`runFixedLengthDraw: kind "${kind}" is not fixed-length (min=${min}, max=${max})`);
-	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
+	const renderOpts = {
+		graphicsStyle,
+		symbolColors
+	};
 	const guideEnabled = (guideOpt ?? true) && !shouldSuppressGuide(metadata);
 	const isAreaKind = metadata.geometry === "area";
 	const initialPoints = [];
@@ -2155,7 +2158,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, measureTextAmplifiers, guide: guideOpt, sizeAnchor, onSettled, snap } = options;
+	const { adapter, kind, previewLayer, guideLayer, graphicsStyle, symbolColors, generateId, signal, onSession, seed, measureOptions, measureStyle, measureProperties, measureTextAmplifiers, guide: guideOpt, sizeAnchor, onSettled, snap } = options;
 	const metadata = getControlMeasureMetadata(kind);
 	if (typeof metadata.minCoordinates !== "number") throw new Error(`runVariableLengthDraw: kind "${kind}" has no minCoordinates metadata`);
 	const min = metadata.minCoordinates;
@@ -2173,7 +2176,10 @@ function runVariableLengthDraw(options) {
 	function insertionIndex(len) {
 		return canonicalFormed(len) ? len - trailingFixed : len;
 	}
-	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
+	const renderOpts = {
+		graphicsStyle,
+		symbolColors
+	};
 	const initialPoints = [];
 	if (seed) {
 		for (const pos of seed) {
@@ -3914,8 +3920,11 @@ const ALLOWED_EDIT_MODES = new Set([
 *  - close / abort / signal / preempt / destroy paths
 */
 function runEdit(opts) {
-	const { adapter, measure, graphicsLayer, previewLayer, guideLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, modes: initialModes, interactionStyle, onSession, handleIdPrefix, guide: guideOpt, settleToGraphics, publishWorkingGraphic, onSettled, onClickAwayGraphicsPick, snap } = opts;
-	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
+	const { adapter, measure, graphicsLayer, previewLayer, guideLayer, handlesLayer, graphicsStyle, symbolColors, signal, closeOnClickAway = true, modes: initialModes, interactionStyle, onSession, handleIdPrefix, guide: guideOpt, settleToGraphics, publishWorkingGraphic, onSettled, onClickAwayGraphicsPick, snap } = opts;
+	const renderOpts = {
+		graphicsStyle,
+		symbolColors
+	};
 	let sizeAnchor = opts.sizeAnchor ?? defaultSizeAnchor(measure);
 	const metadata = getControlMeasureMetadata(measure.kind);
 	const rule = metadata.rule;
@@ -5455,10 +5464,13 @@ function defaultGroupSizeAnchor(graphics) {
 *    a live session without a session boundary
 */
 function runGroupTransform(opts) {
-	const { adapter, capability, imageCapability, graphics, graphicsLayer, previewLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, publishWorkingGraphics, settleWorkingGraphics, isOnGraphicsLayer, onSettled, onClickAwayGraphicsPick } = opts;
+	const { adapter, capability, imageCapability, graphics, graphicsLayer, previewLayer, handlesLayer, graphicsStyle, symbolColors, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, publishWorkingGraphics, settleWorkingGraphics, isOnGraphicsLayer, onSettled, onClickAwayGraphicsPick } = opts;
 	assertCapabilityFor(graphics);
 	validateImageResources(graphics);
-	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
+	const renderOpts = {
+		graphicsStyle,
+		symbolColors
+	};
 	let sizeAnchor = opts.sizeAnchor ?? defaultGroupSizeAnchor(graphics);
 	/** Throw synchronously if any graphic in `list` is a point symbol and no capability was supplied. */
 	function assertCapabilityFor(list) {
@@ -6982,6 +6994,7 @@ var TacticalDraw = class {
 	handlesLayer;
 	ownedLayers;
 	graphicsStyle;
+	symbolColors;
 	defaultInteractionStyle;
 	generateId;
 	pointSymbols;
@@ -7072,6 +7085,7 @@ var TacticalDraw = class {
 	hasHighlightOutlines = false;
 	constructor(adapter, options) {
 		this.adapter = adapter;
+		this.symbolColors = options?.symbolColors ? { ...options.symbolColors } : void 0;
 		this.lastViewResolution = adapter.getResolution();
 		this.graphicsStyle = resolveStyleHints(BUILT_IN_GRAPHICS_STYLE, options?.graphicsStyle, void 0);
 		this.defaultInteractionStyle = options?.interactionStyle;
@@ -7168,7 +7182,10 @@ var TacticalDraw = class {
 				revision
 			};
 		}
-		const render = renderMeasureForAdapter(this.adapter, graphic, { graphicsStyle: this.graphicsStyle });
+		const render = renderMeasureForAdapter(this.adapter, graphic, {
+			graphicsStyle: this.graphicsStyle,
+			symbolColors: this.symbolColors
+		});
 		return {
 			id: graphic.id,
 			features: render.features,
@@ -7412,7 +7429,10 @@ var TacticalDraw = class {
 			if (!this.images) return null;
 			return imageFootprint(graphic, renderImageForAdapter(this.adapter, this.images, graphic).render, this.adapter)?.box ?? null;
 		}
-		const render = renderMeasureForAdapter(this.adapter, graphic, { graphicsStyle: this.graphicsStyle });
+		const render = renderMeasureForAdapter(this.adapter, graphic, {
+			graphicsStyle: this.graphicsStyle,
+			symbolColors: this.symbolColors
+		});
 		if (graphic.kind === "text") return fitTextFootprintFromFeatures(render.features, (lonLat) => this.adapter.getPixelFromCoordinate(lonLat), {
 			resolution: this.adapter.getResolution(),
 			bearing
@@ -7576,6 +7596,7 @@ var TacticalDraw = class {
 			previewLayer: this.previewLayer,
 			guideLayer: this.guideLayer,
 			graphicsStyle: this.graphicsStyle,
+			symbolColors: this.symbolColors,
 			generateId: () => measureDraft.id ?? this.generateId(),
 			signal: options?.signal,
 			measureOptions: measureDraft.options,
@@ -7594,6 +7615,7 @@ var TacticalDraw = class {
 			previewLayer: this.previewLayer,
 			guideLayer: this.guideLayer,
 			graphicsStyle: this.graphicsStyle,
+			symbolColors: this.symbolColors,
 			generateId: () => measureDraft.id ?? this.generateId(),
 			signal: options?.signal,
 			onSession: this.trackSession(options?.onSession),
@@ -7710,6 +7732,7 @@ var TacticalDraw = class {
 			guideLayer: this.guideLayer,
 			handlesLayer: this.handlesLayer,
 			graphicsStyle: this.graphicsStyle,
+			symbolColors: this.symbolColors,
 			signal: options?.signal,
 			closeOnClickAway: options?.closeOnClickAway,
 			modes: options?.modes,
@@ -7764,6 +7787,7 @@ var TacticalDraw = class {
 			previewLayer: this.previewLayer,
 			handlesLayer: this.handlesLayer,
 			graphicsStyle: this.graphicsStyle,
+			symbolColors: this.symbolColors,
 			signal: options?.signal,
 			closeOnClickAway: options?.closeOnClickAway,
 			interactionStyle: mergedInteractionStyle,
@@ -8146,10 +8170,7 @@ function normalisePointEditModes(modes) {
 * identically when neither host nor measure supplies a style — without it,
 * each engine falls through to its own native (and different) vector default.
 */
-const BUILT_IN_GRAPHICS_STYLE = {
-	color: "#000000",
-	strokeWidth: 2
-};
+const BUILT_IN_GRAPHICS_STYLE = { strokeWidth: 2 };
 /**
 * Built-in defaults for the interaction-affordance slots (ADR-0006, extended
 * for the ADR-0017 transform box). The scale (corner) grips and the rotate
@@ -8237,7 +8258,7 @@ function mergeSlot(base, override) {
 }
 function styleToStyleOptions(style) {
 	const out = {};
-	const strokeColor = style.strokeColor ?? style.color;
+	const strokeColor = style.strokeColor ?? style.color ?? DEFAULT_SYMBOL_COLOR;
 	if (strokeColor !== void 0) out.strokeColor = strokeColor;
 	if (style.strokeWidth !== void 0) out.strokeWidth = style.strokeWidth;
 	if (style.strokeDash !== void 0) out.strokeDash = [...style.strokeDash];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "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.22.0"
+    "@orbat-mapper/control-measures": "^0.23.0"
   },
   "peerDependencies": {
     "vitest": ">=4.0.0"