@signalk/tracks-plugin 3.0.2 → 3.0.3

package/dist/index.js

@@ -1,4 +1,4 @@
-import { _ as TimeWindowError, a as createDistanceTo, b as thin, c as gpxFilename, d as rfc8187, g as validateParameters, h as unwrapString, i as contextName, l as historyRowPosition, m as trackLabel, n as SelfPositionUnavailableError, p as toIsoTimes, r as asciiFilename, s as createMatcher, t as QueryParameterError, u as resolveContext, v as parseTrackQuery, x as thinToBudget, y as segment } from "./utils-OGjP1B0D.js";
+import { S as uncoveredBetween, _ as TimeWindowError, a as createDistanceTo, b as thin, c as gpxFilename, d as rfc8187, g as validateParameters, h as unwrapString, i as contextName, l as historyRowPosition, m as trackLabel, n as SelfPositionUnavailableError, p as toIsoTimes, r as asciiFilename, s as createMatcher, t as QueryParameterError, u as resolveContext, v as parseTrackQuery, x as thinToBudget, y as segment } from "./utils-DOEyuPRy.js";
 import { Temporal } from "@js-temporal/polyfill";
 import { join } from "node:path";
 import { Worker } from "node:worker_threads";
@@ -792,12 +792,29 @@ function reconcile(history, stored, resolution) {
 	for (const point of stored) if (!covered.has(bucketOf(point.timestamp, resolution))) positions.push(point);
 	positions.sort((a, b) => a.timestamp - b.timestamp);
 	return {
-		positions,
+		positions: measuredFromHistory(positions, history),
 		fromHistory,
 		fromStore: positions.length - fromHistory
 	};
 }
 /**
+* A stored point's `pauseBefore` was measured over the stored points thinning
+* dropped before it. Where a history point now comes right before it, history
+* covered part of that time, so the pause is at most the time since that
+* bucket, and at most the longest step the store recorded, whichever is less.
+*/
+function measuredFromHistory(positions, history) {
+	const fromHistory = new Set(history);
+	return positions.map((point, i) => {
+		const before = positions[i - 1];
+		if (point.pauseBefore === void 0 || before === void 0 || !fromHistory.has(before)) return point;
+		return {
+			...point,
+			pauseBefore: Math.min(point.pauseBefore, uncoveredBetween(before, point))
+		};
+	});
+}
+/**
 * Fallback when no bucket width is known: history covers its own time span,
 * and the store supplies whatever falls outside it.
 *
@@ -818,7 +835,7 @@ function reconcileByExtent(history, stored) {
 	}
 	const outside = stored.filter((p) => p.timestamp < first || p.timestamp > last);
 	return {
-		positions: [...history, ...outside].sort((a, b) => a.timestamp - b.timestamp),
+		positions: measuredFromHistory([...history, ...outside].sort((a, b) => a.timestamp - b.timestamp), history),
 		fromHistory: history.length,
 		fromStore: outside.length
 	};
@@ -1716,7 +1733,8 @@ async function historyPositions(app, context, window, resolutionMs, debug) {
 				const withinEnd = window.inclusiveEnd ? timestamp <= window.to : timestamp < window.to;
 				if (timestamp >= window.from && withinEnd) points.push({
 					position,
-					timestamp
+					timestamp,
+					span: applied
 				});
 			}
 		}