@signalk/tracks-plugin 3.0.0-beta.0 → 3.0.0-beta.1

package/app-icon.svg

@@ -0,0 +1,42 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" role="img" aria-label="Tracks">
+  <defs>
+    <linearGradient id="sea" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#1b6ea8"/>
+      <stop offset="1" stop-color="#0b3a5e"/>
+    </linearGradient>
+    <clipPath id="card">
+      <rect x="0" y="0" width="128" height="128" rx="22"/>
+    </clipPath>
+  </defs>
+
+  <g clip-path="url(#card)">
+    <rect width="128" height="128" fill="url(#sea)"/>
+
+    <!-- Chart grid, as on the sibling plugins' icons. -->
+    <g stroke="#bee3f4" stroke-opacity="0.28" stroke-width="1" fill="none">
+      <path d="M0 32 H128 M0 64 H128 M0 96 H128"/>
+      <path d="M32 0 V128 M64 0 V128 M96 0 V128"/>
+    </g>
+
+    <!-- The track itself: the recorded path, drawn through its own points. -->
+    <path d="M24 102 C 40 94, 42 72, 58 64 S 84 58, 94 44"
+          fill="none" stroke="#0b3a5e" stroke-opacity="0.45"
+          stroke-width="9" stroke-linecap="round"/>
+    <path d="M24 102 C 40 94, 42 72, 58 64 S 84 58, 94 44"
+          fill="none" stroke="#ffd76a" stroke-width="5"
+          stroke-linecap="round" stroke-linejoin="round"/>
+
+    <!-- Position fixes. The track is a series of recorded points, not a
+         drawn line, and the icon should read that way at 32px too. -->
+    <g fill="#fffaf0" stroke="#0b3a5e" stroke-opacity="0.5" stroke-width="1.5">
+      <circle cx="24" cy="102" r="4.5"/>
+      <circle cx="49" cy="74" r="4"/>
+      <circle cx="72" cy="61" r="4"/>
+    </g>
+
+    <!-- The vessel, at the newest fix, heading along the track. -->
+    <path d="M94 34 L102 52 L94 47 L86 52 Z" fill="#fffaf0"
+          stroke="#0b3a5e" stroke-opacity="0.5" stroke-width="1.5"
+          stroke-linejoin="round"/>
+  </g>
+</svg>

package/dist/index.js

