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

better map bounds logic

Browse Source
This commit is contained in:
vcoppe
2024-05-07 15:16:32 +02:00
parent 0118ebe55a
commit 95d6993cfe
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
website/src/lib/stores.ts
View File

@@ -28,7 +28,10 @@ fileObservers.subscribe((files) => { // Update selectedFiles automatically when
} }
}); });
const targetMapBounds = writable(new mapboxgl.LngLatBounds([180, 90, -180, -90])); const targetMapBounds = writable({
bounds: new mapboxgl.LngLatBounds([180, 90, -180, -90]),
initial: true
});
const fileStatistics: Map<string, Writable<GPXStatistics>> = new Map(); const fileStatistics: Map<string, Writable<GPXStatistics>> = new Map();
const fileUnsubscribe: Map<string, Function> = new Map(); const fileUnsubscribe: Map<string, Function> = new Map();
export const gpxStatistics: Writable<GPXStatistics> = writable(new GPXStatistics()); export const gpxStatistics: Writable<GPXStatistics> = writable(new GPXStatistics());
@@ -52,7 +55,10 @@ fileObservers.subscribe((files) => { // Maintain up-to-date statistics
mapBounds = get(map)?.getBounds() ?? mapBounds; mapBounds = get(map)?.getBounds() ?? mapBounds;
bounds.extend(mapBounds); bounds.extend(mapBounds);
} }
targetMapBounds.set(bounds); targetMapBounds.set({
bounds: bounds,
initial: true
});
} }
fileStatistics.forEach((stats, fileId) => { fileStatistics.forEach((stats, fileId) => {
@@ -79,16 +85,19 @@ fileObservers.subscribe((files) => { // Maintain up-to-date statistics
let boundsUnsubscribe = statisticsStore.subscribe((stats) => { let boundsUnsubscribe = statisticsStore.subscribe((stats) => {
let fileBounds = stats.global.bounds; let fileBounds = stats.global.bounds;
if (fileBounds.southWest.lat == 90 && fileBounds.southWest.lon == 180 && fileBounds.northEast.lat == -90 && fileBounds.northEast.lon == -180) { if (fileBounds.southWest.lat == 90 && fileBounds.southWest.lon == 180 && fileBounds.northEast.lat == -90 && fileBounds.northEast.lon == -180) { // Stats are not yet calculated
return; return;
} }
targetMapBounds.update((bounds) => { if (fileBounds.southWest.lat != fileBounds.northEast.lat || fileBounds.southWest.lon != fileBounds.northEast.lon) { // Avoid update for new files
bounds.extend(fileBounds.southWest); targetMapBounds.update((target) => {
bounds.extend(fileBounds.northEast); target.bounds.extend(fileBounds.southWest);
bounds.extend([fileBounds.southWest.lon, fileBounds.northEast.lat]); target.bounds.extend(fileBounds.northEast);
bounds.extend([fileBounds.northEast.lon, fileBounds.southWest.lat]); target.bounds.extend([fileBounds.southWest.lon, fileBounds.northEast.lat]);
return bounds; target.bounds.extend([fileBounds.northEast.lon, fileBounds.southWest.lat]);
target.initial = false;
return target;
}); });
}
boundsUnsubscribe(); boundsUnsubscribe();
}) })
} }
@@ -100,11 +109,11 @@ selectedFiles.subscribe((selectedFiles) => { // Maintain up-to-date statistics f
}); });
targetMapBounds.subscribe((bounds) => { targetMapBounds.subscribe((bounds) => {
if (bounds.getSouth() == 90 && bounds.getWest() == 180 && bounds.getNorth() == -90 && bounds.getEast() == -180) { if (bounds.initial) {
return; return;
} }
get(map)?.fitBounds(bounds, { get(map)?.fitBounds(bounds.bounds, {
padding: 80, padding: 80,
linear: true, linear: true,
easing: () => 1 easing: () => 1