@orbat-mapper/control-measures 0.11.0 → 0.12.1

package/dist/{renderControlMeasure-DJo_s-lN.mjs → renderControlMeasure-DYcehsHK.mjs}

@@ -130,15 +130,27 @@ const destinationPoint = (origin, distance, bearing) => {
 //#endregion
 //#region src/internal/vector-utils.ts
 /**
-* Offsets a polyline using Miter Joins or Round Joins.
+* Offsets a polyline to both sides at once, using Miter Joins or Round Joins.
+* `offsets` carries one half-width per vertex, so the outline may taper along
+* its centerline; both sides read the same array rather than materialising a
+* negated copy per geometry pass.
 */
-function offsetPolyline(points, offset, rounded = false, segments = 5) {
+function offsetPolylineSides(points, offsets, rounded = false, segments = 5) {
+	return {
+		left: offsetPolylineWithOffsets(points, offsets, rounded, segments, 1),
+		right: offsetPolylineWithOffsets(points, offsets, rounded, segments, -1)
+	};
+}
+/** One side of {@link offsetPolylineSides}; `sign` picks which. */
+function offsetPolylineWithOffsets(points, offsets, rounded, segments, sign) {
 	if (points.length < 2) return points;
+	if (offsets.length !== points.length) return points;
 	const result = [];
 	const N = points.length;
 	for (let i = 0; i < N; i++) {
 		const p = points[i];
 		if (!p) continue;
+		const offset = offsets[i] * sign;
 		if (i === 0) {
 			const next = points[i + 1];
 			if (next) {
@@ -195,6 +207,17 @@ function offsetPolyline(points, offset, rounded = false, segments = 5) {
 	}
 	return result;
 }
+/** Linearly interpolates values by distance along a polyline, not vertex count. */
+function interpolatePolylineValues(points, startValue, endValue) {
+	const distances = [0];
+	for (let i = 1; i < points.length; i++) distances.push(distances[i - 1] + vecMag(vecSub(points[i], points[i - 1])));
+	const totalLength = distances.at(-1) ?? 0;
+	if (totalLength < 1e-6) return points.map(() => endValue);
+	return distances.map((distance) => {
+		const progress = distance / totalLength;
+		return startValue + (endValue - startValue) * progress;
+	});
+}
 function vecAdd(a, b) {
 	return [a[0] + b[0], a[1] + b[1]];
 }
@@ -248,9 +271,81 @@ function lineIntersection(p1, p2, p3, p4) {
 }
 //#endregion
 //#region src/attack-utils.ts
-const DEFAULT_SHAFT_WIDTH_RATIO = .6;
+const DEFAULT_SHAFT_WIDTH_RATIO$1 = .6;
+const DEFAULT_REAR_WIDTH_RATIO = DEFAULT_SHAFT_WIDTH_RATIO$1;
 const SHAFT_MIN_RATIO = .1;
 const SHAFT_MAX_RATIO = .9;
+const REAR_WIDTH_OPTION_HANDLE_ID = "rear-width";
+const SHAFT_WIDTH_OPTION_HANDLE_ID = "shaft-width";
+/**
+* Creates the definition-owned rear-/shaft-width handle pair shared by every
+* variable-width arrow body. Callers supply only how their own geometry maps
+* onto {@link WidthHandleGeometry}; placement (the two ends of the left edge)
+* and the drag math (perpendicular distance from the dragged point to the
+* matching centerline segment, over the reference half-width) live here once.
+*/
+function createWidthOptionHandles(config) {
+	return {
+		get(controlPoints, options) {
+			const geometry = config.geometry(controlPoints, options);
+			const rearLeft = geometry?.leftEdge[0];
+			const neckLeft = geometry?.leftEdge.at(-1);
+			if (!rearLeft || !neckLeft) return [];
+			return [{
+				id: REAR_WIDTH_OPTION_HANDLE_ID,
+				position: unproject(rearLeft[0], rearLeft[1])
+			}, {
+				id: SHAFT_WIDTH_OPTION_HANDLE_ID,
+				position: unproject(neckLeft[0], neckLeft[1])
+			}];
+		},
+		drag({ controlPoints, options, handleId, position }) {
+			const geometry = config.geometry(controlPoints, options);
+			if (!geometry || geometry.referenceHalfWidth < 1e-6) return void 0;
+			const rear = handleId === REAR_WIDTH_OPTION_HANDLE_ID;
+			if (!rear && !(handleId === "shaft-width")) return void 0;
+			const from = rear ? geometry.spine[0] : geometry.spine.at(-2);
+			const to = rear ? geometry.spine[1] : geometry.spine.at(-1);
+			if (!from || !to) return void 0;
+			const ratio = clamp(pointToInfiniteLineDistance(project(position[0], position[1]), from, to) / geometry.referenceHalfWidth, config.minRatio, rear ? config.maxRearRatio : config.maxShaftRatio);
+			return rear ? { rearWidthRatio: ratio } : { shaftWidthRatio: ratio };
+		}
+	};
+}
+/**
+* The width handles for attack bodies built by {@link processAttackGeometry},
+* whose ratios are fractions of the arrowhead half-width. A coordinate resolver
+* lets derivative measures (Counterattack by Fire) map their authored Axis1
+* points to the body coordinates first.
+*/
+function createVariableWidthAttackOptionHandles(resolveCoordinates = (points) => points) {
+	return createWidthOptionHandles({
+		geometry(controlPoints, options) {
+			const coordinates = resolveCoordinates(controlPoints);
+			if (!coordinates) return null;
+			const { geometry } = processAttackGeometry(coordinates, options);
+			const outerLeft = geometry?.headRing[0];
+			if (!geometry || !outerLeft) return null;
+			return {
+				spine: geometry.shaftCenterline,
+				leftEdge: geometry.shaftLeft,
+				referenceHalfWidth: vecMag(vecSub(outerLeft, geometry.ptBase))
+			};
+		},
+		minRatio: SHAFT_MIN_RATIO,
+		maxRearRatio: 3,
+		maxShaftRatio: SHAFT_MAX_RATIO
+	});
+}
+const variableWidthAttackOptionHandles = createVariableWidthAttackOptionHandles();
+/**
+* The single home of the "rear inherits shaft" rule: an omitted `rearWidthRatio`
+* leaves the body parallel by matching the effective shaft ratio. Every
+* variable-width body resolves the option through here so the rule cannot drift.
+*/
+function resolveRearWidthRatio(options, shaftRatio) {
+	return options.rearWidthRatio ?? shaftRatio;
+}
 /**
 * Processes input coordinates and options to generate the core symbol geometry.
 * This handles validation, default values, projection, and geometry calculation.
@@ -259,6 +354,7 @@ function processAttackGeometry(coordinates, options = {}) {
 	const shaftRatio = clamp(options.shaftWidthRatio ?? .6, SHAFT_MIN_RATIO, SHAFT_MAX_RATIO);
 	const smooth = options.smooth ?? false;
 	const smoothResolution = options.smoothResolution ?? 5;
+	const rearRatio = clamp(resolveRearWidthRatio(options, shaftRatio), SHAFT_MIN_RATIO, 3);
 	const points = coordinates.map((c) => project(c[0], c[1]));
 	const numPoints = points.length;
 	const ptTip = points[0];
@@ -268,9 +364,9 @@ function processAttackGeometry(coordinates, options = {}) {
 		const p = points[i];
 		if (p) spinePoints.push(p);
 	}
-	return { geometry: calculateSymbolGeometry(ptTip, ptWidth, spinePoints, shaftRatio, smooth, smoothResolution) };
+	return { geometry: calculateSymbolGeometry(ptTip, ptWidth, spinePoints, shaftRatio, rearRatio, smooth, smoothResolution) };
 }
-function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, smooth, smoothResolution) {
+function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, rearWidthRatio, smooth, smoothResolution) {
 	const initialNeck = spine[spine.length - 1];
 	if (!initialNeck) return null;
 	const initialTipDir = vecNorm(vecSub(ptTip, initialNeck));
@@ -323,10 +419,11 @@ function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, smooth, smoo
 		outerLeft
 	];
 	const fullSpine = [...remainingSpine, shaftEndCenter];
+	const { left: shaftLeft, right: shaftRight } = offsetPolylineSides(fullSpine, interpolatePolylineValues(fullSpine, headHalfWidth * rearWidthRatio, shaftHalfWidth), smooth, smoothResolution);
 	return {
 		shaftCenterline: fullSpine,
-		shaftLeft: offsetPolyline(fullSpine, shaftHalfWidth, smooth, smoothResolution),
-		shaftRight: offsetPolyline(fullSpine, -shaftHalfWidth, smooth, smoothResolution),
+		shaftLeft,
+		shaftRight,
 		headRing,
 		ptTip,
 		ptNeck,
@@ -1726,6 +1823,16 @@ const ATTACK_SHAFT_PARAMS = [
 		max: 1,
 		step: .05
 	},
+	{
+		key: "rearWidthRatio",
+		presentationTier: "advanced",
+		label: "Rear width",
+		description: "Width at the rear of the shaft as a ratio of the arrowhead width.",
+		type: "number",
+		min: .1,
+		max: 2,
+		step: .05
+	},
 	{
 		key: "smooth",
 		label: "Smooth",
@@ -1845,9 +1952,19 @@ const AREA_LABEL_PADDING_PARAM = {
 	max: 2,
 	step: .05
 };
+const MULTILINE_AREA_LABEL_PARAM = {
+	key: "multilineLabel",
+	label: "Multiline label",
+	description: "Place the doctrinal label above Field T on separate centered lines",
+	type: "boolean"
+};
 const LABELED_AREA_PARAMS = [...AREA_SMOOTH_PARAMS, AREA_LABEL_PADDING_PARAM];
-const ECHELON_AREA_PARAMS = [
+const PREFIXED_LABELED_AREA_PARAMS = [
 	...AREA_SMOOTH_PARAMS,
+	MULTILINE_AREA_LABEL_PARAM,
+	AREA_LABEL_PADDING_PARAM
+];
+const ECHELON_GLYPH_PARAMS = [
 	{
 		key: "echelon",
 		label: "Echelon",
@@ -1896,7 +2013,17 @@ const ECHELON_AREA_PARAMS = [
 		min: -.5,
 		max: .5,
 		step: .01
-	},
+	}
+];
+const ECHELON_AREA_PARAMS = [
+	...AREA_SMOOTH_PARAMS,
+	...ECHELON_GLYPH_PARAMS,
+	AREA_LABEL_PADDING_PARAM
+];
+const PREFIXED_ECHELON_AREA_PARAMS = [
+	...AREA_SMOOTH_PARAMS,
+	MULTILINE_AREA_LABEL_PARAM,
+	...ECHELON_GLYPH_PARAMS,
 	AREA_LABEL_PADDING_PARAM
 ];
 const AREA_DESIGNATION_AMPLIFIER = {
@@ -1954,7 +2081,8 @@ const AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE = AREA_TEXT_AMPLIFIERS.filter((d)
 //#endregion
 //#region src/generators/cm15-maneuver-areas/airborneAttack.ts
 const DEFAULT_AIRBORNE_ATTACK_OPTIONS = {
-	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
 	smoothResolution: 5
 };
@@ -2019,7 +2147,8 @@ const AIRBORNE_ATTACK = defineControlMeasure({
 	metadata: AIRBORNE_ATTACK_METADATA,
 	generator: createAirborneAttack,
 	defaultOptions: DEFAULT_AIRBORNE_ATTACK_OPTIONS,
-	rule: axis1DrawRule
+	rule: axis1DrawRule,
+	optionHandles: variableWidthAttackOptionHandles
 });
 /**
 * Reacts to an **input-contract** violation according to `mode`: `throw`
@@ -3897,8 +4026,10 @@ function composeAreaName(prefix, designation, separator = " ") {
 * which differ only in `prefix` (and JTAA's empty `separator`).
 */
 function composeAreaLabelTexts(textAmplifiers, prefix = "", separator = " ") {
+	const designation = textAmplifiers.T?.trim() ?? "";
 	return {
-		name: composeAreaName(prefix, textAmplifiers.T, separator),
+		name: composeAreaName(prefix, designation, separator),
+		multilineName: prefix && designation ? `${prefix}\n${designation}` : void 0,
 		additionalInformation: textAmplifiers.H,
 		dtgStart: textAmplifiers.W,
 		dtgEnd: textAmplifiers.W1,
@@ -4134,19 +4265,41 @@ function pushAreaLabels(out, ringVerts, texts, options = {}, amplifierPlacements
 	const padding = Math.max(0, options.labelPadding ?? 0);
 	const maskRingVerts = maskBoundary?.ringVerts ?? ringVerts;
 	const [cx, cy] = ringLabelAnchor(ringVerts);
+	const multilineName = options.multilineLabel ? texts.multilineName : void 0;
 	const rows = [
-		[texts.name, "T"],
-		[texts.additionalInformation, "H"],
-		[texts.dtgStart, "W"],
-		[texts.dtgEnd, "W1"]
-	].flatMap(([text, field]) => text ? [{
+		[
+			multilineName ?? texts.name,
+			"T",
+			multilineName ? multilineName.split("\n").length : 1
+		],
+		[
+			texts.additionalInformation,
+			"H",
+			1
+		],
+		[
+			texts.dtgStart,
+			"W",
+			1
+		],
+		[
+			texts.dtgEnd,
+			"W1",
+			1
+		]
+	].flatMap(([text, field, lineCount]) => text ? [{
 		text,
-		field
+		field,
+		lineCount
 	}] : []);
 	if (rows.length > 0) {
 		const pitch = resolveLabelOffsetMeters(options, ROW_PITCH_RATIO + padding);
-		rows.forEach(({ text, field }, i) => {
-			pushLabel(out, [cx, cy + ((rows.length - 1) / 2 - i) * pitch], text, HORIZONTAL_LABEL_ROTATION, sizeProps, void 0, field);
+		const totalLineCount = rows.reduce((sum, row) => sum + row.lineCount, 0);
+		let precedingLineCount = 0;
+		rows.forEach(({ text, field, lineCount }) => {
+			const rowCenter = precedingLineCount + (lineCount - 1) / 2;
+			pushLabel(out, [cx, cy + ((totalLineCount - 1) / 2 - rowCenter) * pitch], text, HORIZONTAL_LABEL_ROTATION, sizeProps, void 0, field);
+			precedingLineCount += lineCount;
 		});
 	}
 	if (!texts.hostile) return [];
@@ -4552,7 +4705,7 @@ const ENGAGEMENT_AREA_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -4819,7 +4972,7 @@ const AREA_OF_OPERATIONS_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS
 };
 /**
@@ -4843,7 +4996,10 @@ const AREA_OF_OPERATIONS = defineControlMeasure({
 			[-1, .5]
 		],
 		textAmplifiers: { T: "GREEN" },
-		options: { labelSize: 96 }
+		options: {
+			labelSize: 96,
+			multilineLabel: true
+		}
 	}
 });
 //#endregion
@@ -4878,7 +5034,7 @@ const NAMED_AREA_OF_INTEREST_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -4937,7 +5093,7 @@ const TARGET_AREA_OF_INTEREST_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -5189,7 +5345,7 @@ const BASE_CAMP_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: ECHELON_AREA_PARAMS,
+	params: PREFIXED_ECHELON_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS
 };
 /**
@@ -5247,7 +5403,7 @@ const GUERRILLA_BASE_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: ECHELON_AREA_PARAMS,
+	params: PREFIXED_ECHELON_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS
 };
 /**
@@ -5365,7 +5521,7 @@ const ASSEMBLY_AREA_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS
 };
 /**
@@ -5856,7 +6012,8 @@ const ATTACK_BY_FIRE = defineControlMeasure({
 //#endregion
 //#region src/generators/cm15-maneuver-areas/attackHelicopter.ts
 const DEFAULT_ATTACK_HELICOPTER_OPTIONS = {
-	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
 	smoothResolution: 5,
 	symbolHeightRatio: .45,
@@ -6075,7 +6232,8 @@ const ATTACK_HELICOPTER = defineControlMeasure({
 	metadata: ATTACK_HELICOPTER_METADATA,
 	generator: createAttackHelicopter,
 	defaultOptions: DEFAULT_ATTACK_HELICOPTER_OPTIONS,
-	rule: axis1DrawRule
+	rule: axis1DrawRule,
+	optionHandles: variableWidthAttackOptionHandles
 });
 //#endregion
 //#region src/generators/cm15-maneuver-areas/battlePosition.ts
@@ -6133,10 +6291,7 @@ function battlePositionAreaFeatures(positions, options, textAmplifiers, context,
 	const verts = buildClosedRing(positions, smooth, smoothResolution, DEFAULT_SMOOTH_RESOLUTION$6);
 	const { strokes, fills, gaps } = placeEchelon(buildAreaPerimeter(verts), h, echelon, echelonPadding, echelonPosition, echelonAnchor);
 	const labelFeatures = [];
-	const enyGaps = pushAreaLabels(labelFeatures, verts, {
-		name: variant.namePrefix ? composeAreaName(variant.namePrefix, textAmplifiers.T) : textAmplifiers.T,
-		hostile: textAmplifiers.N
-	}, options, context.amplifierPlacements, void 0, context);
+	const enyGaps = pushAreaLabels(labelFeatures, verts, composeAreaLabelTexts(textAmplifiers, variant.namePrefix), options, context.amplifierPlacements, void 0, context);
 	const boundaryCoords = buildGappedLine(verts, [...gaps, ...enyGaps]);
 	const features = [];
 	if (boundaryCoords.length > 0) features.push({
@@ -6257,7 +6412,7 @@ const BATTLE_POSITION_PREPARED_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: ECHELON_AREA_PARAMS,
+	params: PREFIXED_ECHELON_AREA_PARAMS,
 	textAmplifiers: AREA_UNIT_DESIGNATION_HOSTILE_AMPLIFIERS
 };
 /**
@@ -6710,8 +6865,12 @@ const BRIDGE_OR_GAP = defineControlMeasure({
 const DEFAULT_SMOOTH_RESOLUTION$5 = 12;
 const MIN_SMOOTH_RESOLUTION$1 = 2;
 const MAX_SMOOTH_RESOLUTION$1 = 64;
+const DEFAULT_SHAFT_WIDTH_RATIO = .06;
+const MIN_SHAFT_WIDTH_RATIO = .01;
+const MAX_SHAFT_WIDTH_RATIO = .3;
 const DEFAULT_BLOCK_ARROW_OPTIONS = {
-	shaftWidthRatio: .06,
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
+	rearWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
 	arrowheadStyle: "triangle",
 	arrowheadWidthRatio: .18,
 	arrowheadLengthRatio: .22,
@@ -6743,8 +6902,18 @@ const BLOCK_ARROW_METADATA = {
 			label: "Shaft width",
 			description: "Shaft band width as a fraction of the total path length",
 			type: "number",
-			min: .01,
-			max: .3,
+			min: MIN_SHAFT_WIDTH_RATIO,
+			max: MAX_SHAFT_WIDTH_RATIO,
+			step: .01
+		},
+		{
+			key: "rearWidthRatio",
+			presentationTier: "advanced",
+			label: "Rear width",
+			description: "Width at the rear of the shaft as a fraction of the total path length",
+			type: "number",
+			min: MIN_SHAFT_WIDTH_RATIO,
+			max: MAX_SHAFT_WIDTH_RATIO,
 			step: .01
 		},
 		{
@@ -6835,25 +7004,42 @@ const BLOCK_ARROW_METADATA = {
 * right side of the shaft.
 */
 function createBlockArrow(coordinates, options = {}) {
-	const { shaftWidthRatio, arrowheadStyle, arrowheadWidthRatio, arrowheadLengthRatio, smooth, smoothResolution, filled } = {
-		...DEFAULT_BLOCK_ARROW_OPTIONS,
-		...options
-	};
-	const axis1 = axis1Geometry(coordinates);
-	const axis = arrowAxis(axis1.path);
-	if (!axis) return {
+	const resolved = resolveBlockArrowOptions(options);
+	const geometry = calculateBlockArrowGeometry(coordinates, resolved);
+	if (!geometry) return {
 		type: "FeatureCollection",
 		features: []
 	};
+	const { ring } = geometry;
+	return {
+		type: "FeatureCollection",
+		features: [{
+			type: "Feature",
+			properties: {
+				part: "body",
+				fill: resolved.filled
+			},
+			geometry: {
+				type: "Polygon",
+				coordinates: [ring.map((p) => unproject(p[0], p[1]))]
+			}
+		}]
+	};
+}
+function calculateBlockArrowGeometry(coordinates, options) {
+	const axis1 = axis1Geometry(coordinates);
+	const axis = arrowAxis(axis1.path);
+	if (!axis) return null;
 	const { pts, pathLength, tip, dir, perp, segLength } = axis;
-	const requestedHeadLen = axis1.headLength ?? pathLength * arrowheadLengthRatio;
+	const requestedHeadLen = axis1.headLength ?? pathLength * options.arrowheadLengthRatio;
 	const headLen = Math.min(requestedHeadLen, segLength * .95);
-	const halfShaft = pathLength * shaftWidthRatio / 2;
-	const halfHead = axis1.headHalfWidth ?? pathLength * arrowheadWidthRatio / 2;
+	const halfShaft = pathLength * options.shaftWidthRatio / 2;
+	const halfRear = pathLength * options.rearWidthRatio / 2;
+	const halfHead = axis1.headHalfWidth ?? pathLength * options.arrowheadWidthRatio / 2;
 	const onAxis = (d, side = 0) => [tip[0] - dir[0] * d + perp[0] * side, tip[1] - dir[1] * d + perp[1] * side];
 	let shaftEndDist;
 	let headPts;
-	switch (arrowheadStyle) {
+	switch (options.arrowheadStyle) {
 		case "barbed":
 			shaftEndDist = headLen * .55;
 			headPts = [
@@ -6911,9 +7097,9 @@ function createBlockArrow(coordinates, options = {}) {
 			break;
 	}
 	let spine = [...pts.slice(0, -1), onAxis(shaftEndDist)];
-	if (smooth) spine = catmullRom(spine, normalizeSmoothResolution$1(smoothResolution));
-	const leftSide = offsetPolyline(spine, halfShaft);
-	const rightSide = offsetPolyline(spine, -halfShaft);
+	if (options.smooth) spine = catmullRom(spine, normalizeSmoothResolution$1(options.smoothResolution));
+	const widths = interpolatePolylineValues(spine, halfRear, halfShaft);
+	const { left: leftSide, right: rightSide } = offsetPolylineSides(spine, widths);
 	const ring = [
 		...leftSide,
 		...headPts,
@@ -6921,18 +7107,20 @@ function createBlockArrow(coordinates, options = {}) {
 	];
 	ring.push(ring[0]);
 	return {
-		type: "FeatureCollection",
-		features: [{
-			type: "Feature",
-			properties: {
-				part: "body",
-				fill: filled
-			},
-			geometry: {
-				type: "Polygon",
-				coordinates: [ring.map((p) => unproject(p[0], p[1]))]
-			}
-		}]
+		ring,
+		spine,
+		leftSide,
+		pathLength
+	};
+}
+function resolveBlockArrowOptions(options) {
+	const resolved = {
+		...DEFAULT_BLOCK_ARROW_OPTIONS,
+		...options
+	};
+	return {
+		...resolved,
+		rearWidthRatio: resolveRearWidthRatio(options, resolved.shaftWidthRatio)
 	};
 }
 const BLOCK_ARROW = defineControlMeasure({
@@ -6940,6 +7128,20 @@ const BLOCK_ARROW = defineControlMeasure({
 	generator: createBlockArrow,
 	defaultOptions: DEFAULT_BLOCK_ARROW_OPTIONS,
 	rule: axis1DrawRule,
+	optionHandles: createWidthOptionHandles({
+		geometry(controlPoints, options) {
+			const geometry = calculateBlockArrowGeometry(controlPoints, resolveBlockArrowOptions(options));
+			if (!geometry) return null;
+			return {
+				spine: geometry.spine,
+				leftEdge: geometry.leftSide,
+				referenceHalfWidth: geometry.pathLength / 2
+			};
+		},
+		minRatio: MIN_SHAFT_WIDTH_RATIO,
+		maxRearRatio: MAX_SHAFT_WIDTH_RATIO,
+		maxShaftRatio: MAX_SHAFT_WIDTH_RATIO
+	}),
 	previewSample: {
 		controlPoints: [
 			[1.4, 0],
@@ -9392,7 +9594,8 @@ const CLEAR = defineControlMeasure({
 //#endregion
 //#region src/generators/cm15-maneuver-areas/supportingAttack.ts
 const DEFAULT_SUPPORTING_ATTACK_OPTIONS = {
-	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
 	smoothResolution: 5
 };
@@ -9464,12 +9667,14 @@ const SUPPORTING_ATTACK = defineControlMeasure({
 	metadata: SUPPORTING_ATTACK_METADATA,
 	generator: createSupportingAttack,
 	defaultOptions: DEFAULT_SUPPORTING_ATTACK_OPTIONS,
-	rule: axis1DrawRule
+	rule: axis1DrawRule,
+	optionHandles: variableWidthAttackOptionHandles
 });
 //#endregion
 //#region src/generators/cm34-mission-tasks/counterattack.ts
 const DEFAULT_COUNTERATTACK_OPTIONS = {
-	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
 	smoothResolution: 5,
 	labelPosition: 1
@@ -9554,6 +9759,7 @@ const COUNTERATTACK = defineControlMeasure({
 	generator: createCounterattack,
 	defaultOptions: DEFAULT_COUNTERATTACK_OPTIONS,
 	rule: axis1DrawRule,
+	optionHandles: variableWidthAttackOptionHandles,
 	previewSample: {
 		controlPoints: [
 			[1, 0],
@@ -9714,6 +9920,7 @@ const COUNTERATTACK_BY_FIRE = defineControlMeasure({
 	generator: createCounterattackByFire,
 	defaultOptions: DEFAULT_COUNTERATTACK_BY_FIRE_OPTIONS,
 	rule: counterattackByFireDrawRule,
+	optionHandles: createVariableWidthAttackOptionHandles(counterattackByFireBodyCoordinates),
 	previewSample: {
 		controlPoints: [
 			[1.35, 0],
@@ -11061,7 +11268,7 @@ const DROP_ZONE_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -11278,7 +11485,7 @@ const EXTRACTION_ZONE_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -13153,7 +13360,8 @@ const FORTIFIED_AREA = defineControlMeasure({
 //#endregion
 //#region src/generators/cm15-maneuver-areas/maneuver-arrow-task-shared.ts
 const DEFAULT_MANEUVER_ARROW_TASK_OPTIONS = {
-	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
 	smoothResolution: 5,
 	crossbarLengthRatio: 1.1,
@@ -13162,10 +13370,14 @@ const DEFAULT_MANEUVER_ARROW_TASK_OPTIONS = {
 	labelPadding: 0
 };
 function createManeuverArrowTask(coordinates, options, textAmplifiers, config) {
-	const resolved = {
+	const merged = {
 		...DEFAULT_MANEUVER_ARROW_TASK_OPTIONS,
 		...options
 	};
+	const resolved = {
+		...merged,
+		rearWidthRatio: resolveRearWidthRatio(options, merged.shaftWidthRatio)
+	};
 	const { geometry } = processAttackGeometry(coordinates, resolved);
 	if (!geometry) return {
 		type: "FeatureCollection",
@@ -13186,17 +13398,22 @@ function createManeuverArrowTask(coordinates, options, textAmplifiers, config) {
 	};
 	const tipVector = vecSub(geometry.ptTip, geometry.ptBase);
 	const tipDirection = vecNorm(tipVector);
-	const crossbarLength = vecMag(vecSub(geometry.headRing[0], geometry.headRing[2])) * Math.max(1, resolved.crossbarLengthRatio);
+	const headWidth = vecMag(vecSub(geometry.headRing[0], geometry.headRing[2]));
 	let crossbarCenter;
 	let crossbarAlong;
+	let crossbarBaseWidth = headWidth;
 	if (config.crossbarAt === "tip") {
 		crossbarCenter = geometry.ptTip;
 		crossbarAlong = tipDirection;
 	} else {
-		const crossbarFrame = pointAlongPolyline(segments, totalLength, Number.isFinite(config.crossbarAt.shaftPosition) ? clamp01(config.crossbarAt.shaftPosition) : 0);
+		const shaftPosition = Number.isFinite(config.crossbarAt.shaftPosition) ? clamp01(config.crossbarAt.shaftPosition) : 0;
+		const crossbarFrame = pointAlongPolyline(segments, totalLength, shaftPosition);
 		crossbarCenter = crossbarFrame.point;
 		crossbarAlong = crossbarFrame.along;
+		const rearWidth = vecMag(vecSub(geometry.shaftLeft[0], geometry.shaftRight[0]));
+		crossbarBaseWidth = rearWidth + (vecMag(vecSub(geometry.shaftLeft.at(-1), geometry.shaftRight.at(-1))) - rearWidth) * shaftPosition;
 	}
+	const crossbarLength = crossbarBaseWidth * Math.max(1, resolved.crossbarLengthRatio);
 	const crossbarPerp = [-crossbarAlong[1], crossbarAlong[0]];
 	const crossbar = [vecAdd(crossbarCenter, vecScale(crossbarPerp, crossbarLength / 2)), vecSub(crossbarCenter, vecScale(crossbarPerp, crossbarLength / 2))];
 	const features = [{
@@ -13336,6 +13553,7 @@ const FRONTAL_ATTACK = defineControlMeasure({
 	generator: createFrontalAttack,
 	defaultOptions: DEFAULT_FRONTAL_ATTACK_OPTIONS,
 	rule: axis1DrawRule,
+	optionHandles: variableWidthAttackOptionHandles,
 	previewSample: {
 		controlPoints: [
 			[1, 0],
@@ -14040,7 +14258,7 @@ const JOINT_TACTICAL_ACTION_AREA_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS
 };
 /**
@@ -14100,7 +14318,7 @@ const LANDING_ZONE_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS
 };
 /**
@@ -14373,7 +14591,8 @@ const NO_FIRE_AREA_IRREGULAR = defineControlMeasure({
 //#endregion
 //#region src/generators/cm15-maneuver-areas/mainAttack.ts
 const DEFAULT_MAIN_ATTACK_OPTIONS = {
-	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO,
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
 	smoothResolution: 5
 };
@@ -14401,7 +14620,7 @@ const MAIN_ATTACK_METADATA = {
 *
 * The symbol consists of a single MultiLineString feature containing:
 * 1. **Arrowhead**: A line forming a "chevron" or "roof" shape.
-* 2. **Shaft**: Two parallel lines behind the arrow.
+* 2. **Shaft**: Two boundary lines behind the arrow, optionally flared toward the rear.
 *
 * The shaft is calculated to terminate exactly where it touches the inner walls
 * of the arrowhead, creating a seamless connection.
@@ -14440,7 +14659,8 @@ const MAIN_ATTACK = defineControlMeasure({
 	metadata: MAIN_ATTACK_METADATA,
 	generator: createMainAttack,
 	defaultOptions: DEFAULT_MAIN_ATTACK_OPTIONS,
-	rule: axis1DrawRule
+	rule: axis1DrawRule,
+	optionHandles: variableWidthAttackOptionHandles
 });
 //#endregion
 //#region src/generators/cm27-protection-areas/mine-types.ts
@@ -15398,7 +15618,7 @@ const PICKUP_ZONE_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS
 };
 /**
@@ -15453,7 +15673,7 @@ const ASSAULT_POSITION_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -15508,7 +15728,7 @@ const ATTACK_POSITION_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -15563,7 +15783,7 @@ const OBJECTIVE_AREA_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_DESIGNATION_HOSTILE
 };
 /**
@@ -16126,7 +16346,7 @@ const SUBMARINE_ACTION_AREA_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_NO_ADDITIONAL_INFO
 };
 /**
@@ -16186,7 +16406,7 @@ const SUBMARINE_GENERATED_ACTION_AREA_METADATA = {
 	},
 	drawRule: "Area1",
 	capturesLabelSize: true,
-	params: LABELED_AREA_PARAMS,
+	params: PREFIXED_LABELED_AREA_PARAMS,
 	textAmplifiers: AREA_TEXT_AMPLIFIERS_NO_ADDITIONAL_INFO
 };
 /**
@@ -16659,6 +16879,7 @@ const DEFINITIONS = {
 		generator: createTurningMovement,
 		defaultOptions: DEFAULT_TURNING_MOVEMENT_OPTIONS,
 		rule: axis1DrawRule,
+		optionHandles: variableWidthAttackOptionHandles,
 		previewSample: {
 			controlPoints: [
 				[1, 0],