- {(activity.distance / 1000).toFixed(1)} km -
-Distance
-↑ {activity.elevationGain} m
-Ascent
-↓ {activity.elevationLoss} m
-Descent
-- {(route.distance / 1000).toFixed(1)} km -
-{t("routes.distance")}
-↑ {route.elevationGain} m
-Ascent
-↓ {route.elevationLoss} m
-Descent
-{a.description}
diff --git a/openspec/changes/activity-stats/tasks.md b/openspec/changes/activity-stats/tasks.md index 669b517..8f5772d 100644 --- a/openspec/changes/activity-stats/tasks.md +++ b/openspec/changes/activity-stats/tasks.md @@ -1,27 +1,27 @@ ## 1. Helpers -- [ ] 1.1 Add a pure `movingTime(gpx)` helper to `@trails-cool/gpx` (sum inter-point intervals, exclude sub-threshold/stationary segments, max-gap guard); unit-test against fixtures with and without trackpoint times. -- [ ] 1.2 Add a `deriveRate({ distance, time, sportType })` helper returning `{ kind: "pace" | "speed", value }` with the sport→kind rule and speed default. -- [ ] 1.3 Add a `formatStat` helper (distance/elevation/time/speed/pace) routing labels + units through i18n. +- [x] 1.1 Add a pure `movingTime(tracks)` helper to `@trails-cool/gpx` (sum inter-point intervals, exclude sub-threshold/stationary segments, max-gap guard); unit-tested with and without trackpoint times (`moving-time.ts` + test). +- [x] 1.2 Add a `deriveRate(distance, time, sportType)` helper returning `{ kind: "pace" | "speed", value }` with the sport→kind rule and speed default (`stats.ts`). +- [x] 1.3 Add pure `format*` helpers (distance/elevation/duration/speed/pace) in `stats.ts`; labels route through i18n at the call site (`activityStatItems`). ## 2. Component -- [ ] 2.1 Build the shared `StatRow` (ordered `{ value, label, unit }` items; value-prominent layout; no data fetching). -- [ ] 2.2 Define the canonical headline order as a single exported constant the surfaces draw from. +- [x] 2.1 Build the shared `StatRow` (ordered `{ value, label }` items; size sm/lg; no data fetching). +- [x] 2.2 Canonical order encoded once in `activityStatItems` (distance · time · [moving] · pace/speed · ascent · descent); surfaces draw from it. ## 3. Adopt across surfaces -- [ ] 3.1 Activity detail: replace the hand-rolled stats block with `StatRow` (full set incl. pace/speed + moving/elapsed). -- [ ] 3.2 Route detail: adopt `StatRow` (distance, ascent, descent; no time/pace). -- [ ] 3.3 Feed card: adopt `StatRow` compact subset (distance · time · pace/speed); expose the needed fields in the feed loader. -- [ ] 3.4 Profile activity list: adopt `StatRow` compact subset. +- [x] 3.1 Activity detail: replaced the card grid with `StatRow size="lg"` (full set incl. pace/speed + moving/elapsed); loader computes moving time from the GPX. +- [x] 3.2 Route detail: adopt `StatRow size="lg"` (distance, ascent, descent; no time/pace). +- [x] 3.3 Feed card: compact `StatRow` (distance · time · pace/speed); feed loader already exposes duration + sportType. +- [x] 3.4 Profile activity list: compact `StatRow`. ## 4. i18n -- [ ] 4.1 Add `journal.stats.*` keys (labels + unit suffixes for distance, elevation, time, speed, pace) to en + de. +- [x] 4.1 Add `journal.stats.*` keys (distance, duration, movingTime, avgSpeed, avgPace, ascent, descent) to en + de. ## 5. Tests & checks -- [ ] 5.1 Unit: `movingTime` (with/without timestamps; moving ≤ elapsed), `deriveRate` (pace/speed/default), `formatStat`. -- [ ] 5.2 Component: `StatRow` renders ordered items; subset preserves order. -- [ ] 5.3 `pnpm typecheck && pnpm lint && pnpm test && pnpm test:e2e` green. +- [x] 5.1 Unit: `movingTime` (with/without timestamps; moving ≤ elapsed; stationary/gap exclusion), `deriveRate` (pace/speed/default/null), formatters. +- [x] 5.2 Component: `StatRow` renders ordered items (jsdom); `activityStatItems` ordering + compact-subset order asserted. +- [x] 5.3 typecheck + lint + unit (gpx 63, journal 311) green. Full `pnpm test:e2e` runs in CI. diff --git a/packages/gpx/src/index.ts b/packages/gpx/src/index.ts index f958032..7cc11af 100644 --- a/packages/gpx/src/index.ts +++ b/packages/gpx/src/index.ts @@ -3,4 +3,5 @@ export { generateGpx } from "./generate.ts"; export { extractWaypoints } from "./waypoints.ts"; export { computeDays } from "./compute-days.ts"; export type { DayStage } from "./compute-days.ts"; +export { movingTime } from "./moving-time.ts"; export type { GpxData, TrackPoint, ElevationProfile, NoGoArea } from "./types.ts"; diff --git a/packages/gpx/src/moving-time.test.ts b/packages/gpx/src/moving-time.test.ts new file mode 100644 index 0000000..1513386 --- /dev/null +++ b/packages/gpx/src/moving-time.test.ts @@ -0,0 +1,56 @@ +import { describe, it, expect } from "vitest"; +import { movingTime } from "./moving-time.ts"; +import type { TrackPoint } from "./types.ts"; + +// ~0.0001° latitude ≈ 11.1 m. At 11 m per interval, speed depends on dt. +function pt(lat: number, lon: number, time?: string): TrackPoint { + return { lat, lon, time }; +} + +describe("movingTime", () => { + it("returns null when no trackpoints carry timestamps", () => { + const tracks = [[pt(0, 0), pt(0, 0.0001), pt(0, 0.0002)]]; + expect(movingTime(tracks)).toBeNull(); + }); + + it("sums intervals where the athlete is moving", () => { + // Three points 10s apart, each ~11 m → ~1.1 m/s (moving). 2 intervals. + const tracks = [[ + pt(0, 0, "2026-06-01T08:00:00Z"), + pt(0, 0.0001, "2026-06-01T08:00:10Z"), + pt(0, 0.0002, "2026-06-01T08:00:20Z"), + ]]; + expect(movingTime(tracks)).toBe(20); + }); + + it("excludes stationary spans (below the speed threshold)", () => { + // Middle interval: no movement over 10s → stopped, excluded. + const tracks = [[ + pt(0, 0, "2026-06-01T08:00:00Z"), + pt(0, 0.0001, "2026-06-01T08:00:10Z"), // moving (~11 m / 10s) + pt(0, 0.0001, "2026-06-01T08:00:20Z"), // stationary (0 m) + pt(0, 0.0002, "2026-06-01T08:00:30Z"), // moving again + ]]; + expect(movingTime(tracks)).toBe(20); // 2 moving intervals of 10s + }); + + it("excludes long gaps (pauses / signal loss)", () => { + const tracks = [[ + pt(0, 0, "2026-06-01T08:00:00Z"), + pt(0, 0.0001, "2026-06-01T08:00:10Z"), // 10s moving + pt(0, 0.0002, "2026-06-01T09:00:00Z"), // ~1h gap → excluded + ]]; + expect(movingTime(tracks)).toBe(10); + }); + + it("never exceeds elapsed time", () => { + const tracks = [[ + pt(0, 0, "2026-06-01T08:00:00Z"), + pt(0, 0.0001, "2026-06-01T08:00:10Z"), + pt(0, 0.0001, "2026-06-01T08:00:40Z"), // 30s stationary + ]]; + const elapsed = 40; + const moving = movingTime(tracks)!; + expect(moving).toBeLessThanOrEqual(elapsed); + }); +}); diff --git a/packages/gpx/src/moving-time.ts b/packages/gpx/src/moving-time.ts new file mode 100644 index 0000000..aba8d88 --- /dev/null +++ b/packages/gpx/src/moving-time.ts @@ -0,0 +1,46 @@ +import type { TrackPoint } from "./types.ts"; + +// Below this speed we treat the athlete as stopped (traffic lights, photo +// stops, regroups). 0.5 m/s ≈ 1.8 km/h — slower than a slow walk. +const STATIONARY_SPEED_MS = 0.5; +// Intervals longer than this are pauses or GPS gaps, not continuous motion; +// they're excluded entirely so a lunch break doesn't inflate moving time. +const MAX_GAP_S = 60; + +function haversineMeters(lat1: number, lon1: number, lat2: number, lon2: number): number { + const R = 6371000; + const toRad = (d: number) => (d * Math.PI) / 180; + const dLat = toRad(lat2 - lat1); + const dLon = toRad(lon2 - lon1); + const a = + Math.sin(dLat / 2) ** 2 + + Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) * Math.sin(dLon / 2) ** 2; + return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); +} + +/** + * Moving time in seconds, derived from trackpoint timestamps: the sum of + * inter-point intervals during which the athlete was actually moving + * (excluding stationary spans and long gaps). Returns `null` when the track + * has no usable timestamps (planned routes, or recordings without time), so + * callers can fall back to elapsed time. Moving time is always ≤ elapsed. + */ +export function movingTime(tracks: TrackPoint[][]): number | null { + let movingSeconds = 0; + let timedIntervals = 0; + + for (const seg of tracks) { + for (let i = 1; i < seg.length; i++) { + const prev = seg[i - 1]; + const cur = seg[i]; + if (!prev || !cur || !prev.time || !cur.time) continue; + const dt = (Date.parse(cur.time) - Date.parse(prev.time)) / 1000; + if (!Number.isFinite(dt) || dt <= 0 || dt > MAX_GAP_S) continue; + timedIntervals++; + const speed = haversineMeters(prev.lat, prev.lon, cur.lat, cur.lon) / dt; + if (speed >= STATIONARY_SPEED_MS) movingSeconds += dt; + } + } + + return timedIntervals > 0 ? Math.round(movingSeconds) : null; +} diff --git a/packages/i18n/src/locales/de.ts b/packages/i18n/src/locales/de.ts index 9677bfb..ff1c098 100644 --- a/packages/i18n/src/locales/de.ts +++ b/packages/i18n/src/locales/de.ts @@ -396,6 +396,15 @@ export default { public: "Öffentlich (für alle sichtbar)", }, }, + stats: { + distance: "Distanz", + duration: "Zeit", + movingTime: "Bewegungszeit", + avgSpeed: "⌀ Geschwindigkeit", + avgPace: "⌀ Pace", + ascent: "Anstieg", + descent: "Abstieg", + }, settings: { title: "Einstellungen", nav: { diff --git a/packages/i18n/src/locales/en.ts b/packages/i18n/src/locales/en.ts index cc40ce6..4fd48d2 100644 --- a/packages/i18n/src/locales/en.ts +++ b/packages/i18n/src/locales/en.ts @@ -396,6 +396,15 @@ export default { public: "Public (anyone on the internet)", }, }, + stats: { + distance: "Distance", + duration: "Time", + movingTime: "Moving time", + avgSpeed: "Avg speed", + avgPace: "Avg pace", + ascent: "Ascent", + descent: "Descent", + }, settings: { title: "Settings", nav: {