@orbat-mapper/control-measures 0.15.0 → 0.16.0

package/dist/{renderControlMeasure-qnu0Feey.mjs → renderControlMeasure-B61Tgq3f.mjs}

@@ -237,6 +237,11 @@ function vecNorm(v) {
 	const m = vecMag(v);
 	return m === 0 ? [0, 0] : [v[0] / m, v[1] / m];
 }
+function vecRotate(v, radians) {
+	const cosine = Math.cos(radians);
+	const sine = Math.sin(radians);
+	return [v[0] * cosine - v[1] * sine, v[0] * sine + v[1] * cosine];
+}
 function midpoint(a, b) {
 	return vecScale(vecAdd(a, b), .5);
 }
@@ -300,10 +305,10 @@ function createWidthOptionHandles(config) {
 			}];
 		},
 		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 geometry = config.geometry(controlPoints, options);
+			if (!geometry || geometry.referenceHalfWidth < 1e-6) 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;
@@ -9791,12 +9796,189 @@ const CLEAR = defineControlMeasure({
 	rule: line23DrawRule
 });
 //#endregion
+//#region src/generators/cm15-maneuver-areas/maneuver-arrow-task-shared.ts
+const DEFAULT_MANEUVER_ARROW_TASK_AMPLIFIER_OPTIONS = {
+	labelPosition: .25,
+	dtgPosition: .62,
+	labelPadding: 0
+};
+const DEFAULT_MANEUVER_ARROW_TASK_OPTIONS = {
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
+	smooth: false,
+	smoothResolution: 5,
+	crossbarLengthRatio: 1.1,
+	...DEFAULT_MANEUVER_ARROW_TASK_AMPLIFIER_OPTIONS
+};
+function createManeuverArrowTaskAmplifierLabels(geometry, options, textAmplifiers) {
+	const resolved = {
+		...DEFAULT_MANEUVER_ARROW_TASK_AMPLIFIER_OPTIONS,
+		...options
+	};
+	const centerline = geometry.shaftCenterline;
+	const { segments, totalLength } = polylineSegments(centerline);
+	if (segments.length === 0) return [];
+	const labels = [];
+	const sizeProps = labelSizeProps(resolved);
+	const labelFrame = pointAlongPolyline(segments, totalLength, clamp01(resolved.labelPosition));
+	if (labelFrame && textAmplifiers.T) pushLabel(labels, labelFrame.point, textAmplifiers.T, labelRotationAlong(labelFrame.along), sizeProps, void 0, "T");
+	const dtgFrame = pointAlongPolyline(segments, totalLength, clamp01(resolved.dtgPosition));
+	if (dtgFrame) {
+		const rowOffset = resolveLabelOffsetMeters(resolved, .55 + Math.max(0, resolved.labelPadding));
+		const rotation = labelRotationAlong(dtgFrame.along);
+		if (textAmplifiers.W) pushLabel(labels, vecAdd(dtgFrame.point, vecScale(dtgFrame.perp, rowOffset)), textAmplifiers.W, rotation, sizeProps, void 0, "W");
+		if (textAmplifiers.W1) pushLabel(labels, vecSub(dtgFrame.point, vecScale(dtgFrame.perp, rowOffset)), textAmplifiers.W1, rotation, sizeProps, void 0, "W1");
+	}
+	return labels;
+}
+function createManeuverArrowTask(coordinates, options, textAmplifiers, config) {
+	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",
+		features: []
+	};
+	const outline = [
+		...geometry.shaftLeft,
+		geometry.headRing[0],
+		geometry.headRing[1],
+		geometry.headRing[2],
+		...[...geometry.shaftRight].reverse()
+	];
+	const centerline = geometry.shaftCenterline;
+	const { segments, totalLength } = polylineSegments(centerline);
+	if (segments.length === 0) return {
+		type: "FeatureCollection",
+		features: []
+	};
+	const tipVector = vecSub(geometry.ptTip, geometry.ptBase);
+	const tipDirection = vecNorm(tipVector);
+	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 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 = [{
+		type: "Feature",
+		properties: { part: config.part },
+		geometry: {
+			type: "MultiLineString",
+			coordinates: [outline, crossbar].map((line) => line.map((point) => unproject(point[0], point[1])))
+		}
+	}];
+	const sizeProps = labelSizeProps(resolved);
+	const codePoint = vecAdd(geometry.ptBase, vecScale(tipVector, .55));
+	const labels = [{
+		type: "Feature",
+		properties: {
+			part: "label",
+			labelPlacement: false,
+			text: config.code,
+			rotation: labelRotationAlong(tipDirection),
+			...sizeProps
+		},
+		geometry: {
+			type: "Point",
+			coordinates: unproject(codePoint[0], codePoint[1])
+		}
+	}];
+	features.push(...labels, ...createManeuverArrowTaskAmplifierLabels(geometry, resolved, textAmplifiers));
+	return {
+		type: "FeatureCollection",
+		features
+	};
+}
+const MANEUVER_ARROW_TASK_AMPLIFIER_PARAMS = [
+	{
+		key: "labelPosition",
+		presentationTier: "advanced",
+		label: "Designation position",
+		description: "Position of Field T along the shaft, from tail (0) to head (1)",
+		type: "number",
+		min: 0,
+		max: 1,
+		step: .01
+	},
+	{
+		key: "dtgPosition",
+		presentationTier: "advanced",
+		label: "Date-time position",
+		description: "Position of Fields W/W1 along the shaft, from tail (0) to head (1)",
+		type: "number",
+		min: 0,
+		max: 1,
+		step: .01
+	},
+	{
+		key: "labelPadding",
+		presentationTier: "advanced",
+		label: "Label padding",
+		description: "Extra spacing between the W and W1 rows, in label heights",
+		type: "number",
+		min: 0,
+		max: 2,
+		step: .05
+	}
+];
+const MANEUVER_ARROW_TASK_PARAMS = [{
+	key: "crossbarLengthRatio",
+	presentationTier: "advanced",
+	label: "Straight line length",
+	description: "Crossbar length as a multiple of the arrowhead base width",
+	type: "number",
+	min: 1,
+	max: 2.5,
+	step: .1
+}, ...MANEUVER_ARROW_TASK_AMPLIFIER_PARAMS];
+const MANEUVER_ARROW_TASK_TEXT_AMPLIFIERS = [
+	{
+		key: "T",
+		label: "Unique designation",
+		description: "Field T — the maneuver's unique designation.",
+		placeholder: "DAVID",
+		maxLength: 21
+	},
+	{
+		key: "W",
+		label: "Start date-time group",
+		description: "Field W — the maneuver's start date-time group.",
+		placeholder: "080400ZOCT2008"
+	},
+	{
+		key: "W1",
+		label: "End date-time group",
+		description: "Field W1 — the maneuver's end date-time group.",
+		placeholder: "120300ZOCT2008"
+	}
+];
+//#endregion
 //#region src/generators/cm15-maneuver-areas/supportingAttack.ts
 const DEFAULT_SUPPORTING_ATTACK_OPTIONS = {
 	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
 	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
-	smoothResolution: 5
+	smoothResolution: 5,
+	...DEFAULT_MANEUVER_ARROW_TASK_AMPLIFIER_OPTIONS
 };
 const SUPPORTING_ATTACK_METADATA = {
 	id: "supporting-attack",
@@ -9808,14 +9990,16 @@ const SUPPORTING_ATTACK_METADATA = {
 	value: "151404",
 	minCoordinates: 3,
 	geometry: "line",
-	geometryTypes: ["LineString"],
+	geometryTypes: ["LineString", "Point"],
 	paints: {
 		stroke: true,
 		fill: "none",
-		text: false
+		text: true
 	},
 	drawRule: "Axis1",
-	params: ATTACK_SHAFT_PARAMS
+	capturesLabelSize: true,
+	params: [...ATTACK_SHAFT_PARAMS, ...MANEUVER_ARROW_TASK_AMPLIFIER_PARAMS],
+	textAmplifiers: MANEUVER_ARROW_TASK_TEXT_AMPLIFIERS
 };
 /**
 * Generates a GeoJSON FeatureCollection for a Supporting Attack tactical symbol.
@@ -9827,7 +10011,7 @@ const SUPPORTING_ATTACK_METADATA = {
 * @param options - Configuration options.
 * @returns A GeoJSON FeatureCollection<LineString>.
 */
-function createSupportingAttack(coordinates, options = {}) {
+function createSupportingAttack(coordinates, options = {}, textAmplifiers = {}) {
 	const { geometry } = processAttackGeometry(coordinates, options);
 	if (!geometry) return {
 		type: "FeatureCollection",
@@ -9842,7 +10026,7 @@ function createSupportingAttack(coordinates, options = {}) {
 				type: "LineString",
 				coordinates: supportingAttackOutline(geometry)
 			}
-		}]
+		}, ...createManeuverArrowTaskAmplifierLabels(geometry, options, textAmplifiers)]
 	};
 }
 /**
@@ -9867,7 +10051,21 @@ const SUPPORTING_ATTACK = defineControlMeasure({
 	generator: createSupportingAttack,
 	defaultOptions: DEFAULT_SUPPORTING_ATTACK_OPTIONS,
 	rule: axis1DrawRule,
-	optionHandles: variableWidthAttackOptionHandles
+	optionHandles: variableWidthAttackOptionHandles,
+	previewSample: {
+		controlPoints: [
+			[1, 0],
+			[-.4, -.35],
+			[-1, -.8],
+			[.45, .55]
+		],
+		textAmplifiers: {
+			T: "DAVID",
+			W: "080400Z",
+			W1: "120300Z"
+		},
+		options: { labelSize: 80 }
+	}
 });
 //#endregion
 //#region src/generators/cm34-mission-tasks/counterattack.ts
@@ -9917,14 +10115,20 @@ const COUNTERATTACK_METADATA = {
 };
 /** Generates the Counterattack mission task (340600). */
 function createCounterattack(coordinates, options = {}, textAmplifiers = {}) {
-	const outline = createSupportingAttack(coordinates, options);
 	const { geometry } = processAttackGeometry(coordinates, options);
-	if (!geometry || outline.features.length === 0) return outline;
+	if (!geometry) return {
+		type: "FeatureCollection",
+		features: []
+	};
 	const dashedOutline = {
-		...outline.features[0],
+		type: "Feature",
 		properties: {
 			part: "counterattack",
 			style: { strokeDash: [...COUNTERATTACK_DASH] }
+		},
+		geometry: {
+			type: "LineString",
+			coordinates: supportingAttackOutline(geometry)
 		}
 	};
 	const { segments, totalLength } = polylineSegments(geometry.shaftCenterline);
@@ -10180,7 +10384,7 @@ function buildFieldOfFireV(coordinates, hSize, hWidth) {
 	};
 }
 //#endregion
