@tmlmobilidade/dates 20260616.229.43 → 20260616.1147.27

package/dist/calendar/parameters/stops-parameters.d.ts

@@ -4,6 +4,10 @@ export type MergedPathItem = Path & {
     dwell_time?: null | number;
 };
 export interface SegmentTravelTimes {
+    legSeconds: {
+        formatted: Array<string>;
+        raw: Array<null | number>;
+    };
     segmentTravelSeconds: {
         formatted: Array<string>;
         raw: Array<null | number>;
@@ -22,7 +26,7 @@ export interface SegmentTravelTimes {
     };
 }
 export declare function toNumberOrNull(value: unknown): null | number;
-export declare function computeSegmentSeconds(distanceMeters: null | number, speedKmh: null | number): number;
+export declare function computeSegmentSeconds(distanceMeters: null | number, speedKmh: null | number): null | number;
 export declare function formatSecondsToTime(timeInSeconds: null | number): string;
 export declare function computeSegmentTravelTimes(mergedPath: MergedPathItem[]): SegmentTravelTimes;
 export declare function getMergedPath(basePath: Path[], newPath: StopsParameter['path']): MergedPathItem[];

package/dist/calendar/parameters/stops-parameters.js

@@ -12,11 +12,12 @@ export function toNumberOrNull(value) {
     return null;
 }
 export function computeSegmentSeconds(distanceMeters, speedKmh) {
-    if (!distanceMeters || !speedKmh)
-        return 0;
-    // km/h -> m/s
+    if (distanceMeters === null || distanceMeters <= 0)
+        return null;
+    if (speedKmh === null || speedKmh <= 0)
+        return null;
     const speedMs = speedKmh * 1000 / 3600;
-    return Math.round(distanceMeters / speedMs) || 0;
+    return Math.round(distanceMeters / speedMs);
 }
 export function formatSecondsToTime(timeInSeconds) {
     if (timeInSeconds === null || timeInSeconds === undefined)
@@ -37,12 +38,11 @@ export function formatSecondsToTime(timeInSeconds) {
 export function computeSegmentTravelTimes(mergedPath) {
     const segmentTravelSeconds = [];
     const stopDwellSeconds = [];
+    const legSeconds = [];
     for (let i = 0; i < mergedPath.length; i++) {
         const row = mergedPath[i];
-        // Dwell applies at the stop itself
         const dwell = toNumberOrNull(row.dwell_time);
-        stopDwellSeconds.push(dwell && dwell > 0 ? Math.round(dwell) : null);
-        // Segment travel time applies from previous stop -> current stop
+        stopDwellSeconds.push(dwell !== null && dwell > 0 ? Math.round(dwell) : 0);
         if (i === 0) {
             segmentTravelSeconds.push(null);
             continue;
@@ -51,6 +51,14 @@ export function computeSegmentTravelTimes(mergedPath) {
         const speedKmh = toNumberOrNull(row.avg_speed);
         segmentTravelSeconds.push(computeSegmentSeconds(distanceMeters, speedKmh));
     }
+    for (let i = 0; i < mergedPath.length; i++) {
+        const nextTravelSeconds = segmentTravelSeconds[i + 1];
+        if (nextTravelSeconds === undefined || nextTravelSeconds === null) {
+            legSeconds.push(stopDwellSeconds[i] ?? 0);
+            continue;
+        }
+        legSeconds.push((stopDwellSeconds[i] ?? 0) + nextTravelSeconds);
+    }
     const totalTripSecondsWithoutStops = segmentTravelSeconds
         .filter((v) => typeof v === 'number')
         .reduce((a, b) => a + b, 0);
@@ -59,18 +67,31 @@ export function computeSegmentTravelTimes(mergedPath) {
         .reduce((a, b) => a + b, 0);
     const totalTripSecondsWithStops = totalTripSecondsWithoutStops + totalStopSeconds;
     return {
-        segmentTravelSeconds: { formatted: segmentTravelSeconds.map(s => formatSecondsToTime(s)), raw: segmentTravelSeconds },
-        stopDwellSeconds: { formatted: stopDwellSeconds.map(s => formatSecondsToTime(s)), raw: stopDwellSeconds },
-        totalTripSecondsWithoutStops: { formatted: formatSecondsToTime(totalTripSecondsWithoutStops), raw: totalTripSecondsWithoutStops },
-        totalTripSecondsWithStops: { formatted: formatSecondsToTime(totalTripSecondsWithStops), raw: totalTripSecondsWithStops },
+        legSeconds: {
+            formatted: legSeconds.map(s => formatSecondsToTime(s)),
+            raw: legSeconds,
+        },
+        segmentTravelSeconds: {
+            formatted: segmentTravelSeconds.map(s => formatSecondsToTime(s)),
+            raw: segmentTravelSeconds,
+        },
+        stopDwellSeconds: {
+            formatted: stopDwellSeconds.map(s => formatSecondsToTime(s)),
+            raw: stopDwellSeconds,
+        },
+        totalTripSecondsWithoutStops: {
+            formatted: formatSecondsToTime(totalTripSecondsWithoutStops),
+            raw: totalTripSecondsWithoutStops,
+        },
+        totalTripSecondsWithStops: {
+            formatted: formatSecondsToTime(totalTripSecondsWithStops),
+            raw: totalTripSecondsWithStops,
+        },
     };
 }
 export function getMergedPath(basePath, newPath) {
-    const editedByStopId = new Map((newPath || [])
-        .filter(p => p?.stop_id)
-        .map(p => [p.stop_id, p]));
-    return basePath.map((baseItem) => {
-        const edit = editedByStopId.get(baseItem.stop_id);
+    return basePath.map((baseItem, i) => {
+        const edit = (newPath || [])[i];
         return {
             ...baseItem,
             avg_speed: edit?.avg_speed,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/dates",
-	"version": "20260616.229.43",
+	"version": "20260616.1147.27",
 	"author": {
 		"email": "iso@tmlmobilidade.pt",
 		"name": "TML-ISO"