@orbat-mapper/tactical-draw 0.12.0 → 0.13.1

package/dist/index.mjs

@@ -3164,6 +3164,17 @@ function runEditInteraction(spec) {
 }
 //#endregion
 //#region src/tactical-draw/handles.ts
+/** Size of a `compact` option handle relative to its slot's style. */
+const COMPACT_HANDLE_SCALE = 2 / 3;
+/** Shrink a handle style's radius and stroke for a `compact` handle. */
+function compactHandleStyle(style) {
+	const { pointRadius, strokeWidth } = style;
+	return {
+		...style,
+		...pointRadius !== void 0 && { pointRadius: pointRadius * COMPACT_HANDLE_SCALE },
+		...strokeWidth !== void 0 && { strokeWidth: strokeWidth * COMPACT_HANDLE_SCALE }
+	};
+}
 /**
 * Midpoint of the segment between two positions, in lonLat. The single source
 * for "where a midpoint handle sits": `buildHandleSet` places the handle here
@@ -3249,7 +3260,8 @@ function handleStyleFor(kind, interactionStyle, unset = false) {
 */
 function toFeatures(handles, featureIdPrefix, interactionStyle) {
 	return handles.map((handle) => {
-		const style = handleStyleFor(handle.kind, interactionStyle, handle.unset);
+		const slotStyle = handleStyleFor(handle.kind, interactionStyle, handle.unset);
+		const style = slotStyle && handle.compact ? compactHandleStyle(slotStyle) : slotStyle;
 		return {
 			type: "Feature",
 			id: handleFeatureId(featureIdPrefix, handle.kind, handle.index),
@@ -4365,6 +4377,7 @@ function runEdit(opts) {
 	const isAreaKind = metadata.geometry === "area";
 	const isTextGraphic = measure.kind === "text";
 	const foldsTransformIntoOptions = foldsBoxTransformOptions(measure.kind);
+	const holdsAnchorOnFold = foldsTransformIntoOptions && metadata.maxCoordinates === 1;
 	const requestedModes = normaliseModes(initialModes);
 	const editStartPoints = measure.controlPoints.map((p) => [...p]);
 	const workingPoints = editStartPoints.map((p) => [...p]);
@@ -4523,7 +4536,7 @@ function runEdit(opts) {
 			const px = driver.toPixel(p);
 			if (px) pixels.push(px);
 		}
-		return fitTransformBox(pixels, activeOptionTransformInFlight() ? activeBoxDrag.lastSnapshot.box.angle : boxAngle, interactionStyle?.boxPadding ?? 0);
+		return fitTransformBox(pixels, anchoredOptionTransformInFlight() ? activeBoxDrag.lastSnapshot.box.angle : boxAngle, interactionStyle?.boxPadding ?? 0);
 	}
 	/**
 	* The Text footprint box (rotated rectangle hugging the rendered text),
@@ -4542,12 +4555,12 @@ function runEdit(opts) {
 	* Re-fit `box` from `lastWorkingFeatures`. A no-op while a box gesture is
 	* in flight — that drag paints the box rigidly from its own snapshot
 	* (`BoxDragSnapshot.box`) instead of a re-fit, so a corner/rotate/body drag
-	* doesn't fight its own paint. Option-backed transforms are the exception:
-	* their anchor points stay fixed while their rendered footprint changes, so
+	* doesn't fight its own paint. Single-anchor option-backed transforms are the
+	* exception: their anchor points stay fixed while their rendered footprint changes, so
 	* the box must re-fit from that live render on every tick.
 	*/
 	function refitBox() {
-		if (activeBoxDrag && !activeOptionTransformInFlight()) return;
+		if (activeBoxDrag && !anchoredOptionTransformInFlight()) return;
 		box = fitBoxFromFeatures(lastWorkingFeatures);
 	}
 	function renderWorkingGraphic() {
@@ -4596,7 +4609,7 @@ function runEdit(opts) {
 		const features = toFeatures(buildCurrentHandleSet(), handleIdPrefix, interactionStyle);
 		if (modes.includes("labeldrag")) features.push(...labels.handleFeatures());
 		if (modes.includes("transform")) {
-			const liveBox = activeBoxDrag && !activeOptionTransformInFlight() ? activeBoxDrag.lastSnapshot.box : box;
+			const liveBox = activeBoxDrag && !anchoredOptionTransformInFlight() ? activeBoxDrag.lastSnapshot.box : box;
 			if (liveBox) {
 				features.push(boxOutlineFeature(liveBox, dragProjection.fromPixel, `${handleIdPrefix}:box-outline`, interactionStyle?.boxOutline));
 				features.push(...toFeatures(boxToHandles(liveBox, dragProjection.fromPixel), handleIdPrefix, interactionStyle));
@@ -4608,6 +4621,11 @@ function runEdit(opts) {
 			iconResources: []
 		}]);
 	}
+	/** Live view scale for option handles behind pixel-authored sizes. */
+	function optionHandleContext() {
+		const resolution = adapter.getResolution();
+		return hasUsableResolution(resolution) ? { constructionMetersPerCssPixel: resolution } : {};
+	}
 	function buildCurrentHandleSet() {
 		const handles = buildHandleSet(workingPoints, modes, {
 			includeMidpoints: midpointHandlesEnabled,
@@ -4616,7 +4634,10 @@ function runEdit(opts) {
 			closedRing
 		});
 		if (modes.includes("reshape")) {
-			const optionHandles = getControlMeasureOptionHandles(measure.kind, workingPoints, workingOptions, { detail: detailHandles });
+			const optionHandles = getControlMeasureOptionHandles(measure.kind, workingPoints, workingOptions, {
+				detail: detailHandles,
+				...optionHandleContext()
+			});
 			for (let index = 0; index < optionHandles.length; index++) {
 				const handle = optionHandles[index];
 				handles.push({
@@ -4624,7 +4645,8 @@ function runEdit(opts) {
 					index,
 					optionId: handle.id,
 					position: [...handle.position],
-					...handle.unset ? { unset: true } : {}
+					...handle.unset ? { unset: true } : {},
+					...handle.compact ? { compact: true } : {}
 				});
 			}
 		}
@@ -5145,7 +5167,7 @@ function runEdit(opts) {
 	let activeDrag = null;
 	let activeOptionDrag = null;
 	function optionsForOptionHandle(position, drag) {
-		const patch = dragControlMeasureOptionHandle(measure.kind, workingPoints, drag.preDragOptions, drag.handleId, position);
+		const patch = dragControlMeasureOptionHandle(measure.kind, workingPoints, drag.preDragOptions, drag.handleId, position, optionHandleContext());
 		return patch ? {
 			...drag.preDragOptions ?? {},
 			...patch
@@ -5270,7 +5292,7 @@ function runEdit(opts) {
 				return;
 			}
 			if (hit.kind === "option" && hit.optionId && info?.altKey) {
-				const patch = resetControlMeasureOptionHandle(measure.kind, workingPoints, workingOptions, hit.optionId);
+				const patch = resetControlMeasureOptionHandle(measure.kind, workingPoints, workingOptions, hit.optionId, optionHandleContext());
 				if (patch) {
 					setOptions(patch, "gesture", "Reset option handle");
 					shell.suppressNextClickAway();
@@ -5396,6 +5418,10 @@ function runEdit(opts) {
 		const kind = activeBoxDrag.fsm.kind;
 		return kind === "rotate" || kind === "scale";
 	}
+	/** Whether the live option-backed gesture also holds a single anchor fixed. */
+	function anchoredOptionTransformInFlight() {
+		return holdsAnchorOnFold && activeOptionTransformInFlight();
+	}
 	function paintBoxDragSnapshot(pixel, info, constrainRotation = false) {
 		if (!activeBoxDrag) return;
 		const resolvedPixel = translatedBoxPixel(pixel, info, activeBoxDrag);
@@ -5403,9 +5429,11 @@ function runEdit(opts) {
 		activeBoxDrag.lastSnapshot = snapshot;
 		if (activeOptionTransformInFlight()) {
 			const foldedOptions = foldOptionTransform(activeBoxDrag.preDragBox, snapshot.box, activeBoxDrag.fsm.kind, activeBoxDrag.preDragOptions);
-			workingPoints.splice(0, workingPoints.length, ...activeBoxDrag.preDragPoints);
 			if (foldedOptions) workingOptions = foldedOptions;
 			nonGeometryDirty = true;
+		}
+		if (anchoredOptionTransformInFlight()) {
+			workingPoints.splice(0, workingPoints.length, ...activeBoxDrag.preDragPoints);
 			renderWorkingGraphic();
 			renderHandlesLayer();
 			recomputeDirty();
@@ -5528,7 +5556,7 @@ function runEdit(opts) {
 				if (foldedOptions) workingOptions = foldedOptions;
 				nonGeometryDirty = true;
 			}
-			const committedPoints = optionFold ? preDragPoints : finalSnapshot.points;
+			const committedPoints = optionFold && holdsAnchorOnFold ? preDragPoints : finalSnapshot.points;
 			emitTransient("end", committedPoints, null);
 			commitGesture(committedPoints, preDragOptions, transformAmplifierPlacements(preDragAmplifierPlacements, preDragBox, finalSnapshot.box, driver), preDragBox.angle);
 			return;

package/package.json

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