@orbat-mapper/tactical-draw 0.2.0-alpha.25 → 0.2.0-alpha.27

package/dist/index.d.mts

@@ -180,6 +180,12 @@ interface MapAdapter {
    * silently ignored.
    */
   removeFeatures(layerId: LayerId, ids: readonly string[]): void;
+  /**
+   * Defer an upcoming removal from `layerId` until the most recent update to
+   * `updatedLayerId` has completed in the engine. Optional because synchronous
+   * adapters already make cross-layer write order visible atomically.
+   */
+  deferLayerRemovalUntilLayerUpdate?(layerId: LayerId, updatedLayerId: LayerId): void;
   /**
    * Subscribe to click-style "pick" events for a specific layer. Basemap and
    * other-layer clicks never fire the handler.
@@ -544,6 +550,12 @@ interface PointSymbolCapability {
 }
 declare function isPointSymbol(graphic: unknown): graphic is PointSymbol;
 declare function clonePointSymbol(symbol: PointSymbol): PointSymbol;
+/**
+ * Replace a point-symbol size value as a user-driven resize. Ground-size display
+ * bounds scale with the value so they continue to constrain zoom changes rather
+ * than preventing the resize itself.
+ */
+declare function resizePointSymbolSize(size: PointSymbolSize, value: number): PointSymbolSize;
 //#endregion
 //#region src/graphic.d.ts
 type Graphic = ControlMeasure | PointSymbol;
@@ -1512,7 +1524,7 @@ declare class TacticalDraw {
    * Routes every measure through [[renderMeasureForAdapter]] so pixel sizing is
    * resolved against the live map. Callers own any edit-exclusion policy — see
    * `render()` (excludes the edited measure, owned by the preview layer) versus
-   * `restoreOriginalToGraphics` (no exclusion, the edit is ending).
+   * `settleToGraphics` (no exclusion, the edit is ending).
    */
   private renderMeasuresToGraphics;
   /**
@@ -1880,6 +1892,7 @@ interface PointSymbolFootprint {
   box: TransformBox;
   corners: PixelCoordinate[];
 }
+declare function effectivePointSymbolPixelSize(symbol: PointSymbol, resolution: number | undefined): number;
 /** Complete rotated logical footprint for selection and transform chrome. */
 declare function pointSymbolFootprint(symbol: PointSymbol, render: PointSymbolRender, adapter: Pick<MapAdapter, "getBearing" | "getPixelFromCoordinate" | "getResolution">): PointSymbolFootprint | null;
 //#endregion
@@ -1897,4 +1910,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 DrawPointSymbolDraft, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type Graphic, type GraphicEditChangeEvent, type GraphicEditSession, type GraphicGeometrySnappingOptions, type GraphicRender, type GraphicSnapshot, type GuideStyle, type HandleStyle, type IconResource, 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 PointSymbol, type PointSymbolAnchor, type PointSymbolCapability, PointSymbolCapabilityRequiredError, type PointSymbolColors, type PointSymbolFootprint, type PointSymbolGraphicModifiers, type PointSymbolRender, type PointSymbolSize, type PointSymbolStyle, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SessionChangeSource, type SessionHistory, type SessionHistoryState, type SettleReason, type SizeAnchor, type SnapCandidate, type SnapCandidateProvider, type SnapCandidateRequest, type SnapInteraction, type SnapResult, type SnappingOptions, 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, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, 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 DrawPointSymbolDraft, type DrawSession, type EditChangeEvent, type EditManyOptions, type EditMode, type EditOptions, type EditPointerDriver, type EditSession, type FeatureOps, type Graphic, type GraphicEditChangeEvent, type GraphicEditSession, type GraphicGeometrySnappingOptions, type GraphicRender, type GraphicSnapshot, type GuideStyle, type HandleStyle, type IconResource, 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 PointSymbol, type PointSymbolAnchor, type PointSymbolCapability, PointSymbolCapabilityRequiredError, type PointSymbolColors, type PointSymbolFootprint, type PointSymbolGraphicModifiers, type PointSymbolRender, type PointSymbolSize, type PointSymbolStyle, type PointerCallback, PointerCallbackHub, type PointerEventInfo, type SessionChangeSource, type SessionHistory, type SessionHistoryState, type SettleReason, type SizeAnchor, type SnapCandidate, type SnapCandidateProvider, type SnapCandidateRequest, type SnapInteraction, type SnapResult, type SnappingOptions, 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, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, effectivePointSymbolPixelSize, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resizePointSymbolSize, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };

package/dist/index.mjs

@@ -461,6 +461,28 @@ function isPointSymbol(graphic) {
 function clonePointSymbol(symbol) {
 	return structuredClone(symbol);
 }
+/**
+* Replace a point-symbol size value as a user-driven resize. Ground-size display
+* bounds scale with the value so they continue to constrain zoom changes rather
+* than preventing the resize itself.
+*/
+function resizePointSymbolSize(size, value) {
+	if (size.unit === "pixels") return {
+		value,
+		unit: "pixels"
+	};
+	const scale = value / size.value;
+	if (!Number.isFinite(scale) || scale <= 0) return {
+		...size,
+		value
+	};
+	return {
+		...size,
+		value,
+		...size.minPixels !== void 0 ? { minPixels: size.minPixels * scale } : {},
+		...size.maxPixels !== void 0 ? { maxPixels: size.maxPixels * scale } : {}
+	};
+}
 //#endregion
 //#region src/tactical-draw/active-interaction.ts
 /**
@@ -1875,6 +1897,38 @@ function runEditInteraction(spec) {
 		attach(interaction) {
 			ctx = interaction;
 			driver = adapter.createEditPointerDriver();
+			let beforeTeardownRan = false;
+			const runBeforeTeardown = (settlement) => {
+				if (beforeTeardownRan) return;
+				beforeTeardownRan = true;
+				try {
+					spec.onBeforeTeardown?.(settlement);
+				} catch {}
+			};
+			const controllerContext = {
+				get settled() {
+					return interaction.settled;
+				},
+				commit(produce) {
+					return interaction.commit(() => {
+						const value = produce();
+						runBeforeTeardown({
+							status: "committed",
+							value
+						});
+						return value;
+					});
+				},
+				fail(error) {
+					if (!interaction.settled) runBeforeTeardown({
+						status: "rejected",
+						error
+					});
+					interaction.fail(error);
+				},
+				writeLayer: interaction.writeLayer,
+				onTeardown: interaction.onTeardown
+			};
 			const unsubDown = driver.onPointerDown(spec.onDown);
 			const unsubMove = driver.onPointerMove(spec.onMove);
 			const unsubUp = driver.onPointerUp(spec.onUp);
@@ -1883,6 +1937,10 @@ function runEditInteraction(spec) {
 			const unsubGraphics = adapter.onPick(graphicsLayer, onGraphicsPick);
 			adapter.on("click", onClick);
 			interaction.onTeardown(() => {
+				runBeforeTeardown({
+					status: "rejected",
+					error: void 0
+				});
 				adapter.off("click", onClick);
 				unsubPreview();
 				unsubHandles();
@@ -1893,7 +1951,7 @@ function runEditInteraction(spec) {
 				spec.extraTeardown?.();
 				driver.dispose();
 			}, spec.onAbort);
-			spec.attach(interaction, driver, shell);
+			spec.attach(controllerContext, driver, shell);
 		}
 	});
 }
@@ -2961,7 +3019,7 @@ 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, restoreOriginalToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
+	const { adapter, measure, graphicsLayer, previewLayer, guideLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, modes: initialModes, interactionStyle, onSession, handleIdPrefix, guide: guideOpt, settleToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
 	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
 	let sizeAnchor = opts.sizeAnchor ?? "ground";
 	const metadata = getControlMeasureMetadata(measure.kind);
@@ -3836,6 +3894,9 @@ function runEdit(opts) {
 		previewLayer,
 		handlesLayer,
 		closeOnClickAway,
+		onBeforeTeardown: (settlement) => {
+			settleToGraphics(settlement.status === "committed" ? settlement.value.graphic : void 0);
+		},
 		onViewChange: rescaleOnViewChange,
 		onDown: onDriverDown,
 		onMove: onDriverMove,
@@ -3857,13 +3918,15 @@ function runEdit(opts) {
 				dragInFlight = false;
 			}
 		},
-		onAbort: wasOnGraphicsLayer ? restoreOriginalToGraphics : void 0,
 		attach(interaction, createdDriver, createdShell) {
 			ctx = interaction;
 			driver = createdDriver;
 			shell = createdShell;
-			liftOriginalFromGraphics();
 			renderPreview();
+			if (wasOnGraphicsLayer) {
+				adapter.deferLayerRemovalUntilLayerUpdate?.(graphicsLayer, previewLayer);
+				liftOriginalFromGraphics();
+			}
 			renderHandlesLayer();
 			recomputeDirty();
 			if (onSession) onSession(session);
@@ -4134,10 +4197,7 @@ function runGroupTransform(opts) {
 	function buildWorkingPointSymbol(member) {
 		const symbol = clonePointSymbol(member.graphic);
 		symbol.position = [...member.workingPoints[0]];
-		symbol.size = {
-			...symbol.size,
-			value: member.workingSize
-		};
+		symbol.size = resizePointSymbolSize(symbol.size, member.workingSize);
 		symbol.rotation = member.workingRotation;
 		return symbol;
 	}
@@ -4859,7 +4919,7 @@ function symbolBox(adapter, capability, symbol, padding = 0) {
 	};
 }
 function runPointSymbolEdit(opts) {
-	const { adapter, capability, symbol, graphicsLayer, previewLayer, handlesLayer, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, restoreOriginalToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
+	const { adapter, capability, symbol, graphicsLayer, previewLayer, handlesLayer, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, settleToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
 	let modes = normalisePointModes(opts.modes);
 	let working = clonePointSymbol(symbol);
 	let dirty = false;
@@ -5010,7 +5070,7 @@ function runPointSymbolEdit(opts) {
 			next.rotation = normalizeRotation(info?.shiftKey ? constrainRotation(rotation) : rotation);
 		} else {
 			const distance = Math.hypot(pixel[0] - drag.anchor[0], pixel[1] - drag.anchor[1]);
-			next.size.value = Math.max(.1, drag.start.size.value * (distance / drag.startDistance));
+			next.size = resizePointSymbolSize(drag.start.size, Math.max(.1, drag.start.size.value * (distance / drag.startDistance)));
 		}
 		return next;
 	};
@@ -5044,6 +5104,9 @@ function runPointSymbolEdit(opts) {
 		handlesLayer,
 		closeOnClickAway,
 		onViewChange: render,
+		onBeforeTeardown: (settlement) => {
+			settleToGraphics(settlement.status === "committed" ? settlement.value.graphic : void 0);
+		},
 		onDown,
 		onMove,
 		onUp,
@@ -5056,15 +5119,15 @@ function runPointSymbolEdit(opts) {
 		facadeOnSettled: onSettled,
 		emitSettle: (settlement) => settleFromInteraction(settlement, commitEmitter, settleEmitter),
 		extraTeardown: () => adapter.reconcileLayerIconResources(previewLayer, []),
-		onAbort: () => {
-			if (wasOnGraphicsLayer) restoreOriginalToGraphics();
-		},
 		attach(interaction, createdDriver, createdShell) {
 			ctx = interaction;
 			driver = createdDriver;
 			shell = createdShell;
-			if (wasOnGraphicsLayer) adapter.removeFeatures(graphicsLayer, [`${symbol.id}:point-symbol`]);
 			render();
+			if (wasOnGraphicsLayer) {
+				adapter.deferLayerRemovalUntilLayerUpdate?.(graphicsLayer, previewLayer);
+				adapter.removeFeatures(graphicsLayer, [`${symbol.id}:point-symbol`]);
+			}
 			onSession?.(session);
 		}
 	});
@@ -5186,7 +5249,7 @@ var TacticalDraw = class {
 	* Routes every measure through [[renderMeasureForAdapter]] so pixel sizing is
 	* resolved against the live map. Callers own any edit-exclusion policy — see
 	* `render()` (excludes the edited measure, owned by the preview layer) versus
-	* `restoreOriginalToGraphics` (no exclusion, the edit is ending).
+	* `settleToGraphics` (no exclusion, the edit is ending).
 	*/
 	renderMeasuresToGraphics(graphics) {
 		const features = [];
@@ -5482,7 +5545,12 @@ var TacticalDraw = class {
 			const preempt = this.guardAndPreempt();
 			if (preempt) return preempt;
 			const wasOnGraphicsLayer = this.lastRenderedMeasures.some((m) => m.id === measure.id);
-			const restoreOriginalToGraphics = () => this.renderMeasuresToGraphics(this.lastRenderedMeasures);
+			const settleToGraphics = (settledSymbol) => {
+				if (!wasOnGraphicsLayer) return;
+				const graphics = settledSymbol ? this.lastRenderedMeasures.map((graphic) => graphic.id === measure.id ? settledSymbol : graphic) : this.lastRenderedMeasures;
+				this.renderMeasuresToGraphics(graphics);
+				this.adapter.deferLayerRemovalUntilLayerUpdate?.(this.previewLayer, this.graphicsLayer);
+			};
 			const handleIdPrefix = `__td_edit_${++this.editCounter}__`;
 			return this.runWithSlot((onSettled) => runPointSymbolEdit({
 				adapter: this.adapter,
@@ -5497,7 +5565,7 @@ var TacticalDraw = class {
 				interactionStyle: this.resolveInteractionStyle(options?.interactionStyle),
 				onSession: options?.onSession,
 				handleIdPrefix,
-				restoreOriginalToGraphics,
+				settleToGraphics,
 				wasOnGraphicsLayer,
 				onSettled,
 				onClickAwayGraphicsPick: (event) => this.dispatchHostPick(this.graphicsLayer, event),
@@ -5513,8 +5581,11 @@ var TacticalDraw = class {
 		const preempt = this.guardAndPreempt();
 		if (preempt) return preempt;
 		const wasOnGraphicsLayer = this.lastRenderedMeasures.some((m) => m.id === measure.id);
-		const restoreOriginalToGraphics = () => {
-			this.renderMeasuresToGraphics(this.lastRenderedMeasures);
+		const settleToGraphics = (settledMeasure) => {
+			if (!wasOnGraphicsLayer) return;
+			const graphics = settledMeasure ? this.lastRenderedMeasures.map((graphic) => graphic.id === measure.id ? settledMeasure : graphic) : this.lastRenderedMeasures;
+			this.renderMeasuresToGraphics(graphics);
+			this.adapter.deferLayerRemovalUntilLayerUpdate?.(this.previewLayer, this.graphicsLayer);
 		};
 		const handleIdPrefix = `__td_edit_${++this.editCounter}__`;
 		const mergedInteractionStyle = this.resolveInteractionStyle(options?.interactionStyle);
@@ -5538,7 +5609,7 @@ var TacticalDraw = class {
 			handleIdPrefix,
 			guide: options?.guide,
 			sizeAnchor: options?.sizeAnchor,
-			restoreOriginalToGraphics,
+			settleToGraphics,
 			wasOnGraphicsLayer,
 			onSettled,
 			onClickAwayGraphicsPick,
@@ -6040,4 +6111,4 @@ function nearestWorldCopyPosition(position, refLng) {
 	return [nearestWorldCopyLng(position[0], refLng), ...position.slice(1)];
 }
 //#endregion
-export { BaseMapAdapter, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, PointSymbolCapabilityRequiredError, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, TacticalDrawDestroyedError, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };
+export { BaseMapAdapter, DEFAULT_LABEL_SIZE_PIXELS, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, PointSymbolCapabilityRequiredError, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, TacticalDraw, TacticalDrawAbortError, TacticalDrawDestroyedError, bindAbortable, clonePointSymbol, coerceHandleStyle, combineWithHostSignal, effectivePointSymbolPixelSize, getSizeAnchor, hitTestFeature, hitTestIconFeature, ignoreAbort, isPointSymbol, isTacticalDrawAbortError, nearestWorldCopyLng, nearestWorldCopyPosition, pickHitTolerance, pointSymbolFootprint, resizePointSymbolSize, resolveGroundTextSizePixels, tryControlMeasureIdFromFeature };

package/package.json

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