@orbat-mapper/tactical-draw 0.9.0 → 0.9.2

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { A as PinOverridePatch, B as resolvePinPresentation, C as makeFillPatternImage, D as PointerEventInfo, E as PointerCallback, F as PinPresentationStatus, I as PinPresentationStatusEvent, L as PinPresentationStore, M as PinPresentationCapability, N as PinPresentationPatch, O as DEFAULT_PIN_PRESENTATION, P as PinPresentationState, R as PinRender, S as isMinePattern, T as EditPointerDriver, _ as HatchPattern, a as LayerId, b as fillPatternImageDimension, c as MapEvent, d as PickHandler, f as PickOptions, g as HATCH_PATTERNS, h as TextStyleOptions, i as ImageOverlayResource, j as PinPresentation, k as PinFootprint, 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 parseColor, x as fillPatternImageId, y as Rgba, z as isValidPinNumber } from "./map-adapter-azR_hVjj.mjs";
+import { A as PinOverridePatch, B as resolvePinPresentation, C as makeFillPatternImage, D as PointerEventInfo, E as PointerCallback, F as PinPresentationStatus, I as PinPresentationStatusEvent, L as PinPresentationStore, M as PinPresentationCapability, N as PinPresentationPatch, O as DEFAULT_PIN_PRESENTATION, P as PinPresentationState, R as PinRender, S as isMinePattern, T as EditPointerDriver, _ as HatchPattern, a as LayerId, b as fillPatternImageDimension, c as MapEvent, d as PickHandler, f as PickOptions, g as HATCH_PATTERNS, h as TextStyleOptions, i as ImageOverlayResource, j as PinPresentation, k as PinFootprint, 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 parseColor, x as fillPatternImageId, y as Rgba, z as isValidPinNumber } from "./map-adapter-DY-iZRcb.mjs";
 import { AmplifierPlacement, AmplifierPlacements, ControlMeasure, ControlMeasureKind, ControlMeasureRender, ControlMeasureStyle, SymbolColors, TextAmplifiers } from "@orbat-mapper/control-measures";
 import { Feature, Position } from "geojson";
 

package/dist/index.mjs

