From 2ba08c51c0313fa3ea2c6f2b9ecd426aa0fa4dbd Mon Sep 17 00:00:00 2001 From: Alexander Bocken Date: Fri, 20 Mar 2026 14:59:30 +0100 Subject: [PATCH] fitness: fix GPS preview aspect ratio, theme-reactive colors, and UI polish - SessionCard SVG: cosine-corrected coordinates with proper aspect ratio (xMidYMid meet) - SessionCard: use --color-primary for track/distance/pace, add Gauge icon for pace - History detail: theme-reactive pace chart colors via MutationObserver + matchMedia - History detail: add Gauge icon, accent color for distance/pace stats, remove "avg" label - Move GPS remove button from info view to edit screen - Add Leaflet map preview to edit screen - Remove data points count from GPS indicators --- src/lib/components/fitness/SessionCard.svelte | 119 +++++++++++++++-- src/lib/server/simplifyTrack.ts | 103 +++++++++++++++ src/models/WorkoutSession.ts | 30 +++++ src/routes/api/fitness/sessions/+server.ts | 75 +++++++++++ .../api/fitness/sessions/[id]/+server.ts | 24 +++- .../api/fitness/sessions/[id]/gpx/+server.ts | 3 + .../sessions/[id]/recalculate/+server.ts | 121 ++++++++++++++++++ src/routes/fitness/history/[id]/+page.svelte | 107 ++++++++++++++-- 8 files changed, 556 insertions(+), 26 deletions(-) create mode 100644 src/lib/server/simplifyTrack.ts create mode 100644 src/routes/api/fitness/sessions/[id]/recalculate/+server.ts diff --git a/src/lib/components/fitness/SessionCard.svelte b/src/lib/components/fitness/SessionCard.svelte index 69902a4..b2d1994 100644 --- a/src/lib/components/fitness/SessionCard.svelte +++ b/src/lib/components/fitness/SessionCard.svelte @@ -1,6 +1,6 @@ @@ -79,8 +144,24 @@ {formatDate(session.startTime)} · {formatTime(session.startTime)} + {#if svgData} +
+ + + +
+ {/if} +
- {#each session.exercises.slice(0, 4) as ex (ex.exerciseId)} + {#each session.exercises as ex (ex.exerciseId)} {@const exercise = getExerciseById(ex.exerciseId)} {@const label = bestSetLabel(ex.sets, ex.exerciseId)}
@@ -90,17 +171,19 @@ {/if}
{/each} - {#if session.exercises.length > 4} -
+{session.exercises.length - 4} more exercises
- {/if}
{#if session.duration} {formatDuration(session.duration)} {/if} - {#if session.totalVolume} - {Math.round(session.totalVolume).toLocaleString()} kg + {#if hasGpsCardio && cardioSummary.distance > 0} + {cardioSummary.distance.toFixed(1)} km + {#if cardioSummary.pace > 0} + {formatPace(cardioSummary.pace)} + {/if} + {:else if session.totalVolume} + {session.totalVolume >= 1000 ? `${(session.totalVolume / 1000).toFixed(1)}t` : `${Math.round(session.totalVolume).toLocaleString()} kg`} {/if} {#if session.prs && session.prs.length > 0} {session.prs.length} PR{session.prs.length > 1 ? 's' : ''} @@ -139,6 +222,17 @@ font-size: 0.75rem; color: var(--color-text-secondary); } + .map-preview { + height: 80px; + margin-bottom: 0.5rem; + background: color-mix(in srgb, var(--color-primary) 6%, transparent); + border-radius: 6px; + overflow: hidden; + } + .map-preview svg { + width: 100%; + height: 100%; + } .exercise-list { font-size: 0.8rem; margin-bottom: 0.6rem; @@ -155,10 +249,6 @@ font-weight: 600; font-size: 0.78rem; } - .more { - color: var(--color-primary); - font-style: italic; - } .card-footer { display: flex; gap: 1rem; @@ -166,12 +256,17 @@ color: var(--color-text-secondary); border-top: 1px solid var(--color-border); padding-top: 0.5rem; + flex-wrap: wrap; } .stat { display: flex; align-items: center; gap: 0.25rem; } + .stat.accent { + color: var(--color-primary); + font-weight: 700; + } .stat.pr { color: var(--nord13); } diff --git a/src/lib/server/simplifyTrack.ts b/src/lib/server/simplifyTrack.ts new file mode 100644 index 0000000..b7a5b9f --- /dev/null +++ b/src/lib/server/simplifyTrack.ts @@ -0,0 +1,103 @@ +/** + * Ramer-Douglas-Peucker line simplification. + * Reduces a GPS track to a visually faithful preview with far fewer points. + * Preserves curves and corners, drops redundant points on straights. + */ + +interface Point { + lat: number; + lng: number; +} + +/** Perpendicular distance from point P to line segment A-B (in degrees, good enough for simplification) */ +function perpendicularDistance(p: Point, a: Point, b: Point): number { + const dx = b.lng - a.lng; + const dy = b.lat - a.lat; + const lenSq = dx * dx + dy * dy; + if (lenSq === 0) { + // A and B are the same point + const ex = p.lng - a.lng; + const ey = p.lat - a.lat; + return Math.sqrt(ex * ex + ey * ey); + } + const t = Math.max(0, Math.min(1, ((p.lng - a.lng) * dx + (p.lat - a.lat) * dy) / lenSq)); + const projLng = a.lng + t * dx; + const projLat = a.lat + t * dy; + const ex = p.lng - projLng; + const ey = p.lat - projLat; + return Math.sqrt(ex * ex + ey * ey); +} + +function rdpSimplify(points: Point[], epsilon: number): Point[] { + if (points.length <= 2) return points; + + let maxDist = 0; + let maxIdx = 0; + const first = points[0]; + const last = points[points.length - 1]; + + for (let i = 1; i < points.length - 1; i++) { + const d = perpendicularDistance(points[i], first, last); + if (d > maxDist) { + maxDist = d; + maxIdx = i; + } + } + + if (maxDist > epsilon) { + const left = rdpSimplify(points.slice(0, maxIdx + 1), epsilon); + const right = rdpSimplify(points.slice(maxIdx), epsilon); + return [...left.slice(0, -1), ...right]; + } + + return [first, last]; +} + +/** + * Simplify a GPS track to a preview polyline. + * @param track - Full track with lat/lng fields + * @param maxPoints - Target maximum number of points (default 30) + * @returns Array of [lat, lng] pairs + */ +export function simplifyTrack(track: Array<{ lat: number; lng: number }>, maxPoints = 30): number[][] { + if (track.length <= maxPoints) { + return track.map(p => [p.lat, p.lng]); + } + + // Start with a generous epsilon, tighten until we're under maxPoints + // Estimate initial epsilon from bounding box + let minLat = Infinity, maxLat = -Infinity, minLng = Infinity, maxLng = -Infinity; + for (const p of track) { + if (p.lat < minLat) minLat = p.lat; + if (p.lat > maxLat) maxLat = p.lat; + if (p.lng < minLng) minLng = p.lng; + if (p.lng > maxLng) maxLng = p.lng; + } + const extent = Math.max(maxLat - minLat, maxLng - minLng); + + // Binary search for the right epsilon + let lo = 0; + let hi = extent * 0.1; + let result = rdpSimplify(track, hi); + + // If even max epsilon gives too many points, increase hi + while (result.length > maxPoints && hi < extent) { + hi *= 2; + result = rdpSimplify(track, hi); + } + + // Binary search between lo and hi + for (let iter = 0; iter < 20; iter++) { + const mid = (lo + hi) / 2; + result = rdpSimplify(track, mid); + if (result.length > maxPoints) { + lo = mid; + } else { + hi = mid; + } + // Close enough + if (result.length >= maxPoints - 5 && result.length <= maxPoints) break; + } + + return result.map(p => [p.lat, p.lng]); +} diff --git a/src/models/WorkoutSession.ts b/src/models/WorkoutSession.ts index 3185815..f077dfd 100644 --- a/src/models/WorkoutSession.ts +++ b/src/models/WorkoutSession.ts @@ -25,9 +25,17 @@ export interface ICompletedExercise { restTime?: number; notes?: string; gpsTrack?: IGpsPoint[]; + gpsPreview?: number[][]; // downsampled [[lat,lng], ...] for card preview totalDistance?: number; // km } +export interface IPr { + exerciseId: string; + type: string; // 'est1rm' | 'maxWeight' | 'repMax' + value: number; + reps?: number; +} + export interface IWorkoutSession { _id?: string; templateId?: string; // Reference to WorkoutTemplate if based on template @@ -37,6 +45,9 @@ export interface IWorkoutSession { startTime: Date; endTime?: Date; duration?: number; // Duration in minutes + totalVolume?: number; // Total weight × reps across all exercises + totalDistance?: number; // Total distance across all cardio exercises + prs?: IPr[]; notes?: string; createdBy: string; // username/nickname of the person who performed the workout createdAt?: Date; @@ -118,6 +129,10 @@ const CompletedExerciseSchema = new mongoose.Schema({ type: [GpsPointSchema], default: undefined }, + gpsPreview: { + type: [[Number]], + default: undefined + }, totalDistance: { type: Number, min: 0 @@ -162,6 +177,21 @@ const WorkoutSessionSchema = new mongoose.Schema( type: Number, // in minutes min: 0 }, + totalVolume: { + type: Number, + min: 0 + }, + totalDistance: { + type: Number, + min: 0 + }, + prs: [{ + exerciseId: { type: String, required: true }, + type: { type: String, required: true }, + value: { type: Number, required: true }, + reps: Number, + _id: false + }], notes: { type: String, trim: true, diff --git a/src/routes/api/fitness/sessions/+server.ts b/src/routes/api/fitness/sessions/+server.ts index 72f199e..6242267 100644 --- a/src/routes/api/fitness/sessions/+server.ts +++ b/src/routes/api/fitness/sessions/+server.ts @@ -2,7 +2,15 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { dbConnect } from '$utils/db'; import { WorkoutSession } from '$models/WorkoutSession'; +import type { IPr } from '$models/WorkoutSession'; import { WorkoutTemplate } from '$models/WorkoutTemplate'; +import { getExerciseById, getExerciseMetrics } from '$lib/data/exercises'; + +function estimatedOneRepMax(weight: number, reps: number): number { + if (reps <= 0 || weight <= 0) return 0; + if (reps === 1) return weight; + return Math.round(weight * (1 + reps / 30)); +} // GET /api/fitness/sessions - Get all workout sessions for the user export const GET: RequestHandler = async ({ url, locals }) => { @@ -18,6 +26,7 @@ export const GET: RequestHandler = async ({ url, locals }) => { const offset = parseInt(url.searchParams.get('offset') || '0'); const sessions = await WorkoutSession.find({ createdBy: session.user.nickname }) + .select('-exercises.gpsTrack') .sort({ startTime: -1 }) .limit(limit) .skip(offset); @@ -56,6 +65,69 @@ export const POST: RequestHandler = async ({ request, locals }) => { } } + // Compute totalVolume and totalDistance + let totalVolume = 0; + let totalDistance = 0; + for (const ex of exercises) { + const exercise = getExerciseById(ex.exerciseId); + const metrics = getExerciseMetrics(exercise); + const isCardio = metrics.includes('distance'); + const isBilateral = exercise?.bilateral ?? false; + for (const s of (ex.sets ?? [])) { + if (!s.completed) continue; + if (isCardio) { + totalDistance += s.distance ?? 0; + } else { + totalVolume += (s.weight ?? 0) * (s.reps ?? 0) * (isBilateral ? 2 : 1); + } + } + } + + // Detect PRs by comparing against previous best for each exercise + const prs: IPr[] = []; + for (const ex of exercises) { + const exercise = getExerciseById(ex.exerciseId); + const metrics = getExerciseMetrics(exercise); + const isCardio = metrics.includes('distance'); + if (isCardio) continue; + + const completedSets = (ex.sets ?? []).filter((s: { completed: boolean }) => s.completed); + if (completedSets.length === 0) continue; + + // Find previous best for this exercise + const prevSessions = await WorkoutSession.find({ + createdBy: session.user!.nickname, + 'exercises.exerciseId': ex.exerciseId, + }).sort({ startTime: -1 }).limit(50).lean(); + + let prevBestWeight = 0; + let prevBestEst1rm = 0; + for (const ps of prevSessions) { + const pe = ps.exercises.find((e) => e.exerciseId === ex.exerciseId); + if (!pe) continue; + for (const s of pe.sets) { + if (!s.completed || !s.weight || !s.reps) continue; + prevBestWeight = Math.max(prevBestWeight, s.weight); + prevBestEst1rm = Math.max(prevBestEst1rm, estimatedOneRepMax(s.weight, s.reps)); + } + } + + let bestWeight = 0; + let bestEst1rm = 0; + for (const s of completedSets) { + if (!s.weight || !s.reps) continue; + bestWeight = Math.max(bestWeight, s.weight); + bestEst1rm = Math.max(bestEst1rm, estimatedOneRepMax(s.weight, s.reps)); + } + + if (bestWeight > prevBestWeight && prevBestWeight > 0) { + prs.push({ exerciseId: ex.exerciseId, type: 'maxWeight', value: bestWeight }); + } + if (bestEst1rm > prevBestEst1rm && prevBestEst1rm > 0) { + prs.push({ exerciseId: ex.exerciseId, type: 'est1rm', value: bestEst1rm }); + } + } + const workoutSession = new WorkoutSession({ templateId, templateName, @@ -64,6 +136,9 @@ export const POST: RequestHandler = async ({ request, locals }) => { startTime: startTime ? new Date(startTime) : new Date(), endTime: endTime ? new Date(endTime) : undefined, duration: endTime && startTime ? Math.round((new Date(endTime).getTime() - new Date(startTime).getTime()) / (1000 * 60)) : undefined, + totalVolume: totalVolume > 0 ? totalVolume : undefined, + totalDistance: totalDistance > 0 ? totalDistance : undefined, + prs: prs.length > 0 ? prs : undefined, notes, createdBy: session.user.nickname }); diff --git a/src/routes/api/fitness/sessions/[id]/+server.ts b/src/routes/api/fitness/sessions/[id]/+server.ts index 65cd73b..272007c 100644 --- a/src/routes/api/fitness/sessions/[id]/+server.ts +++ b/src/routes/api/fitness/sessions/[id]/+server.ts @@ -2,6 +2,7 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { dbConnect } from '$utils/db'; import { WorkoutSession } from '$models/WorkoutSession'; +import { getExerciseById, getExerciseMetrics } from '$lib/data/exercises'; import mongoose from 'mongoose'; // GET /api/fitness/sessions/[id] - Get a specific workout session @@ -57,7 +58,28 @@ export const PUT: RequestHandler = async ({ params, request, locals }) => { const updateData: Record = {}; if (name) updateData.name = name; - if (exercises) updateData.exercises = exercises; + if (exercises) { + updateData.exercises = exercises; + // Recompute totalVolume + let totalVolume = 0; + let totalDistance = 0; + for (const ex of exercises) { + const exercise = getExerciseById(ex.exerciseId); + const metrics = getExerciseMetrics(exercise); + const isCardio = metrics.includes('distance'); + const isBilateral = exercise?.bilateral ?? false; + for (const s of (ex.sets ?? [])) { + if (!s.completed) continue; + if (isCardio) { + totalDistance += s.distance ?? 0; + } else { + totalVolume += (s.weight ?? 0) * (s.reps ?? 0) * (isBilateral ? 2 : 1); + } + } + } + updateData.totalVolume = totalVolume > 0 ? totalVolume : undefined; + updateData.totalDistance = totalDistance > 0 ? totalDistance : undefined; + } if (startTime) updateData.startTime = new Date(startTime); if (endTime) updateData.endTime = new Date(endTime); if (duration !== undefined) updateData.duration = duration; diff --git a/src/routes/api/fitness/sessions/[id]/gpx/+server.ts b/src/routes/api/fitness/sessions/[id]/gpx/+server.ts index 2433484..198a5ad 100644 --- a/src/routes/api/fitness/sessions/[id]/gpx/+server.ts +++ b/src/routes/api/fitness/sessions/[id]/gpx/+server.ts @@ -3,6 +3,7 @@ import type { RequestHandler } from './$types'; import { dbConnect } from '$utils/db'; import { WorkoutSession } from '$models/WorkoutSession'; import type { IGpsPoint } from '$models/WorkoutSession'; +import { simplifyTrack } from '$lib/server/simplifyTrack'; import mongoose from 'mongoose'; /** Haversine distance in km between two points */ @@ -103,6 +104,7 @@ export const POST: RequestHandler = async ({ params, request, locals }) => { const durationMin = Math.round((track[track.length - 1].timestamp - track[0].timestamp) / 60000); workoutSession.exercises[exerciseIdx].gpsTrack = track; + workoutSession.exercises[exerciseIdx].gpsPreview = simplifyTrack(track); workoutSession.exercises[exerciseIdx].totalDistance = Math.round(distance * 1000) / 1000; // Auto-fill distance and duration on a single set @@ -154,6 +156,7 @@ export const DELETE: RequestHandler = async ({ params, request, locals }) => { } workoutSession.exercises[exerciseIdx].gpsTrack = undefined; + workoutSession.exercises[exerciseIdx].gpsPreview = undefined; workoutSession.exercises[exerciseIdx].totalDistance = undefined; await workoutSession.save(); diff --git a/src/routes/api/fitness/sessions/[id]/recalculate/+server.ts b/src/routes/api/fitness/sessions/[id]/recalculate/+server.ts new file mode 100644 index 0000000..3e69ce5 --- /dev/null +++ b/src/routes/api/fitness/sessions/[id]/recalculate/+server.ts @@ -0,0 +1,121 @@ +import { json } from '@sveltejs/kit'; +import type { RequestHandler } from './$types'; +import { dbConnect } from '$utils/db'; +import { WorkoutSession } from '$models/WorkoutSession'; +import type { IPr } from '$models/WorkoutSession'; +import { getExerciseById, getExerciseMetrics } from '$lib/data/exercises'; +import { simplifyTrack } from '$lib/server/simplifyTrack'; +import mongoose from 'mongoose'; + +function estimatedOneRepMax(weight: number, reps: number): number { + if (reps <= 0 || weight <= 0) return 0; + if (reps === 1) return weight; + return Math.round(weight * (1 + reps / 30)); +} + +// POST /api/fitness/sessions/[id]/recalculate — recompute derived fields +export const POST: RequestHandler = async ({ params, locals }) => { + const session = await locals.auth(); + if (!session || !session.user?.nickname) { + return json({ error: 'Unauthorized' }, { status: 401 }); + } + + if (!mongoose.Types.ObjectId.isValid(params.id)) { + return json({ error: 'Invalid session ID' }, { status: 400 }); + } + + try { + await dbConnect(); + + const workoutSession = await WorkoutSession.findOne({ + _id: params.id, + createdBy: session.user.nickname + }); + + if (!workoutSession) { + return json({ error: 'Session not found' }, { status: 404 }); + } + + // Recompute totalVolume and totalDistance + let totalVolume = 0; + let totalDistance = 0; + for (const ex of workoutSession.exercises) { + const exercise = getExerciseById(ex.exerciseId); + const metrics = getExerciseMetrics(exercise); + const isCardio = metrics.includes('distance'); + const isBilateral = exercise?.bilateral ?? false; + for (const s of ex.sets) { + if (!s.completed) continue; + if (isCardio) { + totalDistance += s.distance ?? 0; + } else { + totalVolume += (s.weight ?? 0) * (s.reps ?? 0) * (isBilateral ? 2 : 1); + } + } + + // Regenerate gpsPreview from gpsTrack if present + if (ex.gpsTrack && ex.gpsTrack.length >= 2) { + ex.gpsPreview = simplifyTrack(ex.gpsTrack); + } + } + + // Detect PRs + const prs: IPr[] = []; + for (const ex of workoutSession.exercises) { + const exercise = getExerciseById(ex.exerciseId); + const metrics = getExerciseMetrics(exercise); + if (metrics.includes('distance')) continue; + + const completedSets = ex.sets.filter(s => s.completed); + if (completedSets.length === 0) continue; + + // Find previous best (sessions before this one) + const prevSessions = await WorkoutSession.find({ + createdBy: session.user!.nickname, + 'exercises.exerciseId': ex.exerciseId, + startTime: { $lt: workoutSession.startTime } + }).sort({ startTime: -1 }).limit(50).lean(); + + let prevBestWeight = 0; + let prevBestEst1rm = 0; + for (const ps of prevSessions) { + const pe = ps.exercises.find(e => e.exerciseId === ex.exerciseId); + if (!pe) continue; + for (const s of pe.sets) { + if (!s.completed || !s.weight || !s.reps) continue; + prevBestWeight = Math.max(prevBestWeight, s.weight); + prevBestEst1rm = Math.max(prevBestEst1rm, estimatedOneRepMax(s.weight, s.reps)); + } + } + + let bestWeight = 0; + let bestEst1rm = 0; + for (const s of completedSets) { + if (!s.weight || !s.reps) continue; + bestWeight = Math.max(bestWeight, s.weight); + bestEst1rm = Math.max(bestEst1rm, estimatedOneRepMax(s.weight, s.reps)); + } + + if (bestWeight > prevBestWeight && prevBestWeight > 0) { + prs.push({ exerciseId: ex.exerciseId, type: 'maxWeight', value: bestWeight }); + } + if (bestEst1rm > prevBestEst1rm && prevBestEst1rm > 0) { + prs.push({ exerciseId: ex.exerciseId, type: 'est1rm', value: bestEst1rm }); + } + } + + workoutSession.totalVolume = totalVolume > 0 ? totalVolume : undefined; + workoutSession.totalDistance = totalDistance > 0 ? totalDistance : undefined; + workoutSession.prs = prs.length > 0 ? prs : undefined; + await workoutSession.save(); + + return json({ + totalVolume: workoutSession.totalVolume, + totalDistance: workoutSession.totalDistance, + prs: workoutSession.prs?.length ?? 0 + }); + } catch (error) { + console.error('Error recalculating session:', error); + return json({ error: 'Failed to recalculate' }, { status: 500 }); + } +}; diff --git a/src/routes/fitness/history/[id]/+page.svelte b/src/routes/fitness/history/[id]/+page.svelte index 1a0f8a3..92801a8 100644 --- a/src/routes/fitness/history/[id]/+page.svelte +++ b/src/routes/fitness/history/[id]/+page.svelte @@ -1,6 +1,6 @@