brian/wanderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix gpx threshold handling (#813)

Browse Source
This commit is contained in:
slothful-vassal
2026-02-16 19:41:37 +01:00
committed by GitHub
parent 67b80f01db
commit 6789a666ef
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web/src/lib/models/gpx/gpx-metrics-computation.ts
View File

@@ -3,6 +3,7 @@ import { haversineDistance } from './utils';
class GpxMetricsComputation { class GpxMetricsComputation {
private readonly thresholdXY_m: number; // Distance threshold for filtering on the XY axis (latitude / longitude) private readonly thresholdXY_m: number; // Distance threshold for filtering on the XY axis (latitude / longitude)
private readonly thresholdZ_m: number; // Distance threshold for filtering on the Z axis (elevation) private readonly thresholdZ_m: number; // Distance threshold for filtering on the Z axis (elevation)
private lastPointXY: any | null = null;
private lastFilteredPointXY: any | null = null; private lastFilteredPointXY: any | null = null;
private lastFilteredZ: number | null = null; private lastFilteredZ: number | null = null;
private lastZ: number | null = null; private lastZ: number | null = null;
@@ -20,8 +21,9 @@ class GpxMetricsComputation {
} }
addAndFilter(point: any) { addAndFilter(point: any) {
if (!this.lastFilteredPointXY) { if (!this.lastPointXY || !this.lastFilteredPointXY) {
// Firstly, we are not yet filtering // Initialize raw and smoothed anchors with the first point.
this.lastPointXY = point;
this.lastFilteredPointXY = point; this.lastFilteredPointXY = point;
this.lastFilteredZ = point.ele ?? 0; this.lastFilteredZ = point.ele ?? 0;
this.lastZ = point.ele ?? 0; this.lastZ = point.ele ?? 0;
@@ -29,6 +31,13 @@ class GpxMetricsComputation {
} }
const distance = haversineDistance( const distance = haversineDistance(
this.lastPointXY.$.lat,
this.lastPointXY.$.lon,
point.$.lat,
point.$.lon
);
const smoothedDistance = haversineDistance(
this.lastFilteredPointXY.$.lat, this.lastFilteredPointXY.$.lat,
this.lastFilteredPointXY.$.lon, this.lastFilteredPointXY.$.lon,
point.$.lat, point.$.lat,
@@ -38,7 +47,7 @@ class GpxMetricsComputation {
this.totalDistance += distance; this.totalDistance += distance;
this.cumulativeDistance.push(this.totalDistance) this.cumulativeDistance.push(this.totalDistance)
this.lastFilteredPointXY = point; this.lastPointXY = point;
const elevation = point.ele ?? 0; const elevation = point.ele ?? 0;
// @ts-ignore I know this.lastZ is not null // @ts-ignore I know this.lastZ is not null
@@ -51,11 +60,12 @@ class GpxMetricsComputation {
this.totalElevationLoss -= elevationDiff; this.totalElevationLoss -= elevationDiff;
} }
if (distance < this.thresholdXY_m) { if (smoothedDistance < this.thresholdXY_m) {
return; return;
} }
this.totalDistanceSmoothed += distance; this.totalDistanceSmoothed += smoothedDistance;
this.lastFilteredPointXY = point;
// @ts-ignore: I know this.lastFilteredZ is not null // @ts-ignore: I know this.lastFilteredZ is not null
const elevationDiffSmoothed = elevation - this.lastFilteredZ; const elevationDiffSmoothed = elevation - this.lastFilteredZ;