@orbat-mapper/tactical-draw 0.2.0-alpha.18 → 0.2.0-alpha.19

package/dist/index.d.mts

@@ -260,6 +260,13 @@ interface MapAdapter {
    * destruction.
    */
   destroy(): void;
+  /**
+   * Returns the features currently set on the layer — the adapter-side cache
+   * of the last `setLayerFeatures`/`updateLayerFeatures`/`removeFeatures`/
+   * `clearLayer` state. Empty array for an unknown layer. Callers must not
+   * mutate the returned array or features.
+   */
+  getLayerFeatures(layerId: LayerId): readonly Feature[];
 }
 //#endregion
 //#region src/base-map-adapter.d.ts
@@ -339,6 +346,7 @@ declare abstract class BaseMapAdapter<TLayerHandle, TEventToken, TViewToken> imp
    * (MapLibre, OpenLayers) override this.
    */
   getBearing(): number;
+  getLayerFeatures(layerId: LayerId): readonly Feature[];
 }
 //#endregion
 //#region src/pick-utils.d.ts
@@ -387,7 +395,7 @@ type ToPixel = (lonLat: Position) => PixelCoordinate | null;
  *
  * Returns the first matching feature in iteration order, or null.
  */
-declare function hitTestFeature(pixel: PixelCoordinate, features: Feature[], hitTolerance: number, toPixel: ToPixel): Feature | null;
+declare function hitTestFeature(pixel: PixelCoordinate, features: readonly Feature[], hitTolerance: number, toPixel: ToPixel): Feature | null;
 //#endregion
 //#region src/gestures/hit-tolerance.d.ts
 declare const TOUCH_HIT_TOLERANCE_PX = 22;
@@ -993,6 +1001,18 @@ interface TacticalDrawLayerOptions {
   guide?: LayerId;
   handles?: LayerId;
 }
