@orbat-mapper/control-measures 0.2.0-alpha.6 → 0.2.0-alpha.7

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { $ as point12DrawRule, A as DEFAULT_GENERIC_POLYGON_OPTIONS, B as DEFAULT_ANTITANK_WALL_OPTIONS, C as DEFAULT_FIX_OPTIONS, D as DEFAULT_DELAY_OPTIONS, E as DEFAULT_DISRUPT_OPTIONS, F as DEFAULT_BREACH_OPTIONS, G as axis1DrawRule, H as DEFAULT_AMBUSH_OPTIONS, I as DEFAULT_BLOCK_MISSION_TASK_OPTIONS, J as line23DrawRule, K as supportByFireDrawRule, L as DEFAULT_BLOCK_OPTIONS, M as DEFAULT_GENERIC_CIRCLE_OPTIONS, N as DEFAULT_CANALIZE_OPTIONS, O as DEFAULT_CLEAR_OPTIONS, P as DEFAULT_BYPASS_OPTIONS, Q as attackByFireDrawRule, R as DEFAULT_ATTACK_HELICOPTER_OPTIONS, S as DEFAULT_FLOT_OPTIONS, T as DEFAULT_ENCIRCLEMENT_OPTIONS, U as DEFAULT_AIRBORNE_ATTACK_OPTIONS, V as DEFAULT_ANTITANK_DITCH_OPTIONS, W as rectangleDrawRule, X as line1DrawRule, Y as turnDrawRule, Z as ambushDrawRule, _ as DEFAULT_OBSTACLE_BYPASS_EASY_OPTIONS, a as DEFINITIONS, at as getMidpointPerpendicularSignedDistance, b as DEFAULT_FORTIFIED_AREA_OPTIONS, c as getDefaultOptions, ct as createBaselineFrame, d as DEFAULT_SUPPORTING_ATTACK_OPTIONS, dt as project, et as centerRadiusDrawRule, f as DEFAULT_SUPPORT_BY_FIRE_OPTIONS, ft as unproject, g as DEFAULT_OBSTACLE_BYPASS_IMPOSSIBLE_OPTIONS, h as DEFAULT_PRINCIPAL_DIRECTION_OF_FIRE_OPTIONS, ht as roundToFixed, i as CONTROL_MEASURE_METADATA, it as createMidpointPerpendicularDrawRule, j as DEFAULT_GENERIC_LINE_OPTIONS, k as DEFAULT_GENERIC_RECTANGLE_OPTIONS, l as listControlMeasureMetadata, lt as calculateMetrics, m as DEFAULT_TACTICAL_ARROW_OPTIONS, mt as getMetersPerPixel, n as resolveStyleHints, nt as blockDrawRule, o as getControlMeasureMetadata, ot as pointOnMidpointPerpendicularAxis, p as DEFAULT_STRONG_POINT_OPTIONS, pt as EPSILON, q as line24DrawRule, r as CONTROL_MEASURE_IDS, rt as computeDefaultMidpointPerpendicularPoint, s as getControlMeasureMetadataByValue, st as snapToMidpointPerpendicular, t as renderControlMeasure, tt as disruptDrawRule, u as DEFAULT_TURN_OPTIONS, ut as computeInitialWidthPoint, v as DEFAULT_OBSTACLE_BYPASS_DIFFICULT_OPTIONS, w as DEFAULT_FINAL_PROTECTIVE_FIRE_OPTIONS, x as DEFAULT_FORTIFIED_LINE_OPTIONS, y as DEFAULT_MAIN_ATTACK_OPTIONS, z as DEFAULT_ATTACK_BY_FIRE_OPTIONS } from "./renderControlMeasure-D5NKuws0.mjs";
+import { $ as point12DrawRule, A as DEFAULT_GENERIC_POLYGON_OPTIONS, B as DEFAULT_ANTITANK_WALL_OPTIONS, C as DEFAULT_FIX_OPTIONS, D as DEFAULT_DELAY_OPTIONS, E as DEFAULT_DISRUPT_OPTIONS, F as DEFAULT_BREACH_OPTIONS, G as axis1DrawRule, H as DEFAULT_AMBUSH_OPTIONS, I as DEFAULT_BLOCK_MISSION_TASK_OPTIONS, J as line23DrawRule, K as supportByFireDrawRule, L as DEFAULT_BLOCK_OPTIONS, M as DEFAULT_GENERIC_CIRCLE_OPTIONS, N as DEFAULT_CANALIZE_OPTIONS, O as DEFAULT_CLEAR_OPTIONS, P as DEFAULT_BYPASS_OPTIONS, Q as attackByFireDrawRule, R as DEFAULT_ATTACK_HELICOPTER_OPTIONS, S as DEFAULT_FLOT_OPTIONS, T as DEFAULT_ENCIRCLEMENT_OPTIONS, U as DEFAULT_AIRBORNE_ATTACK_OPTIONS, V as DEFAULT_ANTITANK_DITCH_OPTIONS, W as rectangleDrawRule, X as line1DrawRule, Y as turnDrawRule, Z as ambushDrawRule, _ as DEFAULT_OBSTACLE_BYPASS_EASY_OPTIONS, a as DEFINITIONS, at as getMidpointPerpendicularSignedDistance, b as DEFAULT_FORTIFIED_AREA_OPTIONS, c as getDefaultOptions, ct as createBaselineFrame, d as DEFAULT_SUPPORTING_ATTACK_OPTIONS, dt as project, et as centerRadiusDrawRule, f as DEFAULT_SUPPORT_BY_FIRE_OPTIONS, ft as unproject, g as DEFAULT_OBSTACLE_BYPASS_IMPOSSIBLE_OPTIONS, h as DEFAULT_PRINCIPAL_DIRECTION_OF_FIRE_OPTIONS, ht as roundToFixed, i as CONTROL_MEASURE_METADATA, it as createMidpointPerpendicularDrawRule, j as DEFAULT_GENERIC_LINE_OPTIONS, k as DEFAULT_GENERIC_RECTANGLE_OPTIONS, l as listControlMeasureMetadata, lt as calculateMetrics, m as DEFAULT_TACTICAL_ARROW_OPTIONS, mt as getMetersPerPixel, n as resolveStyleHints, nt as blockDrawRule, o as getControlMeasureMetadata, ot as pointOnMidpointPerpendicularAxis, p as DEFAULT_STRONG_POINT_OPTIONS, pt as EPSILON, q as line24DrawRule, r as CONTROL_MEASURE_IDS, rt as computeDefaultMidpointPerpendicularPoint, s as getControlMeasureMetadataByValue, st as snapToMidpointPerpendicular, t as renderControlMeasure, tt as disruptDrawRule, u as DEFAULT_TURN_OPTIONS, ut as computeInitialWidthPoint, v as DEFAULT_OBSTACLE_BYPASS_DIFFICULT_OPTIONS, w as DEFAULT_FINAL_PROTECTIVE_FIRE_OPTIONS, x as DEFAULT_FORTIFIED_LINE_OPTIONS, y as DEFAULT_MAIN_ATTACK_OPTIONS, z as DEFAULT_ATTACK_BY_FIRE_OPTIONS } from "./renderControlMeasure-DGWf44sn.mjs";
 //#region src/freeze-orientation.ts
 /**
 * Dispatches to a measure kind's `freezeOrientation` hook (see

package/dist/preview/index.mjs

@@ -1,4 +1,4 @@
-import { a as DEFINITIONS, t as renderControlMeasure } from "../renderControlMeasure-D5NKuws0.mjs";
+import { a as DEFINITIONS, t as renderControlMeasure } from "../renderControlMeasure-DGWf44sn.mjs";
 //#region src/preview/index.ts
 /**
 * Unitless `previewSample` points (~`[-1, 1]`) are scaled by this degree offset

package/dist/{renderControlMeasure-D5NKuws0.mjs → renderControlMeasure-DGWf44sn.mjs}

@@ -181,7 +181,7 @@ function pointToInfiniteLineDistance(p, a, b) {
 }
 /**
 * Calculates intersection of two line segments p1-p2 and p3-p4.
-* Returns null if parallel. Assuming they cross as per design.
+* Returns null if parallel or if the infinite lines intersect outside either segment.
 */
 function lineIntersection(p1, p2, p3, p4) {
 	const x1 = p1[0], y1 = p1[1];
@@ -191,6 +191,8 @@ function lineIntersection(p1, p2, p3, p4) {
 	const denom = (y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1);
 	if (Math.abs(denom) < 1e-6) return null;
 	const ua = ((x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3)) / denom;
+	const ub = ((x2 - x1) * (y1 - y3) - (y2 - y1) * (x1 - x3)) / denom;
+	if (ua < -1e-6 || ua > 1.000001 || ub < -1e-6 || ub > 1.000001) return null;
 	return [x1 + ua * (x2 - x1), y1 + ua * (y2 - y1)];
 }
 //#endregion
@@ -218,15 +220,38 @@ function processAttackGeometry(coordinates, options = {}) {
 	return { geometry: calculateSymbolGeometry(ptTip, ptWidth, spinePoints, shaftRatio, roundedBends, bendSegments) };
 }
 function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, roundedBends, bendSegments) {
-	const ptNeck = spine[spine.length - 1];
+	const initialNeck = spine[spine.length - 1];
+	if (!initialNeck) return null;
+	const initialTipDir = vecNorm(vecSub(ptTip, initialNeck));
+	if (vecMag(initialTipDir) < 1e-6) return null;
+	const headHalfWidth = pointToInfiniteLineDistance(ptWidth, initialNeck, ptTip);
+	const vecTipToWidth = vecSub(ptTip, ptWidth);
+	const requestedHeadLength = Math.max(EPSILON, vecDot(vecTipToWidth, initialTipDir));
+	const path = [...spine, ptTip];
+	let totalArcLength = 0;
+	for (let i = 1; i < path.length; i++) totalArcLength += vecMag(vecSub(path[i], path[i - 1]));
+	const minimumShaftLength = Math.max(EPSILON, totalArcLength * .01);
+	let distanceRemaining = clamp(requestedHeadLength, EPSILON, Math.max(EPSILON, totalArcLength - minimumShaftLength));
+	let ptBase = ptTip;
+	let remainingSpine = spine;
+	for (let i = path.length - 1; i > 0; i--) {
+		const segmentEnd = path[i];
+		const segmentStart = path[i - 1];
+		const segment = vecSub(segmentStart, segmentEnd);
+		const segmentLength = vecMag(segment);
+		if (segmentLength < 1e-6) continue;
+		if (distanceRemaining < segmentLength) {
+			ptBase = vecAdd(segmentEnd, vecScale(segment, distanceRemaining / segmentLength));
+			remainingSpine = path.slice(0, i);
+			break;
+		}
+		distanceRemaining -= segmentLength;
+	}
+	const ptNeck = remainingSpine[remainingSpine.length - 1];
 	if (!ptNeck) return null;
 	const tipDir = vecNorm(vecSub(ptTip, ptNeck));
 	if (vecMag(tipDir) < 1e-6) return null;
-	const headHalfWidth = pointToInfiniteLineDistance(ptWidth, ptNeck, ptTip);
-	const vecTipToWidth = vecSub(ptTip, ptWidth);
-	const maxHeadLength = Math.max(0, vecMag(vecSub(ptTip, ptNeck)) - .1);
-	const headLength = clamp(vecDot(vecTipToWidth, tipDir), EPSILON, maxHeadLength);
-	const ptBase = vecSub(ptTip, vecScale(tipDir, headLength));
+	const headLength = vecMag(vecSub(ptTip, ptBase));
 	const shaftHalfWidth = headHalfWidth * shaftRatio;
 	const perpDir = [-tipDir[1], tipDir[0]];
 	const outerLeft = vecAdd(ptBase, vecScale(perpDir, headHalfWidth));
@@ -234,7 +259,8 @@ function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, roundedBends
 	const innerLeft = vecAdd(ptBase, vecScale(perpDir, shaftHalfWidth));
 	const innerRight = vecAdd(ptBase, vecScale(perpDir, -shaftHalfWidth));
 	const notchDepth = headLength * shaftRatio;
-	const innerTip = vecAdd(ptBase, vecScale(tipDir, Math.min(notchDepth, headLength - EPSILON)));
+	const safeNotchDepth = Math.min(notchDepth, headLength - EPSILON);
+	const innerTip = vecAdd(ptBase, vecScale(tipDir, safeNotchDepth));
 	const shaftEndCenter = ptBase;
 	const headRing = [
 		outerLeft,
@@ -245,7 +271,7 @@ function calculateSymbolGeometry(ptTip, ptWidth, spine, shaftRatio, roundedBends
 		innerLeft,
 		outerLeft
 	];
-	const fullSpine = [...spine, shaftEndCenter];
+	const fullSpine = [...remainingSpine, shaftEndCenter];
 	return {
 		shaftLeft: offsetPolyline(fullSpine, shaftHalfWidth, roundedBends, bendSegments),
 		shaftRight: offsetPolyline(fullSpine, -shaftHalfWidth, roundedBends, bendSegments),
@@ -1826,7 +1852,7 @@ function createAttackHelicopter(coordinates, options = {}) {
 		type: "FeatureCollection",
 		features: []
 	};
-	const center = lineIntersection(pL, pIR, pR, pIL);
+	const center = lineIntersection(pL, pIR, pR, pIL) ?? geometry.ptBase;
 	const features = [{
 		type: "Feature",
 		properties: {},
@@ -2338,15 +2364,18 @@ function closedCatmullRom(points, samples) {
 }
 //#endregion
 //#region src/internal/area-echelon.ts
-/** Mean of the ring's distinct vertices, used as the outward-normal reference. */
-function ringCentroid(verts, count) {
-	let cx = 0;
-	let cy = 0;
-	for (let i = 0; i < count; i++) {
-		cx += verts[i][0];
-		cy += verts[i][1];
+/**
+* Twice the ring's signed area (shoelace). Positive when the ring winds
+* counter-clockwise in projected (y-up) coordinates.
+*/
+function ringSignedArea2(verts) {
+	let area2 = 0;
+	for (let i = 0; i < verts.length - 1; i++) {
+		const a = verts[i];
+		const b = verts[i + 1];
+		area2 += a[0] * b[1] - b[0] * a[1];
 	}
-	return [cx / count, cy / count];
+	return area2;
 }
 /**
 * Projects `positions` and returns a closed ring (first == last), optionally
@@ -2366,7 +2395,7 @@ function buildClosedRing(positions, smooth, smoothResolution, defaultSmoothResol
 * projected y), the side opposite the front.
 */
 function buildAreaPerimeter(verts) {
-	const centroid = ringCentroid(verts, verts.length - 1);
+	const ccw = ringSignedArea2(verts) > 0;
 	const segs = [];
 	let totalLength = 0;
 	let anchorTarget = 0;
@@ -2379,8 +2408,7 @@ function buildAreaPerimeter(verts) {
 		if (length < 1e-6) continue;
 		const along = vecNorm(edge);
 		const mid = [(a[0] + b[0]) / 2, (a[1] + b[1]) / 2];
-		let perp = [-along[1], along[0]];
-		if (perp[0] * (mid[0] - centroid[0]) + perp[1] * (mid[1] - centroid[1]) < 0) perp = [-perp[0], -perp[1]];
+		const perp = ccw ? [along[1], -along[0]] : [-along[1], along[0]];
 		segs.push({
 			start: a,
 			along,

package/package.json

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