@@ -161,6 +161,42 @@ function thin(points, resolution) {
 	return result;
 }
 /**
+* Thin to at most `maxPoints`, widening the spacing until the budget fits.
+*
+* A budget, not a fidelity contract: the caller has said how many points it can
+* afford to transfer and draw, whatever shape the track is. Returns the
+* resolution actually applied so the response can report it — a client that is
+* given 29 points instead of the 546 it would otherwise have received should be
+* able to see the spacing that produced them.
+*
+* Widening by doubling from the span-derived estimate rather than binary
+* searching: `thin` keeps the first point and the last unconditionally, so the
+* count is not a clean function of the spacing and an exact solve would be
+* false precision. Two or three passes settle it in practice.
+*/
+function thinToBudget(points, maxPoints, resolution) {
+	const start = thin(points, resolution);
+	if (start.length <= maxPoints) return {
+		points: start,
+		resolution
+	};
+	if (maxPoints < 2) return {
+		points: start.slice(0, Math.max(0, maxPoints)),
+		resolution
+	};
+	const span = start[start.length - 1].timestamp - start[0].timestamp;
+	let spacing = Math.max(1, Math.ceil(span / (maxPoints - 1)), resolution ?? 0);
+	let result = thin(points, spacing);
+	while (result.length > maxPoints && spacing <= span) {
+		spacing *= 2;
+		result = thin(points, spacing);
+	}
+	return {
+		points: result,
+		resolution: spacing
+	};
+}
+/**
 * Split points into segments wherever recording stopped for longer than `gap`.
 *
 * A track is not one continuous line: a vessel that stops for the night, or
@@ -313,7 +349,7 @@ function resolveContext(vesselId, selfContext) {
 function createMatcher(params, selfPosition, debug) {
 	if (params.bbox) {
 		const inBounds = createInBounds(params.bbox);
-		return (track) => inBounds(lastPoint(track));
+		return params.intersects ? (track) => track.some(inBounds) : (track) => inBounds(lastPoint(track));
 	} else if (params.radius !== null) {
 		if (!selfPosition) throw new Error("No self position to calculate radius values");
 		const radius = params.radius;
@@ -511,21 +547,33 @@ var totalMilliseconds = (duration) => duration.total({
 	unit: "milliseconds",
 	relativeTo: CALENDAR_REFERENCE
 });
+/**
+* Milliseconds back to a Duration, for reporting the spacing applied.
+*
+* Exact, not rounded to something tidier. A budget-derived spacing lands on
+* values like 24470ms, and `PT24.47S` does read as false precision — but the
+* field says what was applied, and a client re-querying with a rounded `PT24S`
+* gets 51 points where the budget it asked for was 50. Reproducibility beats
+* tidiness.
+*/
+var msToDuration = (ms) => Temporal.Duration.from({
+	milliseconds: Math.trunc(ms),
+	nanoseconds: Math.round((ms - Math.trunc(ms)) * 1e6)
+}).round({ largestUnit: "hour" });
 var toLngLat$1 = ([lat, lng]) => [lng, lat];
 /** Bounding box of the returned geometry, in GeoJSON order. */
 var boundsOf = (points) => {
 	if (points.length === 0) return;
-	let west = points[0].position[1];
-	let east = west;
 	let south = points[0].position[0];
 	let north = south;
+	const longitudes = [];
 	for (const { position } of points) {
 		const [lat, lng] = position;
-		if (lng < west) west = lng;
-		if (lng > east) east = lng;
 		if (lat < south) south = lat;
 		if (lat > north) north = lat;
+		longitudes.push(lng);
 	}
+	const [west, east] = longitudeSpan(longitudes);
 	return [
 		west,
 		south,
@@ -533,6 +581,36 @@ var boundsOf = (points) => {
 		north
 	];
 };
+/**
+* The narrower of the two longitude intervals covering these points.
+*
+* A plain min/max describes a track spanning the antimeridian as almost the
+* whole globe: two fixes at 179 and -179 are two degrees apart, but min/max
+* reports 358. RFC 7946 says a box crossing the antimeridian is written with
+* west greater than east, so the wrap-around interval is expressible — pick it
+* whenever it is the shorter of the two.
+*
+* The widest gap between adjacent longitudes is the part of the globe the track
+* does not cover, so the complement of that gap is the tightest interval that
+* does.
+*/
+var longitudeSpan = (longitudes) => {
+	const sorted = [...longitudes].sort((a, b) => a - b);
+	const min = sorted[0];
+	const max = sorted[sorted.length - 1];
+	let widestGap = 360 - (max - min);
+	let west = min;
+	let east = max;
+	for (let i = 1; i < sorted.length; i++) {
+		const gap = sorted[i] - sorted[i - 1];
+		if (gap > widestGap) {
+			widestGap = gap;
+			west = sorted[i];
+			east = sorted[i - 1];
+		}
+	}
+	return [west, east];
+};
 function createTrackProvider(deps) {
 	const matching = async (query) => {
 		const store = deps.store();
@@ -542,7 +620,8 @@ function createTrackProvider(deps) {
 		const wanted = query.contexts?.length ? new Set(query.contexts.map(resolveSelf(deps.selfContext()))) : void 0;
 		const collection = await store.getFilteredTimedTracks({
 			bbox: toGeoBounds(query.bbox),
-			radius: null
+			radius: null,
+			intersects: true
 		}, void 0, void 0, {
 			...window ? { window } : {},
 			...resolution === void 0 ? {} : { resolution }
@@ -560,8 +639,14 @@ function createTrackProvider(deps) {
 			const matched = await matching(query);
 			const gap = deps.segmentGap();
 			const selfContext = deps.selfContext();
+			const requested = query.resolution ? totalMilliseconds(query.resolution) : void 0;
 			const features = [];
-			for (const [context, points] of matched) {
+			for (const [context, all] of matched) {
+				const { points, resolution: appliedMs } = query.maxPoints === void 0 ? {
+					points: all,
+					resolution: requested
+				} : thinToBudget(all, query.maxPoints, requested);
+				if (points.length === 0) continue;
 				const segments = segment(points, gap);
 				const bbox = boundsOf(points);
 				features.push({
@@ -577,7 +662,7 @@ function createTrackProvider(deps) {
 						to: new Date(points[points.length - 1].timestamp).toISOString(),
 						...bbox ? { bbox } : {},
 						pointCount: points.length,
-						...query.resolution ? { resolution: query.resolution.toString() } : {},
+						...appliedMs === void 0 ? {} : { resolution: msToDuration(appliedMs).toString() },
 						...query.times ? { coordTimes: segments.map(toIsoTimes) } : {}
 					}
 				});