-//#region src/generators/cm15-maneuver-areas/searchArea.ts
+//#region src/tactical-arrow-utils.ts
 const DEFAULT_ARROWHEAD_LENGTH_RATIO = .12;
 const DEFAULT_ARROWHEAD_WIDTH_RATIO = .5;
 const DEFAULT_ZIGZAG_START = .55;
@@ -10196,183 +10400,17 @@ const DEFAULT_TACTICAL_ARROW_OPTIONS = {
 	zigzagEnd: DEFAULT_ZIGZAG_END,
 	zigzagAmplitudeRatio: DEFAULT_ZIGZAG_AMPLITUDE_RATIO
 };
-const SEARCH_AREA_METADATA = {
-	id: "search-area",
-	name: "Search Area",
-	description: "Designates an area to examine systematically for specified persons, forces, materiel, or information.",
-	entity: "Maneuver Areas",
-	entityType: "Search Area",
-	value: "152200",
-	minCoordinates: 3,
-	maxCoordinates: 3,
-	geometry: "area",
-	geometryTypes: ["MultiLineString", "MultiPolygon"],
-	paints: {
-		stroke: true,
-		fill: "fixed",
-		text: false
-	},
-	drawRule: "Area21",
-	params: [
-		{
-			key: "arrowheadLengthRatio",
-			presentationTier: "advanced",
-			label: "Arrowhead length",
-			description: "Arrowhead length as a ratio of the total leg length",
-			type: "number",
-			min: 0,
-			max: .5,
-			step: .01
-		},
-		{
-			key: "arrowheadWidthRatio",
-			presentationTier: "advanced",
-			label: "Arrowhead width",
-			description: "Arrowhead base width as a multiple of the arrowhead length",
-			type: "number",
-			min: .05,
-			max: 2,
-			step: .1
-		},
-		{
-			key: "zigzagStart",
-			presentationTier: "advanced",
-			label: "Zigzag start",
-			description: "Point along the leg where the zigzag begins (0-1).",
-			type: "number",
-			min: 0,
-			max: 1,
-			step: .05
-		},
-		{
-			key: "zigzagEnd",
-			presentationTier: "advanced",
-			label: "Zigzag end",
-			description: "Point along the leg where the zigzag returns (0-1).",
-			type: "number",
-			min: 0,
-			max: 1,
-			step: .05
-		},
-		{
-			key: "zigzagAmplitudeRatio",
-			presentationTier: "advanced",
-			label: "Zigzag amplitude",
-			description: "Perpendicular kink offset as a ratio of leg length.",
-			type: "number",
-			min: 0,
-			max: .3,
-			step: .01
-		}
-	]
-};
-/**
-* Generates a GeoJSON FeatureCollection of a tactical "lightning" arrow.
-* Handles internal projection to maintain correct perpendicularity.
-*
-* @param coordinates - [Apex Point (PT1), Top Tail (PT2), Bottom Tail (PT3)]
-* @param options - Geometric configuration parameters
-* @returns A FeatureCollection containing a MultiLineString for bolts and a MultiPolygon for heads
-*/
-function createSearchArea(coordinates, options = {}) {
-	const { arrowheadLengthRatio = DEFAULT_ARROWHEAD_LENGTH_RATIO, arrowheadWidthRatio = DEFAULT_ARROWHEAD_WIDTH_RATIO, zigzagStart = DEFAULT_ZIGZAG_START, zigzagEnd = DEFAULT_ZIGZAG_END, zigzagAmplitudeRatio = DEFAULT_ZIGZAG_AMPLITUDE_RATIO } = options;
-	const safeArrowheadLengthRatio = Math.max(0, arrowheadLengthRatio);
-	const safeArrowheadWidthRatio = Math.max(0, arrowheadWidthRatio);
-	const safeZigzagStart = clamp01(zigzagStart);
-	const safeZigzagEnd = clamp01(zigzagEnd);
-	const safeZigzagAmplitudeRatio = Math.max(0, zigzagAmplitudeRatio);
-	const [c0, c1, c2] = coordinates;
-	const [p1, p2, p3] = [
-		project(c0[0], c0[1]),
-		project(c1[0], c1[1]),
-		project(c2[0], c2[1])
-	];
-	const shaftSegments = [];
-	const headPolygons = [];
-	const addLeg = (origin, tip, opposite) => {
-		const v = vecSub(tip, origin);
-		const totalLen = vecMag(v);
-		if (totalLen < 1e-6) return;
-		const u = vecNorm(v);
-		let n = [-u[1], u[0]];
-		const toOpp = vecSub(opposite, origin);
-		if (vecDot(n, toOpp) > 0) n = vecScale(n, -1);
-		const offset = totalLen * safeZigzagAmplitudeRatio;
-		const ptA = vecAdd(vecAdd(origin, vecScale(v, safeZigzagStart)), vecScale(n, offset));
-		const ptB = vecAdd(vecAdd(origin, vecScale(v, safeZigzagEnd)), vecScale(n, -offset));
-		const fv = vecSub(tip, ptB);
-		const fLen = vecMag(fv);
-		let fu = vecNorm(fv);
-		if (fLen < 1e-6) fu = u;
-		const headLen = totalLen * safeArrowheadLengthRatio;
-		const pBase = vecSub(tip, vecScale(fu, headLen));
-		const wingWidth = headLen * safeArrowheadWidthRatio;
-		const perp = [-fu[1], fu[0]];
-		const pWing1 = vecAdd(pBase, vecScale(perp, wingWidth));
-		const pWing2 = vecSub(pBase, vecScale(perp, wingWidth));
-		shaftSegments.push([
-			origin,
-			ptA,
-			ptB,
-			pBase
-		].map((p) => unproject(p[0], p[1])));
-		headPolygons.push([[
-			tip,
-			pWing1,
-			pWing2,
-			tip
-		].map((p) => unproject(p[0], p[1]))]);
-	};
-	addLeg(p1, p2, p3);
-	addLeg(p1, p3, p2);
-	const features = [];
-	if (shaftSegments.length > 0) features.push({
-		type: "Feature",
-		properties: { part: "shaft" },
-		geometry: {
-			type: "MultiLineString",
-			coordinates: shaftSegments
-		}
-	});
-	if (headPolygons.length > 0) features.push({
-		type: "Feature",
-		properties: {
-			part: "head",
-			fill: true,
-			style: SOLID_ACCENT_FILL
-		},
-		geometry: {
-			type: "MultiPolygon",
-			coordinates: headPolygons
-		}
-	});
-	return {
-		type: "FeatureCollection",
-		features
-	};
-}
-const SEARCH_AREA = defineControlMeasure({
-	metadata: SEARCH_AREA_METADATA,
-	generator: (controlPoints, options) => createSearchArea(asThreePoints(controlPoints), options),
-	defaultOptions: DEFAULT_TACTICAL_ARROW_OPTIONS,
-	rule: searchAreaDrawRule
-});
-//#endregion
-//#region src/generators/cm34-mission-tasks/security-task-shared.ts
-const DEFAULT_SECURITY_TASK_OPTIONS = {
-	...DEFAULT_TACTICAL_ARROW_OPTIONS,
-	labelInsetRatio: .2
-};
-const SECURITY_TASK_PARAMS = [
-	{
-		key: "arrowheadLengthRatio",
-		presentationTier: "advanced",
-		label: "Arrowhead length",
-		description: "Arrowhead length as a ratio of the total leg length",
-		type: "number",
-		min: 0,
-		max: .5,
-		step: .01
+/** The param descriptors every tactical-arrow leg exposes, in presentation order. */
+const TACTICAL_ARROW_PARAMS = [
+	{
+		key: "arrowheadLengthRatio",
+		presentationTier: "advanced",
+		label: "Arrowhead length",
+		description: "Arrowhead length as a ratio of the total leg length",
+		type: "number",
+		min: 0,
+		max: .5,
+		step: .01
 	},
 	{
 		key: "arrowheadWidthRatio",
@@ -10413,19 +10451,39 @@ const SECURITY_TASK_PARAMS = [
 		min: 0,
 		max: .3,
 		step: .01
-	},
-	{
-		key: "labelInsetRatio",
-		presentationTier: "advanced",
-		label: "Letter position",
-		description: "Inset of each task letter from PT. 2 or PT. 3 across the center opening",
-		type: "number",
-		min: .05,
-		max: .45,
-		step: .01
 	}
 ];
 /**
+* The single home of the tactical-arrow option contract: fills in the defaults
+* and applies the clamps the leg geometry relies on, so every measure carrying
+* a lightning leg reads the same ranges.
+*/
+function resolveTacticalArrowOptions(options) {
+	return {
+		arrowheadLengthRatio: Math.max(0, options.arrowheadLengthRatio ?? DEFAULT_ARROWHEAD_LENGTH_RATIO),
+		arrowheadWidthRatio: Math.max(0, options.arrowheadWidthRatio ?? DEFAULT_ARROWHEAD_WIDTH_RATIO),
+		zigzagStart: clamp01(options.zigzagStart ?? DEFAULT_ZIGZAG_START),
+		zigzagEnd: clamp01(options.zigzagEnd ?? DEFAULT_ZIGZAG_END),
+		zigzagAmplitudeRatio: Math.max(0, options.zigzagAmplitudeRatio ?? DEFAULT_ZIGZAG_AMPLITUDE_RATIO)
+	};
+}
+//#endregion
+//#region src/generators/cm34-mission-tasks/security-task-shared.ts
+const DEFAULT_SECURITY_TASK_OPTIONS = {
+	...DEFAULT_TACTICAL_ARROW_OPTIONS,
+	labelInsetRatio: .2
+};
+const SECURITY_TASK_PARAMS = [...TACTICAL_ARROW_PARAMS, {
+	key: "labelInsetRatio",
+	presentationTier: "advanced",
+	label: "Letter position",
+	description: "Inset of each task letter from PT. 2 or PT. 3 across the center opening",
+	type: "number",
+	min: .05,
+	max: .45,
+	step: .01
+}];
+/**
 * Shared Line26 geometry for the Cover, Guard, and Screen task family.
 * PT. 1/PT. 4 are the outward tips; PT. 2/PT. 3 are the inner shaft ends.
 * The opening between PT. 2 and PT. 3 is deliberately left clear for the
@@ -10443,13 +10501,7 @@ function createSecurityTaskSymbol(coordinates, config, options = {}) {
 		...DEFAULT_SECURITY_TASK_OPTIONS,
 		...options
 	};
-	const arrowOptions = {
-		arrowheadLengthRatio: Math.max(0, resolved.arrowheadLengthRatio),
-		arrowheadWidthRatio: Math.max(0, resolved.arrowheadWidthRatio),
-		zigzagStart: clamp(resolved.zigzagStart, 0, 1),
-		zigzagEnd: clamp(resolved.zigzagEnd, 0, 1),
-		zigzagAmplitudeRatio: Math.max(0, resolved.zigzagAmplitudeRatio)
-	};
+	const arrowOptions = resolveTacticalArrowOptions(resolved);
 	const lines = [createTacticalArrow(p2, p1, p3, arrowOptions), createTacticalArrow(p3, p4, p2, arrowOptions)].flatMap((arrow) => arrow ?? []);
 	if (lines.length === 0) return {
 		type: "FeatureCollection",
@@ -12713,7 +12765,7 @@ function createInfiltrationLane(coordinates, options = {}, textAmplifiers = {})
 			type: "Feature",
 			properties: {
 				part: "label",
-				labelPlacement: false,
+				labelPlacementKey: "T",
 				amplifierField: "T",
 				text: textAmplifiers.T,
 				rotation: labelRotationAlong(labelFrame.along),
@@ -13662,215 +13714,54 @@ 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$1,
-	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
-	smooth: false,
-	smoothResolution: 5,
-	crossbarLengthRatio: 1.1,
-	labelPosition: .25,
-	dtgPosition: .62,
-	labelPadding: 0
+//#region src/generators/cm15-maneuver-areas/frontal-attack.ts
+const DEFAULT_FRONTAL_ATTACK_OPTIONS = DEFAULT_MANEUVER_ARROW_TASK_OPTIONS;
+const FRONTAL_ATTACK_METADATA = {
+	id: "frontal-attack",
+	name: "Frontal Attack",
+	description: "An offensive maneuver in which the main action is directed against the front.",
+	entity: "Maneuver Areas",
+	entityType: "Frontal Attack",
+	value: "152700",
+	minCoordinates: 3,
+	geometry: "line",
+	geometryTypes: ["MultiLineString", "Point"],
+	paints: {
+		stroke: true,
+		fill: "none",
+		text: true
+	},
+	drawRule: "Axis1",
+	capturesLabelSize: true,
+	params: [...ATTACK_SHAFT_PARAMS, ...MANEUVER_ARROW_TASK_PARAMS],
+	textAmplifiers: MANEUVER_ARROW_TASK_TEXT_AMPLIFIERS
 };
-function createManeuverArrowTask(coordinates, options, textAmplifiers, config) {
-	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",
-		features: []
-	};
-	const outline = [
-		...geometry.shaftLeft,
-		geometry.headRing[0],
-		geometry.headRing[1],
-		geometry.headRing[2],
-		...[...geometry.shaftRight].reverse()
-	];
-	const centerline = geometry.shaftCenterline;
-	const { segments, totalLength } = polylineSegments(centerline);
-	if (segments.length === 0) return {
-		type: "FeatureCollection",
-		features: []
-	};
-	const tipVector = vecSub(geometry.ptTip, geometry.ptBase);
-	const tipDirection = vecNorm(tipVector);
-	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 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 = [{
-		type: "Feature",
-		properties: { part: config.part },
-		geometry: {
-			type: "MultiLineString",
-			coordinates: [outline, crossbar].map((line) => line.map((point) => unproject(point[0], point[1])))
-		}
-	}];
-	const sizeProps = labelSizeProps(resolved);
-	const codePoint = vecAdd(geometry.ptBase, vecScale(tipVector, .55));
-	const labels = [{
-		type: "Feature",
-		properties: {
-			part: "label",
-			labelPlacement: false,
-			text: config.code,
-			rotation: labelRotationAlong(tipDirection),
-			...sizeProps
-		},
-		geometry: {
-			type: "Point",
-			coordinates: unproject(codePoint[0], codePoint[1])
-		}
-	}];
-	const labelFrame = pointAlongPolyline(segments, totalLength, clamp01(resolved.labelPosition));
-	if (labelFrame && textAmplifiers.T) pushLabel(labels, labelFrame.point, textAmplifiers.T, labelRotationAlong(labelFrame.along), sizeProps, void 0, "T");
-	const dtgFrame = pointAlongPolyline(segments, totalLength, clamp01(resolved.dtgPosition));
-	if (dtgFrame) {
-		const rowOffset = resolveLabelOffsetMeters(resolved, .55 + Math.max(0, resolved.labelPadding));
-		const rotation = labelRotationAlong(dtgFrame.along);
-		if (textAmplifiers.W) pushLabel(labels, vecAdd(dtgFrame.point, vecScale(dtgFrame.perp, rowOffset)), textAmplifiers.W, rotation, sizeProps, void 0, "W");
-		if (textAmplifiers.W1) pushLabel(labels, vecSub(dtgFrame.point, vecScale(dtgFrame.perp, rowOffset)), textAmplifiers.W1, rotation, sizeProps, void 0, "W1");
-	}
-	features.push(...labels);
-	return {
-		type: "FeatureCollection",
-		features
-	};
-}
-const MANEUVER_ARROW_TASK_PARAMS = [
-	{
-		key: "crossbarLengthRatio",
-		presentationTier: "advanced",
-		label: "Straight line length",
-		description: "Crossbar length as a multiple of the arrowhead base width",
-		type: "number",
-		min: 1,
-		max: 2.5,
-		step: .1
-	},
-	{
-		key: "labelPosition",
-		presentationTier: "advanced",
-		label: "Designation position",
-		description: "Position of Field T along the shaft, from tail (0) to head (1)",
-		type: "number",
-		min: 0,
-		max: 1,
-		step: .01
-	},
-	{
-		key: "dtgPosition",
-		presentationTier: "advanced",
-		label: "Date-time position",
-		description: "Position of Fields W/W1 along the shaft, from tail (0) to head (1)",
-		type: "number",
-		min: 0,
-		max: 1,
-		step: .01
-	},
-	{
-		key: "labelPadding",
-		presentationTier: "advanced",
-		label: "Label padding",
-		description: "Extra spacing between the W and W1 rows, in label heights",
-		type: "number",
-		min: 0,
-		max: 2,
-		step: .05
-	}
-];
-const MANEUVER_ARROW_TASK_TEXT_AMPLIFIERS = [
-	{
-		key: "T",
-		label: "Unique designation",
-		description: "Field T — the maneuver's unique designation.",
-		placeholder: "DAVID",
-		maxLength: 21
-	},
-	{
-		key: "W",
-		label: "Start date-time group",
-		description: "Field W — the maneuver's start date-time group.",
-		placeholder: "080400ZOCT2008"
-	},
-	{
-		key: "W1",
-		label: "End date-time group",
-		description: "Field W1 — the maneuver's end date-time group.",
-		placeholder: "120300ZOCT2008"
-	}
-];
-//#endregion
-//#region src/generators/cm15-maneuver-areas/frontal-attack.ts
-const DEFAULT_FRONTAL_ATTACK_OPTIONS = DEFAULT_MANEUVER_ARROW_TASK_OPTIONS;
-const FRONTAL_ATTACK_METADATA = {
-	id: "frontal-attack",
-	name: "Frontal Attack",
-	description: "An offensive maneuver in which the main action is directed against the front.",
-	entity: "Maneuver Areas",
-	entityType: "Frontal Attack",
-	value: "152700",
-	minCoordinates: 3,
-	geometry: "line",
-	geometryTypes: ["MultiLineString", "Point"],
-	paints: {
-		stroke: true,
-		fill: "none",
-		text: true
-	},
-	drawRule: "Axis1",
-	capturesLabelSize: true,
-	params: [...ATTACK_SHAFT_PARAMS, ...MANEUVER_ARROW_TASK_PARAMS],
-	textAmplifiers: MANEUVER_ARROW_TASK_TEXT_AMPLIFIERS
-};
-function createFrontalAttack(coordinates, options = {}, textAmplifiers = {}) {
-	return createManeuverArrowTask(coordinates, options, textAmplifiers, {
-		part: "frontal-attack",
-		code: "A",
-		crossbarAt: "tip"
-	});
-}
-const FRONTAL_ATTACK = defineControlMeasure({
-	metadata: FRONTAL_ATTACK_METADATA,
-	generator: createFrontalAttack,
-	defaultOptions: DEFAULT_FRONTAL_ATTACK_OPTIONS,
-	rule: axis1DrawRule,
-	optionHandles: variableWidthAttackOptionHandles,
-	previewSample: {
-		controlPoints: [
-			[1, 0],
-			[-.4, -.35],
-			[-1, -.8],
-			[.45, .55]
-		],
-		textAmplifiers: {
-			T: "FOX",
-			W: "080400Z",
-			W1: "120300Z"
-		},
-		options: { labelSize: 80 }
+function createFrontalAttack(coordinates, options = {}, textAmplifiers = {}) {
+	return createManeuverArrowTask(coordinates, options, textAmplifiers, {
+		part: "frontal-attack",
+		code: "A",
+		crossbarAt: "tip"
+	});
+}
+const FRONTAL_ATTACK = defineControlMeasure({
+	metadata: FRONTAL_ATTACK_METADATA,
+	generator: createFrontalAttack,
+	defaultOptions: DEFAULT_FRONTAL_ATTACK_OPTIONS,
+	rule: axis1DrawRule,
+	optionHandles: variableWidthAttackOptionHandles,
+	previewSample: {
+		controlPoints: [
+			[1, 0],
+			[-.4, -.35],
+			[-1, -.8],
+			[.45, .55]
+		],
+		textAmplifiers: {
+			T: "FOX",
+			W: "080400Z",
+			W1: "120300Z"
+		},
+		options: { labelSize: 80 }
 	}
 });
 //#endregion
@@ -14012,6 +13903,201 @@ const ISOLATE = defineControlMeasure({
 	rule: isolateDrawRule
 });
 //#endregion
+//#region src/generators/cm34-mission-tasks/movement-to-contact.ts
+/** Default bolt length as a multiple of the shaft width at the arrow base. */
+const MOVEMENT_TO_CONTACT_BOLT_LENGTH_RATIO = 1;
+const DEFAULT_MOVEMENT_TO_CONTACT_BOLT_ANGLE = 45;
+const MOVEMENT_TO_CONTACT_BOLT_HANDLE_ID = "bolt-tip";
+const MOVEMENT_TO_CONTACT_STEM_SETBACK_RATIO = .22;
+const MOVEMENT_TO_CONTACT_STEM_OFFSET_RATIO = .55;
+const DEFAULT_MOVEMENT_TO_CONTACT_OPTIONS = {
+	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
+	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
+	smooth: false,
+	smoothResolution: 5,
+	...DEFAULT_TACTICAL_ARROW_OPTIONS,
+	...DEFAULT_MANEUVER_ARROW_TASK_AMPLIFIER_OPTIONS,
+	boltLengthRatio: MOVEMENT_TO_CONTACT_BOLT_LENGTH_RATIO,
+	boltAngle: DEFAULT_MOVEMENT_TO_CONTACT_BOLT_ANGLE
+};
+const MOVEMENT_TO_CONTACT_METADATA = {
+	id: "movement-to-contact",
+	name: "Movement to Contact",
+	description: "Develops the situation and establishes or regains contact with the enemy.",
+	entity: "Mission Tasks",
+	entityType: "Movement to Contact",
+	value: "342900",
+	minCoordinates: 3,
+	geometry: "line",
+	geometryTypes: [
+		"MultiLineString",
+		"MultiPolygon",
+		"Point"
+	],
+	paints: {
+		stroke: true,
+		fill: "fixed",
+		text: true
+	},
+	drawRule: "Axis1",
+	capturesLabelSize: true,
+	params: [
+		...ATTACK_SHAFT_PARAMS,
+		{
+			key: "boltLengthRatio",
+			presentationTier: "advanced",
+			label: "Bolt length",
+			description: "Bolt length as a multiple of the shaft width at the arrow base (2 or more is recommended).",
+			type: "number",
+			min: .1,
+			max: 6,
+			step: .1
+		},
+		{
+			key: "boltAngle",
+			presentationTier: "advanced",
+			label: "Bolt angle",
+			description: "Angle between each bolt and the main arrow axis, in degrees.",
+			type: "number",
+			min: 0,
+			max: 90,
+			step: 1
+		},
+		...TACTICAL_ARROW_PARAMS,
+		...MANEUVER_ARROW_TASK_AMPLIFIER_PARAMS
+	],
+	textAmplifiers: MANEUVER_ARROW_TASK_TEXT_AMPLIFIERS
+};
+function createBolt({ tip, arrowDirection, arrowBaseWidth, boltLengthRatio, boltAngle, side, options }) {
+	const arrowNormal = [-arrowDirection[1], arrowDirection[0]];
+	const direction = vecRotate(arrowDirection, side * (boltAngle * Math.PI / 180));
+	const boltNormal = [-direction[1], direction[0]];
+	const origin = vecAdd(vecAdd(tip, vecScale(arrowDirection, -arrowBaseWidth * MOVEMENT_TO_CONTACT_STEM_SETBACK_RATIO)), vecScale(arrowNormal, side * arrowBaseWidth * MOVEMENT_TO_CONTACT_STEM_OFFSET_RATIO));
+	const boltLength = arrowBaseWidth * boltLengthRatio;
+	const boltTip = vecAdd(origin, vecScale(direction, boltLength));
+	const zigzagAmplitude = boltLength * options.zigzagAmplitudeRatio;
+	const firstKink = vecAdd(vecAdd(origin, vecScale(direction, boltLength * options.zigzagStart)), vecScale(boltNormal, zigzagAmplitude));
+	const secondKink = vecAdd(vecAdd(origin, vecScale(direction, boltLength * options.zigzagEnd)), vecScale(boltNormal, -zigzagAmplitude));
+	const finalSegment = vecSub(boltTip, secondKink);
+	const finalDirection = vecMag(finalSegment) >= 1e-6 ? vecNorm(finalSegment) : direction;
+	const headLength = boltLength * options.arrowheadLengthRatio;
+	return {
+		origin,
+		tip: boltTip,
+		shaft: [
+			origin,
+			firstKink,
+			secondKink,
+			vecAdd(boltTip, vecScale(finalDirection, -headLength))
+		],
+		head: createArrowHeadRing(boltTip, finalDirection, headLength, headLength * options.arrowheadWidthRatio * 2)
+	};
+}
+function resolveMovementToContactGeometry(coordinates, options) {
+	const { geometry } = processAttackGeometry(coordinates, options);
+	if (!geometry) return null;
+	const direction = vecNorm(vecSub(geometry.ptTip, geometry.ptBase));
+	const arrowBaseWidth = vecMag(vecSub(geometry.shaftLeft.at(-1), geometry.shaftRight.at(-1)));
+	const boltLengthRatio = Math.max(0, options.boltLengthRatio ?? DEFAULT_MOVEMENT_TO_CONTACT_OPTIONS.boltLengthRatio);
+	const boltAngle = clamp(options.boltAngle ?? DEFAULT_MOVEMENT_TO_CONTACT_OPTIONS.boltAngle, 0, 90);
+	const boltOptions = resolveTacticalArrowOptions(options);
+	const create = (side) => createBolt({
+		tip: geometry.ptTip,
+		arrowDirection: direction,
+		arrowBaseWidth,
+		boltLengthRatio,
+		boltAngle,
+		side,
+		options: boltOptions
+	});
+	return {
+		geometry,
+		direction,
+		arrowBaseWidth,
+		bolts: [create(1), create(-1)]
+	};
+}
+/** Generates the Movement to Contact mission task (342900). */
+function createMovementToContact(coordinates, options = {}, textAmplifiers = {}) {
+	const resolved = resolveMovementToContactGeometry(coordinates, options);
+	if (!resolved) return {
+		type: "FeatureCollection",
+		features: []
+	};
+	const { geometry, bolts } = resolved;
+	return {
+		type: "FeatureCollection",
+		features: [
+			{
+				type: "Feature",
+				properties: { part: "body-and-bolts" },
+				geometry: {
+					type: "MultiLineString",
+					coordinates: [supportingAttackOutline(geometry), ...bolts.map((bolt) => bolt.shaft.map((point) => unproject(point[0], point[1])))]
+				}
+			},
+			{
+				type: "Feature",
+				properties: {
+					part: "bolt-heads",
+					fill: true,
+					style: SOLID_ACCENT_FILL
+				},
+				geometry: {
+					type: "MultiPolygon",
+					coordinates: bolts.map((bolt) => [bolt.head])
+				}
+			},
+			...createManeuverArrowTaskAmplifierLabels(geometry, options, textAmplifiers)
+		]
+	};
+}
+const MOVEMENT_TO_CONTACT = defineControlMeasure({
+	metadata: MOVEMENT_TO_CONTACT_METADATA,
+	generator: createMovementToContact,
+	defaultOptions: DEFAULT_MOVEMENT_TO_CONTACT_OPTIONS,
+	rule: axis1DrawRule,
+	optionHandles: {
+		get(controlPoints, options) {
+			const widthHandles = variableWidthAttackOptionHandles.get(controlPoints, options);
+			const resolved = resolveMovementToContactGeometry(controlPoints, options);
+			if (!resolved) return widthHandles;
+			return [...widthHandles, {
+				id: MOVEMENT_TO_CONTACT_BOLT_HANDLE_ID,
+				position: unproject(resolved.bolts[0].tip[0], resolved.bolts[0].tip[1])
+			}];
+		},
+		drag(event) {
+			if (event.handleId !== MOVEMENT_TO_CONTACT_BOLT_HANDLE_ID) return variableWidthAttackOptionHandles.drag(event);
+			const resolved = resolveMovementToContactGeometry(event.controlPoints, event.options);
+			if (!resolved || resolved.arrowBaseWidth < 1e-6) return void 0;
+			const fromOrigin = vecSub(project(event.position[0], event.position[1]), resolved.bolts[0].origin);
+			const length = vecMag(fromOrigin);
+			if (length < 1e-6) return { boltLengthRatio: 0 };
+			const cross = resolved.direction[0] * fromOrigin[1] - resolved.direction[1] * fromOrigin[0];
+			const dot = resolved.direction[0] * fromOrigin[0] + resolved.direction[1] * fromOrigin[1];
+			return {
+				boltLengthRatio: length / resolved.arrowBaseWidth,
+				boltAngle: clamp(Math.abs(Math.atan2(cross, dot) * 180 / Math.PI), 0, 90)
+			};
+		}
+	},
+	previewSample: {
+		controlPoints: [
+			[1, 0],
+			[-.4, -.35],
+			[-1, -.8],
+			[.45, .55]
+		],
+		textAmplifiers: {
+			T: "DAVID",
+			W: "080400Z",
+			W1: "120300Z"
+		},
+		options: { labelSize: 80 }
+	}
+});
+//#endregion
 //#region src/generators/cm34-mission-tasks/penetrate.ts
 const DEFAULT_PENETRATE_OPTIONS = {
 	arrowheadLengthRatio: .15,
@@ -14898,7 +14984,8 @@ const DEFAULT_MAIN_ATTACK_OPTIONS = {
 	shaftWidthRatio: DEFAULT_SHAFT_WIDTH_RATIO$1,
 	rearWidthRatio: DEFAULT_REAR_WIDTH_RATIO,
 	smooth: false,
-	smoothResolution: 5
+	smoothResolution: 5,
+	...DEFAULT_MANEUVER_ARROW_TASK_AMPLIFIER_OPTIONS
 };
 const MAIN_ATTACK_METADATA = {
 	id: "main-attack",
@@ -14910,14 +14997,16 @@ const MAIN_ATTACK_METADATA = {
 	value: "151403",
 	minCoordinates: 3,
 	geometry: "line",
-	geometryTypes: ["MultiLineString"],
+	geometryTypes: ["MultiLineString", "Point"],
 	paints: {
 		stroke: true,
 		fill: "none",
-		text: false
+		text: true
 	},
 	drawRule: "Axis1",
-	params: ATTACK_SHAFT_PARAMS
+	capturesLabelSize: true,
+	params: [...ATTACK_SHAFT_PARAMS, ...MANEUVER_ARROW_TASK_AMPLIFIER_PARAMS],
+	textAmplifiers: MANEUVER_ARROW_TASK_TEXT_AMPLIFIERS
 };
 /**
 * Generates a GeoJSON FeatureCollection for a Main Attack tactical symbol.
@@ -14937,7 +15026,7 @@ const MAIN_ATTACK_METADATA = {
 * @param options - Configuration for ratios and properties.
 * @returns A GeoJSON FeatureCollection containing a single MultiLineString.
 */
-function createMainAttack(coordinates, options = {}) {
+function createMainAttack(coordinates, options = {}, textAmplifiers = {}) {
 	const { geometry } = processAttackGeometry(coordinates, options);
 	if (!geometry) return {
 		type: "FeatureCollection",
@@ -14956,7 +15045,7 @@ function createMainAttack(coordinates, options = {}) {
 					geometry.headRing.map((p) => unproject(p[0], p[1]))
 				]
 			}
-		}]
+		}, ...createManeuverArrowTaskAmplifierLabels(geometry, options, textAmplifiers)]
 	};
 }
 const MAIN_ATTACK = defineControlMeasure({
@@ -14964,7 +15053,21 @@ const MAIN_ATTACK = defineControlMeasure({
 	generator: createMainAttack,
 	defaultOptions: DEFAULT_MAIN_ATTACK_OPTIONS,
 	rule: axis1DrawRule,
-	optionHandles: variableWidthAttackOptionHandles
+	optionHandles: variableWidthAttackOptionHandles,
+	previewSample: {
+		controlPoints: [
+			[1, 0],
+			[-.4, -.35],
+			[-1, -.8],
+			[.45, .55]
+		],
+		textAmplifiers: {
+			T: "DAVID",
+			W: "080400Z",
+			W1: "120300Z"
+		},
+		options: { labelSize: 80 }
+	}
 });
 //#endregion
 //#region src/generators/cm27-protection-areas/mine-types.ts
@@ -16303,6 +16406,113 @@ const SECONDARY_DIRECTION_OF_FIRE = defineControlMeasure({
 	] }
 });
 //#endregion
+//#region src/generators/cm15-maneuver-areas/searchArea.ts
+const SEARCH_AREA_METADATA = {
+	id: "search-area",
+	name: "Search Area",
+	description: "Designates an area to examine systematically for specified persons, forces, materiel, or information.",
+	entity: "Maneuver Areas",
+	entityType: "Search Area",
+	value: "152200",
+	minCoordinates: 3,
+	maxCoordinates: 3,
+	geometry: "area",
+	geometryTypes: ["MultiLineString", "MultiPolygon"],
+	paints: {
+		stroke: true,
+		fill: "fixed",
+		text: false
+	},
+	drawRule: "Area21",
+	params: TACTICAL_ARROW_PARAMS
+};
+/**
+* Generates a GeoJSON FeatureCollection of a tactical "lightning" arrow.
+* Handles internal projection to maintain correct perpendicularity.
+*
+* @param coordinates - [Apex Point (PT1), Top Tail (PT2), Bottom Tail (PT3)]
+* @param options - Geometric configuration parameters
+* @returns A FeatureCollection containing a MultiLineString for bolts and a MultiPolygon for heads
+*/
+function createSearchArea(coordinates, options = {}) {
+	const { arrowheadLengthRatio: safeArrowheadLengthRatio, arrowheadWidthRatio: safeArrowheadWidthRatio, zigzagStart: safeZigzagStart, zigzagEnd: safeZigzagEnd, zigzagAmplitudeRatio: safeZigzagAmplitudeRatio } = resolveTacticalArrowOptions(options);
+	const [c0, c1, c2] = coordinates;
+	const [p1, p2, p3] = [
+		project(c0[0], c0[1]),
+		project(c1[0], c1[1]),
+		project(c2[0], c2[1])
+	];
+	const shaftSegments = [];
+	const headPolygons = [];
+	const addLeg = (origin, tip, opposite) => {
+		const v = vecSub(tip, origin);
+		const totalLen = vecMag(v);
+		if (totalLen < 1e-6) return;
+		const u = vecNorm(v);
+		let n = [-u[1], u[0]];
+		const toOpp = vecSub(opposite, origin);
+		if (vecDot(n, toOpp) > 0) n = vecScale(n, -1);
+		const offset = totalLen * safeZigzagAmplitudeRatio;
+		const ptA = vecAdd(vecAdd(origin, vecScale(v, safeZigzagStart)), vecScale(n, offset));
+		const ptB = vecAdd(vecAdd(origin, vecScale(v, safeZigzagEnd)), vecScale(n, -offset));
+		const fv = vecSub(tip, ptB);
+		const fLen = vecMag(fv);
+		let fu = vecNorm(fv);
+		if (fLen < 1e-6) fu = u;
+		const headLen = totalLen * safeArrowheadLengthRatio;
+		const pBase = vecSub(tip, vecScale(fu, headLen));
+		const wingWidth = headLen * safeArrowheadWidthRatio;
+		const perp = [-fu[1], fu[0]];
+		const pWing1 = vecAdd(pBase, vecScale(perp, wingWidth));
+		const pWing2 = vecSub(pBase, vecScale(perp, wingWidth));
+		shaftSegments.push([
+			origin,
+			ptA,
+			ptB,
+			pBase
+		].map((p) => unproject(p[0], p[1])));
+		headPolygons.push([[
+			tip,
+			pWing1,
+			pWing2,
+			tip
+		].map((p) => unproject(p[0], p[1]))]);
+	};
+	addLeg(p1, p2, p3);
+	addLeg(p1, p3, p2);
+	const features = [];
+	if (shaftSegments.length > 0) features.push({
+		type: "Feature",
+		properties: { part: "shaft" },
+		geometry: {
+			type: "MultiLineString",
+			coordinates: shaftSegments
+		}
+	});
+	if (headPolygons.length > 0) features.push({
+		type: "Feature",
+		properties: {
+			part: "head",
+			fill: true,
+			style: SOLID_ACCENT_FILL
+		},
+		geometry: {
+			type: "MultiPolygon",
+			coordinates: headPolygons
+		}
+	});
+	return {
+		type: "FeatureCollection",
+		features
+	};
+}
+const SEARCH_AREA = defineControlMeasure({
+	metadata: SEARCH_AREA_METADATA,
+	generator: (controlPoints, options) => createSearchArea(asThreePoints(controlPoints), options),
+	defaultOptions: DEFAULT_TACTICAL_ARROW_OPTIONS,
+	rule: searchAreaDrawRule
+});
+//#endregion
 //#region src/generators/cm15-maneuver-areas/strongPoint.ts
 const DEFAULT_SMOOTH_RESOLUTION = 16;
 /** Default options for the Strong Point control measure. */
@@ -17166,6 +17376,7 @@ const DEFINITIONS = {
 	infiltration: INFILTRATION,
 	guard: GUARD,
 	isolate: ISOLATE,
+	"movement-to-contact": MOVEMENT_TO_CONTACT,
 	penetrate: PENETRATE,
 	"rearward-passage-of-lines": REARWARD_PASSAGE_OF_LINES,
 	retire: RETIRE,
@@ -17597,4 +17808,4 @@ function assertNever(value) {
 	throw new Error(`Unhandled control measure kind: ${String(value)}`);
 }
 //#endregion
-export { DEFAULT_ENCIRCLEMENT_OPTIONS as $, DEFAULT_PORTRAYAL as $t, DEFAULT_RETIRE_OPTIONS as A, pointOnMidpointPerpendicularAxis as An, DEFAULT_BLOCK_OPTIONS as At, DEFAULT_LIMIT_OF_ADVANCE_OPTIONS as B, getMetersPerPixel as Bn, DEFAULT_ENGAGEMENT_AREA_OPTIONS as Bt, DEFAULT_MAIN_ATTACK_OPTIONS as C, blockDrawRule as Cn, DEFAULT_BREACH_OPTIONS as Ct, DEFAULT_WITHDRAW_OPTIONS as D, computeDefaultMidpointPerpendicularPoint as Dn, DEFAULT_LIGHT_LINE_OPTIONS as Dt, DEFAULT_WITHDRAW_UNDER_PRESSURE_OPTIONS as E, area27DrawRule as En, DEFAULT_ENGINEER_WORK_LINE_OPTIONS as Et, DEFAULT_FORTIFIED_LINE_OPTIONS as F, haversineDistance as Fn, DEFAULT_ANTITANK_WALL_OPTIONS as Ft, DEFAULT_HOLDING_LINE_OPTIONS as G, TEXT_AMPLIFIER_FIELDS as Gt, DEFAULT_HANDOVER_LINE_OPTIONS as H, DEFAULT_DIRECTION_OF_SUPPORTING_ATTACK_OPTIONS as Ht, DEFAULT_PROBABLE_LINE_OF_DEPLOYMENT_OPTIONS as I, project as In, DEFAULT_ANTITANK_DITCH_OPTIONS as It, DEFAULT_PHASE_LINE_OPTIONS as J, resolveAmplifierPlacement as Jt, DEFAULT_INFILTRATION_LANE_OPTIONS as K, canonicalTextAmplifierKey as Kt, PROBABLE_LINE_OF_DEPLOYMENT_DASH as L, sphericalBearing as Ln, DEFAULT_ASSEMBLY_AREA_OPTIONS as Lt, DEFAULT_PENETRATE_OPTIONS as M, createBaselineFrame as Mn, DEFAULT_BATTLE_POSITION_OPTIONS as Mt, DEFAULT_FRONTAL_ATTACK_OPTIONS as N, calculateMetrics as Nn, DEFAULT_ATTACK_HELICOPTER_OPTIONS as Nt, DEFAULT_SEIZE_OPTIONS as O, createMidpointPerpendicularDrawRule as On, DEFAULT_BOUNDARY_OPTIONS as Ot, DEFAULT_FORTIFIED_AREA_OPTIONS as P, computeInitialWidthPoint as Pn, DEFAULT_ATTACK_BY_FIRE_OPTIONS as Pt, DEFAULT_FINAL_PROTECTIVE_FIRE_OPTIONS as Q, DEFAULT_LINE_JOIN as Qt, DEFAULT_LINE_OF_DEPARTURE_CONTACT_OPTIONS as R, unproject as Rn, DEFAULT_AREA_OF_OPERATIONS_OPTIONS as Rt, DEFAULT_MINEFIELD_OPTIONS as S, disruptDrawRule as Sn, DEFAULT_BYPASS_OPTIONS as St, DEFAULT_JOINT_TACTICAL_ACTION_AREA_OPTIONS as T, containDrawRule as Tn, DEFAULT_GENERIC_C2_LINE_OPTIONS as Tt, DEFAULT_FORWARD_EDGE_OF_BATTLE_AREA_OPTIONS as U, DEFAULT_DIRECTION_OF_MAIN_ATTACK_OPTIONS as Ut, DEFAULT_BATTLE_HANDOVER_LINE_OPTIONS as V, roundToFixed as Vn, DEFAULT_AREA_DEFENSE_OPTIONS as Vt, DEFAULT_RELEASE_LINE_OPTIONS as W, DEFAULT_DIRECTION_OF_ATTACK_AVIATION_OPTIONS as Wt, DEFAULT_FIX_MISSION_TASK_OPTIONS as X, DEFAULT_LABEL_SIZE_CLAMP_CSS_PIXELS as Xt, DEFAULT_FLOT_OPTIONS as Y, DEFAULT_LABEL_HEIGHT_CSS_PIXELS as Yt, DEFAULT_FIX_OPTIONS as Z, DEFAULT_LINE_CAP as Zt, DEFAULT_PRINCIPAL_DIRECTION_OF_FIRE_OPTIONS as _, dynamicPointDrawRule as _n, DEFAULT_GENERIC_POLYGON_OPTIONS as _t, DEFINITIONS as a, rectangleDrawRule as an, DEFAULT_COVER_OPTIONS as at, DEFAULT_OBSTACLE_BYPASS_EASY_OPTIONS as b, point12DrawRule as bn, DEFAULT_CLASSIC_ARROW_OPTIONS as bt, getDefaultOptions as c, polyline1DrawRule as cn, DEFAULT_COUNTERATTACK_OPTIONS as ct, DEFAULT_TURN_OPTIONS as d, line24DrawRule as dn, DEFAULT_RADAR_SEARCH_DOCTRINE_OPTIONS as dt, DEFAULT_STROKE_DASH_CSS_PIXELS as en, DEFAULT_DISRUPT_OPTIONS as et, DEFAULT_SUPPORT_BY_FIRE_OPTIONS as f, line23DrawRule as fn, RADAR_SEARCH_DOCTRINE_FILL_COLOR as ft, SECONDARY_DIRECTION_OF_FIRE_DASH as g, attackByFireDrawRule as gn, DEFAULT_GENERIC_RECTANGLE_OPTIONS as gt, DEFAULT_SECONDARY_DIRECTION_OF_FIRE_OPTIONS as h, ambushDrawRule as hn, DEFAULT_GENERIC_SECTOR_OPTIONS as ht, CONTROL_MEASURE_METADATA as i, DEFAULT_AIRBORNE_ATTACK_OPTIONS as in, DEFAULT_DELAY_OPTIONS as it, DEFAULT_REARWARD_PASSAGE_OF_LINES_OPTIONS as j, snapToMidpointPerpendicular as jn, DEFAULT_CONTAIN_OPTIONS as jt, DEFAULT_SCREEN_OPTIONS as k, getMidpointPerpendicularSignedDistance as kn, DEFAULT_BLOCK_ARROW_OPTIONS as kt, listControlMeasureMetadata as l, line27DrawRule as ln, DEFAULT_SUPPORTING_ATTACK_OPTIONS as lt, DEFAULT_STRONG_POINT_OPTIONS as m, line1DrawRule as mn, DEFAULT_GENERIC_TEXT_OPTIONS as mt, resolveStyleHints as n, DEFAULT_SYMBOL_COLOR as nn, DEFAULT_DISRUPT_MISSION_TASK_OPTIONS as nt, getControlMeasureMetadata as o, axis1DrawRule as on, DEFAULT_TACTICAL_ARROW_OPTIONS as ot, DEFAULT_RETAIN_OPTIONS as p, turnDrawRule as pn, RADAR_SEARCH_DOCTRINE_STROKE_COLOR as pt, DEFAULT_BRIDGEHEAD_LINE_OPTIONS as q, normalizeTextAmplifiers as qt, CONTROL_MEASURE_IDS as r, DEFAULT_AMBUSH_OPTIONS as rn, DEFAULT_DISENGAGE_OPTIONS as rt, getControlMeasureMetadataByValue as s, supportByFireDrawRule as sn, DEFAULT_COUNTERATTACK_BY_FIRE_OPTIONS as st, renderControlMeasure as t, DEFAULT_STROKE_WIDTH_CSS_PIXELS as tn, DEFAULT_GUARD_OPTIONS as tt, DEFAULT_TURNING_MOVEMENT_OPTIONS as u, line26DrawRule as un, DEFAULT_CLEAR_OPTIONS as ut, DEFAULT_PICKUP_ZONE_OPTIONS as v, sectorDrawRule as vn, DEFAULT_GENERIC_LINE_OPTIONS as vt, DEFAULT_LANDING_ZONE_OPTIONS as w, centerRadiusDrawRule as wn, DEFAULT_BLOCK_MISSION_TASK_OPTIONS as wt, DEFAULT_OBSTACLE_BYPASS_DIFFICULT_OPTIONS as x, penetrateDrawRule as xn, DEFAULT_CANALIZE_OPTIONS as xt, DEFAULT_OBSTACLE_BYPASS_IMPOSSIBLE_OPTIONS as y, staticPointDrawRule as yn, DEFAULT_GENERIC_CIRCLE_OPTIONS as yt, DEFAULT_LINE_OF_DEPARTURE_OPTIONS as z, EPSILON as zn, DEFAULT_MOBILE_DEFENSE_OPTIONS as zt };
+export { DEFAULT_FINAL_PROTECTIVE_FIRE_OPTIONS as $, DEFAULT_LINE_JOIN as $t, DEFAULT_RETIRE_OPTIONS as A, getMidpointPerpendicularSignedDistance as An, DEFAULT_BLOCK_ARROW_OPTIONS as At, DEFAULT_LINE_OF_DEPARTURE_OPTIONS as B, EPSILON as Bn, DEFAULT_MOBILE_DEFENSE_OPTIONS as Bt, DEFAULT_MAIN_ATTACK_OPTIONS as C, disruptDrawRule as Cn, DEFAULT_BYPASS_OPTIONS as Ct, DEFAULT_WITHDRAW_OPTIONS as D, area27DrawRule as Dn, DEFAULT_ENGINEER_WORK_LINE_OPTIONS as Dt, DEFAULT_WITHDRAW_UNDER_PRESSURE_OPTIONS as E, containDrawRule as En, DEFAULT_GENERIC_C2_LINE_OPTIONS as Et, DEFAULT_FORTIFIED_AREA_OPTIONS as F, computeInitialWidthPoint as Fn, DEFAULT_ATTACK_BY_FIRE_OPTIONS as Ft, DEFAULT_RELEASE_LINE_OPTIONS as G, DEFAULT_DIRECTION_OF_ATTACK_AVIATION_OPTIONS as Gt, DEFAULT_BATTLE_HANDOVER_LINE_OPTIONS as H, roundToFixed as Hn, DEFAULT_AREA_DEFENSE_OPTIONS as Ht, DEFAULT_FORTIFIED_LINE_OPTIONS as I, haversineDistance as In, DEFAULT_ANTITANK_WALL_OPTIONS as It, DEFAULT_BRIDGEHEAD_LINE_OPTIONS as J, normalizeTextAmplifiers as Jt, DEFAULT_HOLDING_LINE_OPTIONS as K, TEXT_AMPLIFIER_FIELDS as Kt, DEFAULT_PROBABLE_LINE_OF_DEPLOYMENT_OPTIONS as L, project as Ln, DEFAULT_ANTITANK_DITCH_OPTIONS as Lt, DEFAULT_PENETRATE_OPTIONS as M, snapToMidpointPerpendicular as Mn, DEFAULT_CONTAIN_OPTIONS as Mt, DEFAULT_MOVEMENT_TO_CONTACT_OPTIONS as N, createBaselineFrame as Nn, DEFAULT_BATTLE_POSITION_OPTIONS as Nt, DEFAULT_SEIZE_OPTIONS as O, computeDefaultMidpointPerpendicularPoint as On, DEFAULT_LIGHT_LINE_OPTIONS as Ot, DEFAULT_FRONTAL_ATTACK_OPTIONS as P, calculateMetrics as Pn, DEFAULT_ATTACK_HELICOPTER_OPTIONS as Pt, DEFAULT_FIX_OPTIONS as Q, DEFAULT_LINE_CAP as Qt, PROBABLE_LINE_OF_DEPLOYMENT_DASH as R, sphericalBearing as Rn, DEFAULT_ASSEMBLY_AREA_OPTIONS as Rt, DEFAULT_MINEFIELD_OPTIONS as S, penetrateDrawRule as Sn, DEFAULT_CANALIZE_OPTIONS as St, DEFAULT_JOINT_TACTICAL_ACTION_AREA_OPTIONS as T, centerRadiusDrawRule as Tn, DEFAULT_BLOCK_MISSION_TASK_OPTIONS as Tt, DEFAULT_HANDOVER_LINE_OPTIONS as U, DEFAULT_DIRECTION_OF_SUPPORTING_ATTACK_OPTIONS as Ut, DEFAULT_LIMIT_OF_ADVANCE_OPTIONS as V, getMetersPerPixel as Vn, DEFAULT_ENGAGEMENT_AREA_OPTIONS as Vt, DEFAULT_FORWARD_EDGE_OF_BATTLE_AREA_OPTIONS as W, DEFAULT_DIRECTION_OF_MAIN_ATTACK_OPTIONS as Wt, DEFAULT_FLOT_OPTIONS as X, DEFAULT_LABEL_HEIGHT_CSS_PIXELS as Xt, DEFAULT_PHASE_LINE_OPTIONS as Y, resolveAmplifierPlacement as Yt, DEFAULT_FIX_MISSION_TASK_OPTIONS as Z, DEFAULT_LABEL_SIZE_CLAMP_CSS_PIXELS as Zt, DEFAULT_PRINCIPAL_DIRECTION_OF_FIRE_OPTIONS as _, attackByFireDrawRule as _n, DEFAULT_GENERIC_RECTANGLE_OPTIONS as _t, DEFINITIONS as a, DEFAULT_AIRBORNE_ATTACK_OPTIONS as an, DEFAULT_DELAY_OPTIONS as at, DEFAULT_OBSTACLE_BYPASS_EASY_OPTIONS as b, staticPointDrawRule as bn, DEFAULT_GENERIC_CIRCLE_OPTIONS as bt, getDefaultOptions as c, supportByFireDrawRule as cn, DEFAULT_COUNTERATTACK_BY_FIRE_OPTIONS as ct, DEFAULT_TURN_OPTIONS as d, line26DrawRule as dn, DEFAULT_CLEAR_OPTIONS as dt, DEFAULT_PORTRAYAL as en, DEFAULT_ENCIRCLEMENT_OPTIONS as et, DEFAULT_SUPPORT_BY_FIRE_OPTIONS as f, line24DrawRule as fn, DEFAULT_RADAR_SEARCH_DOCTRINE_OPTIONS as ft, SECONDARY_DIRECTION_OF_FIRE_DASH as g, ambushDrawRule as gn, DEFAULT_GENERIC_SECTOR_OPTIONS as gt, DEFAULT_SECONDARY_DIRECTION_OF_FIRE_OPTIONS as h, line1DrawRule as hn, DEFAULT_GENERIC_TEXT_OPTIONS as ht, CONTROL_MEASURE_METADATA as i, DEFAULT_AMBUSH_OPTIONS as in, DEFAULT_DISENGAGE_OPTIONS as it, DEFAULT_REARWARD_PASSAGE_OF_LINES_OPTIONS as j, pointOnMidpointPerpendicularAxis as jn, DEFAULT_BLOCK_OPTIONS as jt, DEFAULT_SCREEN_OPTIONS as k, createMidpointPerpendicularDrawRule as kn, DEFAULT_BOUNDARY_OPTIONS as kt, listControlMeasureMetadata as l, polyline1DrawRule as ln, DEFAULT_COUNTERATTACK_OPTIONS as lt, DEFAULT_STRONG_POINT_OPTIONS as m, turnDrawRule as mn, RADAR_SEARCH_DOCTRINE_STROKE_COLOR as mt, resolveStyleHints as n, DEFAULT_STROKE_WIDTH_CSS_PIXELS as nn, DEFAULT_GUARD_OPTIONS as nt, getControlMeasureMetadata as o, rectangleDrawRule as on, DEFAULT_COVER_OPTIONS as ot, DEFAULT_RETAIN_OPTIONS as p, line23DrawRule as pn, RADAR_SEARCH_DOCTRINE_FILL_COLOR as pt, DEFAULT_INFILTRATION_LANE_OPTIONS as q, canonicalTextAmplifierKey as qt, CONTROL_MEASURE_IDS as r, DEFAULT_SYMBOL_COLOR as rn, DEFAULT_DISRUPT_MISSION_TASK_OPTIONS as rt, getControlMeasureMetadataByValue as s, axis1DrawRule as sn, DEFAULT_TACTICAL_ARROW_OPTIONS as st, renderControlMeasure as t, DEFAULT_STROKE_DASH_CSS_PIXELS as tn, DEFAULT_DISRUPT_OPTIONS as tt, DEFAULT_TURNING_MOVEMENT_OPTIONS as u, line27DrawRule as un, DEFAULT_SUPPORTING_ATTACK_OPTIONS as ut, DEFAULT_PICKUP_ZONE_OPTIONS as v, dynamicPointDrawRule as vn, DEFAULT_GENERIC_POLYGON_OPTIONS as vt, DEFAULT_LANDING_ZONE_OPTIONS as w, blockDrawRule as wn, DEFAULT_BREACH_OPTIONS as wt, DEFAULT_OBSTACLE_BYPASS_DIFFICULT_OPTIONS as x, point12DrawRule as xn, DEFAULT_CLASSIC_ARROW_OPTIONS as xt, DEFAULT_OBSTACLE_BYPASS_IMPOSSIBLE_OPTIONS as y, sectorDrawRule as yn, DEFAULT_GENERIC_LINE_OPTIONS as yt, DEFAULT_LINE_OF_DEPARTURE_CONTACT_OPTIONS as z, unproject as zn, DEFAULT_AREA_OF_OPERATIONS_OPTIONS as zt };