steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-08-31 15:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

temporary fix for #129

Browse Source
This commit is contained in:
vcoppe
2024-10-02 12:49:08 +02:00
parent 48eaa344e4
commit acf0750ccb
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/src/lib/assets/layers.ts
View File

@@ -1,11 +1,11 @@
import { TramFront, Utensils, ShoppingBasket, Droplet, ShowerHead, Fuel, CircleParking, Fence, FerrisWheel, Bed, Mountain, Pickaxe, Store, TrainFront, Bus, Ship, Croissant, House, Tent, Wrench, Binoculars } from 'lucide-static'; import { TramFront, Utensils, ShoppingBasket, Droplet, ShowerHead, Fuel, CircleParking, Fence, FerrisWheel, Bed, Mountain, Pickaxe, Store, TrainFront, Bus, Ship, Croissant, House, Tent, Wrench, Binoculars } from 'lucide-static';
import { type Style } from 'mapbox-gl'; import { type StyleSpecification } from 'mapbox-gl';
import ignFrTopo from './custom/ign-fr-topo.json'; import ignFrTopo from './custom/ign-fr-topo.json';
import ignFrPlan from './custom/ign-fr-plan.json'; import ignFrPlan from './custom/ign-fr-plan.json';
import ignFrSatellite from './custom/ign-fr-satellite.json'; import ignFrSatellite from './custom/ign-fr-satellite.json';
import bikerouterGravel from './custom/bikerouter-gravel.json'; import bikerouterGravel from './custom/bikerouter-gravel.json';
export const basemaps: { [key: string]: string | Style; } = { export const basemaps: { [key: string]: string | StyleSpecification; } = {
mapboxOutdoors: 'mapbox://styles/mapbox/outdoors-v12', mapboxOutdoors: 'mapbox://styles/mapbox/outdoors-v12',
mapboxSatellite: 'mapbox://styles/mapbox/satellite-streets-v12', mapboxSatellite: 'mapbox://styles/mapbox/satellite-streets-v12',
openStreetMap: { openStreetMap: {
@@ -286,7 +286,7 @@ export const basemaps: { [key: string]: string | Style; } = {
}, },
}; };
export const overlays: { [key: string]: string | Style; } = { export const overlays: { [key: string]: string | StyleSpecification; } = {
cyclOSMlite: { cyclOSMlite: {
version: 8, version: 8,
sources: { sources: {

14
website/src/lib/components/Map.svelte
View File

@@ -50,6 +50,20 @@
language = 'en'; language = 'en';
} }
const loadJson = mapboxgl.Style.prototype._load;
mapboxgl.Style.prototype._load = function (json, validate) {
if (
json['sources'] &&
json['sources']['mapbox-satellite'] &&
json['sources']['mapbox-satellite']['data'] &&
json['sources']['mapbox-satellite']['data']['data']
) {
// Temporary fix for https://github.com/gpxstudio/gpx.studio/issues/129
delete json['sources']['mapbox-satellite']['data']['data'];
}
loadJson.call(this, json, validate);
};
let newMap = new mapboxgl.Map({ let newMap = new mapboxgl.Map({
container: 'map', container: 'map',
style: { style: {

4
website/src/lib/components/layer-control/LayerControl.svelte
View File

@@ -130,7 +130,9 @@
}); });
currentBasemap.subscribe((value) => { currentBasemap.subscribe((value) => {
// Updates coming from the database, or from the user swapping basemaps // Updates coming from the database, or from the user swapping basemaps
selectedBasemap.set(value); if (value !== get(selectedBasemap)) {
selectedBasemap.set(value);
}
}); });
let open = false; let open = false;

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

@@ -10,7 +10,6 @@ import { updateAnchorPoints } from '$lib/components/toolbar/tools/routing/Simpli
import { SplitType } from '$lib/components/toolbar/tools/scissors/Scissors.svelte'; import { SplitType } from '$lib/components/toolbar/tools/scissors/Scissors.svelte';
import { getClosestLinePoint, getElevation } from '$lib/utils'; import { getClosestLinePoint, getElevation } from '$lib/utils';
import { browser } from '$app/environment'; import { browser } from '$app/environment';
import type mapboxgl from 'mapbox-gl';
enableMapSet(); enableMapSet();
enablePatches(); enablePatches();