+/**
+ * Result of {@link TacticalDraw.ownsInteractionAt} — which layer claimed the
+ * pixel and the feature that matched.
+ */
+interface InteractionHit {
+  /** Which TacticalDraw layer owns the pixel — topmost match wins. */
+  layer: "handles" | "preview" | "graphics";
+  /** The hit feature (do not mutate). */
+  feature: Feature;
+  /** Control-measure id when the hit feature belongs to one (graphics/preview parts). */
+  measureId?: string;
+}
 interface TacticalDrawOptions {
   layers?: TacticalDrawLayerOptions;
   /**
@@ -1414,6 +1434,47 @@ declare class TacticalDraw {
    * Returns an unsubscribe function. Optional `signal` mirrors `adapter.onPick`.
    */
   onPick(layerId: LayerId, handler: PickHandler, opts?: PickOptions): () => void;
+  /**
+   * Stateless hit test answering "does TacticalDraw own the pixel at
+   * `pixel`?" — for hosts composing their own click-away / deselection logic
+   * (issue #216) alongside `TacticalDraw`'s draw/edit sessions. Today hosts
+   * hack this together from the `@internal` `layerIds` plus engine-specific
+   * layer queries; this is the supported replacement.
+   *
+   * Tests, topmost first, the three interactive layers — `handlesLayer`,
+   * then `previewLayer`, then `graphicsLayer` — against each layer's current
+   * `adapter.getLayerFeatures(...)` cache. The `guideLayer` is deliberately
+   * excluded: it is non-interactive draw-guide scaffolding, never a
+   * legitimate "owned" click target.
+   *
+   * `preview` and `graphics` each get a label text-extent fallback after the
+   * geometry pass misses on that layer: for every `Point` feature carrying a
+   * string `properties.text`, the anchor is projected and
+   * `fitLabelBoxFromFeature` (shared with the edit controller's `pickLabel`,
+   * see commit f908434) estimates the rendered text's box; a pixel inside
+   * that box counts as owned even though it's off the anchor point itself.
+   * This matters most for the active preview, since a click can land
+   * anywhere across a rotated/offset label during an edit.
+   *
+   * `tolerance` defaults to `mapEventHitTolerance(options?.originalEvent)` —
+   * pass the host's raw click event as `originalEvent` to get the same
+   * pointer-type-aware tolerance (4px mouse/pen, 12px touch) `onPick` uses;
+   * pass an explicit `tolerance` to override it outright.
+   *
+   * `measureId` is set when the hit feature resolves to a control-measure id
+   * via `tryControlMeasureIdFromFeature` — present for graphics/preview
+   * parts, generally absent for handles.
+   *
+   * This is a pure synchronous query over adapter-cached state: it does not
+   * depend on `onPick`/`"click"` dispatch having run first, so it is safe to
+   * call from any host click handler regardless of ordering relative to
+   * TacticalDraw's own pick/click pipeline.
+   */
+  ownsInteractionAt(pixel: PixelCoordinate, options?: {
+    tolerance?: number;
+    originalEvent?: unknown;
+  }): InteractionHit | null;
+  private toInteractionHit;
   /**
    * Abort the in-flight draw or edit. The default `"session"` reason matches
    * `DrawSession.abort()` / `EditSession.abort()`.
@@ -1543,4 +1604,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 DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type GuideStyle, type HandleStyle, type InteractionStyle, type LayerId, type MapAdapter, type MapCursor, type MapEvent, type MapEventHandler, type NativeEventEntry, type PickEvent, type PickHandler, type PickOptions, type PixelCoordinate, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SettleReason, type SizeAnchor, 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, bindAbortable, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, ignoreAbort, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, 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 DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type GuideStyle, type HandleStyle, 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 PointerCallback, PointerCallbackHub, type PointerEventInfo, type SettleReason, type SizeAnchor, 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, bindAbortable, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, ignoreAbort, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };

package/dist/index.mjs

@@ -180,6 +180,9 @@ var BaseMapAdapter = class {
 	getBearing() {
 		return 0;
 	}
+	getLayerFeatures(layerId) {
+		return this.featureCache.get(layerId) ?? [];
+	}
 };
 function pickHitTolerance(originalEvent) {
 	if (typeof PointerEvent !== "undefined" && originalEvent instanceof PointerEvent) return originalEvent.pointerType === "touch" ? 12 : 4;
@@ -2140,6 +2143,28 @@ function fitLabelTransformBox(input) {
 		angle
 	};
 }
+/**
+* Read a label `Point` feature's rendered props (`text`, `rotation`,
+* `textAnchor`, `textSizePixels`, `textSizeMeters`) into a
+* {@link fitLabelTransformBox} input, anchored at `anchorPixel`. Shared by
+* the edit controller's label picking/dragging and `TacticalDraw`'s
+* `ownsInteractionAt` label-extent fallback — both need the exact same
+* text-extent estimate so a click that "owns" a label during a host
+* click-away check matches what the edit controller would pick.
+*/
+function fitLabelBoxFromFeature(feature, anchorPixel, view) {
+	const props = feature.properties ?? {};
+	return fitLabelTransformBox({
+		text: typeof props.text === "string" ? props.text : void 0,
+		rotation: typeof props.rotation === "number" ? props.rotation : void 0,
+		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,
+		anchor: anchorPixel,
+		resolution: view.resolution,
+		bearing: view.bearing
+	});
+}
 //#endregion
 //#region src/tactical-draw/edit-controller.ts
 /**
@@ -2374,7 +2399,10 @@ function runEdit(opts) {
 			else {
 				const anchor = selectedLabelAnchor();
 				if (selectedLabelKey && !anchor) selectedLabelKey = null;
-				else if (anchor) labelBox = fitLabelBoxFromFeature(anchor.feature, anchor.pixel);
+				else if (anchor) labelBox = fitLabelBoxFromFeature(anchor.feature, anchor.pixel, {
+					resolution: adapter.getResolution(),
+					bearing: adapter.getBearing()
+				});
 			}
 			for (const feature of lastPreviewFeatures) {
 				const key = feature.properties?.labelPlacementKey;
@@ -2860,20 +2888,6 @@ function runEdit(opts) {
 	* click landed at within the box).
 	*/
 	let activeAmplifierDrag = null;
-	/** Read a label feature's rendered props into a `fitLabelTransformBox` input, anchored at `anchorPixel`. */
-	function fitLabelBoxFromFeature(feature, anchorPixel) {
-		const props = feature.properties ?? {};
-		return fitLabelTransformBox({
-			text: typeof props.text === "string" ? props.text : void 0,
-			rotation: typeof props.rotation === "number" ? props.rotation : void 0,
-			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,
-			anchor: anchorPixel,
-			resolution: adapter.getResolution(),
-			bearing: adapter.getBearing()
-		});
-	}
 	function pickLabel(pixel, tolerance) {
 		for (const feature of lastPreviewFeatures) {
 			const key = feature.properties?.labelPlacementKey;
@@ -2887,7 +2901,10 @@ function runEdit(opts) {
 					anchorPixel: projected
 				};
 			}
-			const box = fitLabelBoxFromFeature(feature, projected);
+			const box = fitLabelBoxFromFeature(feature, projected, {
+				resolution: adapter.getResolution(),
+				bearing: adapter.getBearing()
+			});
 			if (box && pointInBox(box, pixel)) return {
 				key,
 				anchorPixel: projected
@@ -4640,6 +4657,92 @@ var TacticalDraw = class {
 		return remove;
 	}
 	/**
+	* Stateless hit test answering "does TacticalDraw own the pixel at
+	* `pixel`?" — for hosts composing their own click-away / deselection logic
+	* (issue #216) alongside `TacticalDraw`'s draw/edit sessions. Today hosts
+	* hack this together from the `@internal` `layerIds` plus engine-specific
+	* layer queries; this is the supported replacement.
+	*
+	* Tests, topmost first, the three interactive layers — `handlesLayer`,
+	* then `previewLayer`, then `graphicsLayer` — against each layer's current
+	* `adapter.getLayerFeatures(...)` cache. The `guideLayer` is deliberately
+	* excluded: it is non-interactive draw-guide scaffolding, never a
+	* legitimate "owned" click target.
+	*
+	* `preview` and `graphics` each get a label text-extent fallback after the
+	* geometry pass misses on that layer: for every `Point` feature carrying a
+	* string `properties.text`, the anchor is projected and
+	* `fitLabelBoxFromFeature` (shared with the edit controller's `pickLabel`,
+	* see commit f908434) estimates the rendered text's box; a pixel inside
+	* that box counts as owned even though it's off the anchor point itself.
+	* This matters most for the active preview, since a click can land
+	* anywhere across a rotated/offset label during an edit.
+	*
+	* `tolerance` defaults to `mapEventHitTolerance(options?.originalEvent)` —
+	* pass the host's raw click event as `originalEvent` to get the same
+	* pointer-type-aware tolerance (4px mouse/pen, 12px touch) `onPick` uses;
+	* pass an explicit `tolerance` to override it outright.
+	*
+	* `measureId` is set when the hit feature resolves to a control-measure id
+	* via `tryControlMeasureIdFromFeature` — present for graphics/preview
+	* parts, generally absent for handles.
+	*
+	* This is a pure synchronous query over adapter-cached state: it does not
+	* depend on `onPick`/`"click"` dispatch having run first, so it is safe to
+	* call from any host click handler regardless of ordering relative to
+	* TacticalDraw's own pick/click pipeline.
+	*/
+	ownsInteractionAt(pixel, options) {
+		this.assertAlive();
+		const tolerance = options?.tolerance ?? mapEventHitTolerance(options?.originalEvent);
+		const toPixel = (lonLat) => this.adapter.getPixelFromCoordinate(lonLat);
+		const layers = [
+			{
+				layer: "handles",
+				layerId: this.handlesLayer,
+				labelFallback: false
+			},
+			{
+				layer: "preview",
+				layerId: this.previewLayer,
+				labelFallback: true
+			},
+			{
+				layer: "graphics",
+				layerId: this.graphicsLayer,
+				labelFallback: true
+			}
+		];
+		for (const { layer, layerId, labelFallback } of layers) {
+			const features = this.adapter.getLayerFeatures(layerId);
+			const hit = hitTestFeature(pixel, features, tolerance, toPixel);
+			if (hit) return this.toInteractionHit(layer, hit);
+			if (labelFallback) for (const feature of features) {
+				if (feature.geometry?.type !== "Point") continue;
+				if (typeof feature.properties?.text !== "string") continue;
+				const anchorPixel = toPixel(feature.geometry.coordinates);
+				if (!anchorPixel) continue;
+				const box = fitLabelBoxFromFeature(feature, anchorPixel, {
+					resolution: this.adapter.getResolution(),
+					bearing: this.adapter.getBearing()
+				});
+				if (box && pointInBox(box, pixel)) return this.toInteractionHit(layer, feature);
+			}
+		}
+		return null;
+	}
+	toInteractionHit(layer, feature) {
+		const measureId = tryControlMeasureIdFromFeature(feature);
+		return measureId != null ? {
+			layer,
+			feature,
+			measureId
+		} : {
+			layer,
+			feature
+		};
+	}
+	/**
 	* Abort the in-flight draw or edit. The default `"session"` reason matches
 	* `DrawSession.abort()` / `EditSession.abort()`.
 	*

package/package.json

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