@@ -1088,7 +1088,11 @@ function createCommitEmitter(listenerErrorsMessage) {
 //#endregion
 //#region src/pin-presentation.ts
 function validateOverride(patch) {
-	for (const key of ["mode", "occlusion"]) if (Object.hasOwn(patch, key)) throw new TypeError(`Pin setting ${key} is view-wide only`);
+	for (const key of [
+		"mode",
+		"occlusion",
+		"prioritizePins"
+	]) if (Object.hasOwn(patch, key)) throw new TypeError(`Pin setting ${key} is view-wide only`);
 }
 const DEFAULT_PIN_PRESENTATION = Object.freeze({
 	enabled: false,
@@ -1097,6 +1101,7 @@ const DEFAULT_PIN_PRESENTATION = Object.freeze({
 	heightMeters: 250,
 	sizePixels: 32,
 	occlusion: "none",
+	prioritizePins: true,
 	stem: Object.freeze({
 		color: "#172033",
 		width: 2,
@@ -6062,6 +6067,15 @@ function runGroupTransform(opts) {
 		}
 		return pixels;
 	}
+	/** An axis-aligned {@link TransformBox} spanning a min/max pixel extent. */
+	function boxFromPixelBounds(min, max) {
+		return {
+			center: [(min[0] + max[0]) / 2, (min[1] + max[1]) / 2],
+			halfWidth: (max[0] - min[0]) / 2,
+			halfHeight: (max[1] - min[1]) / 2,
+			angle: 0
+		};
+	}
 	/** The rotated-text footprint corners for a Text member's rendered feature, or `null`. */
 	function textFootprintCorners(features) {
 		const box = fitTextFootprintFromFeatures(features, driver.toPixel, {
@@ -6127,6 +6141,7 @@ function runGroupTransform(opts) {
 			let features;
 			let iconResources = [];
 			let imageOverlays;
+			let pinGroup;
 			let boxPixels = [];
 			if (isImageMember(member)) {
 				const image = buildWorkingImage(member);
@@ -6138,11 +6153,23 @@ function runGroupTransform(opts) {
 			} else try {
 				if (isPointSymbolMember(member)) {
 					const symbol = buildWorkingPointSymbol(member);
-					const plan = renderPointSymbolForAdapter(adapter, capability, symbol);
-					iconResources = [plan.resource];
-					features = plan.features;
-					const footprint = pointSymbolFootprint(symbol, plan.render, adapter);
-					if (footprint) boxPixels = footprint.corners;
+					pinGroup = opts.renderPin?.(symbol);
+					if (pinGroup?.pin) {
+						features = pinGroup.features;
+						iconResources = pinGroup.iconResources;
+						const pinFootprint = adapter.getPinFootprint?.(symbol.id);
+						if (pinFootprint) boxPixels = boxCorners(boxFromPixelBounds(pinFootprint.min, pinFootprint.max));
+						else {
+							const footprint = pointSymbolFootprint(symbol, renderPointSymbolForAdapter(adapter, capability, symbol).render, adapter);
+							if (footprint) boxPixels = footprint.corners;
+						}
+					} else {
+						const plan = renderPointSymbolForAdapter(adapter, capability, symbol);
+						iconResources = [plan.resource];
+						features = plan.features;
+						const footprint = pointSymbolFootprint(symbol, plan.render, adapter);
+						if (footprint) boxPixels = footprint.corners;
+					}
 				} else {
 					const working = workingGraphicFor(i);
 					features = renderMeasureForAdapter(adapter, working, renderOpts).features;
@@ -6153,16 +6180,11 @@ function runGroupTransform(opts) {
 				boxPixels = [];
 			}
 			member.lastBoxPixels = boxPixels;
-			if (member.usesGraphicStack) workingGroups.push({
-				id: member.graphic.id,
-				features,
-				iconResources,
-				...imageOverlays ? { imageOverlays } : {}
-			});
-			else previewGroups.push({
+			(member.usesGraphicStack ? workingGroups : previewGroups).push({
 				id: member.graphic.id,
 				features,
 				iconResources,
+				...pinGroup?.pin ? { pin: pinGroup.pin } : {},
 				...imageOverlays ? { imageOverlays } : {}
 			});
 		});
@@ -6983,6 +7005,13 @@ function runPointSymbolEdit(opts) {
 		}
 	};
 	const pointerAngle = (pixel, anchor) => Math.atan2(pixel[1] - anchor[1], pixel[0] - anchor[0]);
+	const snapTranslate = (position, fallbackPixel, info) => snap?.({
+		coordinate: position,
+		pixel: driver.toPixel(position) ?? fallbackPixel,
+		interaction: "translate",
+		graphicId: symbol.id,
+		originalEvent: info?.native
+	})?.coordinate ?? position;
 	const onDown = (pixel, info) => {
 		if (pinEditing && opts.canRenderPin?.() && !ctx.settled) {
 			const footprint = adapter.getPinFootprint?.(working.id);
@@ -7031,11 +7060,13 @@ function runPointSymbolEdit(opts) {
 	};
 	const transformed = (pixel, info) => {
 		if (pinDrag) {
-			const position = adapter.movePinFromPixel?.(working.id, [pinDrag.attachment[0] + pixel[0] - pinDrag.down[0], pinDrag.attachment[1] + pixel[1] - pinDrag.down[1]]);
-			return position ? {
+			const attachment = [pinDrag.attachment[0] + pixel[0] - pinDrag.down[0], pinDrag.attachment[1] + pixel[1] - pinDrag.down[1]];
+			const position = adapter.movePinFromPixel?.(working.id, attachment);
+			if (!position) return null;
+			return {
 				...clonePointSymbol(pinDrag.start),
-				position
-			} : null;
+				position: snapTranslate(position, attachment, info)
+			};
 		}
 		if (!drag) return null;
 		let next = clonePointSymbol(drag.start);
@@ -7061,15 +7092,7 @@ function runPointSymbolEdit(opts) {
 			return next;
 		}
 		if (drag.kind === "body" || drag.kind === "location") {
-			const unsnappedPosition = driver.fromPixel([drag.anchor[0] + pixel[0] - drag.down[0], drag.anchor[1] + pixel[1] - drag.down[1]]);
-			const anchorPixel = driver.toPixel(unsnappedPosition) ?? pixel;
-			const position = (snap?.({
-				coordinate: unsnappedPosition,
-				pixel: anchorPixel,
-				interaction: "translate",
-				graphicId: symbol.id,
-				originalEvent: info?.native
-			}))?.coordinate ?? unsnappedPosition;
+			const position = snapTranslate(driver.fromPixel([drag.anchor[0] + pixel[0] - drag.down[0], drag.anchor[1] + pixel[1] - drag.down[1]]), pixel, info);
 			if (drag.kind === "location") return movePointSymbolLocation(next, intrinsic, adapter, position);
 			next.position = position;
 			if (next.offset?.placement.mode === "ground") {
@@ -8484,6 +8507,7 @@ var TacticalDraw = class {
 			adapter: this.adapter,
 			capability: this.pointSymbols,
 			imageCapability: this.images,
+			...this.pointSymbols ? { renderPin: (symbol) => this.buildGraphicGroup(symbol) } : {},
 			graphics: measures,
 			graphicsLayer: this.graphicsLayer,
 			previewLayer: this.previewLayer,

package/dist/{map-adapter-azR_hVjj.d.mts → map-adapter-DY-iZRcb.d.mts}

@@ -10,6 +10,7 @@ interface PinPresentation {
   heightMeters: number;
   sizePixels: number;
   occlusion: "none" | "terrain";
+  prioritizePins: boolean;
   stem: {
     color: string;
     width: number;
@@ -48,7 +49,7 @@ type PinPresentationPatch = Partial<Omit<PinPresentation, "stem" | "dot" | "halo
   plate?: Partial<PinPresentation["plate"]>;
 };
 /** Per-unit appearance and dimensions; spatial rules belong to the view. */
-type PinOverridePatch = Omit<PinPresentationPatch, "mode" | "occlusion">;
+type PinOverridePatch = Omit<PinPresentationPatch, "mode" | "occlusion" | "prioritizePins">;
 interface PinPresentationState {
   defaults: PinPresentationPatch;
   overrides: Record<string, PinOverridePatch>;

package/dist/testing.d.mts

@@ -1,4 +1,4 @@
-import { a as LayerId, o as MapAdapter, p as PixelCoordinate } from "./map-adapter-azR_hVjj.mjs";
+import { a as LayerId, o as MapAdapter, p as PixelCoordinate } from "./map-adapter-DY-iZRcb.mjs";
 import { Feature } from "geojson";
 
 //#region src/testing/feature-group-conformance.d.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.9.0",
+  "version": "0.9.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",