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

rework bounds logic, related to #8

Browse Source
This commit is contained in:
vcoppe
2024-07-17 10:23:04 +02:00
parent fe100f9247
commit 004f08a8d3
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import { writable, get, type Writable } from 'svelte/store';
import { writable, get, type Writable, derived } from 'svelte/store';
import mapboxgl from 'mapbox-gl';
import { GPXFile, buildGPX, parseGPX, GPXStatistics, type Coordinates } from 'gpx';
@@ -68,42 +68,40 @@ gpxStatistics.subscribe(() => {
const targetMapBounds = writable({
bounds: new mapboxgl.LngLatBounds([180, 90, -180, -90]),
count: 0
count: 0,
total: -1
});
targetMapBounds.subscribe((bounds) => {
if (bounds.count === 0) {
derived([targetMapBounds, map], x => x).subscribe(([bounds, $map]) => {
if ($map === null || bounds.count !== bounds.total) {
return;
}
let currentBounds = get(map)?.getBounds();
if (bounds.count !== get(fileObservers).size &&
currentBounds && currentBounds.contains(bounds.bounds.getSouthEast()) && currentBounds.contains(bounds.bounds.getNorthWest())) {
return;
}
let currentBounds = $map.getBounds();
if (bounds.count !== get(fileObservers).size && currentBounds) {
// There are other files on the map
map.subscribe((m) => {
if (m) {
m.fitBounds(bounds.bounds, {
padding: 80,
linear: true,
easing: () => 1
});
if (currentBounds.contains(bounds.bounds.getSouthEast()) && currentBounds.contains(bounds.bounds.getNorthWest())) {
return;
}
bounds.bounds.extend(currentBounds.getSouthWest());
bounds.bounds.extend(currentBounds.getNorthEast());
}
$map.fitBounds(bounds.bounds, {
padding: 80,
linear: true,
easing: () => 1
});
});
export function initTargetMapBounds(first: boolean) {
let bounds = new mapboxgl.LngLatBounds([180, 90, -180, -90]);
let mapBounds = new mapboxgl.LngLatBounds([180, 90, -180, -90]);
if (!first) { // Some files are already loaded
mapBounds = get(map)?.getBounds() ?? mapBounds;
bounds.extend(mapBounds);
}
export function initTargetMapBounds(total: number) {
targetMapBounds.set({
bounds: bounds,
count: 0
bounds: new mapboxgl.LngLatBounds([180, 90, -180, -90]),
count: 0,
total: total
});
}