@orbat-mapper/control-measures 0.29.0 → 0.29.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { $ as DEFAULT_INFILTRATION_LANE_OPTIONS, $n as pointOnMidpointPerpendicularAxis, $t as DEFAULT_ENGAGEMENT_AREA_OPTIONS, A as DEFAULT_EVACUATE_OPTIONS, An as line27DrawRule, At as DEFAULT_GENERIC_POLYGON_OPTIONS, B as DEFAULT_FRONTAL_ATTACK_OPTIONS, Bn as staticPointDrawRule, Bt as DEFAULT_LIGHT_LINE_OPTIONS, C as DEFAULT_MINEFIELD_OPTIONS, Cn as MIL_STD_GREEN, Ct as DEFAULT_CLEAR_OPTIONS, D as DEFAULT_TURN_OPTIONS, Dn as computeInitialWidthPoint, Dt as DEFAULT_GENERIC_TEXT_OPTIONS, E as DEFAULT_JOINT_TACTICAL_ACTION_AREA_OPTIONS, En as calculateMetrics, Et as RADAR_SEARCH_DOCTRINE_STROKE_COLOR, F as DEFAULT_RELIEF_IN_PLACE_OPTIONS, Fn as line1DrawRule, Ft as DEFAULT_BYPASS_OPTIONS, G as DEFAULT_LINE_OF_DEPARTURE_CONTACT_OPTIONS, Gn as disruptDrawRule, Gt as DEFAULT_BATTLE_POSITION_OPTIONS, H as DEFAULT_FORTIFIED_LINE_OPTIONS, Hn as secureDrawRule, Ht as DEFAULT_BLOCK_ARROW_OPTIONS, I as DEFAULT_REARWARD_PASSAGE_OF_LINES_OPTIONS, In as ambushDrawRule, It as DEFAULT_BREACH_OPTIONS, J as DEFAULT_BATTLE_HANDOVER_LINE_OPTIONS, Jn as containDrawRule, Jt as DEFAULT_ANTITANK_WALL_OPTIONS, K as DEFAULT_LINE_OF_DEPARTURE_OPTIONS, Kn as blockDrawRule, Kt as DEFAULT_ATTACK_HELICOPTER_OPTIONS, L as DEFAULT_PENETRATE_OPTIONS, Ln as attackByFireDrawRule, Lt as DEFAULT_BLOCK_MISSION_TASK_OPTIONS, M as DEFAULT_SECURE_OPTIONS, Mn as line24DrawRule, Mt as DEFAULT_GENERIC_CIRCLE_OPTIONS, N as DEFAULT_SCREEN_OPTIONS, Nn as line23DrawRule, Nt as DEFAULT_CLASSIC_ARROW_OPTIONS, O as DEFAULT_WITHDRAW_UNDER_PRESSURE_OPTIONS, On as supportByFireDrawRule, Ot as DEFAULT_GENERIC_SECTOR_OPTIONS, P as DEFAULT_RETIRE_OPTIONS, Pn as turnDrawRule, Pt as DEFAULT_CANALIZE_OPTIONS, Q as DEFAULT_HOLDING_LINE_OPTIONS, Qn as getMidpointPerpendicularSignedDistance, Qt as DEFAULT_MOBILE_DEFENSE_OPTIONS, R as DEFAULT_OCCUPY_OPTIONS, Rn as dynamicPointDrawRule, Rt as DEFAULT_GENERIC_C2_LINE_OPTIONS, S as DEFAULT_OBSTACLE_BYPASS_DIFFICULT_OPTIONS, Sn as DEFAULT_SYMBOL_COLOR, St as DEFAULT_ISOLATE_OPTIONS, T as DEFAULT_LANDING_ZONE_OPTIONS, Tn as axis1DrawRule, Tt as RADAR_SEARCH_DOCTRINE_FILL_COLOR, U as DEFAULT_PROBABLE_LINE_OF_DEPLOYMENT_OPTIONS, Un as penetrateDrawRule, Ut as DEFAULT_BLOCK_OPTIONS, V as DEFAULT_FORTIFIED_AREA_OPTIONS, Vn as point12DrawRule, Vt as DEFAULT_BOUNDARY_OPTIONS, W as PROBABLE_LINE_OF_DEPLOYMENT_DASH, Wn as occupyDrawRule, Wt as DEFAULT_CONTAIN_OPTIONS, X as DEFAULT_FORWARD_EDGE_OF_BATTLE_AREA_OPTIONS, Xn as computeDefaultMidpointPerpendicularPoint, Xt as DEFAULT_ASSEMBLY_AREA_OPTIONS, Y as DEFAULT_HANDOVER_LINE_OPTIONS, Yn as area27DrawRule, Yt as DEFAULT_ANTITANK_DITCH_OPTIONS, Z as DEFAULT_RELEASE_LINE_OPTIONS, Zn as createMidpointPerpendicularDrawRule, Zt as DEFAULT_AREA_OF_OPERATIONS_OPTIONS, _ as SECONDARY_DIRECTION_OF_FIRE_DASH, _n as DEFAULT_LINE_JOIN, _t as DEFAULT_COUNTERATTACK_BY_FIRE_OPTIONS, a as CONTROL_MEASURE_IDS, an as canonicalTextAmplifierKey, ar as sphericalBearing, at as DEFAULT_FINAL_PROTECTIVE_FIRE_OPTIONS, b as DEFAULT_OBSTACLE_BYPASS_IMPOSSIBLE_OPTIONS, bn as DEFAULT_STROKE_WIDTH_CSS_PIXELS, bt as DEFAULT_CORDON_AND_SEARCH_OPTIONS, c as getControlMeasureMetadata, cn as DEFAULT_AMBUSH_OPTIONS, cr as getMetersPerPixel, ct as DEFAULT_GUARD_OPTIONS, d as listControlMeasureMetadata, dn as DEFAULT_NEUTRALIZE_OPTIONS, dt as DEFAULT_DISRUPT_MISSION_TASK_OPTIONS, en as DEFAULT_AREA_DEFENSE_OPTIONS, er as snapToMidpointPerpendicular, et as DEFAULT_BRIDGEHEAD_LINE_OPTIONS, f as DEFAULT_TURNING_MOVEMENT_OPTIONS, fn as DEFAULT_SUPPRESS_OPTIONS, ft as DEFAULT_DISENGAGE_OPTIONS, g as DEFAULT_SECONDARY_DIRECTION_OF_FIRE_OPTIONS, gn as DEFAULT_LINE_CAP, gt as DEFAULT_TACTICAL_ARROW_OPTIONS, h as DEFAULT_STRONG_POINT_OPTIONS, hn as DEFAULT_LABEL_SIZE_CLAMP_CSS_PIXELS, ht as DEFAULT_COVER_OPTIONS, i as resolveSymbolColor, in as TEXT_AMPLIFIER_FIELDS, ir as project, it as DEFAULT_FIX_OPTIONS, j as DEFAULT_SEIZE_OPTIONS, jn as line26DrawRule, jt as DEFAULT_GENERIC_LINE_OPTIONS, k as DEFAULT_WITHDRAW_OPTIONS, kn as polyline1DrawRule, kt as DEFAULT_GENERIC_RECTANGLE_OPTIONS, l as getControlMeasureMetadataByValue, ln as DEFAULT_AIRBORNE_ATTACK_OPTIONS, lr as isFiniteNumber, lt as createFollowAndSupport, m as DEFAULT_RETAIN_OPTIONS, mn as DEFAULT_LABEL_HEIGHT_CSS_PIXELS, mt as DEFAULT_DELAY_OPTIONS, n as resolveDefaultSymbolColor, nn as DEFAULT_DIRECTION_OF_MAIN_ATTACK_OPTIONS, nr as EARTH_RADIUS, nt as DEFAULT_FLOT_OPTIONS, o as CONTROL_MEASURE_METADATA, on as normalizeTextAmplifiers, or as unproject, ot as DEFAULT_ENCIRCLEMENT_OPTIONS, p as DEFAULT_SUPPORT_BY_FIRE_OPTIONS, pn as DEFAULT_DEFEAT_OPTIONS, pt as DEFAULT_DEMONSTRATE_OPTIONS, q as DEFAULT_LIMIT_OF_ADVANCE_OPTIONS, qn as centerRadiusDrawRule, qt as DEFAULT_ATTACK_BY_FIRE_OPTIONS, r as resolveStyleHints, rn as DEFAULT_DIRECTION_OF_ATTACK_AVIATION_OPTIONS, rr as haversineDistance, rt as DEFAULT_FIX_MISSION_TASK_OPTIONS, s as DEFINITIONS, sn as resolveAmplifierPlacement, sr as EPSILON, st as DEFAULT_DISRUPT_OPTIONS, t as renderControlMeasure, tn as DEFAULT_DIRECTION_OF_SUPPORTING_ATTACK_OPTIONS, tr as createBaselineFrame, tt as DEFAULT_PHASE_LINE_OPTIONS, u as getDefaultOptions, un as DEFAULT_DESTROY_OPTIONS, ur as roundToFixed, ut as createFollowAndAssume, v as DEFAULT_PRINCIPAL_DIRECTION_OF_FIRE_OPTIONS, vn as DEFAULT_PORTRAYAL, vt as DEFAULT_COUNTERATTACK_OPTIONS, w as DEFAULT_MAIN_ATTACK_OPTIONS, wn as rectangleDrawRule, wt as DEFAULT_RADAR_SEARCH_DOCTRINE_OPTIONS, x as DEFAULT_OBSTACLE_BYPASS_EASY_OPTIONS, xn as resolveConstructionMetersPerCssPixel, xt as DEFAULT_CORDON_AND_KNOCK_OPTIONS, y as DEFAULT_PICKUP_ZONE_OPTIONS, yn as DEFAULT_STROKE_DASH_CSS_PIXELS, yt as DEFAULT_SUPPORTING_ATTACK_OPTIONS, z as DEFAULT_MOVEMENT_TO_CONTACT_OPTIONS, zn as sectorDrawRule, zt as DEFAULT_ENGINEER_WORK_LINE_OPTIONS } from "./renderControlMeasure-ZpYrUlKM.mjs";
+import { $ as DEFAULT_INFILTRATION_LANE_OPTIONS, $n as pointOnMidpointPerpendicularAxis, $t as DEFAULT_ENGAGEMENT_AREA_OPTIONS, A as DEFAULT_EVACUATE_OPTIONS, An as line27DrawRule, At as DEFAULT_GENERIC_POLYGON_OPTIONS, B as DEFAULT_FRONTAL_ATTACK_OPTIONS, Bn as staticPointDrawRule, Bt as DEFAULT_LIGHT_LINE_OPTIONS, C as DEFAULT_MINEFIELD_OPTIONS, Cn as MIL_STD_GREEN, Ct as DEFAULT_CLEAR_OPTIONS, D as DEFAULT_TURN_OPTIONS, Dn as computeInitialWidthPoint, Dt as DEFAULT_GENERIC_TEXT_OPTIONS, E as DEFAULT_JOINT_TACTICAL_ACTION_AREA_OPTIONS, En as calculateMetrics, Et as RADAR_SEARCH_DOCTRINE_STROKE_COLOR, F as DEFAULT_RELIEF_IN_PLACE_OPTIONS, Fn as line1DrawRule, Ft as DEFAULT_BYPASS_OPTIONS, G as DEFAULT_LINE_OF_DEPARTURE_CONTACT_OPTIONS, Gn as disruptDrawRule, Gt as DEFAULT_BATTLE_POSITION_OPTIONS, H as DEFAULT_FORTIFIED_LINE_OPTIONS, Hn as secureDrawRule, Ht as DEFAULT_BLOCK_ARROW_OPTIONS, I as DEFAULT_REARWARD_PASSAGE_OF_LINES_OPTIONS, In as ambushDrawRule, It as DEFAULT_BREACH_OPTIONS, J as DEFAULT_BATTLE_HANDOVER_LINE_OPTIONS, Jn as containDrawRule, Jt as DEFAULT_ANTITANK_WALL_OPTIONS, K as DEFAULT_LINE_OF_DEPARTURE_OPTIONS, Kn as blockDrawRule, Kt as DEFAULT_ATTACK_HELICOPTER_OPTIONS, L as DEFAULT_PENETRATE_OPTIONS, Ln as attackByFireDrawRule, Lt as DEFAULT_BLOCK_MISSION_TASK_OPTIONS, M as DEFAULT_SECURE_OPTIONS, Mn as line24DrawRule, Mt as DEFAULT_GENERIC_CIRCLE_OPTIONS, N as DEFAULT_SCREEN_OPTIONS, Nn as line23DrawRule, Nt as DEFAULT_CLASSIC_ARROW_OPTIONS, O as DEFAULT_WITHDRAW_UNDER_PRESSURE_OPTIONS, On as supportByFireDrawRule, Ot as DEFAULT_GENERIC_SECTOR_OPTIONS, P as DEFAULT_RETIRE_OPTIONS, Pn as turnDrawRule, Pt as DEFAULT_CANALIZE_OPTIONS, Q as DEFAULT_HOLDING_LINE_OPTIONS, Qn as getMidpointPerpendicularSignedDistance, Qt as DEFAULT_MOBILE_DEFENSE_OPTIONS, R as DEFAULT_OCCUPY_OPTIONS, Rn as dynamicPointDrawRule, Rt as DEFAULT_GENERIC_C2_LINE_OPTIONS, S as DEFAULT_OBSTACLE_BYPASS_DIFFICULT_OPTIONS, Sn as DEFAULT_SYMBOL_COLOR, St as DEFAULT_ISOLATE_OPTIONS, T as DEFAULT_LANDING_ZONE_OPTIONS, Tn as axis1DrawRule, Tt as RADAR_SEARCH_DOCTRINE_FILL_COLOR, U as DEFAULT_PROBABLE_LINE_OF_DEPLOYMENT_OPTIONS, Un as penetrateDrawRule, Ut as DEFAULT_BLOCK_OPTIONS, V as DEFAULT_FORTIFIED_AREA_OPTIONS, Vn as point12DrawRule, Vt as DEFAULT_BOUNDARY_OPTIONS, W as PROBABLE_LINE_OF_DEPLOYMENT_DASH, Wn as occupyDrawRule, Wt as DEFAULT_CONTAIN_OPTIONS, X as DEFAULT_FORWARD_EDGE_OF_BATTLE_AREA_OPTIONS, Xn as computeDefaultMidpointPerpendicularPoint, Xt as DEFAULT_ASSEMBLY_AREA_OPTIONS, Y as DEFAULT_HANDOVER_LINE_OPTIONS, Yn as area27DrawRule, Yt as DEFAULT_ANTITANK_DITCH_OPTIONS, Z as DEFAULT_RELEASE_LINE_OPTIONS, Zn as createMidpointPerpendicularDrawRule, Zt as DEFAULT_AREA_OF_OPERATIONS_OPTIONS, _ as SECONDARY_DIRECTION_OF_FIRE_DASH, _n as DEFAULT_LINE_JOIN, _t as DEFAULT_COUNTERATTACK_BY_FIRE_OPTIONS, a as CONTROL_MEASURE_IDS, an as canonicalTextAmplifierKey, ar as sphericalBearing, at as DEFAULT_FINAL_PROTECTIVE_FIRE_OPTIONS, b as DEFAULT_OBSTACLE_BYPASS_IMPOSSIBLE_OPTIONS, bn as DEFAULT_STROKE_WIDTH_CSS_PIXELS, bt as DEFAULT_CORDON_AND_SEARCH_OPTIONS, c as getControlMeasureMetadata, cn as DEFAULT_AMBUSH_OPTIONS, cr as getMetersPerPixel, ct as DEFAULT_GUARD_OPTIONS, d as listControlMeasureMetadata, dn as DEFAULT_NEUTRALIZE_OPTIONS, dt as DEFAULT_DISRUPT_MISSION_TASK_OPTIONS, en as DEFAULT_AREA_DEFENSE_OPTIONS, er as snapToMidpointPerpendicular, et as DEFAULT_BRIDGEHEAD_LINE_OPTIONS, f as DEFAULT_TURNING_MOVEMENT_OPTIONS, fn as DEFAULT_SUPPRESS_OPTIONS, ft as DEFAULT_DISENGAGE_OPTIONS, g as DEFAULT_SECONDARY_DIRECTION_OF_FIRE_OPTIONS, gn as DEFAULT_LINE_CAP, gt as DEFAULT_TACTICAL_ARROW_OPTIONS, h as DEFAULT_STRONG_POINT_OPTIONS, hn as DEFAULT_LABEL_SIZE_CLAMP_CSS_PIXELS, ht as DEFAULT_COVER_OPTIONS, i as resolveSymbolColor, in as TEXT_AMPLIFIER_FIELDS, ir as project, it as DEFAULT_FIX_OPTIONS, j as DEFAULT_SEIZE_OPTIONS, jn as line26DrawRule, jt as DEFAULT_GENERIC_LINE_OPTIONS, k as DEFAULT_WITHDRAW_OPTIONS, kn as polyline1DrawRule, kt as DEFAULT_GENERIC_RECTANGLE_OPTIONS, l as getControlMeasureMetadataByValue, ln as DEFAULT_AIRBORNE_ATTACK_OPTIONS, lr as isFiniteNumber, lt as createFollowAndSupport, m as DEFAULT_RETAIN_OPTIONS, mn as DEFAULT_LABEL_HEIGHT_CSS_PIXELS, mt as DEFAULT_DELAY_OPTIONS, n as resolveDefaultSymbolColor, nn as DEFAULT_DIRECTION_OF_MAIN_ATTACK_OPTIONS, nr as EARTH_RADIUS, nt as DEFAULT_FLOT_OPTIONS, o as CONTROL_MEASURE_METADATA, on as normalizeTextAmplifiers, or as unproject, ot as DEFAULT_ENCIRCLEMENT_OPTIONS, p as DEFAULT_SUPPORT_BY_FIRE_OPTIONS, pn as DEFAULT_DEFEAT_OPTIONS, pt as DEFAULT_DEMONSTRATE_OPTIONS, q as DEFAULT_LIMIT_OF_ADVANCE_OPTIONS, qn as centerRadiusDrawRule, qt as DEFAULT_ATTACK_BY_FIRE_OPTIONS, r as resolveStyleHints, rn as DEFAULT_DIRECTION_OF_ATTACK_AVIATION_OPTIONS, rr as haversineDistance, rt as DEFAULT_FIX_MISSION_TASK_OPTIONS, s as DEFINITIONS, sn as resolveAmplifierPlacement, sr as EPSILON, st as DEFAULT_DISRUPT_OPTIONS, t as renderControlMeasure, tn as DEFAULT_DIRECTION_OF_SUPPORTING_ATTACK_OPTIONS, tr as createBaselineFrame, tt as DEFAULT_PHASE_LINE_OPTIONS, u as getDefaultOptions, un as DEFAULT_DESTROY_OPTIONS, ur as roundToFixed, ut as createFollowAndAssume, v as DEFAULT_PRINCIPAL_DIRECTION_OF_FIRE_OPTIONS, vn as DEFAULT_PORTRAYAL, vt as DEFAULT_COUNTERATTACK_OPTIONS, w as DEFAULT_MAIN_ATTACK_OPTIONS, wn as rectangleDrawRule, wt as DEFAULT_RADAR_SEARCH_DOCTRINE_OPTIONS, x as DEFAULT_OBSTACLE_BYPASS_EASY_OPTIONS, xn as resolveConstructionMetersPerCssPixel, xt as DEFAULT_CORDON_AND_KNOCK_OPTIONS, y as DEFAULT_PICKUP_ZONE_OPTIONS, yn as DEFAULT_STROKE_DASH_CSS_PIXELS, yt as DEFAULT_SUPPORTING_ATTACK_OPTIONS, z as DEFAULT_MOVEMENT_TO_CONTACT_OPTIONS, zn as sectorDrawRule, zt as DEFAULT_ENGINEER_WORK_LINE_OPTIONS } from "./renderControlMeasure-DsTDL15-.mjs";
 import { FILL_PATTERN_DEFINITIONS, NON_SOLID_FILL_PATTERNS, getFillPatternDefinition } from "./patterns.mjs";
 //#region src/metadata.ts
 const PARAMETER_PRESENTATION_TIERS = [

package/dist/preview/index.mjs

@@ -1,4 +1,4 @@
-import { s as DEFINITIONS, t as renderControlMeasure } from "../renderControlMeasure-ZpYrUlKM.mjs";
+import { s as DEFINITIONS, t as renderControlMeasure } from "../renderControlMeasure-DsTDL15-.mjs";
 import { FILL_PATTERN_DEFINITIONS, NON_SOLID_FILL_PATTERNS } from "../patterns.mjs";
 //#region src/preview/index.ts
 /** Side length (SVG units) of the repeating non-mine tile in {@link PREVIEW_FILL_PATTERNS}. */

package/dist/{renderControlMeasure-ZpYrUlKM.mjs → renderControlMeasure-DsTDL15-.mjs}

@@ -1590,33 +1590,56 @@ function evenlySpacePath(points, targetSegmentLength) {
 	out.push(points[points.length - 1]);
 	return out;
 }
-/** One centripetal Catmull-Rom sample at parameter `t` over control points `p0..p3`. */
-function catmullRomAt(p0, p1, p2, p3, t) {
-	const t2 = t * t;
-	const t3 = t2 * t;
-	return [.5 * (2 * p1[0] + (-p0[0] + p2[0]) * t + (2 * p0[0] - 5 * p1[0] + 4 * p2[0] - p3[0]) * t2 + (-p0[0] + 3 * p1[0] - 3 * p2[0] + p3[0]) * t3), .5 * (2 * p1[1] + (-p0[1] + p2[1]) * t + (2 * p0[1] - 5 * p1[1] + 4 * p2[1] - p3[1]) * t2 + (-p0[1] + 3 * p1[1] - 3 * p2[1] + p3[1]) * t3)];
+/**
+* Samples one centripetal (alpha = 0.5) Catmull-Rom segment from `p1` to `p2`
+* at `t = s / samples` for `s` in `[first, last]`, appending to `out`. Uses the
+* Hermite form (Yuksel et al.); centripetal knots keep the curve from
+* overshooting or looping next to a much shorter neighbouring segment.
+*/
+function sampleCatmullRomSegment(out, [p0, p1, p2, p3], samples, first, last) {
+	const knot = (a, b) => Math.sqrt(vecMag(vecSub(b, a)));
+	const d1 = knot(p1, p2);
+	const d0 = knot(p0, p1) || d1;
+	const d2 = knot(p2, p3) || d1;
+	const tangent = (a, b, c, da, db) => d1 < 1e-12 ? [0, 0] : [((b[0] - a[0]) / da - (c[0] - a[0]) / (da + db) + (c[0] - b[0]) / db) * d1, ((b[1] - a[1]) / da - (c[1] - a[1]) / (da + db) + (c[1] - b[1]) / db) * d1];
+	const m1 = tangent(p0, p1, p2, d0, d1);
+	const m2 = tangent(p1, p2, p3, d1, d2);
+	for (let s = first; s <= last; s++) {
+		const t = s / samples;
+		const t2 = t * t;
+		const t3 = t2 * t;
+		const h00 = 2 * t3 - 3 * t2 + 1;
+		const h10 = t3 - 2 * t2 + t;
+		const h01 = -2 * t3 + 3 * t2;
+		const h11 = t3 - t2;
+		out.push([h00 * p1[0] + h10 * m1[0] + h01 * p2[0] + h11 * m2[0], h00 * p1[1] + h10 * m1[1] + h01 * p2[1] + h11 * m2[1]]);
+	}
 }
 /**
 * Centripetal Catmull-Rom spline through `points`, sampled `samples` times per
 * segment. Endpoints are duplicated so the curve passes through them, so the
-* first and last points are preserved exactly. With `samples <= 1` (or fewer
-* than 3 points) it returns the input unchanged.
+* first and last points are preserved exactly. An `endDirection` instead makes
+* the curve arrive at the last point heading that way. With `samples <= 1` (or
+* fewer than 3 points) it returns the input unchanged.
 */
-function catmullRom(points, samples) {
+function catmullRom(points, samples, endDirection) {
 	if (points.length < 3 || samples <= 1) return points;
+	const last = points[points.length - 1];
+	const beforeLast = points[points.length - 2];
+	const reach = vecMag(vecSub(last, beforeLast));
+	const end = endDirection ? [last[0] + endDirection[0] * reach, last[1] + endDirection[1] * reach] : last;
 	const pts = [
 		points[0],
 		...points,
-		points[points.length - 1]
+		end
 	];
 	const out = [points[0]];
-	for (let i = 1; i < pts.length - 2; i++) {
-		const p0 = pts[i - 1];
-		const p1 = pts[i];
-		const p2 = pts[i + 1];
-		const p3 = pts[i + 2];
-		for (let s = 1; s <= samples; s++) out.push(catmullRomAt(p0, p1, p2, p3, s / samples));
-	}
+	for (let i = 1; i < pts.length - 2; i++) sampleCatmullRomSegment(out, [
+		pts[i - 1],
+		pts[i],
+		pts[i + 1],
+		pts[i + 2]
+	], samples, 1, samples);
 	return out;
 }
 /**
@@ -1629,13 +1652,12 @@ function closedCatmullRom(points, samples) {
 	const n = points.length;
 	if (n < 3 || samples <= 1) return points;
 	const out = [];
-	for (let i = 0; i < n; i++) {
-		const p0 = points[(i - 1 + n) % n];
-		const p1 = points[i];
-		const p2 = points[(i + 1) % n];
-		const p3 = points[(i + 2) % n];
-		for (let s = 0; s < samples; s++) out.push(catmullRomAt(p0, p1, p2, p3, s / samples));
-	}
+	for (let i = 0; i < n; i++) sampleCatmullRomSegment(out, [
+		points[(i - 1 + n) % n],
+		points[i],
+		points[(i + 1) % n],
+		points[(i + 2) % n]
+	], samples, 0, samples - 1);
 	out.push([...out[0]]);
 	return out;
 }
@@ -1732,13 +1754,13 @@ function valueAtFraction(distances, values, t) {
 * index `j * stride`. Fewer than three vertices or two samples leave the spine
 * as authored, with a stride of 1.
 */
-function curveSpine(authored, samples) {
+function curveSpine(authored, samples, endDirection) {
 	if (authored.length < 3 || samples < 2) return {
 		spine: authored,
 		stride: 1
 	};
 	return {
-		spine: catmullRom(authored, samples),
+		spine: catmullRom(authored, samples, endDirection),
 		stride: samples
 	};
 }
@@ -2167,7 +2189,7 @@ function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, rearWidthRat
 	];
 	const fullSpine = [...remainingSpine, shaftEndCenter];
 	const rearHalfWidth = headHalfWidth * rearWidthRatio;
-	const { spine: drawnSpine, stride } = smoothing === "curve" ? curveSpine(fullSpine, normalizeSmoothResolution$1(smoothResolution * CURVE_SAMPLES_PER_RESOLUTION, 5 * CURVE_SAMPLES_PER_RESOLUTION)) : {
+	const { spine: drawnSpine, stride } = smoothing === "curve" ? curveSpine(fullSpine, normalizeSmoothResolution$1(smoothResolution * CURVE_SAMPLES_PER_RESOLUTION, 5 * CURVE_SAMPLES_PER_RESOLUTION), tipDir) : {
 		spine: fullSpine,
 		stride: 1
 	};
@@ -2181,6 +2203,8 @@ function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, rearWidthRat
 		rounded: smoothing !== null && !(stride > 1),
 		roundSegments: smoothResolution
 	});
+	shaftLeft[shaftLeft.length - 1] = innerLeft;
+	shaftRight[shaftRight.length - 1] = innerRight;
 	return {
 		shaftCenterline: drawnSpine,
 		shaftLeft,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/control-measures",
-  "version": "0.29.0",
+  "version": "0.29.1",
   "description": "Library for drawing tactical graphics and control measures according to MIL-STD-2525 and APP-6 standards.",
   "license": "MIT",
   "author": "Orbat Mapper",