steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-09-02 00:32:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor elevation queries

Browse Source
This commit is contained in:
vcoppe
2024-07-19 13:17:23 +02:00
parent 78fff5981c
commit 48aa88489e
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/src/lib/components/gpx-layer/GPXLayer.ts
View File

@@ -6,7 +6,7 @@ import { currentPopupWaypoint, deleteWaypoint, waypointPopup } from "./WaypointP
import { addSelectItem, selectItem, selection } from "$lib/components/file-list/Selection"; import { addSelectItem, selectItem, selection } from "$lib/components/file-list/Selection";
import { ListTrackSegmentItem, ListWaypointItem, ListWaypointsItem, ListTrackItem, ListFileItem, ListRootItem } from "$lib/components/file-list/FileList"; import { ListTrackSegmentItem, ListWaypointItem, ListWaypointsItem, ListTrackItem, ListFileItem, ListRootItem } from "$lib/components/file-list/FileList";
import type { Waypoint } from "gpx"; import type { Waypoint } from "gpx";
import { resetCursor, setCursor, setGrabbingCursor, setPointerCursor } from "$lib/utils"; import { getElevation, resetCursor, setCursor, setGrabbingCursor, setPointerCursor } from "$lib/utils";
import { font } from "$lib/assets/layers"; import { font } from "$lib/assets/layers";
import { selectedWaypoint } from "$lib/components/toolbar/tools/Waypoint.svelte"; import { selectedWaypoint } from "$lib/components/toolbar/tools/Waypoint.svelte";
import { MapPin } from "lucide-static"; import { MapPin } from "lucide-static";
@@ -250,7 +250,7 @@ export class GPXLayer {
lat: latLng.lat, lat: latLng.lat,
lon: latLng.lng lon: latLng.lng
}); });
wpt.ele = this.map.queryTerrainElevation([latLng.lng, latLng.lat], { exaggerated: false }) ?? 0; wpt.ele = getElevation(this.map, wpt.getCoordinates());
}); });
dragEndTimestamp = Date.now() dragEndTimestamp = Date.now()
}); });

6
website/src/lib/components/toolbar/tools/routing/Routing.ts
View File

@@ -4,6 +4,7 @@ import { derived, get, writable } from "svelte/store";
import { settings } from "$lib/db"; import { settings } from "$lib/db";
import { _, isLoading, locale } from "svelte-i18n"; import { _, isLoading, locale } from "svelte-i18n";
import { map } from "$lib/stores"; import { map } from "$lib/stores";
import { getElevation } from "$lib/utils";
const { routing, routingProfile, privateRoads } = settings; const { routing, routingProfile, privateRoads } = settings;
@@ -123,9 +124,12 @@ function getIntermediatePoints(points: Coordinates[]): Promise<TrackPoint[]> {
} }
})); }));
let m = get(map);
route.forEach((point) => { route.forEach((point) => {
point.setSurface("unknown"); point.setSurface("unknown");
point.ele = get(map)?.queryTerrainElevation(point.getCoordinates(), { exaggerated: false }) ?? undefined; if (m) {
point.ele = getElevation(m, point.getCoordinates());
}
}); });
return new Promise((resolve) => resolve(route)); return new Promise((resolve) => resolve(route));

8
website/src/lib/db.ts
View File

@@ -8,6 +8,8 @@ import { applyToOrderedItemsFromFile, applyToOrderedSelectedItemsFromFile, selec
import { ListFileItem, ListItem, ListTrackItem, ListLevel, ListTrackSegmentItem, ListWaypointItem, ListRootItem } from '$lib/components/file-list/FileList'; import { ListFileItem, ListItem, ListTrackItem, ListLevel, ListTrackSegmentItem, ListWaypointItem, ListRootItem } from '$lib/components/file-list/FileList';
import { updateAnchorPoints } from '$lib/components/toolbar/tools/routing/Simplify'; import { updateAnchorPoints } from '$lib/components/toolbar/tools/routing/Simplify';
import { SplitType } from '$lib/components/toolbar/tools/Scissors.svelte'; import { SplitType } from '$lib/components/toolbar/tools/Scissors.svelte';
import { getElevation } from '$lib/utils';
enableMapSet(); enableMapSet();
enablePatches(); enablePatches();
@@ -894,7 +896,11 @@ export const dbUtils = {
}); });
}, },
addOrUpdateWaypoint: (waypoint: WaypointType, item?: ListWaypointItem) => { addOrUpdateWaypoint: (waypoint: WaypointType, item?: ListWaypointItem) => {
let ele = get(map)?.queryTerrainElevation([waypoint.attributes.lon, waypoint.attributes.lat], { exaggerated: false }) ?? 0; let m = get(map);
if (m === null) {
return;
}
let ele = getElevation(m, waypoint.attributes);
if (item) { if (item) {
dbUtils.applyToFile(item.getFileId(), (file) => { dbUtils.applyToFile(item.getFileId(), (file) => {
let wpt = file.wpt[item.getWaypointIndex()]; let wpt = file.wpt[item.getWaypointIndex()];

7
website/src/lib/utils.ts
View File

@@ -8,6 +8,8 @@ import { base } from "$app/paths";
import { browser } from "$app/environment"; import { browser } from "$app/environment";
import { languages } from "$lib/languages"; import { languages } from "$lib/languages";
import { locale } from "svelte-i18n"; import { locale } from "svelte-i18n";
import type Coordinates from "gpx";
import type mapboxgl from "mapbox-gl";
export function cn(...inputs: ClassValue[]) { export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)); return twMerge(clsx(inputs));
@@ -67,6 +69,11 @@ export const flyAndScale = (
}; };
}; };
export function getElevation(map: mapboxgl.Map, coordinates: Coordinates): number {
let elevation = map.queryTerrainElevation(coordinates, { exaggerated: false });
return elevation === null ? 0 : elevation;
}
let previousCursors: string[] = []; let previousCursors: string[] = [];
export function setCursor(cursor: string) { export function setCursor(cursor: string) {
let m = get(map); let m = get(map);