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

correct elevation for summit logs

Browse Source
This commit is contained in:
Christian Beutel
2025-08-20 13:34:55 +02:00
parent e3916e371a
commit 097ecd409d
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/lib/components/summit_log/summit_log_modal.svelte
View File

@@ -90,9 +90,13 @@
return; return;
} }
const gpxObject = GPX.parse(trailData); const gpxObject = GPX.parse(trailData);
try {
const totals = gpxObject.features; await gpxObject.correctElevation();
} catch (e) {
console.warn("Unable to correct elevation: " + e);
}
const totals = gpxObject.features;
$data.duration = totals.duration / 1000; $data.duration = totals.duration / 1000;
$data.elevation_gain = totals.elevationGain; $data.elevation_gain = totals.elevationGain;
$data.elevation_loss = totals.elevationLoss; $data.elevation_loss = totals.elevationLoss;

2
web/src/lib/components/summit_log/summit_log_table.svelte
View File

@@ -58,7 +58,7 @@
}; };
} }
trail = gpx2trail(log.expand.gpx_data!).trail; trail = (await gpx2trail(log.expand.gpx_data!)).trail;
trail.id = log.id; trail.id = log.id;
trail.expand!.gpx_data = log.expand.gpx_data; trail.expand!.gpx_data = log.expand.gpx_data;

4
web/src/lib/models/gpx/gpx.ts
View File

@@ -10,9 +10,7 @@ import geohash from "ngeohash"
import { encodePolyline } from '$lib/util/polyline_util'; import { encodePolyline } from '$lib/util/polyline_util';
import { APIError } from '$lib/util/api_util'; import { APIError } from '$lib/util/api_util';
import type { ValhallaHeightResponse } from '../valhalla'; import type { ValhallaHeightResponse } from '../valhalla';
import { bbox, splitMultiLineStringToLineStrings } from '$lib/util/geojson_util'; import { bbox } from '$lib/util/geojson_util';
import { browser } from '$app/environment';
import xmldom from 'xmldom';
const defaultAttributes = { const defaultAttributes = {
version: '1.1', version: '1.1',

15
web/src/lib/util/gpx_util.ts
View File

@@ -18,18 +18,21 @@ import { handleFromRecordWithIRI } from "./activitypub_util";
import { Waypoint } from "$lib/models/waypoint"; import { Waypoint } from "$lib/models/waypoint";
export function gpx2trail(gpxString: string, fallbackName?: string, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) { export async function gpx2trail(gpxString: string, fallbackName?: string, correctElevation: boolean = false, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
const gpx = GPX.parse(gpxString); const gpx = GPX.parse(gpxString);
if (gpx instanceof Error) { if (gpx instanceof Error) {
throw gpx; throw gpx;
} }
// try { if (correctElevation) {
// await gpx.correctElevation(f) try {
// } catch(e) { await gpx.correctElevation(f)
// console.warn("Unable to correct elevation: " + e) } catch (e) {
// } console.warn("Unable to correct elevation: " + e)
}
}
const trail = new Trail(""); const trail = new Trail("");

2
web/src/routes/api/v1/trail/upload/+server.ts
View File

@@ -21,7 +21,7 @@ export async function PUT(event: RequestEvent) {
} }
let parseResult: { trail: Trail, gpx: GPX }; let parseResult: { trail: Trail, gpx: GPX };
try { try {
parseResult = gpx2trail(gpxData, data.get("name") as string | undefined, event.fetch); parseResult = await gpx2trail(gpxData, data.get("name") as string | undefined, true, event.fetch);
} catch (e: any) { } catch (e: any) {
console.error(e) console.error(e)
throw new ClientResponseError({ status: 400, response: { message: "Invalid file" } }) throw new ClientResponseError({ status: 400, response: { message: "Invalid file" } })

2
web/src/routes/trail/edit/[id]/+page.svelte
View File

@@ -319,7 +319,7 @@
try { try {
const prevId = $formData.id; const prevId = $formData.id;
const parseResult = gpx2trail(gpxData, selectedFile.name); const parseResult = await gpx2trail(gpxData, selectedFile.name);
setFields(parseResult.trail); setFields(parseResult.trail);
$formData.id = prevId ?? cryptoRandomString({ length: 15 }); $formData.id = prevId ?? cryptoRandomString({ length: 15 });
$formData.expand!.gpx_data = gpxData; $formData.expand!.gpx_data = gpxData;