New translations faq.mdx (Polish)

.github/workflows/deploy.yml

@@ -31,7 +31,7 @@ jobs:
             - name: Create env file
               run: |
                   touch website/.env
-                  echo PUBLIC_MAPTILER_KEY=${{ secrets.PUBLIC_MAPTILER_KEY }} >> website/.env
+                  echo PUBLIC_MAPBOX_TOKEN=${{ secrets.PUBLIC_MAPBOX_TOKEN }} >> website/.env
                   cat website/.env
 
             - name: Build website

README.md

@@ -27,8 +27,8 @@ Any help is greatly appreciated!
 
 The code is split into two parts:
 
-- `gpx`: a Typescript library for parsing and manipulating GPX files,
-- `website`: the website itself, which is a [SvelteKit](https://kit.svelte.dev/) application.
+-   `gpx`: a Typescript library for parsing and manipulating GPX files,
+-   `website`: the website itself, which is a [SvelteKit](https://kit.svelte.dev/) application.
 
 You will need [Node.js](https://nodejs.org/) to build and run these two parts.
 
@@ -42,11 +42,11 @@ npm run build
 
 ### Running the website
 
-To be able to load the map, you will need to create your own <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> and store it in a `.env` file in the `website` directory.
+To be able to load the map, you will need to create your own <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> and store it in a `.env` file in the `website` directory.
 
 ```bash
 cd website
-echo PUBLIC_MAPTILER_KEY={YOUR_MAPTILER_KEY} >> .env
+echo PUBLIC_MAPBOX_TOKEN={YOUR_MAPBOX_TOKEN} >> .env
 npm install
 npm run dev
 ```
@@ -55,25 +55,25 @@ npm run dev
 
 This project has been made possible thanks to the following open source projects:
 
-- Development:
-    - [Svelte](https://github.com/sveltejs/svelte) and [SvelteKit](https://github.com/sveltejs/kit) — seamless development experience
-    - [MDsveX](https://github.com/pngwn/MDsveX) — allowing a Markdown-based documentation
-- Design:
-    - [shadcn-svelte](https://github.com/huntabyte/shadcn-svelte) — beautiful components
-    - [@lucide/svelte](https://github.com/lucide-icons/lucide/tree/main/packages/svelte) — beautiful icons
-    - [tailwindcss](https://github.com/tailwindlabs/tailwindcss) — easy styling
-    - [Chart.js](https://github.com/chartjs/Chart.js) — beautiful and fast charts
-- Logic:
-    - [immer](https://github.com/immerjs/immer) — complex state management
-    - [Dexie.js](https://github.com/dexie/Dexie.js) — IndexedDB wrapper
-    - [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) — fast GPX file parsing
-    - [SortableJS](https://github.com/SortableJS/Sortable) — creating a sortable file tree
-- Mapping:
-    - [MapLibre GL JS](https://github.com/maplibre/maplibre-gl-js) — beautiful and fast interactive maps
-    - [brouter](https://github.com/abrensch/brouter) — routing engine
-    - [OpenStreetMap](https://www.openstreetmap.org) — map data used by most of the map layers, and by the routing engine
-- Search:
-    - [DocSearch](https://github.com/algolia/docsearch) — search engine for the documentation
+-   Development:
+    -   [Svelte](https://github.com/sveltejs/svelte) and [SvelteKit](https://github.com/sveltejs/kit) — seamless development experience
+    -   [MDsveX](https://github.com/pngwn/MDsveX) — allowing a Markdown-based documentation
+-   Design:
+    -   [shadcn-svelte](https://github.com/huntabyte/shadcn-svelte) — beautiful components
+    -   [@lucide/svelte](https://github.com/lucide-icons/lucide/tree/main/packages/svelte) — beautiful icons
+    -   [tailwindcss](https://github.com/tailwindlabs/tailwindcss) — easy styling
+    -   [Chart.js](https://github.com/chartjs/Chart.js) — beautiful and fast charts
+-   Logic:
+    -   [immer](https://github.com/immerjs/immer) — complex state management
+    -   [Dexie.js](https://github.com/dexie/Dexie.js) — IndexedDB wrapper
+    -   [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) — fast GPX file parsing
+    -   [SortableJS](https://github.com/SortableJS/Sortable) — creating a sortable file tree
+-   Mapping:
+    -   [Mapbox GL JS](https://github.com/mapbox/mapbox-gl-js) — beautiful and fast interactive maps
+    -   [brouter](https://github.com/abrensch/brouter) — routing engine
+    -   [OpenStreetMap](https://www.openstreetmap.org) — map data used by Mapbox and brouter
+-   Search:
+    -   [DocSearch](https://github.com/algolia/docsearch) — search engine for the documentation
 
 ## License
 

website/.env.example

@@ -1 +1 @@
-PUBLIC_MAPTILER_KEY=YOUR_MAPTILER_KEY
+PUBLIC_MAPBOX_TOKEN=YOUR_MAPBOX_TOKEN

website/package.json

@@ -23,9 +23,10 @@
         "@types/eslint": "^9.6.1",
         "@types/events": "^3.0.3",
         "@types/file-saver": "^2.0.7",
-        "@types/mapbox__sphericalmercator": "^1.2.3",
         "@types/mapbox__tilebelt": "^1.0.4",
+        "@types/mapbox-gl": "^3.4.1",
         "@types/node": "^22.15.30",
+        "@types/png.js": "^0.2.3",
         "@types/sanitize-html": "^2.16.0",
         "@types/sortablejs": "^1.15.8",
         "@typescript-eslint/eslint-plugin": "^8.33.1",
@@ -61,9 +62,10 @@
     "dependencies": {
         "@docsearch/js": "^3.9.0",
         "@internationalized/date": "^3.8.2",
+        "@mapbox/mapbox-gl-geocoder": "^5.0.3",
         "@mapbox/sphericalmercator": "^2.0.1",
         "@mapbox/tilebelt": "^2.0.2",
-        "@maplibre/maplibre-gl-geocoder": "^1.9.4",
+        "@types/mapbox__sphericalmercator": "^1.2.3",
         "chart.js": "^4.5.1",
         "chartjs-plugin-zoom": "^2.2.0",
         "clsx": "^2.1.1",
@@ -72,8 +74,9 @@
         "gpx": "file:../gpx",
         "immer": "^10.1.1",
         "jszip": "^3.10.1",
+        "mapbox-gl": "^3.17.0",
         "mapillary-js": "^4.1.2",
-        "maplibre-gl": "^5.16.0",
+        "png.js": "^0.2.1",
         "sanitize-html": "^2.17.0",
         "sortablejs": "^1.15.6",
         "tailwind-merge": "^3.3.0"

website/src/lib/assets/layers.ts

@@ -22,18 +22,15 @@ import {
     Binoculars,
     Toilet,
 } from 'lucide-static';
-import { type RasterDEMSourceSpecification, type StyleSpecification } from 'maplibre-gl';
+import { type RasterDEMSourceSpecification, type StyleSpecification } from 'mapbox-gl';
 import ignFrTopo from './custom/ign-fr-topo.json';
 import ignFrPlan from './custom/ign-fr-plan.json';
 import ignFrSatellite from './custom/ign-fr-satellite.json';
 import bikerouterGravel from './custom/bikerouter-gravel.json';
 
-export const maptilerKeyPlaceHolder = 'MAPTILER_KEY';
-
 export const basemaps: { [key: string]: string | StyleSpecification } = {
-    maptilerTopo: `https://api.maptiler.com/maps/topo-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    maptilerOutdoors: `https://api.maptiler.com/maps/outdoor-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    maptilerSatellite: `https://api.maptiler.com/maps/hybrid-v4/style.json?key=${maptilerKeyPlaceHolder}`,
+    mapboxOutdoors: 'mapbox://styles/mapbox/outdoors-v12',
+    mapboxSatellite: 'mapbox://styles/mapbox/satellite-streets-v12',
     openStreetMap: {
         version: 8,
         sources: {
@@ -776,9 +773,8 @@ export type LayerTreeType = { [key: string]: LayerTreeType | boolean };
 export const basemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            maptilerTopo: true,
-            maptilerOutdoors: true,
-            maptilerSatellite: true,
+            mapboxOutdoors: true,
+            mapboxSatellite: true,
             openStreetMap: true,
             openTopoMap: true,
             openHikingMap: true,
@@ -911,7 +907,7 @@ export const overpassTree: LayerTreeType = {
 };
 
 // Default basemap used
-export const defaultBasemap = 'maptilerTopo';
+export const defaultBasemap = 'mapboxOutdoors';
 
 // Default overlays used (none)
 export const defaultOverlays: LayerTreeType = {
@@ -1000,9 +996,8 @@ export const defaultOverpassQueries: LayerTreeType = {
 export const defaultBasemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            maptilerTopo: true,
-            maptilerOutdoors: true,
-            maptilerSatellite: true,
+            mapboxOutdoors: true,
+            mapboxSatellite: true,
             openStreetMap: true,
             openTopoMap: true,
             openHikingMap: true,
@@ -1141,7 +1136,7 @@ export type CustomLayer = {
     maxZoom: number;
     layerType: 'basemap' | 'overlay';
     resourceType: 'raster' | 'vector';
-    value: string | maplibregl.StyleSpecification;
+    value: string | {};
 };
 
 type OverpassQueryData = {
@@ -1460,9 +1455,11 @@ export const overpassQueryData: Record<string, OverpassQueryData> = {
 };
 
 export const terrainSources: { [key: string]: RasterDEMSourceSpecification } = {
-    'maptiler-dem': {
+    'mapbox-dem': {
         type: 'raster-dem',
-        url: `https://api.maptiler.com/tiles/terrain-rgb-v2/tiles.json?key=${maptilerKeyPlaceHolder}`,
+        url: 'mapbox://mapbox.mapbox-terrain-dem-v1',
+        tileSize: 512,
+        maxzoom: 14,
     },
     mapterhorn: {
         type: 'raster-dem',
@@ -1470,4 +1467,4 @@ export const terrainSources: { [key: string]: RasterDEMSourceSpecification } = {
     },
 };
 
-export const defaultTerrainSource = 'maptiler-dem';
+export const defaultTerrainSource = 'mapbox-dem';

website/src/lib/components/GPXStatistics.svelte

@@ -31,13 +31,13 @@
 
 <Card.Root
     class="h-full {orientation === 'vertical'
-        ? 'min-w-40 sm:min-w-44'
-        : 'w-full h-10'} border-none shadow-none p-0 text-sm sm:text-base"
+        ? 'min-w-40 sm:min-w-44 text-sm sm:text-base'
+        : 'w-full'} border-none shadow-none p-0"
 >
     <Card.Content
         class="h-full flex {orientation === 'vertical'
             ? 'flex-col justify-center'
-            : 'flex-row w-full justify-evenly'} gap-4 p-0"
+            : 'flex-row w-full justify-between'} gap-4  p-0"
     >
         <Tooltip label={i18n._('quantities.distance')}>
             <span class="flex flex-row items-center">

website/src/lib/components/Logo.svelte

@@ -8,7 +8,7 @@
         ...others
     }: {
         iconOnly?: boolean;
-        company?: 'gpx.studio' | 'maptiler' | 'github' | 'crowdin' | 'facebook' | 'reddit';
+        company?: 'gpx.studio' | 'mapbox' | 'github' | 'crowdin' | 'facebook' | 'reddit';
         [key: string]: any;
     } = $props();
 </script>
@@ -19,10 +19,10 @@
         alt="Logo of gpx.studio."
         {...others}
     />
-{:else if company === 'maptiler'}
+{:else if company === 'mapbox'}
     <img
-        src="{base}/maptiler-logo{mode.current === 'dark' ? '-dark' : ''}.svg"
-        alt="Logo of Maptiler."
+        src="{base}/mapbox-logo-{mode.current === 'dark' ? 'white' : 'black'}.svg"
+        alt="Logo of Mapbox."
         {...others}
     />
 {:else if company === 'github'}

website/src/lib/components/docs/DocsLayers.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
-    import maptilerTopoMap from '$lib/assets/img/home/maptiler-topo.png?enhanced';
+    import mapboxOutdoorsMap from '$lib/assets/img/home/mapbox-outdoors.png?enhanced';
     import waymarkedMap from '$lib/assets/img/home/waymarked.png?enhanced';
 </script>
 
 <div class="relative h-80 aspect-square rounded-2xl shadow-xl overflow-clip">
-    <enhanced:img src={maptilerTopoMap} alt="MapTiler Topo map screenshot." class="absolute" />
+    <enhanced:img src={mapboxOutdoorsMap} alt="Mapbox Outdoors map screenshot." class="absolute" />
     <enhanced:img
         src={waymarkedMap}
         alt="Waymarked Trails map screenshot."

website/src/lib/components/elevation-profile/ElevationProfile.svelte

@@ -18,7 +18,7 @@
         Construction,
     } from '@lucide/svelte';
     import type { Readable, Writable } from 'svelte/store';
-    import type { Coordinates, GPXGlobalStatistics, GPXStatisticsGroup } from 'gpx';
+    import type { GPXGlobalStatistics, GPXStatisticsGroup } from 'gpx';
     import { settings } from '$lib/logic/settings';
     import { i18n } from '$lib/i18n.svelte';
     import { ElevationProfile } from '$lib/components/elevation-profile/elevation-profile';
@@ -28,14 +28,12 @@
     let {
         gpxStatistics,
         slicedGPXStatistics,
-        hoveredPoint,
         additionalDatasets,
         elevationFill,
         showControls = true,
     }: {
         gpxStatistics: Readable<GPXStatisticsGroup>;
         slicedGPXStatistics: Writable<[GPXGlobalStatistics, number, number] | undefined>;
-        hoveredPoint: Writable<Coordinates | null>;
         additionalDatasets: Writable<string[]>;
         elevationFill: Writable<'slope' | 'surface' | 'highway' | undefined>;
         showControls?: boolean;
@@ -49,7 +47,6 @@
         elevationProfile = new ElevationProfile(
             gpxStatistics,
             slicedGPXStatistics,
-            hoveredPoint,
             additionalDatasets,
             elevationFill,
             canvas,
@@ -64,7 +61,7 @@
     });
 </script>
 
-<div class="h-full grow min-w-0 min-h-0 relative">
+<div class="h-full grow min-w-0 relative py-2">
     <canvas bind:this={overlay} class="w-full h-full absolute pointer-events-none"></canvas>
     <canvas bind:this={canvas} class="w-full h-full absolute"></canvas>
     {#if showControls}

website/src/lib/components/elevation-profile/elevation-profile.ts

@@ -20,8 +20,10 @@ import Chart, {
     type ScriptableLineSegmentContext,
     type TooltipItem,
 } from 'chart.js/auto';
+import mapboxgl from 'mapbox-gl';
 import { get, type Readable, type Writable } from 'svelte/store';
-import type { Coordinates, GPXGlobalStatistics, GPXStatisticsGroup } from 'gpx';
+import { map } from '$lib/components/map/map';
+import type { GPXGlobalStatistics, GPXStatisticsGroup } from 'gpx';
 import { mode } from 'mode-watcher';
 import { getHighwayColor, getSlopeColor, getSurfaceColor } from '$lib/assets/colors';
 
@@ -40,7 +42,7 @@ interface ElevationProfilePoint {
         length: number;
     };
     extensions: Record<string, any>;
-    coordinates: Coordinates;
+    coordinates: [number, number];
     index: number;
 }
 
@@ -48,19 +50,18 @@ export class ElevationProfile {
     private _chart: Chart | null = null;
     private _canvas: HTMLCanvasElement;
     private _overlay: HTMLCanvasElement;
+    private _marker: mapboxgl.Marker | null = null;
     private _dragging = false;
     private _panning = false;
 
     private _gpxStatistics: Readable<GPXStatisticsGroup>;
     private _slicedGPXStatistics: Writable<[GPXGlobalStatistics, number, number] | undefined>;
-    private _hoveredPoint: Writable<Coordinates | null>;
     private _additionalDatasets: Readable<string[]>;
     private _elevationFill: Readable<'slope' | 'surface' | 'highway' | undefined>;
 
     constructor(
         gpxStatistics: Readable<GPXStatisticsGroup>,
         slicedGPXStatistics: Writable<[GPXGlobalStatistics, number, number] | undefined>,
-        hoveredPoint: Writable<Coordinates | null>,
         additionalDatasets: Readable<string[]>,
         elevationFill: Readable<'slope' | 'surface' | 'highway' | undefined>,
         canvas: HTMLCanvasElement,
@@ -68,12 +69,17 @@ export class ElevationProfile {
     ) {
         this._gpxStatistics = gpxStatistics;
         this._slicedGPXStatistics = slicedGPXStatistics;
-        this._hoveredPoint = hoveredPoint;
         this._additionalDatasets = additionalDatasets;
         this._elevationFill = elevationFill;
         this._canvas = canvas;
         this._overlay = overlay;
 
+        let element = document.createElement('div');
+        element.className = 'h-4 w-4 rounded-full bg-cyan-500 border-2 border-white';
+        this._marker = new mapboxgl.Marker({
+            element,
+        });
+
         import('chartjs-plugin-zoom').then((module) => {
             Chart.register(module.default);
             this.initialize();
@@ -156,10 +162,14 @@ export class ElevationProfile {
                         label: (context: TooltipItem<'line'>) => {
                             let point = context.raw as ElevationProfilePoint;
                             if (context.datasetIndex === 0) {
-                                if (this._dragging) {
-                                    this._hoveredPoint.set(null);
-                                } else {
-                                    this._hoveredPoint.set(point.coordinates);
+                                const map_ = get(map);
+                                if (map_ && this._marker) {
+                                    if (this._dragging) {
+                                        this._marker.remove();
+                                    } else {
+                                        this._marker.setLngLat(point.coordinates);
+                                        this._marker.addTo(map_);
+                                    }
                                 }
                                 return `${i18n._('quantities.elevation')}: ${getElevationWithUnits(point.y, false)}`;
                             } else if (context.datasetIndex === 1) {
@@ -302,7 +312,10 @@ export class ElevationProfile {
                     events: ['mouseout'],
                     afterEvent: (chart: Chart, args: { event: ChartEvent }) => {
                         if (args.event.type === 'mouseout') {
-                            this._hoveredPoint.set(null);
+                            const map_ = get(map);
+                            if (map_ && this._marker) {
+                                this._marker.remove();
+                            }
                         }
                     },
                 },
@@ -624,5 +637,8 @@ export class ElevationProfile {
             this._chart.destroy();
             this._chart = null;
         }
+        if (this._marker) {
+            this._marker.remove();
+        }
     }
 }

website/src/lib/components/embedding/Embedding.svelte

@@ -16,7 +16,7 @@
     import { setMode } from 'mode-watcher';
     import { settings } from '$lib/logic/settings';
     import { fileStateCollection } from '$lib/logic/file-state';
-    import { gpxStatistics, hoveredPoint, slicedGPXStatistics } from '$lib/logic/statistics';
+    import { gpxStatistics, slicedGPXStatistics } from '$lib/logic/statistics';
     import { loadFile } from '$lib/logic/file-actions';
     import { selection } from '$lib/logic/selection';
     import { untrack } from 'svelte';
@@ -102,7 +102,7 @@
     <div class="grow relative">
         <Map
             class="h-full {$fileStateCollection.size > 1 ? 'horizontal' : ''}"
-            maptilerKey={options.key}
+            accessToken={options.token}
             geocoder={false}
             geolocate={true}
             hash={useHash}
@@ -130,7 +130,6 @@
             <ElevationProfile
                 {gpxStatistics}
                 {slicedGPXStatistics}
-                {hoveredPoint}
                 {additionalDatasets}
                 {elevationFill}
                 showControls={options.elevation.controls}

website/src/lib/components/embedding/EmbeddingPlayground.svelte

@@ -22,7 +22,7 @@
         getCleanedEmbeddingOptions,
         getMergedEmbeddingOptions,
     } from './embedding';
-    import { PUBLIC_MAPTILER_KEY } from '$env/static/public';
+    import { PUBLIC_MAPBOX_TOKEN } from '$env/static/public';
     import Embedding from './Embedding.svelte';
     import { onDestroy } from 'svelte';
     import { base } from '$app/paths';
@@ -32,7 +32,7 @@
     let options = $state(
         getMergedEmbeddingOptions(
             {
-                key: 'YOUR_MAPTILER_KEY',
+                token: 'YOUR_MAPBOX_TOKEN',
                 theme: mode.current,
             },
             defaultEmbeddingOptions
@@ -46,10 +46,10 @@
     let iframeOptions = $derived(
         getMergedEmbeddingOptions(
             {
-                key:
-                    options.key.length === 0 || options.key === 'YOUR_MAPTILER_KEY'
-                        ? PUBLIC_MAPTILER_KEY
-                        : options.key,
+                token:
+                    options.token.length === 0 || options.token === 'YOUR_MAPBOX_TOKEN'
+                        ? PUBLIC_MAPBOX_TOKEN
+                        : options.token,
                 files: files.split(',').filter((url) => url.length > 0),
                 ids: driveIds.split(',').filter((id) => id.length > 0),
                 elevation: {
@@ -102,8 +102,8 @@
     </Card.Header>
     <Card.Content>
         <fieldset class="flex flex-col gap-3">
-            <Label for="key">{i18n._('embedding.maptiler_key')}</Label>
-            <Input id="key" type="text" class="h-8" bind:value={options.key} />
+            <Label for="token">{i18n._('embedding.mapbox_token')}</Label>
+            <Input id="token" type="text" class="h-8" bind:value={options.token} />
             <Label for="file_urls">{i18n._('embedding.file_urls')}</Label>
             <Input id="file_urls" type="text" class="h-8" bind:value={files} />
             <Label for="drive_ids">{i18n._('embedding.drive_ids')}</Label>

website/src/lib/components/embedding/embedding.ts

@@ -1,8 +1,8 @@
-import { PUBLIC_MAPTILER_KEY } from '$env/static/public';
+import { PUBLIC_MAPBOX_TOKEN } from '$env/static/public';
 import { basemaps } from '$lib/assets/layers';
 
 export type EmbeddingOptions = {
-    key: string;
+    token: string;
     files: string[];
     ids: string[];
     basemap: string;
@@ -26,10 +26,10 @@ export type EmbeddingOptions = {
 };
 
 export const defaultEmbeddingOptions = {
-    key: '',
+    token: '',
     files: [],
     ids: [],
-    basemap: 'maptilerTopo',
+    basemap: 'mapboxOutdoors',
     elevation: {
         show: true,
         height: 170,
@@ -107,7 +107,7 @@ export function getURLForGoogleDriveFile(fileId: string): string {
 
 export function convertOldEmbeddingOptions(options: URLSearchParams): any {
     let newOptions: any = {
-        key: PUBLIC_MAPTILER_KEY,
+        token: PUBLIC_MAPBOX_TOKEN,
         files: [],
         ids: [],
     };
@@ -123,7 +123,7 @@ export function convertOldEmbeddingOptions(options: URLSearchParams): any {
     if (options.has('source')) {
         let basemap = options.get('source')!;
         if (basemap === 'satellite') {
-            newOptions.basemap = 'maptilerSatellite';
+            newOptions.basemap = 'mapboxSatellite';
         } else if (basemap === 'otm') {
             newOptions.basemap = 'openTopoMap';
         } else if (basemap === 'ohm') {

website/src/lib/components/map/CoordinatesPopup.svelte

@@ -5,16 +5,6 @@
 
     map.onLoad((map_) => {
         map_.on('contextmenu', (e) => {
-            if (
-                map_.queryRenderedFeatures(e.point, {
-                    layers: map_
-                        .getLayersOrder()
-                        .filter((layerId) => layerId.startsWith('routing-controls')),
-                }).length
-            ) {
-                // Clicked on routing control, ignoring
-                return;
-            }
             trackpointPopup?.setItem({
                 item: new TrackPoint({
                     attributes: {

website/src/lib/components/map/Map.svelte

@@ -1,25 +1,30 @@
 <script lang="ts">
     import { onDestroy, onMount } from 'svelte';
+    import mapboxgl from 'mapbox-gl';
+    import 'mapbox-gl/dist/mapbox-gl.css';
+    import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css';
     import { Button } from '$lib/components/ui/button';
     import { i18n } from '$lib/i18n.svelte';
+    import { PUBLIC_MAPBOX_TOKEN } from '$env/static/public';
     import { page } from '$app/state';
     import { map } from '$lib/components/map/map';
-    import { PUBLIC_MAPTILER_KEY } from '$env/static/public';
 
     let {
-        maptilerKey = PUBLIC_MAPTILER_KEY,
+        accessToken = PUBLIC_MAPBOX_TOKEN,
         geolocate = true,
         geocoder = true,
         hash = true,
         class: className = '',
     }: {
-        maptilerKey?: string;
+        accessToken?: string;
         geolocate?: boolean;
         geocoder?: boolean;
         hash?: boolean;
         class?: string;
     } = $props();
 
+    mapboxgl.accessToken = accessToken;
+
     let webgl2Supported = $state(true);
     let embeddedApp = $state(false);
 
@@ -43,7 +48,7 @@
             language = 'en';
         }
 
-        map.init(maptilerKey, language, hash, geocoder, geolocate);
+        map.init(language, hash, geocoder, geolocate);
     });
 
     onDestroy(() => {
@@ -76,21 +81,21 @@
 <style lang="postcss">
     @reference "../../../app.css";
 
-    div :global(.maplibregl-map) {
+    div :global(.mapboxgl-map) {
         @apply font-sans;
     }
 
-    div :global(.maplibregl-ctrl-top-right > .maplibregl-ctrl) {
+    div :global(.mapboxgl-ctrl-top-right > .mapboxgl-ctrl) {
         @apply shadow-md;
         @apply bg-background;
         @apply text-foreground;
     }
 
-    div :global(.maplibregl-ctrl-icon) {
+    div :global(.mapboxgl-ctrl-icon) {
         @apply dark:brightness-[4.7];
     }
 
-    div :global(.maplibregl-ctrl-geocoder) {
+    div :global(.mapboxgl-ctrl-geocoder) {
         @apply flex;
         @apply flex-row;
         @apply w-fit;
@@ -105,45 +110,36 @@
         @apply text-foreground;
     }
 
-    div :global(.maplibregl-ctrl-geocoder .suggestions > li > a) {
+    div :global(.mapboxgl-ctrl-geocoder .suggestions > li > a) {
         @apply text-foreground;
         @apply hover:text-accent-foreground;
         @apply hover:bg-accent;
     }
 
-    div :global(.maplibregl-ctrl-geocoder .suggestions > .active > a) {
+    div :global(.mapboxgl-ctrl-geocoder .suggestions > .active > a) {
         @apply bg-background;
     }
 
-    div :global(.maplibregl-ctrl-geocoder--button) {
+    div :global(.mapboxgl-ctrl-geocoder--button) {
         @apply bg-transparent;
         @apply hover:bg-transparent;
     }
 
-    div :global(.maplibregl-ctrl-geocoder--icon) {
+    div :global(.mapboxgl-ctrl-geocoder--icon) {
         @apply fill-foreground;
         @apply hover:fill-accent-foreground;
     }
 
-    div :global(.maplibregl-ctrl-geocoder--icon-search) {
+    div :global(.mapboxgl-ctrl-geocoder--icon-search) {
         @apply relative;
         @apply top-0;
         @apply left-0;
+        @apply my-2;
         @apply w-[29px];
     }
 
-    div :global(.maplibregl-ctrl-geocoder--icon-loading) {
-        @apply -mt-1;
-        @apply mb-0;
-    }
-
-    div :global(.maplibregl-ctrl-geocoder--icon-close) {
-        @apply my-0;
-    }
-
-    div :global(.maplibregl-ctrl-geocoder--input) {
+    div :global(.mapboxgl-ctrl-geocoder--input) {
         @apply relative;
-        @apply h-8;
         @apply w-64;
         @apply py-0;
         @apply pl-2;
@@ -153,12 +149,12 @@
         @apply text-foreground;
     }
 
-    div :global(.maplibregl-ctrl-geocoder--collapsed .maplibregl-ctrl-geocoder--input) {
+    div :global(.mapboxgl-ctrl-geocoder--collapsed .mapboxgl-ctrl-geocoder--input) {
         @apply w-0;
         @apply p-0;
     }
 
-    div :global(.maplibregl-ctrl-top-right) {
+    div :global(.mapboxgl-ctrl-top-right) {
         @apply z-40;
         @apply flex;
         @apply flex-col;
@@ -167,76 +163,77 @@
         @apply overflow-hidden;
     }
 
-    .horizontal :global(.maplibregl-ctrl-bottom-left) {
+    .horizontal :global(.mapboxgl-ctrl-bottom-left) {
         @apply bottom-[42px];
     }
 
-    .horizontal :global(.maplibregl-ctrl-bottom-right) {
+    .horizontal :global(.mapboxgl-ctrl-bottom-right) {
         @apply bottom-[42px];
     }
 
-    div :global(.maplibregl-ctrl-attrib) {
+    div :global(.mapboxgl-ctrl-attrib) {
         @apply dark:bg-transparent;
     }
 
-    div :global(.maplibregl-compact-show.maplibregl-ctrl-attrib) {
+    div :global(.mapboxgl-compact-show.mapboxgl-ctrl-attrib) {
         @apply dark:bg-background;
     }
 
-    div :global(.maplibregl-ctrl-attrib-button) {
+    div :global(.mapboxgl-ctrl-attrib-button) {
         @apply dark:bg-foreground;
     }
 
-    div :global(.maplibregl-compact-show .maplibregl-ctrl-attrib-button) {
+    div :global(.mapboxgl-compact-show .mapboxgl-ctrl-attrib-button) {
         @apply dark:bg-foreground;
     }
 
-    div :global(.maplibregl-ctrl-attrib a) {
+    div :global(.mapboxgl-ctrl-attrib a) {
         @apply text-foreground;
     }
 
-    div :global(.maplibregl-popup) {
+    div :global(.mapboxgl-popup) {
+        @apply w-fit;
         @apply z-50;
     }
 
-    div :global(.maplibregl-popup-content) {
+    div :global(.mapboxgl-popup-content) {
         @apply p-0;
         @apply bg-transparent;
         @apply shadow-none;
     }
 
-    div :global(.maplibregl-popup-anchor-top .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-top .mapboxgl-popup-tip) {
         @apply border-b-background;
     }
 
-    div :global(.maplibregl-popup-anchor-top-left .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-top-left .mapboxgl-popup-tip) {
         @apply border-b-background;
     }
 
-    div :global(.maplibregl-popup-anchor-top-right .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-top-right .mapboxgl-popup-tip) {
         @apply border-b-background;
     }
 
-    div :global(.maplibregl-popup-anchor-bottom .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-bottom .mapboxgl-popup-tip) {
         @apply border-t-background;
         @apply drop-shadow-md;
     }
 
-    div :global(.maplibregl-popup-anchor-bottom-left .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-bottom-left .mapboxgl-popup-tip) {
         @apply border-t-background;
         @apply drop-shadow-md;
     }
 
-    div :global(.maplibregl-popup-anchor-bottom-right .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-bottom-right .mapboxgl-popup-tip) {
         @apply border-t-background;
         @apply drop-shadow-md;
     }
 
-    div :global(.maplibregl-popup-anchor-left .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-left .mapboxgl-popup-tip) {
         @apply border-r-background;
     }
 
-    div :global(.maplibregl-popup-anchor-right .maplibregl-popup-tip) {
+    div :global(.mapboxgl-popup-anchor-right .mapboxgl-popup-tip) {
         @apply border-l-background;
     }
 </style>

website/src/lib/components/map/custom-control/CustomControl.svelte

@@ -17,7 +17,7 @@
     let control: CustomControl | null = null;
 
     onMount(() => {
-        map.onLoad((map: maplibregl.Map) => {
+        map.onLoad((map: mapboxgl.Map) => {
             if (position.includes('right')) container.classList.add('float-right');
             else container.classList.add('float-left');
             container.classList.remove('hidden');

website/src/lib/components/map/custom-control/custom-control.ts

@@ -1,4 +1,4 @@
-import { type Map, type IControl } from 'maplibre-gl';
+import { type Map, type IControl } from 'mapbox-gl';
 
 export default class CustomControl implements IControl {
     _map: Map | undefined;

website/src/lib/components/map/gpx-layer/distance-markers.ts

@@ -1,11 +1,10 @@
 import { settings } from '$lib/logic/settings';
 import { gpxStatistics } from '$lib/logic/statistics';
 import { getConvertedDistanceToKilometers } from '$lib/units';
+import type { GeoJSONSource } from 'mapbox-gl';
 import { get } from 'svelte/store';
-import { map } from '$lib/components/map/map';
+import { ANCHOR_LAYER_KEY, map } from '$lib/components/map/map';
 import { allHidden } from '$lib/logic/hidden';
-import type { GeoJSONSource } from 'maplibre-gl';
-import { ANCHOR_LAYER_KEY } from '../style';
 
 const { distanceMarkers, distanceUnits } = settings;
 
@@ -23,7 +22,7 @@ export class DistanceMarkers {
         this.unsubscribes.push(
             map.subscribe((map_) => {
                 if (map_) {
-                    map_.on('style.load', this.updateBinded);
+                    map_.on('style.import.load', this.updateBinded);
                 }
             })
         );

website/src/lib/components/map/gpx-layer/gpx-layer-popup.ts

@@ -3,14 +3,13 @@ import { MapPopup } from '$lib/components/map/map-popup';
 export let waypointPopup: MapPopup | null = null;
 export let trackpointPopup: MapPopup | null = null;
 
-export function createPopups(map: maplibregl.Map) {
+export function createPopups(map: mapboxgl.Map) {
     removePopups();
     waypointPopup = new MapPopup(map, {
         closeButton: false,
         focusAfterOpen: false,
         maxWidth: undefined,
         offset: {
-            center: [0, 0],
             top: [0, 0],
             'top-left': [0, 0],
             'top-right': [0, 0],

website/src/lib/components/map/gpx-layer/gpx-layer.ts

@@ -1,11 +1,6 @@
 import { get, type Readable } from 'svelte/store';
-import maplibregl, {
-    type GeoJSONSource,
-    type FilterSpecification,
-    type MapLayerMouseEvent,
-    type MapLayerTouchEvent,
-} from 'maplibre-gl';
-import { map } from '$lib/components/map/map';
+import mapboxgl, { type FilterSpecification } from 'mapbox-gl';
+import { ANCHOR_LAYER_KEY, map } from '$lib/components/map/map';
 import { waypointPopup, trackpointPopup } from './gpx-layer-popup';
 import {
     ListTrackSegmentItem,
@@ -15,7 +10,7 @@ import {
     ListFileItem,
     ListRootItem,
 } from '$lib/components/file-list/file-list';
-import { getClosestLinePoint, getElevation, loadSVGIcon } from '$lib/utils';
+import { getClosestLinePoint, getElevation } from '$lib/utils';
 import { selectedWaypoint } from '$lib/components/toolbar/tools/waypoint/waypoint';
 import { MapPin, Square } from 'lucide-static';
 import { getSymbolKey, symbols } from '$lib/assets/symbols';
@@ -27,8 +22,7 @@ import { fileActionManager } from '$lib/logic/file-action-manager';
 import { fileActions } from '$lib/logic/file-actions';
 import { splitAs } from '$lib/components/toolbar/tools/scissors/scissors';
 import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
-import { gpxColors } from './gpx-layers';
+import { gpxColors } from '$lib/components/map/gpx-layer/gpx-layers';
 
 const colors = [
     '#ff0000',
@@ -120,28 +114,28 @@ export class GPXLayer {
     selected: boolean = false;
     currentWaypointData: GeoJSON.FeatureCollection | null = null;
     draggedWaypointIndex: number | null = null;
-    draggingStartingPosition: maplibregl.Point = new maplibregl.Point(0, 0);
+    draggingStartingPosition: mapboxgl.Point = new mapboxgl.Point(0, 0);
     unsubscribe: Function[] = [];
 
     updateBinded: () => void = this.update.bind(this);
     layerOnMouseEnterBinded: (e: any) => void = this.layerOnMouseEnter.bind(this);
     layerOnMouseLeaveBinded: () => void = this.layerOnMouseLeave.bind(this);
     layerOnMouseMoveBinded: (e: any) => void = this.layerOnMouseMove.bind(this);
-    layerOnClickBinded: (e: MapLayerMouseEvent) => void = this.layerOnClick.bind(this);
-    layerOnContextMenuBinded: (e: MapLayerMouseEvent) => void = this.layerOnContextMenu.bind(this);
-    waypointLayerOnMouseEnterBinded: (e: MapLayerMouseEvent) => void =
+    layerOnClickBinded: (e: any) => void = this.layerOnClick.bind(this);
+    layerOnContextMenuBinded: (e: any) => void = this.layerOnContextMenu.bind(this);
+    waypointLayerOnMouseEnterBinded: (e: mapboxgl.MapMouseEvent) => void =
         this.waypointLayerOnMouseEnter.bind(this);
-    waypointLayerOnMouseLeaveBinded: (e: MapLayerMouseEvent) => void =
+    waypointLayerOnMouseLeaveBinded: (e: mapboxgl.MapMouseEvent) => void =
         this.waypointLayerOnMouseLeave.bind(this);
-    waypointLayerOnClickBinded: (e: MapLayerMouseEvent) => void =
+    waypointLayerOnClickBinded: (e: mapboxgl.MapMouseEvent) => void =
         this.waypointLayerOnClick.bind(this);
-    waypointLayerOnMouseDownBinded: (e: MapLayerMouseEvent) => void =
+    waypointLayerOnMouseDownBinded: (e: mapboxgl.MapMouseEvent) => void =
         this.waypointLayerOnMouseDown.bind(this);
-    waypointLayerOnTouchStartBinded: (e: MapLayerTouchEvent) => void =
+    waypointLayerOnTouchStartBinded: (e: mapboxgl.MapTouchEvent) => void =
         this.waypointLayerOnTouchStart.bind(this);
-    waypointLayerOnMouseMoveBinded: (e: MapLayerMouseEvent | MapLayerTouchEvent) => void =
+    waypointLayerOnMouseMoveBinded: (e: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent) => void =
         this.waypointLayerOnMouseMove.bind(this);
-    waypointLayerOnMouseUpBinded: (e: MapLayerMouseEvent | MapLayerTouchEvent) => void =
+    waypointLayerOnMouseUpBinded: (e: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent) => void =
         this.waypointLayerOnMouseUp.bind(this);
 
     constructor(fileId: string, file: Readable<GPXFileWithStatistics | undefined>) {
@@ -151,7 +145,7 @@ export class GPXLayer {
         this.unsubscribe.push(
             map.subscribe(($map) => {
                 if ($map) {
-                    $map.on('style.load', this.updateBinded);
+                    $map.on('style.import.load', this.updateBinded);
                     this.update();
                 }
             })
@@ -174,9 +168,8 @@ export class GPXLayer {
 
     update() {
         const _map = get(map);
-        const layerEventManager = map.layerEventManager;
         let file = get(this.file)?.file;
-        if (!_map || !layerEventManager || !file) {
+        if (!_map || !file) {
             return;
         }
 
@@ -192,7 +185,7 @@ export class GPXLayer {
         this.loadIcons();
 
         try {
-            let source = _map.getSource(this.fileId) as GeoJSONSource | undefined;
+            let source = _map.getSource(this.fileId) as mapboxgl.GeoJSONSource | undefined;
             if (source) {
                 source.setData(this.getGeoJSON());
             } else {
@@ -221,26 +214,65 @@ export class GPXLayer {
                     ANCHOR_LAYER_KEY.tracks
                 );
 
-                layerEventManager.on('click', this.fileId, this.layerOnClickBinded);
-                layerEventManager.on('contextmenu', this.fileId, this.layerOnContextMenuBinded);
-                layerEventManager.on('mouseenter', this.fileId, this.layerOnMouseEnterBinded);
-                layerEventManager.on('mouseleave', this.fileId, this.layerOnMouseLeaveBinded);
-                layerEventManager.on('mousemove', this.fileId, this.layerOnMouseMoveBinded);
+                _map.on('click', this.fileId, this.layerOnClickBinded);
+                _map.on('contextmenu', this.fileId, this.layerOnContextMenuBinded);
+                _map.on('mouseenter', this.fileId, this.layerOnMouseEnterBinded);
+                _map.on('mouseleave', this.fileId, this.layerOnMouseLeaveBinded);
+                _map.on('mousemove', this.fileId, this.layerOnMouseMoveBinded);
             }
 
-            let visibleTrackSegmentIds: string[] = [];
-            file.forEachSegment((segment, trackIndex, segmentIndex) => {
-                if (!segment._data.hidden) {
-                    visibleTrackSegmentIds.push(`${trackIndex}-${segmentIndex}`);
-                }
-            });
-            const segmentFilter: FilterSpecification = [
-                'in',
-                ['get', 'trackSegmentId'],
-                ['literal', visibleTrackSegmentIds],
-            ];
+            let waypointSource = _map.getSource(this.fileId + '-waypoints') as
+                | mapboxgl.GeoJSONSource
+                | undefined;
+            this.currentWaypointData = this.getWaypointsGeoJSON();
+            if (waypointSource) {
+                waypointSource.setData(this.currentWaypointData);
+            } else {
+                _map.addSource(this.fileId + '-waypoints', {
+                    type: 'geojson',
+                    data: this.currentWaypointData,
+                });
+            }
 
-            _map.setFilter(this.fileId, segmentFilter, { validate: false });
+            if (!_map.getLayer(this.fileId + '-waypoints')) {
+                _map.addLayer(
+                    {
+                        id: this.fileId + '-waypoints',
+                        type: 'symbol',
+                        source: this.fileId + '-waypoints',
+                        layout: {
+                            'icon-image': ['get', 'icon'],
+                            'icon-size': 0.3,
+                            'icon-anchor': 'bottom',
+                            'icon-padding': 0,
+                            'icon-allow-overlap': true,
+                        },
+                    },
+                    ANCHOR_LAYER_KEY.waypoints
+                );
+
+                _map.on(
+                    'mouseenter',
+                    this.fileId + '-waypoints',
+                    this.waypointLayerOnMouseEnterBinded
+                );
+                _map.on(
+                    'mouseleave',
+                    this.fileId + '-waypoints',
+                    this.waypointLayerOnMouseLeaveBinded
+                );
+                _map.on('click', this.fileId + '-waypoints', this.waypointLayerOnClickBinded);
+                _map.on(
+                    'mousedown',
+                    this.fileId + '-waypoints',
+                    this.waypointLayerOnMouseDownBinded
+                );
+                _map.on(
+                    'touchstart',
+                    this.fileId + '-waypoints',
+                    this.waypointLayerOnTouchStartBinded
+                );
+            }
 
             if (get(directionMarkers)) {
                 if (!_map.getLayer(this.fileId + '-direction')) {
@@ -269,70 +301,28 @@ export class GPXLayer {
                         ANCHOR_LAYER_KEY.directionMarkers
                     );
                 }
-
-                _map.setFilter(this.fileId + '-direction', segmentFilter, { validate: false });
             } else {
                 if (_map.getLayer(this.fileId + '-direction')) {
                     _map.removeLayer(this.fileId + '-direction');
                 }
             }
 
-            let waypointSource = _map.getSource(this.fileId + '-waypoints') as
-                | GeoJSONSource
-                | undefined;
-            this.currentWaypointData = this.getWaypointsGeoJSON();
-            if (waypointSource) {
-                waypointSource.setData(this.currentWaypointData);
-            } else {
-                _map.addSource(this.fileId + '-waypoints', {
-                    type: 'geojson',
-                    data: this.currentWaypointData,
-                    promoteId: 'waypointIndex',
-                });
-            }
+            let visibleTrackSegmentIds: string[] = [];
+            file.forEachSegment((segment, trackIndex, segmentIndex) => {
+                if (!segment._data.hidden) {
+                    visibleTrackSegmentIds.push(`${trackIndex}-${segmentIndex}`);
+                }
+            });
+            const segmentFilter: FilterSpecification = [
+                'in',
+                ['get', 'trackSegmentId'],
+                ['literal', visibleTrackSegmentIds],
+            ];
 
-            if (!_map.getLayer(this.fileId + '-waypoints')) {
-                _map.addLayer(
-                    {
-                        id: this.fileId + '-waypoints',
-                        type: 'symbol',
-                        source: this.fileId + '-waypoints',
-                        layout: {
-                            'icon-image': ['get', 'icon'],
-                            'icon-size': 0.3,
-                            'icon-anchor': 'bottom',
-                            'icon-padding': 0,
-                            'icon-allow-overlap': true,
-                        },
-                    },
-                    ANCHOR_LAYER_KEY.waypoints
-                );
+            _map.setFilter(this.fileId, segmentFilter, { validate: false });
 
-                layerEventManager.on(
-                    'mouseenter',
-                    this.fileId + '-waypoints',
-                    this.waypointLayerOnMouseEnterBinded
-                );
-                layerEventManager.on(
-                    'mouseleave',
-                    this.fileId + '-waypoints',
-                    this.waypointLayerOnMouseLeaveBinded
-                );
-                layerEventManager.on(
-                    'click',
-                    this.fileId + '-waypoints',
-                    this.waypointLayerOnClickBinded
-                );
-                layerEventManager.on(
-                    'mousedown',
-                    this.fileId + '-waypoints',
-                    this.waypointLayerOnMouseDownBinded
-                );
-                layerEventManager.on(
-                    'touchstart',
-                    this.fileId + '-waypoints',
-                    this.waypointLayerOnTouchStartBinded
-                );
+            if (_map.getLayer(this.fileId + '-direction')) {
+                _map.setFilter(this.fileId + '-direction', segmentFilter, { validate: false });
             }
 
             let visibleWaypoints: number[] = [];
@@ -355,47 +345,32 @@ export class GPXLayer {
 
     remove() {
         const _map = get(map);
-
         if (_map) {
-            _map.off('style.load', this.updateBinded);
-        }
+            _map.off('click', this.fileId, this.layerOnClickBinded);
+            _map.off('contextmenu', this.fileId, this.layerOnContextMenuBinded);
+            _map.off('mouseenter', this.fileId, this.layerOnMouseEnterBinded);
+            _map.off('mouseleave', this.fileId, this.layerOnMouseLeaveBinded);
+            _map.off('mousemove', this.fileId, this.layerOnMouseMoveBinded);
+            _map.off('style.import.load', this.updateBinded);
 
-        const layerEventManager = map.layerEventManager;
-        if (layerEventManager) {
-            layerEventManager.off('click', this.fileId, this.layerOnClickBinded);
-            layerEventManager.off('contextmenu', this.fileId, this.layerOnContextMenuBinded);
-            layerEventManager.off('mouseenter', this.fileId, this.layerOnMouseEnterBinded);
-            layerEventManager.off('mouseleave', this.fileId, this.layerOnMouseLeaveBinded);
-            layerEventManager.off('mousemove', this.fileId, this.layerOnMouseMoveBinded);
-
-            layerEventManager.off(
+            _map.off(
                 'mouseenter',
                 this.fileId + '-waypoints',
                 this.waypointLayerOnMouseEnterBinded
             );
-            layerEventManager.off(
+            _map.off(
                 'mouseleave',
                 this.fileId + '-waypoints',
                 this.waypointLayerOnMouseLeaveBinded
             );
-            layerEventManager.off(
-                'click',
-                this.fileId + '-waypoints',
-                this.waypointLayerOnClickBinded
-            );
-            layerEventManager.off(
-                'mousedown',
-                this.fileId + '-waypoints',
-                this.waypointLayerOnMouseDownBinded
-            );
-            layerEventManager.off(
+            _map.off('click', this.fileId + '-waypoints', this.waypointLayerOnClickBinded);
+            _map.off('mousedown', this.fileId + '-waypoints', this.waypointLayerOnMouseDownBinded);
+            _map.off(
                 'touchstart',
                 this.fileId + '-waypoints',
                 this.waypointLayerOnTouchStartBinded
             );
-        }
 
-        if (_map) {
             if (_map.getLayer(this.fileId + '-direction')) {
                 _map.removeLayer(this.fileId + '-direction');
             }
@@ -471,7 +446,7 @@ export class GPXLayer {
         }
     }
 
-    layerOnClick(e: MapLayerMouseEvent) {
+    layerOnClick(e: mapboxgl.MapMouseEvent) {
         if (
             get(currentTool) === Tool.ROUTING &&
             get(selection).hasAnyChildren(new ListRootItem(), true, ['waypoints'])
@@ -529,7 +504,7 @@ export class GPXLayer {
         }
     }
 
-    waypointLayerOnMouseEnter(e: MapLayerMouseEvent) {
+    waypointLayerOnMouseEnter(e: mapboxgl.MapMouseEvent) {
         if (this.draggedWaypointIndex !== null) {
             return;
         }
@@ -549,7 +524,7 @@ export class GPXLayer {
         mapCursor.notify(MapCursorState.WAYPOINT_HOVER, false);
     }
 
-    waypointLayerOnClick(e: MapLayerMouseEvent) {
+    waypointLayerOnClick(e: mapboxgl.MapMouseEvent) {
         e.preventDefault();
 
         let waypointIndex = e.features![0].properties!.waypointIndex;
@@ -591,7 +566,7 @@ export class GPXLayer {
         }
     }
 
-    waypointLayerOnMouseDown(e: MapLayerMouseEvent) {
+    waypointLayerOnMouseDown(e: mapboxgl.MapMouseEvent) {
         if (get(currentTool) !== Tool.WAYPOINT || !this.selected) {
             return;
         }
@@ -601,7 +576,6 @@ export class GPXLayer {
         }
 
         e.preventDefault();
-        _map.dragPan.disable();
 
         this.draggedWaypointIndex = e.features![0].properties!.waypointIndex;
         this.draggingStartingPosition = e.point;
@@ -611,7 +585,7 @@ export class GPXLayer {
         _map.once('mouseup', this.waypointLayerOnMouseUpBinded);
     }
 
-    waypointLayerOnTouchStart(e: MapLayerTouchEvent) {
+    waypointLayerOnTouchStart(e: mapboxgl.MapTouchEvent) {
         if (e.points.length !== 1 || get(currentTool) !== Tool.WAYPOINT || !this.selected) {
             return;
         }
@@ -625,13 +599,12 @@ export class GPXLayer {
         waypointPopup?.hide();
 
         e.preventDefault();
-        _map.dragPan.disable();
 
         _map.on('touchmove', this.waypointLayerOnMouseMoveBinded);
         _map.once('touchend', this.waypointLayerOnMouseUpBinded);
     }
 
-    waypointLayerOnMouseMove(e: MapLayerMouseEvent | MapLayerTouchEvent) {
+    waypointLayerOnMouseMove(e: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent) {
         if (this.draggedWaypointIndex === null || e.point.equals(this.draggingStartingPosition)) {
             return;
         }
@@ -643,35 +616,18 @@ export class GPXLayer {
         ).coordinates = [e.lngLat.lng, e.lngLat.lat];
 
         let waypointSource = get(map)?.getSource(this.fileId + '-waypoints') as
-            | GeoJSONSource
+            | mapboxgl.GeoJSONSource
             | undefined;
         if (waypointSource) {
-            waypointSource.updateData({
-                update: [
-                    {
-                        id: this.draggedWaypointIndex,
-                        newGeometry: {
-                            type: 'Point',
-                            coordinates: [e.lngLat.lng, e.lngLat.lat],
-                        },
-                    },
-                ],
-            });
+            waypointSource.setData(this.currentWaypointData!);
         }
     }
 
-    waypointLayerOnMouseUp(e: MapLayerMouseEvent | MapLayerTouchEvent) {
+    waypointLayerOnMouseUp(e: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent) {
         mapCursor.notify(MapCursorState.WAYPOINT_DRAGGING, false);
 
-        const _map = get(map);
-        if (!_map) {
-            return;
-        }
-
-        _map.dragPan.enable();
-
-        _map.off('mousemove', this.waypointLayerOnMouseMoveBinded);
-        _map.off('touchmove', this.waypointLayerOnMouseMoveBinded);
+        get(map)?.off('mousemove', this.waypointLayerOnMouseMoveBinded);
+        get(map)?.off('touchmove', this.waypointLayerOnMouseMoveBinded);
 
         if (this.draggedWaypointIndex === null) {
             return;
@@ -794,7 +750,20 @@ export class GPXLayer {
 
         symbols.forEach((symbol) => {
             const iconId = `waypoint-${symbol ?? 'default'}-${this.layerColor}`;
-            loadSVGIcon(_map, iconId, getSvgForSymbol(symbol, this.layerColor));
+            if (!_map.hasImage(iconId)) {
+                let icon = new Image(100, 100);
+                icon.onload = () => {
+                    if (!_map.hasImage(iconId)) {
+                        _map.addImage(iconId, icon);
+                    }
+                };
+
+                // Lucide icons are SVG files with a 24x24 viewBox
+                // Create a new SVG with a 32x32 viewBox and center the icon in a circle
+                icon.src =
+                    'data:image/svg+xml,' +
+                    encodeURIComponent(getSvgForSymbol(symbol, this.layerColor));
+            }
         });
     }
 }

website/src/lib/components/map/gpx-layer/start-end-markers.ts

@@ -1,40 +1,30 @@
 import { currentTool, Tool } from '$lib/components/toolbar/tools';
-import { gpxStatistics, hoveredPoint, slicedGPXStatistics } from '$lib/logic/statistics';
-import type { GeoJSONSource } from 'maplibre-gl';
+import { gpxStatistics, slicedGPXStatistics } from '$lib/logic/statistics';
+import mapboxgl from 'mapbox-gl';
 import { get } from 'svelte/store';
 import { map } from '$lib/components/map/map';
 import { allHidden } from '$lib/logic/hidden';
-import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
-import { loadSVGIcon } from '$lib/utils';
-
-const startMarkerSVG = `<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="8" cy="8" r="6" fill="#22c55e" stroke="white" stroke-width="1.5"/>
-</svg>`;
-
-const endMarkerSVG = `<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <pattern id="checkerboard" x="0" y="0" width="5" height="5" patternUnits="userSpaceOnUse">
-      <rect x="0" y="0" width="2.5" height="2.5" fill="white"/>
-      <rect x="2.5" y="2.5" width="2.5" height="2.5" fill="white"/>
-      <rect x="2.5" y="0" width="2.5" height="2.5" fill="black"/>
-      <rect x="0" y="2.5" width="2.5" height="2.5" fill="black"/>
-    </pattern>
-  </defs>
-  <circle cx="8" cy="8" r="6" fill="url(#checkerboard)" stroke="white" stroke-width="1.5"/>
-</svg>`;
-const hoverMarkerSVG = `<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="8" cy="8" r="6" fill="#00b8db" stroke="white" stroke-width="1.5"/>
-</svg>`;
 
 export class StartEndMarkers {
+    start: mapboxgl.Marker;
+    end: mapboxgl.Marker;
     updateBinded: () => void = this.update.bind(this);
     unsubscribes: (() => void)[] = [];
 
     constructor() {
+        let startElement = document.createElement('div');
+        let endElement = document.createElement('div');
+        startElement.className = `h-4 w-4 rounded-full bg-green-500 border-2 border-white`;
+        endElement.className = `h-4 w-4 rounded-full border-2 border-white`;
+        endElement.style.background =
+            'repeating-conic-gradient(#fff 0 90deg, #000 0 180deg) 0 0/8px 8px round';
+
+        this.start = new mapboxgl.Marker({ element: startElement });
+        this.end = new mapboxgl.Marker({ element: endElement });
+
         map.onLoad(() => this.update());
         this.unsubscribes.push(gpxStatistics.subscribe(this.updateBinded));
         this.unsubscribes.push(slicedGPXStatistics.subscribe(this.updateBinded));
-        this.unsubscribes.push(hoveredPoint.subscribe(this.updateBinded));
         this.unsubscribes.push(currentTool.subscribe(this.updateBinded));
         this.unsubscribes.push(allHidden.subscribe(this.updateBinded));
     }
@@ -43,115 +33,33 @@ export class StartEndMarkers {
         const map_ = get(map);
         if (!map_) return;
 
-        this.loadIcons();
-
         const tool = get(currentTool);
         const statistics = get(gpxStatistics);
         const slicedStatistics = get(slicedGPXStatistics);
-        const hovered = get(hoveredPoint);
         const hidden = get(allHidden);
-        if (!hidden) {
-            const data: GeoJSON.FeatureCollection = {
-                type: 'FeatureCollection',
-                features: [],
-            };
-
-            if (statistics.global.length > 0 && tool !== Tool.ROUTING) {
-                const start = statistics
-                    .getTrackPoint(slicedStatistics?.[1] ?? 0)!
-                    .trkpt.getCoordinates();
-                const end = statistics
-                    .getTrackPoint(slicedStatistics?.[2] ?? statistics.global.length - 1)!
-                    .trkpt.getCoordinates();
-                data.features.push({
-                    type: 'Feature',
-                    geometry: {
-                        type: 'Point',
-                        coordinates: [start.lon, start.lat],
-                    },
-                    properties: {
-                        icon: 'start-marker',
-                    },
-                });
-                data.features.push({
-                    type: 'Feature',
-                    geometry: {
-                        type: 'Point',
-                        coordinates: [end.lon, end.lat],
-                    },
-                    properties: {
-                        icon: 'end-marker',
-                    },
-                });
-            }
-
-            if (hovered) {
-                data.features.push({
-                    type: 'Feature',
-                    geometry: {
-                        type: 'Point',
-                        coordinates: [hovered.lon, hovered.lat],
-                    },
-                    properties: {
-                        icon: 'hover-marker',
-                    },
-                });
-            }
-
-            let source = map_.getSource('start-end-markers') as GeoJSONSource | undefined;
-            if (source) {
-                source.setData(data);
-            } else {
-                map_.addSource('start-end-markers', {
-                    type: 'geojson',
-                    data: data,
-                });
-            }
-
-            if (!map_.getLayer('start-end-markers')) {
-                map_.addLayer(
-                    {
-                        id: 'start-end-markers',
-                        type: 'symbol',
-                        source: 'start-end-markers',
-                        layout: {
-                            'icon-image': ['get', 'icon'],
-                            'icon-size': 0.2,
-                            'icon-allow-overlap': true,
-                        },
-                    },
-                    ANCHOR_LAYER_KEY.startEndMarkers
-                );
-            }
+        if (statistics.global.length > 0 && tool !== Tool.ROUTING && !hidden) {
+            this.start
+                .setLngLat(
+                    statistics.getTrackPoint(slicedStatistics?.[1] ?? 0)!.trkpt.getCoordinates()
+                )
+                .addTo(map_);
+            this.end
+                .setLngLat(
+                    statistics
+                        .getTrackPoint(slicedStatistics?.[2] ?? statistics.global.length - 1)!
+                        .trkpt.getCoordinates()
+                )
+                .addTo(map_);
         } else {
-            if (map_.getLayer('start-end-markers')) {
-                map_.removeLayer('start-end-markers');
-            }
-            if (map_.getSource('start-end-markers')) {
-                map_.removeSource('start-end-markers');
-            }
+            this.start.remove();
+            this.end.remove();
         }
     }
 
     remove() {
         this.unsubscribes.forEach((unsubscribe) => unsubscribe());
 
-        const map_ = get(map);
-        if (!map_) return;
-
-        if (map_.getLayer('start-end-markers')) {
-            map_.removeLayer('start-end-markers');
-        }
-        if (map_.getSource('start-end-markers')) {
-            map_.removeSource('start-end-markers');
-        }
-    }
-
-    loadIcons() {
-        const map_ = get(map);
-        if (!map_) return;
-        loadSVGIcon(map_, 'start-marker', startMarkerSVG);
-        loadSVGIcon(map_, 'end-marker', endMarkerSVG);
-        loadSVGIcon(map_, 'hover-marker', hoverMarkerSVG);
+        this.start.remove();
+        this.end.remove();
     }
 }

website/src/lib/components/map/layer-control/CustomLayers.svelte

@@ -20,8 +20,9 @@
     import { i18n } from '$lib/i18n.svelte';
     import { defaultBasemap, type CustomLayer } from '$lib/assets/layers';
     import { onMount } from 'svelte';
-    import { remove } from './utils';
+    import { customBasemapUpdate, isSelected, remove } from './utils';
     import { settings } from '$lib/logic/settings';
+    import { map } from '$lib/components/map/map';
     import { dndzone } from 'svelte-dnd-action';
 
     const {
@@ -41,8 +42,13 @@
     let maxZoom: number = $state(20);
     let layerType: 'basemap' | 'overlay' = $state('basemap');
     let resourceType: 'raster' | 'vector' = $derived.by(() => {
-        if (tileUrls[0].length > 0 && tileUrls[0].includes('.json')) {
-            return 'vector';
+        if (tileUrls[0].length > 0) {
+            if (
+                tileUrls[0].includes('.json') ||
+                (tileUrls[0].includes('api.mapbox.com/styles') && !tileUrls[0].includes('tiles'))
+            ) {
+                return 'vector';
+            }
         }
         return 'raster';
     });
@@ -128,8 +134,8 @@
                 ],
             };
         }
-        addLayer(layerId);
         $customLayers[layerId] = layer;
+        addLayer(layerId);
         selectedLayerId = undefined;
         setDataFromSelectedLayer();
     }
@@ -152,7 +158,9 @@
                 return $tree;
             });
 
-            if ($currentBasemap !== layerId) {
+            if ($currentBasemap === layerId) {
+                $customBasemapUpdate++;
+            } else {
                 $currentBasemap = layerId;
             }
 
@@ -168,6 +176,14 @@
                 return $tree;
             });
 
+            if ($map && $currentOverlays && isSelected($currentOverlays, layerId)) {
+                try {
+                    $map.removeImport(layerId);
+                } catch (e) {
+                    // No reliable way to check if the map is ready to remove sources and layers
+                }
+            }
+
             currentOverlays.update(($overlays) => {
                 if (!$overlays.overlays.hasOwnProperty('custom')) {
                     $overlays.overlays['custom'] = {};

website/src/lib/components/map/layer-control/LayerControl.svelte

@@ -5,8 +5,12 @@
     import { Separator } from '$lib/components/ui/separator';
     import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
     import { Layers } from '@lucide/svelte';
+    import { basemaps, defaultBasemap, overlays } from '$lib/assets/layers';
     import { settings } from '$lib/logic/settings';
     import { map } from '$lib/components/map/map';
+    import { customBasemapUpdate, getLayers } from './utils';
+    import type { ImportSpecification, StyleSpecification } from 'mapbox-gl';
+    import { untrack } from 'svelte';
 
     let container: HTMLDivElement;
     let overpassLayer: OverpassLayer;
@@ -19,14 +23,125 @@
         selectedBasemapTree,
         selectedOverlayTree,
         selectedOverpassTree,
+        customLayers,
+        opacities,
     } = settings;
 
-    map.onLoad((_map: maplibregl.Map) => {
+    function setStyle() {
+        if (!$map) {
+            return;
+        }
+        let basemap = basemaps.hasOwnProperty($currentBasemap)
+            ? basemaps[$currentBasemap]
+            : ($customLayers[$currentBasemap]?.value ?? basemaps[defaultBasemap]);
+        $map.removeImport('basemap');
+        if (typeof basemap === 'string') {
+            $map.addImport({ id: 'basemap', url: basemap }, 'overlays');
+        } else {
+            $map.addImport(
+                {
+                    id: 'basemap',
+                    url: '',
+                    data: basemap as StyleSpecification,
+                },
+                'overlays'
+            );
+        }
+    }
+
+    $effect(() => {
+        if ($map && ($currentBasemap || $customBasemapUpdate)) {
+            untrack(() => setStyle());
+        }
+    });
+
+    function addOverlay(id: string) {
+        if (!$map) {
+            return;
+        }
+        try {
+            let overlay = $customLayers.hasOwnProperty(id) ? $customLayers[id].value : overlays[id];
+            if (typeof overlay === 'string') {
+                $map.addImport({ id, url: overlay });
+            } else {
+                if ($opacities.hasOwnProperty(id)) {
+                    overlay = {
+                        ...overlay,
+                        layers: (overlay as StyleSpecification).layers.map((layer) => {
+                            if (layer.type === 'raster') {
+                                if (!layer.paint) {
+                                    layer.paint = {};
+                                }
+                                layer.paint['raster-opacity'] = $opacities[id];
+                            }
+                            return layer;
+                        }),
+                    };
+                }
+                $map.addImport({
+                    id,
+                    url: '',
+                    data: overlay as StyleSpecification,
+                });
+            }
+        } catch (e) {
+            // No reliable way to check if the map is ready to add sources and layers
+        }
+    }
+
+    function updateOverlays() {
+        if ($map && $currentOverlays && $opacities) {
+            let overlayLayers = getLayers($currentOverlays);
+            try {
+                let activeOverlays =
+                    $map
+                        .getStyle()
+                        .imports?.reduce(
+                            (
+                                acc: Record<string, ImportSpecification>,
+                                imprt: ImportSpecification
+                            ) => {
+                                if (!['basemap', 'overlays'].includes(imprt.id)) {
+                                    acc[imprt.id] = imprt;
+                                }
+                                return acc;
+                            },
+                            {}
+                        ) || {};
+                let toRemove = Object.keys(activeOverlays).filter((id) => !overlayLayers[id]);
+                toRemove.forEach((id) => {
+                    $map?.removeImport(id);
+                });
+                let toAdd = Object.entries(overlayLayers)
+                    .filter(([id, selected]) => selected && !activeOverlays.hasOwnProperty(id))
+                    .map(([id]) => id);
+                toAdd.forEach((id) => {
+                    addOverlay(id);
+                });
+            } catch (e) {
+                // No reliable way to check if the map is ready to add sources and layers
+            }
+        }
+    }
+
+    $effect(() => {
+        if ($map && $currentOverlays && $opacities) {
+            untrack(() => updateOverlays());
+        }
+    });
+
+    map.onLoad((_map: mapboxgl.Map) => {
         if (overpassLayer) {
             overpassLayer.remove();
         }
-        overpassLayer = new OverpassLayer(_map, map.layerEventManager!);
+        overpassLayer = new OverpassLayer(_map);
         overpassLayer.add();
+        let first = true;
+        _map.on('style.import.load', () => {
+            if (!first) return;
+            first = false;
+            updateOverlays();
+        });
     });
 
     let open = $state(false);

website/src/lib/components/map/layer-control/LayerControlSettings.svelte

@@ -167,11 +167,11 @@
                                             {#if isSelected($selectedOverlayTree, selectedOverlay)}
                                                 {#if $isLayerFromExtension(selectedOverlay)}
                                                     {$getLayerName(selectedOverlay)}
-                                                {:else if $customLayers.hasOwnProperty(selectedOverlay)}
-                                                    {$customLayers[selectedOverlay].name}
                                                 {:else}
                                                     {i18n._(`layers.label.${selectedOverlay}`)}
                                                 {/if}
+                                            {:else if $customLayers.hasOwnProperty(selectedOverlay)}
+                                                {$customLayers[selectedOverlay].name}
                                             {/if}
                                         {/if}
                                     </Select.Trigger>
@@ -213,9 +213,7 @@
                                                     isSelected($currentOverlays, selectedOverlay)
                                                 ) {
                                                     try {
-                                                        if ($map.getLayer(selectedOverlay)) {
-                                                            $map.removeLayer(selectedOverlay);
-                                                        }
+                                                        $map.removeImport(selectedOverlay);
                                                     } catch (e) {
                                                         // No reliable way to check if the map is ready to remove sources and layers
                                                     }

website/src/lib/components/map/layer-control/extension-api.ts

@@ -103,7 +103,7 @@ export class ExtensionAPI {
         if (current && isSelected(current, overlay.id)) {
             show = true;
             try {
-                get(map)?.removeLayer(overlay.id);
+                get(map)?.removeImport(overlay.id);
             } catch (e) {
                 // No reliable way to check if the map is ready to remove sources and layers
             }

website/src/lib/components/map/layer-control/overpass-layer.ts

@@ -6,10 +6,7 @@ import { overpassQueryData } from '$lib/assets/layers';
 import { MapPopup } from '$lib/components/map/map-popup';
 import { settings } from '$lib/logic/settings';
 import { db } from '$lib/db';
-import type { GeoJSONSource } from 'maplibre-gl';
-import { ANCHOR_LAYER_KEY } from '../style';
-import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
-import { loadSVGIcon } from '$lib/utils';
+import { ANCHOR_LAYER_KEY } from '$lib/components/map/map';
 
 const { currentOverpassQueries } = settings;
 
@@ -24,12 +21,11 @@ liveQuery(() => db.overpassdata.toArray()).subscribe((pois) => {
 });
 
 export class OverpassLayer {
-    overpassUrl = 'https://maps.mail.ru/osm/tools/overpass/api/interpreter';
+    overpassUrl = 'https://overpass.private.coffee/api/interpreter';
     minZoom = 12;
     queryZoom = 12;
     expirationTime = 7 * 24 * 3600 * 1000;
-    map: maplibregl.Map;
-    layerEventManager: MapLayerEventManager;
+    map: mapboxgl.Map;
     popup: MapPopup;
 
     currentQueries: Set<string> = new Set();
@@ -40,9 +36,8 @@ export class OverpassLayer {
     updateBinded = this.update.bind(this);
     onHoverBinded = this.onHover.bind(this);
 
-    constructor(map: maplibregl.Map, layerEventManager: MapLayerEventManager) {
+    constructor(map: mapboxgl.Map) {
         this.map = map;
-        this.layerEventManager = layerEventManager;
         this.popup = new MapPopup(map, {
             closeButton: false,
             focusAfterOpen: false,
@@ -53,7 +48,7 @@ export class OverpassLayer {
 
     add() {
         this.map.on('moveend', this.queryIfNeededBinded);
-        this.map.on('style.load', this.updateBinded);
+        this.map.on('style.import.load', this.updateBinded);
         this.unsubscribes.push(data.subscribe(this.updateBinded));
         this.unsubscribes.push(
             currentOverpassQueries.subscribe(() => {
@@ -77,17 +72,10 @@ export class OverpassLayer {
     update() {
         this.loadIcons();
 
-        const fullData = get(data);
-        const queries = getCurrentQueries();
-        const d: GeoJSON.FeatureCollection = {
-            type: 'FeatureCollection',
-            features: fullData.features.filter((feature) =>
-                queries.includes(feature.properties!.query)
-            ),
-        };
+        let d = get(data);
 
         try {
-            let source = this.map.getSource('overpass') as GeoJSONSource | undefined;
+            let source = this.map.getSource('overpass') as mapboxgl.GeoJSONSource | undefined;
             if (source) {
                 source.setData(d);
             } else {
@@ -113,9 +101,13 @@ export class OverpassLayer {
                     ANCHOR_LAYER_KEY.overpass
                 );
 
-                this.layerEventManager.on('mouseenter', 'overpass', this.onHoverBinded);
-                this.layerEventManager.on('click', 'overpass', this.onHoverBinded);
+                this.map.on('mouseenter', 'overpass', this.onHoverBinded);
+                this.map.on('click', 'overpass', this.onHoverBinded);
             }
+
+            this.map.setFilter('overpass', ['in', 'query', ...getCurrentQueries()], {
+                validate: false,
+            });
         } catch (e) {
             // No reliable way to check if the map is ready to add sources and layers
         }
@@ -123,9 +115,7 @@ export class OverpassLayer {
 
     remove() {
         this.map.off('moveend', this.queryIfNeededBinded);
-        this.map.off('style.load', this.updateBinded);
-        this.layerEventManager.off('mouseenter', 'overpass', this.onHoverBinded);
-        this.layerEventManager.off('click', 'overpass', this.onHoverBinded);
+        this.map.off('style.import.load', this.updateBinded);
         this.unsubscribes.forEach((unsubscribe) => unsubscribe());
 
         try {
@@ -258,16 +248,27 @@ export class OverpassLayer {
     loadIcons() {
         let currentQueries = getCurrentQueries();
         currentQueries.forEach((query) => {
-            loadSVGIcon(
-                this.map,
-                `overpass-${query}`,
-                `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">
+            if (!this.map.hasImage(`overpass-${query}`)) {
+                let icon = new Image(100, 100);
+                icon.onload = () => {
+                    if (!this.map.hasImage(`overpass-${query}`)) {
+                        this.map.addImage(`overpass-${query}`, icon);
+                    }
+                };
+
+                // Lucide icons are SVG files with a 24x24 viewBox
+                // Create a new SVG with a 32x32 viewBox and center the icon in a circle
+                icon.src =
+                    'data:image/svg+xml,' +
+                    encodeURIComponent(`
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">
                     <circle cx="20" cy="20" r="20" fill="${overpassQueryData[query].icon.color}" />
                     <g transform="translate(8 8)">
                     ${overpassQueryData[query].icon.svg.replace('stroke="currentColor"', 'stroke="white"')}
                     </g>
-                </svg>`
-            );
+                </svg>
+            `);
+            }
         });
     }
 }

website/src/lib/components/map/layer-control/utils.ts

@@ -76,3 +76,5 @@ export function removeAll(node: LayerTreeType, ids: string[]) {
     });
     return node;
 }
+
+export const customBasemapUpdate = writable(0);

website/src/lib/components/map/map-layer-event-manager.ts

@@ -1,281 +0,0 @@
-import { fileStateCollection } from '$lib/logic/file-state';
-import maplibregl from 'maplibre-gl';
-
-type MapLayerMouseEventListener = (e: maplibregl.MapLayerMouseEvent) => void;
-type MapLayerTouchEventListener = (e: maplibregl.MapLayerTouchEvent) => void;
-type MapLayerListener = {
-    features: maplibregl.MapGeoJSONFeature[];
-    mousemoves: MapLayerMouseEventListener[];
-    mouseenters: MapLayerMouseEventListener[];
-    mouseleaves: MapLayerMouseEventListener[];
-    mousedowns: MapLayerMouseEventListener[];
-    clicks: MapLayerMouseEventListener[];
-    contextmenus: MapLayerMouseEventListener[];
-    touchstarts: MapLayerTouchEventListener[];
-};
-
-export class MapLayerEventManager {
-    private _map: maplibregl.Map;
-    private _listeners: Record<string, MapLayerListener> = {};
-
-    constructor(map: maplibregl.Map) {
-        this._map = map;
-        this._map.on('mousemove', this._handleMouseMove.bind(this));
-        this._map.on('click', this._handleMouseClick.bind(this, 'click'));
-        this._map.on('contextmenu', this._handleMouseClick.bind(this, 'contextmenu'));
-        this._map.on('mousedown', this._handleMouseClick.bind(this, 'mousedown'));
-        this._map.on('touchstart', this._handleTouchStart.bind(this));
-    }
-
-    on(
-        eventType:
-            | 'mousemove'
-            | 'mouseenter'
-            | 'mouseleave'
-            | 'mousedown'
-            | 'click'
-            | 'contextmenu'
-            | 'touchstart',
-
-        layerId: string,
-        listener: MapLayerMouseEventListener | MapLayerTouchEventListener
-    ) {
-        if (!this._listeners[layerId]) {
-            this._listeners[layerId] = {
-                features: [],
-                mousemoves: [],
-                mouseenters: [],
-                mouseleaves: [],
-                mousedowns: [],
-                clicks: [],
-                contextmenus: [],
-                touchstarts: [],
-            };
-        }
-        switch (eventType) {
-            case 'mousemove':
-                this._listeners[layerId].mousemoves.push(listener as MapLayerMouseEventListener);
-                break;
-            case 'mouseenter':
-                this._listeners[layerId].mouseenters.push(listener as MapLayerMouseEventListener);
-                break;
-            case 'mouseleave':
-                this._listeners[layerId].mouseleaves.push(listener as MapLayerMouseEventListener);
-                break;
-            case 'mousedown':
-                this._listeners[layerId].mousedowns.push(listener as MapLayerMouseEventListener);
-                break;
-            case 'click':
-                this._listeners[layerId].clicks.push(listener as MapLayerMouseEventListener);
-                break;
-            case 'contextmenu':
-                this._listeners[layerId].contextmenus.push(listener as MapLayerMouseEventListener);
-                break;
-            case 'touchstart':
-                this._listeners[layerId].touchstarts.push(listener as MapLayerTouchEventListener);
-                break;
-        }
-    }
-
-    off(
-        eventType:
-            | 'mousemove'
-            | 'mouseenter'
-            | 'mouseleave'
-            | 'mousedown'
-            | 'click'
-            | 'contextmenu'
-            | 'touchstart',
-        layerId: string,
-        listener: MapLayerMouseEventListener | MapLayerTouchEventListener
-    ) {
-        if (this._listeners[layerId]) {
-            switch (eventType) {
-                case 'mousemove':
-                    this._listeners[layerId].mousemoves = this._listeners[
-                        layerId
-                    ].mousemoves.filter((l) => l !== listener);
-                    break;
-                case 'mouseenter':
-                    this._listeners[layerId].mouseenters = this._listeners[
-                        layerId
-                    ].mouseenters.filter((l) => l !== listener);
-                    break;
-                case 'mouseleave':
-                    this._listeners[layerId].mouseleaves = this._listeners[
-                        layerId
-                    ].mouseleaves.filter((l) => l !== listener);
-                    break;
-                case 'mousedown':
-                    this._listeners[layerId].mousedowns = this._listeners[
-                        layerId
-                    ].mousedowns.filter((l) => l !== listener);
-                    break;
-                case 'click':
-                    this._listeners[layerId].clicks = this._listeners[layerId].clicks.filter(
-                        (l) => l !== listener
-                    );
-                    break;
-                case 'contextmenu':
-                    this._listeners[layerId].contextmenus = this._listeners[
-                        layerId
-                    ].contextmenus.filter((l) => l !== listener);
-                    break;
-                case 'touchstart':
-                    this._listeners[layerId].touchstarts = this._listeners[
-                        layerId
-                    ].touchstarts.filter((l) => l !== listener);
-                    break;
-            }
-            if (
-                this._listeners[layerId].mousemoves.length === 0 &&
-                this._listeners[layerId].mouseenters.length === 0 &&
-                this._listeners[layerId].mouseleaves.length === 0 &&
-                this._listeners[layerId].mousedowns.length === 0 &&
-                this._listeners[layerId].clicks.length === 0 &&
-                this._listeners[layerId].contextmenus.length === 0 &&
-                this._listeners[layerId].touchstarts.length === 0
-            ) {
-                delete this._listeners[layerId];
-            }
-        }
-    }
-
-    private _handleMouseMove(e: maplibregl.MapMouseEvent) {
-        const featuresByLayer = this._getRenderedFeaturesByLayer(e);
-        Object.keys(this._listeners).forEach((layerId) => {
-            const features = featuresByLayer[layerId] || [];
-            const listener = this._listeners[layerId];
-            if ((features.length == 0) != (listener.features.length == 0)) {
-                if (features.length > 0) {
-                    if (listener.mouseenters.length > 0) {
-                        const event = new maplibregl.MapMouseEvent(
-                            'mouseenter',
-                            e.target,
-                            e.originalEvent,
-                            {
-                                features: featuresByLayer[layerId]!,
-                            }
-                        );
-                        listener.mouseenters.forEach((l) => l(event));
-                    }
-                } else {
-                    if (listener.mouseleaves.length > 0) {
-                        const event = new maplibregl.MapMouseEvent(
-                            'mouseleave',
-                            e.target,
-                            e.originalEvent
-                        );
-                        listener.mouseleaves.forEach((l) => l(event));
-                    }
-                }
-            }
-            if (features.length > 0 && listener.mousemoves.length > 0) {
-                const event = new maplibregl.MapMouseEvent('mousemove', e.target, e.originalEvent, {
-                    features: featuresByLayer[layerId]!,
-                });
-                listener.mousemoves.forEach((l) => l(event));
-            }
-            listener.features = features;
-        });
-    }
-
-    private _handleMouseClick(type: string, e: maplibregl.MapMouseEvent) {
-        const featuresByLayer = this._getRenderedFeaturesByLayer(e);
-        Object.keys(this._listeners).forEach((layerId) => {
-            const features = featuresByLayer[layerId] || [];
-            const listener = this._listeners[layerId];
-            if (features.length > 0) {
-                if (type === 'click' && listener.clicks.length > 0) {
-                    const event = new maplibregl.MapMouseEvent('click', e.target, e.originalEvent, {
-                        features: features,
-                    });
-                    listener.clicks.forEach((l) => l(event));
-                } else if (type === 'contextmenu' && listener.contextmenus.length > 0) {
-                    const event = new maplibregl.MapMouseEvent(
-                        'contextmenu',
-                        e.target,
-                        e.originalEvent,
-                        {
-                            features: features,
-                        }
-                    );
-                    listener.contextmenus.forEach((l) => l(event));
-                } else if (type === 'mousedown' && listener.mousedowns.length > 0) {
-                    const event = new maplibregl.MapMouseEvent(
-                        'mousedown',
-                        e.target,
-                        e.originalEvent,
-                        {
-                            features: features,
-                        }
-                    );
-                    listener.mousedowns.forEach((l) => l(event));
-                }
-            }
-        });
-    }
-
-    private _handleTouchStart(e: maplibregl.MapTouchEvent) {
-        const featuresByLayer = this._getRenderedFeaturesByLayer(e);
-        Object.keys(this._listeners).forEach((layerId) => {
-            const features = featuresByLayer[layerId] || [];
-            const listener = this._listeners[layerId];
-            if (features.length > 0) {
-                const event: maplibregl.MapLayerTouchEvent = new maplibregl.MapTouchEvent(
-                    'touchstart',
-                    e.target,
-                    e.originalEvent
-                );
-                event.features = featuresByLayer[layerId]!;
-                listener.touchstarts.forEach((l) => l(event));
-            }
-        });
-    }
-
-    private _getBounds(point: maplibregl.Point) {
-        const delta = 30;
-        return new maplibregl.LngLatBounds(
-            this._map.unproject([point.x - delta, point.y + delta]),
-            this._map.unproject([point.x + delta, point.y - delta])
-        );
-    }
-
-    private _filterLayersIntersectingBounds(
-        layerIds: string[],
-        bounds: maplibregl.LngLatBounds
-    ): string[] {
-        let result = layerIds.filter((layerId) => {
-            if (!this._map.getLayer(layerId)) return false;
-            const fileId = layerId.replace('-waypoints', '');
-            if (fileId === layerId) {
-                return fileStateCollection.getStatistics(fileId)?.intersectsBBox(bounds) ?? true;
-            } else {
-                return (
-                    fileStateCollection.getStatistics(fileId)?.intersectsWaypointBBox(bounds) ??
-                    true
-                );
-            }
-        });
-        return result;
-    }
-
-    private _getRenderedFeaturesByLayer(e: maplibregl.MapMouseEvent | maplibregl.MapTouchEvent) {
-        const layerIds = this._filterLayersIntersectingBounds(
-            Object.keys(this._listeners),
-            this._getBounds(e.point)
-        );
-        const features =
-            layerIds.length > 0
-                ? this._map.queryRenderedFeatures(e.point, { layers: layerIds })
-                : [];
-        const featuresByLayer: Record<string, maplibregl.MapGeoJSONFeature[]> = {};
-        features.forEach((f) => {
-            if (!featuresByLayer[f.layer.id]) {
-                featuresByLayer[f.layer.id] = [];
-            }
-            featuresByLayer[f.layer.id].push(f);
-        });
-        return featuresByLayer;
-    }
-}

website/src/lib/components/map/map-popup.ts

@@ -1,5 +1,5 @@
 import { TrackPoint, Waypoint } from 'gpx';
-import maplibregl from 'maplibre-gl';
+import mapboxgl from 'mapbox-gl';
 import { mount, tick, unmount } from 'svelte';
 import { get, writable, type Writable } from 'svelte/store';
 import MapPopupComponent from '$lib/components/map/MapPopup.svelte';
@@ -11,15 +11,15 @@ export type PopupItem<T = Waypoint | TrackPoint | any> = {
 };
 
 export class MapPopup {
-    map: maplibregl.Map;
-    popup: maplibregl.Popup;
+    map: mapboxgl.Map;
+    popup: mapboxgl.Popup;
     item: Writable<PopupItem | null> = writable(null);
     component: ReturnType<typeof mount>;
     maybeHideBinded = this.maybeHide.bind(this);
 
-    constructor(map: maplibregl.Map, options?: maplibregl.PopupOptions) {
+    constructor(map: mapboxgl.Map, options?: mapboxgl.PopupOptions) {
         this.map = map;
-        this.popup = new maplibregl.Popup(options);
+        this.popup = new mapboxgl.Popup(options);
         this.component = mount(MapPopupComponent, {
             target: document.body,
             props: {
@@ -51,7 +51,7 @@ export class MapPopup {
         this.map.on('mousemove', this.maybeHideBinded);
     }
 
-    maybeHide(e: maplibregl.MapMouseEvent) {
+    maybeHide(e: mapboxgl.MapMouseEvent) {
         const item = get(this.item);
         if (item === null) {
             this.hide();
@@ -75,10 +75,10 @@ export class MapPopup {
     getCoordinates() {
         const item = get(this.item);
         if (item === null) {
-            return new maplibregl.LngLat(0, 0);
+            return new mapboxgl.LngLat(0, 0);
         }
         return item.item instanceof Waypoint || item.item instanceof TrackPoint
             ? item.item.getCoordinates()
-            : new maplibregl.LngLat(item.item.lon, item.item.lat);
+            : new mapboxgl.LngLat(item.item.lon, item.item.lat);
     }
 }

website/src/lib/components/map/map.ts

@@ -1,80 +1,110 @@
-import maplibregl from 'maplibre-gl';
-import 'maplibre-gl/dist/maplibre-gl.css';
-import MaplibreGeocoder, {
-    type MaplibreGeocoderFeatureResults,
-} from '@maplibre/maplibre-gl-geocoder';
-import '@maplibre/maplibre-gl-geocoder/dist/maplibre-gl-geocoder.css';
+import mapboxgl from 'mapbox-gl';
+import MapboxGeocoder from '@mapbox/mapbox-gl-geocoder';
 import { get, writable, type Writable } from 'svelte/store';
 import { settings } from '$lib/logic/settings';
 import { tick } from 'svelte';
-import { ANCHOR_LAYER_KEY, StyleManager } from '$lib/components/map/style';
-import { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
+import { terrainSources } from '$lib/assets/layers';
 
-const { treeFileView, elevationProfile, bottomPanelSize, rightPanelSize, distanceUnits } = settings;
+const {
+    treeFileView,
+    elevationProfile,
+    bottomPanelSize,
+    rightPanelSize,
+    distanceUnits,
+    terrainSource,
+} = settings;
 
-let fitBoundsOptions: maplibregl.MapOptions['fitBoundsOptions'] = {
+let fitBoundsOptions: mapboxgl.MapOptions['fitBoundsOptions'] = {
     maxZoom: 15,
     linear: true,
     easing: () => 1,
 };
 
-export class MapLibreGLMap {
-    private _maptilerKey: string = '';
-    private _map: maplibregl.Map | null = null;
-    private _mapStore: Writable<maplibregl.Map | null> = writable(null);
-    private _styleManager: StyleManager | null = null;
-    private _onLoadCallbacks: ((map: maplibregl.Map) => void)[] = [];
-    private _unsubscribes: (() => void)[] = [];
-    private callOnLoadBinded: () => void = this.callOnLoad.bind(this);
-    public layerEventManager: MapLayerEventManager | null = null;
+const emptySource: mapboxgl.GeoJSONSourceSpecification = {
+    type: 'geojson',
+    data: {
+        type: 'FeatureCollection',
+        features: [],
+    },
+};
+export const ANCHOR_LAYER_KEY = {
+    mapillary: 'mapillary-end',
+    tracks: 'tracks-end',
+    directionMarkers: 'direction-markers-end',
+    distanceMarkers: 'distance-markers-end',
+    interactions: 'interactions-end',
+    overpass: 'overpass-end',
+    waypoints: 'waypoints-end',
+};
+const anchorLayers: mapboxgl.LayerSpecification[] = Object.values(ANCHOR_LAYER_KEY).map((id) => ({
+    id: id,
+    type: 'symbol',
+    source: 'empty-source',
+}));
 
-    subscribe(run: (value: maplibregl.Map | null) => void, invalidate?: () => void) {
-        return this._mapStore.subscribe(run, invalidate);
+export class MapboxGLMap {
+    private _map: Writable<mapboxgl.Map | null> = writable(null);
+    private _onLoadCallbacks: ((map: mapboxgl.Map) => void)[] = [];
+    private _unsubscribes: (() => void)[] = [];
+
+    subscribe(run: (value: mapboxgl.Map | null) => void, invalidate?: () => void) {
+        return this._map.subscribe(run, invalidate);
     }
 
-    init(
-        maptilerKey: string,
-        language: string,
-        hash: boolean,
-        geocoder: boolean,
-        geolocate: boolean
-    ) {
-        this._maptilerKey = maptilerKey;
-        this._styleManager = new StyleManager(this._mapStore, this._maptilerKey);
-        const map = new maplibregl.Map({
+    init(language: string, hash: boolean, geocoder: boolean, geolocate: boolean) {
+        const map = new mapboxgl.Map({
             container: 'map',
             style: {
                 version: 8,
-                projection: {
-                    type: 'globe',
+                sources: {
+                    'empty-source': emptySource,
                 },
-                sources: {},
-                layers: [],
+                layers: anchorLayers,
+                imports: [
+                    {
+                        id: 'basemap',
+                        url: '',
+                    },
+                    {
+                        id: 'overlays',
+                        url: '',
+                    },
+                ],
             },
+            projection: 'globe',
             zoom: 0,
             hash: hash,
+            language,
+            attributionControl: false,
+            logoPosition: 'bottom-right',
             boxZoom: false,
-            maxPitch: 85,
         });
-        this.layerEventManager = new MapLayerEventManager(map);
         map.addControl(
-            new maplibregl.NavigationControl({
+            new mapboxgl.AttributionControl({
+                compact: true,
+            })
+        );
+        map.addControl(
+            new mapboxgl.NavigationControl({
                 visualizePitch: true,
             })
         );
         if (geocoder) {
-            let geocoder = new MaplibreGeocoder(
-                {
-                    forwardGeocode: async (config) => {
-                        const results: MaplibreGeocoderFeatureResults = {
-                            features: [],
-                            type: 'FeatureCollection',
-                        };
-                        try {
-                            const request = `https://nominatim.openstreetmap.org/search?format=json&q=${config.query}&limit=5&accept-language=${language}`;
-                            const response = await fetch(request);
-                            const geojson = await response.json();
-                            results.features = geojson.map((result: any) => {
+            let geocoder = new MapboxGeocoder({
+                mapboxgl: mapboxgl,
+                enableEventLogging: false,
+                collapsed: true,
+                flyTo: fitBoundsOptions,
+                language,
+                localGeocoder: () => [],
+                localGeocoderOnly: true,
+                externalGeocoder: (query: string) =>
+                    fetch(
+                        `https://nominatim.openstreetmap.org/search?format=json&q=${query}&limit=5&accept-language=${language}`
+                    )
+                        .then((response) => response.json())
+                        .then((data) => {
+                            return data.map((result: any) => {
                                 return {
                                     type: 'Feature',
                                     geometry: {
@@ -84,43 +114,61 @@ export class MapLibreGLMap {
                                     place_name: result.display_name,
                                 };
                             });
-                        } catch (e) {}
-                        return results;
-                    },
-                },
-                {
-                    maplibregl: maplibregl,
-                    enableEventLogging: false,
-                    collapsed: true,
-                    flyTo: fitBoundsOptions,
-                    language,
+                        }),
+            });
+            let onKeyDown = geocoder._onKeyDown;
+            geocoder._onKeyDown = (e: KeyboardEvent) => {
+                // Trigger search on Enter key only
+                if (e.key === 'Enter') {
+                    onKeyDown.apply(geocoder, [{ target: geocoder._inputEl }]);
+                } else if (geocoder._typeahead.data.length > 0) {
+                    geocoder._typeahead.clear();
                 }
-            );
+            };
             map.addControl(geocoder);
         }
         if (geolocate) {
             map.addControl(
-                new maplibregl.GeolocateControl({
+                new mapboxgl.GeolocateControl({
                     positionOptions: {
                         enableHighAccuracy: true,
                     },
                     fitBoundsOptions,
                     trackUserLocation: true,
+                    showUserHeading: true,
                 })
             );
         }
-        const scaleControl = new maplibregl.ScaleControl({
+        const scaleControl = new mapboxgl.ScaleControl({
             unit: get(distanceUnits),
         });
         map.addControl(scaleControl);
+        map.on('style.load', () => {
+            map.setFog({
+                color: 'rgb(186, 210, 235)',
+                'high-color': 'rgb(36, 92, 223)',
+                'horizon-blend': 0.1,
+                'space-color': 'rgb(156, 240, 255)',
+            });
+            map.on('pitch', this.setTerrain.bind(this));
+            this.setTerrain();
+        });
+        map.on('style.import.load', () => {
+            const basemap = map.getStyle().imports?.find((imprt) => imprt.id === 'basemap');
+            if (basemap && basemap.data && basemap.data.glyphs) {
+                map.setGlyphsUrl(basemap.data.glyphs);
+            }
+        });
         map.on('load', () => {
-            this._map = map;
-            this._mapStore.set(map); // only set the store after the map has loaded
+            this._map.set(map); // only set the store after the map has loaded
             window._map = map; // entry point for extensions
             this.resize();
+            this.setTerrain();
             scaleControl.setUnit(get(distanceUnits));
+
+            this._onLoadCallbacks.forEach((callback) => callback(map));
+            this._onLoadCallbacks = [];
         });
-        map.on('style.load', this.callOnLoadBinded);
 
         this._unsubscribes.push(treeFileView.subscribe(() => this.resize()));
         this._unsubscribes.push(elevationProfile.subscribe(() => this.resize()));
@@ -131,50 +179,70 @@ export class MapLibreGLMap {
                 scaleControl.setUnit(units);
             })
         );
+        this._unsubscribes.push(terrainSource.subscribe(() => this.setTerrain()));
+    }
+
+    onLoad(callback: (map: mapboxgl.Map) => void) {
+        const map = get(this._map);
+        if (map) {
+            callback(map);
+        } else {
+            this._onLoadCallbacks.push(callback);
+        }
     }
 
     destroy() {
-        if (this._map) {
-            this._map.remove();
-            this._mapStore.set(null);
+        const map = get(this._map);
+        if (map) {
+            map.remove();
+            this._map.set(null);
         }
         this._unsubscribes.forEach((unsubscribe) => unsubscribe());
         this._unsubscribes = [];
     }
 
     resize() {
-        if (this._map) {
+        const map = get(this._map);
+        if (map) {
             tick().then(() => {
-                this._map?.resize();
+                map.resize();
             });
         }
     }
 
     toggle3D() {
-        if (this._map) {
-            if (this._map.getPitch() === 0) {
-                this._map.easeTo({ pitch: 70 });
+        const map = get(this._map);
+        if (map) {
+            if (map.getPitch() === 0) {
+                map.easeTo({ pitch: 70 });
             } else {
-                this._map.easeTo({ pitch: 0 });
+                map.easeTo({ pitch: 0 });
             }
         }
     }
 
-    onLoad(callback: (map: maplibregl.Map) => void) {
-        if (this._map) {
-            callback(this._map);
-        } else {
-            this._onLoadCallbacks.push(callback);
-        }
-    }
-
-    callOnLoad() {
-        if (this._map && this._map.getLayer(ANCHOR_LAYER_KEY.overlays)) {
-            this._onLoadCallbacks.forEach((callback) => callback(this._map!));
-            this._onLoadCallbacks = [];
-            this._map.off('style.load', this.callOnLoadBinded);
+    setTerrain() {
+        const map = get(this._map);
+        if (map) {
+            const source = get(terrainSource);
+            try {
+                if (!map.getSource(source)) {
+                    map.addSource(source, terrainSources[source]);
+                }
+                if (map.getPitch() > 0) {
+                    map.setTerrain({
+                        source: source,
+                        exaggeration: 1,
+                    });
+                } else {
+                    map.setTerrain(null);
+                }
+            } catch (e) {
+                // No reliable way to check if the map is ready to add sources and layers
+                return;
+            }
         }
     }
 }
 
-export const map = new MapLibreGLMap();
+export const map = new MapboxGLMap();

website/src/lib/components/map/street-view-control/StreetViewControl.svelte

@@ -20,14 +20,9 @@
     let container: HTMLElement;
 
     onMount(() => {
-        map.onLoad((map_: maplibregl.Map) => {
-            googleRedirect = new GoogleRedirect(map_);
-            mapillaryLayer = new MapillaryLayer(
-                map_,
-                map.layerEventManager!,
-                container,
-                mapillaryOpen
-            );
+        map.onLoad((map: mapboxgl.Map) => {
+            googleRedirect = new GoogleRedirect(map);
+            mapillaryLayer = new MapillaryLayer(map, container, mapillaryOpen);
         });
     });
 

website/src/lib/components/map/street-view-control/google.ts

@@ -1,10 +1,11 @@
 import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+import type mapboxgl from 'mapbox-gl';
 
 export class GoogleRedirect {
-    map: maplibregl.Map;
+    map: mapboxgl.Map;
     enabled = false;
 
-    constructor(map: maplibregl.Map) {
+    constructor(map: mapboxgl.Map) {
         this.map = map;
     }
 
@@ -24,7 +25,7 @@ export class GoogleRedirect {
         this.map.off('click', this.openStreetView);
     }
 
-    openStreetView(e: maplibregl.MapMouseEvent) {
+    openStreetView(e: mapboxgl.MapMouseEvent) {
         window.open(
             `https://www.google.com/maps/@?api=1&map_action=pano&viewpoint=${e.lngLat.lat},${e.lngLat.lng}`
         );

website/src/lib/components/map/street-view-control/mapillary.ts

@@ -1,9 +1,8 @@
-import maplibregl, { type LayerSpecification, type VectorSourceSpecification } from 'maplibre-gl';
+import mapboxgl, { type LayerSpecification, type VectorSourceSpecification } from 'mapbox-gl';
 import { Viewer, type ViewerBearingEvent } from 'mapillary-js/dist/mapillary.module';
 import 'mapillary-js/dist/mapillary.css';
 import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-import { ANCHOR_LAYER_KEY } from '../style';
-import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
+import { ANCHOR_LAYER_KEY } from '$lib/components/map/map';
 
 const mapillarySource: VectorSourceSpecification = {
     type: 'vector',
@@ -43,9 +42,8 @@ const mapillaryImageLayer: LayerSpecification = {
 };
 
 export class MapillaryLayer {
-    map: maplibregl.Map;
-    layerEventManager: MapLayerEventManager;
-    marker: maplibregl.Marker;
+    map: mapboxgl.Map;
+    marker: mapboxgl.Marker;
     viewer: Viewer;
 
     active = false;
@@ -55,14 +53,8 @@ export class MapillaryLayer {
     onMouseEnterBinded = this.onMouseEnter.bind(this);
     onMouseLeaveBinded = this.onMouseLeave.bind(this);
 
-    constructor(
-        map: maplibregl.Map,
-        layerEventManager: MapLayerEventManager,
-        container: HTMLElement,
-        popupOpen: { value: boolean }
-    ) {
+    constructor(map: mapboxgl.Map, container: HTMLElement, popupOpen: { value: boolean }) {
         this.map = map;
-        this.layerEventManager = layerEventManager;
 
         this.viewer = new Viewer({
             accessToken: 'MLY|4381405525255083|3204871ec181638c3c31320490f03011',
@@ -70,12 +62,15 @@ export class MapillaryLayer {
         });
 
         const element = document.createElement('div');
-        element.className = 'maplibregl-user-location maplibregl-user-location-show-heading';
+        element.className = 'mapboxgl-user-location mapboxgl-user-location-show-heading';
         const dot = document.createElement('div');
-        dot.className = 'maplibregl-user-location-dot';
+        dot.className = 'mapboxgl-user-location-dot';
+        const heading = document.createElement('div');
+        heading.className = 'mapboxgl-user-location-heading';
         element.appendChild(dot);
+        element.appendChild(heading);
 
-        this.marker = new maplibregl.Marker({
+        this.marker = new mapboxgl.Marker({
             rotationAlignment: 'map',
             element,
         });
@@ -111,14 +106,14 @@ export class MapillaryLayer {
             this.map.addLayer(mapillaryImageLayer, ANCHOR_LAYER_KEY.mapillary);
         }
         this.map.on('style.load', this.addBinded);
-        this.layerEventManager.on('mouseenter', 'mapillary-image', this.onMouseEnterBinded);
-        this.layerEventManager.on('mouseleave', 'mapillary-image', this.onMouseLeaveBinded);
+        this.map.on('mouseenter', 'mapillary-image', this.onMouseEnterBinded);
+        this.map.on('mouseleave', 'mapillary-image', this.onMouseLeaveBinded);
     }
 
     remove() {
         this.map.off('style.load', this.addBinded);
-        this.layerEventManager.off('mouseenter', 'mapillary-image', this.onMouseEnterBinded);
-        this.layerEventManager.off('mouseleave', 'mapillary-image', this.onMouseLeaveBinded);
+        this.map.off('mouseenter', 'mapillary-image', this.onMouseEnterBinded);
+        this.map.off('mouseleave', 'mapillary-image', this.onMouseLeaveBinded);
 
         if (this.map.getLayer('mapillary-image')) {
             this.map.removeLayer('mapillary-image');
@@ -140,7 +135,7 @@ export class MapillaryLayer {
         this.popupOpen.value = false;
     }
 
-    onMouseEnter(e: maplibregl.MapLayerMouseEvent) {
+    onMouseEnter(e: mapboxgl.MapMouseEvent) {
         if (
             e.features &&
             e.features.length > 0 &&

website/src/lib/components/map/style.ts

@@ -1,231 +0,0 @@
-import { settings } from '$lib/logic/settings';
-import { get, type Writable } from 'svelte/store';
-import {
-    basemaps,
-    defaultBasemap,
-    maptilerKeyPlaceHolder,
-    overlays,
-    terrainSources,
-} from '$lib/assets/layers';
-import { getLayers } from '$lib/components/map/layer-control/utils';
-import { i18n } from '$lib/i18n.svelte';
-
-const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource } = settings;
-
-const emptySource: maplibregl.GeoJSONSourceSpecification = {
-    type: 'geojson',
-    data: {
-        type: 'FeatureCollection',
-        features: [],
-    },
-};
-export const ANCHOR_LAYER_KEY = {
-    overlays: 'overlays-end',
-    mapillary: 'mapillary-end',
-    tracks: 'tracks-end',
-    directionMarkers: 'direction-markers-end',
-    distanceMarkers: 'distance-markers-end',
-    startEndMarkers: 'start-end-markers-end',
-    interactions: 'interactions-end',
-    overpass: 'overpass-end',
-    waypoints: 'waypoints-end',
-    routingControls: 'routing-controls-end',
-};
-const anchorLayers: maplibregl.LayerSpecification[] = Object.values(ANCHOR_LAYER_KEY).map((id) => ({
-    id: id,
-    type: 'symbol',
-    source: 'empty-source',
-}));
-
-export class StyleManager {
-    private _map: Writable<maplibregl.Map | null>;
-    private _maptilerKey: string;
-    private _pastOverlays: Set<string> = new Set();
-
-    constructor(map: Writable<maplibregl.Map | null>, maptilerKey: string) {
-        this._map = map;
-        this._maptilerKey = maptilerKey;
-        this._map.subscribe((map_) => {
-            if (map_) {
-                this.updateBasemap();
-                map_.on('style.load', () => this.updateOverlays());
-                map_.on('pitch', () => this.updateTerrain());
-            }
-        });
-        currentBasemap.subscribe(() => this.updateBasemap());
-        currentOverlays.subscribe(() => this.updateOverlays());
-        opacities.subscribe(() => this.updateOverlays());
-        terrainSource.subscribe(() => this.updateTerrain());
-        customLayers.subscribe(() => this.updateBasemap());
-    }
-
-    updateBasemap() {
-        const map_ = get(this._map);
-        if (!map_) return;
-        this.buildStyle().then((style) => map_.setStyle(style));
-    }
-
-    async buildStyle(): Promise<maplibregl.StyleSpecification> {
-        const custom = get(customLayers);
-
-        const style: maplibregl.StyleSpecification = {
-            version: 8,
-            projection: {
-                type: 'globe',
-            },
-            sources: {
-                'empty-source': emptySource,
-            },
-            layers: [],
-        };
-
-        let basemap = get(currentBasemap);
-        const basemapInfo = basemaps[basemap] ?? custom[basemap]?.value ?? basemaps[defaultBasemap];
-        const basemapStyle = await this.get(basemapInfo);
-
-        this.merge(style, basemapStyle);
-
-        const terrain = this.getCurrentTerrain();
-        style.sources[terrain.source] = terrainSources[terrain.source];
-        style.terrain = terrain.exaggeration > 0 ? terrain : undefined;
-
-        style.layers.push(...anchorLayers);
-
-        return style;
-    }
-
-    async updateOverlays() {
-        const map_ = get(this._map);
-        if (!map_) return;
-        if (!map_.getSource('empty-source')) return;
-
-        const custom = get(customLayers);
-        const overlayOpacities = get(opacities);
-        try {
-            const layers = getLayers(get(currentOverlays) ?? {});
-            for (let overlay in layers) {
-                if (!layers[overlay]) {
-                    if (this._pastOverlays.has(overlay)) {
-                        const overlayInfo = custom[overlay]?.value ?? overlays[overlay];
-                        const overlayStyle = await this.get(overlayInfo);
-                        for (let layer of overlayStyle.layers ?? []) {
-                            if (map_.getLayer(layer.id)) {
-                                map_.removeLayer(layer.id);
-                            }
-                        }
-                        this._pastOverlays.delete(overlay);
-                    }
-                } else {
-                    const overlayInfo = custom[overlay]?.value ?? overlays[overlay];
-                    const overlayStyle = await this.get(overlayInfo);
-                    const opacity = overlayOpacities[overlay];
-
-                    for (let sourceId in overlayStyle.sources) {
-                        if (!map_.getSource(sourceId)) {
-                            map_.addSource(sourceId, overlayStyle.sources[sourceId]);
-                        }
-                    }
-
-                    for (let layer of overlayStyle.layers ?? []) {
-                        if (!map_.getLayer(layer.id)) {
-                            if (opacity !== undefined) {
-                                if (layer.type === 'raster') {
-                                    if (!layer.paint) {
-                                        layer.paint = {};
-                                    }
-                                    layer.paint['raster-opacity'] = opacity;
-                                } else if (layer.type === 'hillshade') {
-                                    if (!layer.paint) {
-                                        layer.paint = {};
-                                    }
-                                    layer.paint['hillshade-exaggeration'] = opacity / 2;
-                                }
-                            }
-                            map_.addLayer(layer, ANCHOR_LAYER_KEY.overlays);
-                        }
-                    }
-
-                    this._pastOverlays.add(overlay);
-                }
-            }
-        } catch (e) {}
-    }
-
-    updateTerrain() {
-        const map_ = get(this._map);
-        if (!map_) return;
-
-        const mapTerrain = map_.getTerrain();
-        const terrain = this.getCurrentTerrain();
-        if (JSON.stringify(mapTerrain) !== JSON.stringify(terrain)) {
-            if (terrain.exaggeration > 0) {
-                if (!map_.getSource(terrain.source)) {
-                    map_.addSource(terrain.source, terrainSources[terrain.source]);
-                }
-                map_.setTerrain(terrain);
-            } else {
-                map_.setTerrain(null);
-            }
-        }
-    }
-
-    async get(
-        styleInfo: maplibregl.StyleSpecification | string
-    ): Promise<maplibregl.StyleSpecification> {
-        if (typeof styleInfo === 'string') {
-            let styleUrl = styleInfo as string;
-            if (styleUrl.includes(maptilerKeyPlaceHolder)) {
-                styleUrl = styleUrl.replace(maptilerKeyPlaceHolder, this._maptilerKey);
-            }
-            const response = await fetch(styleUrl, { cache: 'force-cache' });
-            const style = await response.json();
-            return style;
-        } else {
-            return styleInfo;
-        }
-    }
-
-    merge(style: maplibregl.StyleSpecification, other: maplibregl.StyleSpecification) {
-        style.sources = { ...style.sources, ...other.sources };
-        for (let layer of other.layers ?? []) {
-            if (layer.type === 'symbol' && layer.layout && layer.layout['text-field']) {
-                const textField = layer.layout['text-field'];
-                if (
-                    Array.isArray(textField) &&
-                    textField.length >= 2 &&
-                    textField[0] === 'coalesce' &&
-                    Array.isArray(textField[1]) &&
-                    textField[1][0] === 'get' &&
-                    typeof textField[1][1] === 'string' &&
-                    textField[1][1].startsWith('name')
-                ) {
-                    layer.layout['text-field'] = [
-                        'coalesce',
-                        ['get', `name:${i18n.lang}`],
-                        ['get', 'name'],
-                    ];
-                }
-            }
-            style.layers.push(layer);
-        }
-        if (other.sprite && !style.sprite) {
-            style.sprite = other.sprite;
-        }
-        if (other.glyphs && !style.glyphs) {
-            style.glyphs = other.glyphs;
-        }
-    }
-
-    getCurrentTerrain() {
-        const terrain = get(terrainSource);
-        const source = terrainSources[terrain];
-        if (source.url && source.url.includes(maptilerKeyPlaceHolder)) {
-            source.url = source.url.replace(maptilerKeyPlaceHolder, this._maptilerKey);
-        }
-        const map_ = get(this._map);
-        return {
-            source: terrain,
-            exaggeration: !map_ || map_.getPitch() === 0 ? 0 : 1,
-        };
-    }
-}

website/src/lib/components/toolbar/ToolbarItemMenu.svelte

@@ -11,7 +11,7 @@
     import Clean from '$lib/components/toolbar/tools/Clean.svelte';
     import Reduce from '$lib/components/toolbar/tools/reduce/Reduce.svelte';
     import RoutingControlPopup from '$lib/components/toolbar/tools/routing/RoutingControlPopup.svelte';
-    import maplibregl from 'maplibre-gl';
+    import mapboxgl from 'mapbox-gl';
     import { settings } from '$lib/logic/settings';
 
     let {
@@ -23,11 +23,11 @@
     const { minimizeRoutingMenu } = settings;
 
     let popupElement: HTMLDivElement | undefined = $state(undefined);
-    let popup: maplibregl.Popup | undefined = $derived.by(() => {
+    let popup: mapboxgl.Popup | undefined = $derived.by(() => {
         if (!popupElement) {
             return undefined;
         }
-        let popup = new maplibregl.Popup({
+        let popup = new mapboxgl.Popup({
             closeButton: false,
             maxWidth: undefined,
         });

website/src/lib/components/toolbar/tools/Clean.svelte

@@ -15,12 +15,11 @@
     import { onDestroy, onMount } from 'svelte';
     import { getURLForLanguage } from '$lib/utils';
     import { Trash2 } from '@lucide/svelte';
-    import { map } from '$lib/components/map/map';
-    import type { GeoJSONSource } from 'maplibre-gl';
+    import { ANCHOR_LAYER_KEY, map } from '$lib/components/map/map';
+    import type { GeoJSONSource } from 'mapbox-gl';
     import { selection } from '$lib/logic/selection';
     import { fileActions } from '$lib/logic/file-actions';
     import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-    import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 
     let props: {
         class?: string;
@@ -29,7 +28,7 @@
     let cleanType = $state(CleanType.INSIDE);
     let deleteTrackpoints = $state(true);
     let deleteWaypoints = $state(true);
-    let rectangleCoordinates: maplibregl.LngLat[] = $state([]);
+    let rectangleCoordinates: mapboxgl.LngLat[] = $state([]);
 
     $effect(() => {
         if ($map) {

website/src/lib/components/toolbar/tools/reduce/utils.svelte.ts

@@ -1,11 +1,10 @@
 import { ListItem, ListTrackSegmentItem } from '$lib/components/file-list/file-list';
-import { map } from '$lib/components/map/map';
-import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
+import { ANCHOR_LAYER_KEY, map } from '$lib/components/map/map';
 import { fileActions } from '$lib/logic/file-actions';
 import { GPXFileStateCollectionObserver, type GPXFileState } from '$lib/logic/file-state';
 import { selection } from '$lib/logic/selection';
 import { ramerDouglasPeucker, TrackPoint, type SimplifiedTrackPoint } from 'gpx';
-import type { GeoJSONSource } from 'maplibre-gl';
+import type { GeoJSONSource } from 'mapbox-gl';
 import { get, writable } from 'svelte/store';
 
 export const minTolerance = 0.1;

website/src/lib/components/toolbar/tools/routing/Routing.svelte

@@ -21,7 +21,7 @@
         SquareArrowUpLeft,
         SquareArrowOutDownRight,
     } from '@lucide/svelte';
-    import { routingProfiles } from '$lib/components/toolbar/tools/routing/routing';
+    import { brouterProfiles } from '$lib/components/toolbar/tools/routing/routing';
     import { i18n } from '$lib/i18n.svelte';
     import { slide } from 'svelte/transition';
     import {
@@ -51,7 +51,7 @@
     }: {
         minimized?: boolean;
         minimizable?: boolean;
-        popup?: maplibregl.Popup;
+        popup?: mapboxgl.Popup;
         popupElement?: HTMLDivElement;
         class?: string;
     } = $props();
@@ -167,7 +167,7 @@
                                 {i18n._(`toolbar.routing.activities.${$routingProfile}`)}
                             </Select.Trigger>
                             <Select.Content>
-                                {#each Object.keys(routingProfiles) as profile}
+                                {#each Object.keys(brouterProfiles) as profile}
                                     <Select.Item value={profile}
                                         >{i18n._(
                                             `toolbar.routing.activities.${profile}`

website/src/lib/components/toolbar/tools/routing/routing.ts

@@ -6,7 +6,7 @@ import { get } from 'svelte/store';
 
 const { routing, routingProfile, privateRoads } = settings;
 
-export const routingProfiles: { [key: string]: string } = {
+export const brouterProfiles: { [key: string]: string } = {
     bike: 'Trekking-dry',
     racing_bike: 'fastbike',
     gravel_bike: 'gravel',
@@ -19,7 +19,7 @@ export const routingProfiles: { [key: string]: string } = {
 
 export function route(points: Coordinates[]): Promise<TrackPoint[]> {
     if (get(routing)) {
-        return getRoute(points, routingProfiles[get(routingProfile)], get(privateRoads));
+        return getRoute(points, brouterProfiles[get(routingProfile)], get(privateRoads));
     } else {
         return getIntermediatePoints(points);
     }

website/src/lib/components/toolbar/tools/routing/simplify.ts

@@ -2,21 +2,15 @@ import { ramerDouglasPeucker, type GPXFile, type TrackSegment } from 'gpx';
 
 const earthRadius = 6371008.8;
 
-export const MIN_ANCHOR_ZOOM = 0;
-export const MAX_ANCHOR_ZOOM = 22;
-
 export function getZoomLevelForDistance(latitude: number, distance?: number): number {
     if (distance === undefined) {
-        return MIN_ANCHOR_ZOOM;
+        return 0;
     }
 
     const rad = Math.PI / 180;
     const lat = latitude * rad;
 
-    return Math.min(
-        MAX_ANCHOR_ZOOM,
-        Math.max(MIN_ANCHOR_ZOOM, Math.round(Math.log2((earthRadius * Math.cos(lat)) / distance)))
-    );
+    return Math.min(22, Math.max(0, Math.log2((earthRadius * Math.cos(lat)) / distance)));
 }
 
 export function updateAnchorPoints(file: GPXFile) {

website/src/lib/components/toolbar/tools/scissors/Scissors.svelte

@@ -36,7 +36,7 @@
 
     onMount(() => {
         if ($map) {
-            splitControls = new SplitControls($map, map.layerEventManager!);
+            splitControls = new SplitControls($map);
         }
     });
 

website/src/lib/components/toolbar/tools/scissors/split-controls.ts

@@ -8,33 +8,40 @@ import { get } from 'svelte/store';
 import { fileStateCollection } from '$lib/logic/file-state';
 import { fileActions } from '$lib/logic/file-actions';
 import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-import type { GeoJSONSource } from 'maplibre-gl';
-import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
-import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
-import { loadSVGIcon } from '$lib/utils';
+import { ANCHOR_LAYER_KEY } from '$lib/components/map/map';
 
 export class SplitControls {
-    map: maplibregl.Map;
-    layerEventManager: MapLayerEventManager;
+    map: mapboxgl.Map;
     unsubscribes: Function[] = [];
 
     layerOnMouseEnterBinded: (e: any) => void = this.layerOnMouseEnter.bind(this);
     layerOnMouseLeaveBinded: () => void = this.layerOnMouseLeave.bind(this);
     layerOnClickBinded: (e: any) => void = this.layerOnClick.bind(this);
 
-    constructor(map: maplibregl.Map, layerEventManager: MapLayerEventManager) {
+    constructor(map: mapboxgl.Map) {
         this.map = map;
-        this.layerEventManager = layerEventManager;
-        loadSVGIcon(
-            this.map,
-            'split-control',
-            `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">
-                <circle cx="20" cy="20" r="20" fill="white" />
-                <g transform="translate(8 8)">
-                ${Scissors.replace('stroke="currentColor"', 'stroke="black"')}
-                </g>
-            </svg>`
-        );
+
+        if (!this.map.hasImage('split-control')) {
+            let icon = new Image(100, 100);
+            icon.onload = () => {
+                if (!this.map.hasImage('split-control')) {
+                    this.map.addImage('split-control', icon);
+                }
+            };
+
+            // Lucide icons are SVG files with a 24x24 viewBox
+            // Create a new SVG with a 32x32 viewBox and center the icon in a circle
+            icon.src =
+                'data:image/svg+xml,' +
+                encodeURIComponent(`
+                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">
+                            <circle cx="20" cy="20" r="20" fill="white" />
+                            <g transform="translate(8 8)">
+                            ${Scissors.replace('stroke="currentColor"', 'stroke="black"')}
+                            </g>
+                        </svg>
+                    `);
+        }
 
         this.unsubscribes.push(gpxStatistics.subscribe(this.addIfNeeded.bind(this)));
         this.unsubscribes.push(currentTool.subscribe(this.addIfNeeded.bind(this)));
@@ -91,7 +98,7 @@ export class SplitControls {
         }, false);
 
         try {
-            let source = this.map.getSource('split-controls') as GeoJSONSource | undefined;
+            let source = this.map.getSource('split-controls') as mapboxgl.GeoJSONSource | undefined;
             if (source) {
                 source.setData(data);
             } else {
@@ -117,17 +124,9 @@ export class SplitControls {
                     ANCHOR_LAYER_KEY.interactions
                 );
 
-                this.layerEventManager.on(
-                    'mouseenter',
-                    'split-controls',
-                    this.layerOnMouseEnterBinded
-                );
-                this.layerEventManager.on(
-                    'mouseleave',
-                    'split-controls',
-                    this.layerOnMouseLeaveBinded
-                );
-                this.layerEventManager.on('click', 'split-controls', this.layerOnClickBinded);
+                this.map.on('mouseenter', 'split-controls', this.layerOnMouseEnterBinded);
+                this.map.on('mouseleave', 'split-controls', this.layerOnMouseLeaveBinded);
+                this.map.on('click', 'split-controls', this.layerOnClickBinded);
             }
         } catch (e) {
             // No reliable way to check if the map is ready to add sources and layers
@@ -135,9 +134,9 @@ export class SplitControls {
     }
 
     remove() {
-        this.layerEventManager.off('mouseenter', 'split-controls', this.layerOnMouseEnterBinded);
-        this.layerEventManager.off('mouseleave', 'split-controls', this.layerOnMouseLeaveBinded);
-        this.layerEventManager.off('click', 'split-controls', this.layerOnClickBinded);
+        this.map.off('mouseenter', 'split-controls', this.layerOnMouseEnterBinded);
+        this.map.off('mouseleave', 'split-controls', this.layerOnMouseLeaveBinded);
+        this.map.off('click', 'split-controls', this.layerOnClickBinded);
 
         try {
             if (this.map.getLayer('split-controls')) {
@@ -160,7 +159,7 @@ export class SplitControls {
         mapCursor.notify(MapCursorState.SPLIT_CONTROL, false);
     }
 
-    layerOnClick(e: maplibregl.MapLayerMouseEvent) {
+    layerOnClick(e: mapboxgl.MapMouseEvent) {
         let coordinates = (e.features![0].geometry as GeoJSON.Point).coordinates;
         fileActions.split(
             get(splitAs),

website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte

@@ -16,7 +16,7 @@
     import { fileActions } from '$lib/logic/file-actions';
     import { map } from '$lib/components/map/map';
     import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-    import maplibregl from 'maplibre-gl';
+    import mapboxgl from 'mapbox-gl';
     import { getSvgForSymbol } from '$lib/components/map/gpx-layer/gpx-layer';
 
     let props: {
@@ -41,7 +41,7 @@
         })
     );
 
-    let marker: maplibregl.Marker | null = null;
+    let marker: mapboxgl.Marker | null = null;
 
     function reset() {
         if ($selectedWaypoint) {
@@ -125,7 +125,7 @@
                     let element = document.createElement('div');
                     element.classList.add('w-8', 'h-8');
                     element.innerHTML = getSvgForSymbol(symbolKey);
-                    marker = new maplibregl.Marker({
+                    marker = new mapboxgl.Marker({
                         element,
                         anchor: 'bottom',
                     })

website/src/lib/docs/ca/menu/file.mdx

@@ -29,13 +29,13 @@ Pots arrossegar y deixar arxius directament des del seu sistema d'arxius cap a l
 
 Crear una còpia dels arxius seleccionats.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Esborra
 
-Delete the currently selected files.
+Esborra l'arxiu seleccinat.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete all
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Esborra-ho tot
 
-Delete all files.
+Esborra tots els fitxers.
 
 ### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Exportar...
 

website/src/lib/docs/de/home/mapbox.mdx

@@ -1,5 +1,5 @@
-Mapbox ist das Unternehmen, das einige der schönen Karten auf dieser Website zur Verfügung stellt.
-Sie entwickeln auch die <a href="https://github.com/mapbox/mapbox-gl-js" target="_blank">Karten-Engine</a> welche **gpx.studio** unterstützt.
+Mapbox stellt einige der auf dieser Website verwendeten Karten bereit.
+Sie entwickeln auch die <a href="https://github.com/mapbox/mapbox-gl-js" target="_blank">Karten-Engine</a>, die **gpx.studio** unterstützt.
 
-Wir sind äußerst glücklich und dankbar, Teil ihres <a href="https://mapbox.com/community" target="_blank">Community</a> Programms zu sein, das gemeinnützige Organisationen, Bildungseinrichtungen und Organisationen mit positivem Einfluss unterstützt.
+Wir sind froh und dankbar, Teil ihres <a href="https://mapbox.com/community" target="_blank">Community</a> Programms zu sein, das gemeinnützige Organisationen, Bildungseinrichtungen und Organisationen unterstützt.
 Diese Partnerschaft ermöglicht es **gpx.studio**, von den Mapbox-Tools zu ermäßigten Preisen zu profitieren, was erheblich zur finanziellen Tragfähigkeit des Projekts beiträgt und es uns ermöglicht, die bestmögliche Benutzererfahrung zu bieten.

website/src/lib/docs/en/files-and-stats.mdx

@@ -12,7 +12,6 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
-    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -85,7 +84,6 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
-        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />

website/src/lib/docs/en/home/funding.mdx

@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.

website/src/lib/docs/en/home/mapbox.mdx

@@ -0,0 +1,5 @@
+Mapbox is the company that provides some of the beautiful maps on this website.
+They also develop the <a href="https://github.com/mapbox/mapbox-gl-js" target="_blank">map engine</a> which powers **gpx.studio**.
+
+We are incredibly fortunate and grateful to be part of their <a href="https://mapbox.com/community" target="_blank">Community</a> program, which supports nonprofits, educational institutions, and positive impact organizations.
+This partnership allows **gpx.studio** to benefit from Mapbox tools at discounted prices, greatly contributing to the financial viability of the project and enabling us to offer the best possible user experience.

website/src/lib/docs/en/integration.mdx

@@ -12,7 +12,7 @@ title: Integration
 You can use **gpx.studio** to create maps showing your GPX files and embed them in your website.
 
 All you need is:
-1. A <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load the map, and
+1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
 1. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.

website/src/lib/docs/en/map-controls.mdx

@@ -58,7 +58,7 @@ Only one basemap can be displayed at a time.
 <div class="flex flex-col items-center">
     <DocsLayers />
     <span class="text-sm text-center mt-2">
-        Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+        Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
     </span>
 </div>
 
@@ -67,4 +67,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.

website/src/lib/docs/en/toolbar/elevation.mdx

@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapbox.com" target="_blank">Mapbox</a>.
+You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
 
 </DocsNote>

website/src/lib/docs/fr/menu/file.mdx

@@ -35,7 +35,7 @@ Supprimer les fichiers sélectionnés.
 
 ### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Supprimer tout
 
-Supprimer toutes les fichiers.
+Supprimer tous les fichiers.
 
 ### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Exporter...
 

website/src/lib/docs/pl/faq.mdx

@@ -8,11 +8,11 @@ title: FAQ
 
 # { title }
 
-### Do I need to donate to use the website?
+### Czy muszę przekazać darowiznę za korzystanie ze strony internetowej?
 
 Nie.
-The website is free to use and always will be (as long as it is financially sustainable).
-However, donations are appreciated and help keep the website running.
+Strona internetowa jest darmowa i zawsze będzie (o ile będzie się zgadzał rachunek).
+Darowizny są jednak doceniane i pomagają utrzymać funkcjonowanie strony.
 
 ### Why is this route chosen over that one? _Or_ how can I add something to the map?
 

website/src/lib/docs/pl/getting-started.mdx

@@ -8,12 +8,12 @@ title: Wprowadzenie
 
 # { title }
 
-Welcome to the official guide for **gpx.studio**!
-This guide will walk you through all the components and tools of the interface, helping you become a proficient user of the application.
+Witamy w oficjalnym przewodniku dla **gpx.studio**!
+Ten przewodnik przeprowadzi Cię przez wszystkie komponenty i narzędzia interfejsu, co pomoże stać się wydajnym użytkownikiem aplikacji.
 
 <DocsImage src="getting-started/interface" alt="The gpx.studio interface." />
 
-As shown in the screenshot above, the interface is divided into four main sections organized around the map. 
+Jak pokazano na zrzucie ekranu powyżej, interfejs jest podzielony na cztery główne sekcje zorganizowane wokół mapy. 
 Before we dive into the details of each section, let's have a quick overview of the interface.
 
 ## Menu główne
@@ -31,7 +31,7 @@ In the [dedicated section](./files-and-stats), we will explain how to select mul
 
 On the left side of the interface, you will find the [toolbar](./toolbar), which contains all the tools you can use to edit your files.
 
-## Map controls
+## Sterowanie mapą
 
-Finally, on the right side of the interface, you will find the [map controls](./map-controls).
-These controls allow you to navigate the map, zoom in and out, and switch between different map styles.
+Na koniec, po prawej stronie interfejsu znajdziesz [sterowanie mapą] (./map-controls).
+Za pomocą tych elementów sterujących można poruszać się po mapie, powiększać i pomniejszać widok oraz przełączać się między różnymi stylami mapy.

website/src/lib/docs/pl/home/funding.mdx

@@ -2,7 +2,7 @@
     import { HeartHandshake } from '@lucide/svelte';
 </script>
 
-## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
+## <HeartHandshake size="18" class="inline-block align-baseline" /> Pomóż nam utrzymać tę stronę jako bezpłatną (i wolną od reklam)
 
 Za każdym razem, gdy dodasz lub przenosisz punkty GPS, nasze serwery obliczają najlepszą trasę w sieci drogowej.
 Używamy również API z <a href="https://mapbox.com" target="_blank">Mapbox</a> do wyświetlania pięknych map, pobierania danych wysokości i wyszukiwania miejsc.

website/src/lib/docs/pl/home/translation.mdx

@@ -2,11 +2,11 @@
     import { Languages } from '@lucide/svelte';
 </script>
 
-## <Languages size="18" class="inline-block align-baseline" /> Translation
+## <Languages size="18" class="inline-block align-baseline" /> Tłumaczenie
 
 Strona internetowa jest tłumaczona przez wolontariuszy na platformie do współpracy w tłumaczeniu.
-Możesz pomóc dodając i sprawdzając istniejące tłumaczenie w <a href="https://crowdin.com/project/gpxstudio" target="_blank">projekcie Crowdin</a>.
+Możesz przyczynić się do rozwoju naszego projektu, dodając lub ulepszając tłumaczenia w ramach <a href="https://crowdin.com/project/gpxstudio" target="_blank">projektu Crowdin</a>.
 
-Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się</a>.
+Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się z nami</a>.
 
 Każda pomoc jest bardzo mile widziana!

website/src/lib/docs/pl/map-controls.mdx

@@ -1,5 +1,5 @@
 ---
-title: Map controls
+title: Sterowanie mapą
 ---
 
 <script>
@@ -10,10 +10,10 @@ title: Map controls
 
 # { title }
 
-The map controls are located on the right side of the interface.
-These controls allow you to navigate the map, zoom in and out, and switch between different map styles.
+Elementy sterujące mapą znajdują się po prawej stronie interfejsu.
+Za pomocą tych elementów sterujących można poruszać się po mapie, powiększać i pomniejszać widok oraz przełączać się między różnymi stylami mapy.
 
-### <Diff size="16" class="inline-block" style="margin-bottom: 2px" /> Map navigation
+### <Diff size="16" class="inline-block" style="margin-bottom: 2px" /> Nawigacja mapą
 
 The controls at the top allow you to zoom in <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> and out <Minus size="16" class="inline-block" style="margin-bottom: 2px" />, and to change the orientation and tilt of the map <Compass size="16" class="inline-block" style="margin-bottom: 2px" />.
 
@@ -39,7 +39,7 @@ This only works if you have allowed your browser and <b>gpx.studio</b> to access
 
 ### <PersonStanding size="16" class="inline-block" style="margin-bottom: 2px" /> Street view
 
-This button can be used to enable street view mode on the map.
+Ten przycisk może być użyty do włączenia trybu street view na mapie.
 Depending on the street view source chosen in the [settings](./menu/settings), street view imagery can be accessed differently.
 
 - <a href="https://www.mapillary.com/" target="_blank">Mapillary</a>: the street view coverage will appear as green lines on the map. When zoomed in enough, green dots will show the exact locations where street view imagery is available. Hovering over a green dot will show the street view image at that location.

website/src/lib/docs/pl/menu/file.mdx

@@ -9,44 +9,44 @@ title: Akcje menu Plik
 
 # { title }
 
-The file actions menu contains a set of pretty self-explanatory file operations.
+Menu operacji na plikach zawiera zestaw funkcji, których przeznaczenie jest dość oczywiste.
 
-### <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> New
+### <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> Nowy
 
 Tworzy nowy pusty plik.
 
-### <FolderOpen size="16" class="inline-block" style="margin-bottom: 2px" /> Open...
+### <FolderOpen size="16" class="inline-block" style="margin-bottom: 2px" /> Otwórz...
 
-Open files from your computer. 
+Otwórz pliki z komputera. 
 
 <DocsNote>
 
-You can also drag and drop files directly from your file system into the window.
+Można również przeciągać i upuszczać pliki bezpośrednio z systemu plików do okna.
 
 </DocsNote>
 
-### <Copy size="16" class="inline-block" style="margin-bottom: 2px" /> Duplicate
+### <Copy size="16" class="inline-block" style="margin-bottom: 2px" /> Duplikuj
 
-Create a copy of the currently selected files.
+Utwórz kopię aktualnie zaznaczonych plików.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Usuń
 
-Delete the currently selected files.
+Usuń aktualnie zaznaczone pliki.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete all
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Usuń wszystko
 
-Delete all files.
+Usuń wszystkie pliki.
 
-### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Export...
+### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Eksport...
 
-Open the export dialog to save the currently selected files to your computer.
+Otwórz okno dialogowe eksportu, aby zapisać aktualnie wybrane pliki na komputerze.
 
-### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Export all...
+### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Eksportuj wszystko...
 
-Open the export dialog to save all files to your computer.
+Otwórz okno dialogowe eksportu, aby zapisać wszystkie pliki na komputerze.
 
 <DocsNote type="warning">
 
-If your download does not start after clicking the download button, please check your browser settings to allow downloads from <b>gpx.studio</b>.
+Jeśli po kliknięciu przycisku pobierania plik nie zacznie się pobierać, sprawdź ustawienia przeglądarki i upewnij się, że zezwalają one na pobieranie plików z witryny <b>gpx.studio</b>.
 
 </DocsNote>

website/src/lib/docs/pl/menu/settings.mdx

@@ -11,11 +11,11 @@ title: Settings
 
 ### <Ruler size="16" class="inline-block" style="margin-bottom: 2px" /> Distance units
 
-Change the units used to display distances in the interface.
+Zmień jednostki stosowane do wyświetlania odległości w interfejsie.
 
 ### <Zap size="16" class="inline-block" style="margin-bottom: 2px" /> Velocity units
 
-Change the units used to display velocities in the interface.
+Zmień jednostki używane do wyświetlania prędkości w interfejsie.
 You can choose between distance per hour or minutes per distance, which can be more suitable for running activities.
 
 ### <Thermometer size="16" class="inline-block" style="margin-bottom: 2px" /> Temperature units
@@ -28,8 +28,8 @@ Change the language used in the interface.
 
 <DocsNote>
 
-Możesz pomóc dodając i sprawdzając istniejące tłumaczenie w <a href="https://crowdin.com/project/gpxstudio" target="_blank">projekcie Crowdin</a>.
-Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się</a>.
+Możesz przyczynić się do rozwoju naszego projektu, dodając lub ulepszając tłumaczenia w ramach <a href="https://crowdin.com/project/gpxstudio" target="_blank">projektu Crowdin</a>.
+Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się z nami</a>.
 Każda pomoc jest bardzo mile widziana!
 
 </DocsNote>

website/src/lib/docs/pl/menu/view.mdx

@@ -9,21 +9,21 @@ title: Akcje menu Widok
 
 # { title }
 
-This menu provides options to rearrange the interface and the map view.
+To menu zawiera opcje zmiany kolejności interfejsu i widoku mapy.
 
-### <ChartArea size="16" class="inline-block" style="margin-bottom: 2px" /> Elevation profile
+### <ChartArea size="16" class="inline-block" style="margin-bottom: 2px" /> Profil wysokościowy
 
-Hide the elevation profile to make room for the map, or show it to inspect the current selection.
+Ukryj profil ukształtowania terenu, aby zrobić miejsce na mapie lub pokaż go, aby sprawdzić bieżący wybór.
 
-### <ListTree size="16" class="inline-block" style="margin-bottom: 2px" /> File tree
+### <ListTree size="16" class="inline-block" style="margin-bottom: 2px" /> Drzewo plików
 
-Toggle the tree layout for the [file list](../files-and-stats).
+Przełącz układ drzewa na [listy plików](../files-and-stats).
 This layout is ideal for managing a large number of open files, as it organizes them into a vertical list on the right side of the map.
-In addition, the file tree view enables you to inspect the [tracks, segments, and points of interest](../gpx) contained inside the files through collapsible sections.
+Dodatkowo, widok drzewa plików umożliwia sprawdzenie [tras, segmentów, oraz punktów zainteresowania](../gpx) zawarte w plikach poprzez zwijalne sekcje.
 
-### <Map size="16" class="inline-block" style="margin-bottom: 2px" /> Switch to previous basemap
+### <Map size="16" class="inline-block" style="margin-bottom: 2px" /> Przełącz na poprzednią mapę
 
-Change the basemap to the one previously selected through the [map layer control](../map-controls).
+Zmień mapę na mapę wybraną poprzednio przez [sterowanie warstwą map](../map-controls).
 
 ### <Layers2 size="16" class="inline-block" style="margin-bottom: 2px" /> Toggle overlays
 

website/src/lib/docs/pl/toolbar/routing.mdx

@@ -1,5 +1,5 @@
 ---
-title: Route planning and editing
+title: Planowanie i edycja trasy
 ---
 
 <script>
@@ -11,11 +11,11 @@ title: Route planning and editing
 
 # <Pencil size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
 
-The route planning and editing tool allows you to create and edit routes by placing or moving anchor points on the map.
+Narzędzie do planowania i edycji trasy pozwala na tworzenie i edytowanie tras poprzez umieszczanie lub przesuwanie punktów kotwiczenia na mapie.
 
 ## Settings
 
-As shown below, the tool dialog contains a few settings to control the routing behavior.
+Jak pokazano poniżej, okno dialogowe narzędzia zawiera kilka ustawień do kontrolowania zachowania rutingu.
 You can minimize the dialog to save space by clicking on <button><SquareArrowUpLeft size="16" class="inline-block" style="margin-bottom: 2px" /></button>.
 
 <div class="flex flex-row justify-center">

website/src/lib/docs/pl/toolbar/scissors.mdx

@@ -24,7 +24,7 @@ Validate the selection when you are satisfied with the result.
 ## Podziel
 
 To split the selected trace into two parts, click on one of the split markers displayed along the trace.
-To split at a specific point of your choice, hover over the trace on the map.
+Aby podzielić w wybranym przez Ciebie punkcie, zaznacz punkt na śladzie trasy.
 Scissors will appear at the cursor position, showing that you can split the trace at that point.
 
 You can choose to split the trace into two GPX files, or to keep the split parts in the same file as [tracks or segments](../gpx).

website/src/lib/docs/pl/toolbar/time.mdx

@@ -10,18 +10,18 @@ title: Czas
 
 # <CalendarClock size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
 
-This tool allows you to change or add timestamps to a trace.
-You simply need to use the form shown below and validate it when you are done.
+To narzędzie pozwala na zmianę lub dodanie znaczników czasu do śladu.
+Musisz po prostu użyć poniższego formularza i potwierdzić go po zakończeniu.
 
 <div class="flex flex-row justify-center">
     <Time class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
 
-When you edit the speed, the moving time is adapted accordingly in the form, and vice versa.
-Similarly, when you edit the start time, the end time is updated to keep the same total duration, and vice versa.
+Podczas edycji prędkości, czas poruszania się jest odpowiednio dostosowywany w formularzu i odwrotnie.
+Podobnie, kiedy edytujesz czas rozpoczęcia, czas zakończenia jest aktualizowany, aby zachować ten sam czas trwania i odwrotnie.
 
 <DocsNote>
 
-When using this tool with existing timestamps, changing the time or speed will simply shift, stretch, or compress them accordingly.
+Gdy używasz to narzędzie z istniejącymi znacznikami czasu, zmiana czasu lub prędkości po prostu się zmieni, rozciągnij lub kompresuj je.
 
 </DocsNote>

website/src/lib/docs/pt-BR/files-and-stats.mdx

@@ -50,7 +50,7 @@ Clicando com o botão direito em uma aba arquivo, você pode acessar as mesmas a
 
 As mentioned in the [view options section](./menu/view), you can switch to a tree layout for the files list.
 This layout is ideal for managing a large number of open files, as it organizes them into a vertical list on the right side of the map.
-In addition, the file tree view enables you to inspect the [tracks, segments, and points of interest](./gpx) contained inside the files through collapsible sections.
+Além disso, a exibição de árvore de arquivos permite que você inspecione as [faixas, segmentos, e pontos de interesse](./gpx) contidos dentro dos arquivos através de seções recolhidas.
 
 Você também pode aplicar as [ações de edição](./menu/edit) e [ferramentas](./toolbar) para itens de arquivos internos.
 Além disso, você pode arrastar e soltar os itens internos para reordená-los, ou movê-los na hierarquia ou até mesmo para outro arquivo.
@@ -105,6 +105,6 @@ Using the <kbd><ChartNoAxesColumn size="16" class="inline-block" style="margin-b
 
 - **slope** information computed from the elevation data, or
 - **surface** or **category** data coming from <a href="https://www.openstreetmap.org/" target="_blank">OpenStreetMap</a>'s <a href="https://wiki.openstreetmap.org/wiki/Key:surface" target="_blank">surface</a> and <a href="https://wiki.openstreetmap.org/wiki/Key:highway" target="_blank">highway</a> tags.
-  This is only available for files created with **gpx.studio**.
+  Isso só está disponível para arquivos criados com **gpx.studio**.
 
 If your selection includes it, you can also visualize: **speed**, **heart rate**, **cadence**, **temperature** and **power** data on the elevation profile.

website/src/lib/docs/pt-BR/menu/file.mdx

@@ -35,7 +35,7 @@ Delete the currently selected files.
 
 ### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete all
 
-Delete all files.
+Apagar todos os arquivos.
 
 ### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Exportar...
 

website/src/lib/docs/uk/home/funding.mdx

@@ -2,7 +2,8 @@
     import { HeartHandshake } from '@lucide/svelte';
 </script>
 
-## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
+## <HeartHandshake size="18" class="inline-block align-baseline" /> 
+Допоможіть нам залишати цей сайт безкоштовним (та без реклами)
 
 Кожного разу, коли ви додаєте або переміщуєте GPS точки, наші сервери обчислюють найкращий маршрут на мережі доріг.
 Ми також використовуємо API від <a href="https://mapbox.com" target="_blank">Mapbox</a> для зображення красивих карт, отримання даних висот та можливості пошуку місць.

website/src/lib/docs/uk/home/translation.mdx

@@ -2,7 +2,7 @@
     import { Languages } from '@lucide/svelte';
 </script>
 
-## <Languages size="18" class="inline-block align-baseline" /> Translation
+## <Languages size="18" class="inline-block align-baseline" /> Переклад
 
 Сайт перекладається волонтерами з використанням платформи для спільного перекладу.
 Ви можете зробити свій внесок, додаючи або покращуючи переклади в нашому <a href="https://crowdin.com/project/gpxstudio" target="_blank">проєкті Crowdin</a>.

website/src/lib/docs/uk/menu/file.mdx

@@ -47,6 +47,6 @@ Open the export dialog to save all files to your computer.
 
 <DocsNote type="warning">
 
-If your download does not start after clicking the download button, please check your browser settings to allow downloads from <b>gpx.studio</b>.
+Якщо завантаження не починається після натискання кнопки завантаження, будь ласка, перевірте налаштування браузера, щоб дозволити завантаження з <b>gpx.studio</b>.
 
 </DocsNote>

website/src/lib/logic/bounds.ts

@@ -1,6 +1,6 @@
 import { get } from 'svelte/store';
 import { selection } from '$lib/logic/selection';
-import maplibregl from 'maplibre-gl';
+import mapboxgl from 'mapbox-gl';
 import { ListFileItem, ListWaypointItem } from '$lib/components/file-list/file-list';
 import { fileStateCollection, GPXFileStateCollectionObserver } from '$lib/logic/file-state';
 import { gpxStatistics } from '$lib/logic/statistics';
@@ -10,7 +10,7 @@ import type { Coordinates } from 'gpx';
 import { page } from '$app/state';
 
 export class BoundsManager {
-    private _bounds: maplibregl.LngLatBounds = new maplibregl.LngLatBounds();
+    private _bounds: mapboxgl.LngLatBounds = new mapboxgl.LngLatBounds();
     private _files: Set<string> = new Set();
     private _fileStateCollectionObserver: GPXFileStateCollectionObserver | null = null;
     private _unsubscribes: (() => void)[] = [];
@@ -87,12 +87,12 @@ export class BoundsManager {
         }
         this._unsubscribes.forEach((unsubscribe) => unsubscribe());
         this._unsubscribes = [];
-        this._bounds = new maplibregl.LngLatBounds([180, 90, -180, -90]);
+        this._bounds = new mapboxgl.LngLatBounds([180, 90, -180, -90]);
     }
 
     centerMapOnSelection() {
         let selected = get(selection).getSelected();
-        let bounds = new maplibregl.LngLatBounds();
+        let bounds = new mapboxgl.LngLatBounds();
 
         if (selected.find((item) => item instanceof ListWaypointItem)) {
             selection.applyToOrderedSelectedItemsFromFile((fileId, level, items) => {

website/src/lib/logic/map-cursor.ts

@@ -7,8 +7,7 @@ export enum MapCursorState {
     TOOL_WITH_CROSSHAIR,
     WAYPOINT_HOVER,
     WAYPOINT_DRAGGING,
-    ANCHOR_HOVER,
-    ANCHOR_DRAGGING,
+    TRACKPOINT_DRAGGING,
     SCISSORS,
     SPLIT_CONTROL,
     MAPILLARY_HOVER,
@@ -21,8 +20,7 @@ const cursorStyles = {
     [MapCursorState.LAYER_HOVER]: 'pointer',
     [MapCursorState.WAYPOINT_HOVER]: 'pointer',
     [MapCursorState.WAYPOINT_DRAGGING]: 'grabbing',
-    [MapCursorState.ANCHOR_HOVER]: 'pointer',
-    [MapCursorState.ANCHOR_DRAGGING]: 'grabbing',
+    [MapCursorState.TRACKPOINT_DRAGGING]: 'grabbing',
     [MapCursorState.TOOL_WITH_CROSSHAIR]: 'crosshair',
     [MapCursorState.SCISSORS]: scissorsCursor,
     [MapCursorState.SPLIT_CONTROL]: 'pointer',

website/src/lib/logic/settings.ts

@@ -1,7 +1,6 @@
 import { type Database } from '$lib/db';
 import { liveQuery } from 'dexie';
 import {
-    basemaps,
     defaultBasemap,
     defaultBasemapTree,
     defaultOpacities,
@@ -10,10 +9,7 @@ import {
     defaultOverpassQueries,
     defaultOverpassTree,
     defaultTerrainSource,
-    overlays,
-    overpassQueryData,
     type CustomLayer,
-    type LayerTreeType,
 } from '$lib/assets/layers';
 import { browser } from '$app/environment';
 import { get, writable, type Writable } from 'svelte/store';
@@ -23,12 +19,10 @@ export class Setting<V> {
     private _subscription: { unsubscribe: () => void } | null = null;
     private _key: string;
     private _value: Writable<V>;
-    private _validator?: (value: V) => V;
 
-    constructor(key: string, initial: V, validator?: (value: V) => V) {
+    constructor(key: string, initial: V) {
         this._key = key;
         this._value = writable(initial);
-        this._validator = validator;
     }
 
     connectToDatabase(db: Database) {
@@ -42,9 +36,6 @@ export class Setting<V> {
                     this._value.set(value);
                 }
             } else {
-                if (this._validator) {
-                    value = this._validator(value);
-                }
                 this._value.set(value);
             }
             first = false;
@@ -82,13 +73,11 @@ export class SettingInitOnFirstRead<V> {
     private _key: string;
     private _value: Writable<V | undefined>;
     private _initial: V;
-    private _validator?: (value: V) => V;
 
-    constructor(key: string, initial: V, validator?: (value: V) => V) {
+    constructor(key: string, initial: V) {
         this._key = key;
         this._value = writable(undefined);
         this._initial = initial;
-        this._validator = validator;
     }
 
     connectToDatabase(db: Database) {
@@ -104,9 +93,6 @@ export class SettingInitOnFirstRead<V> {
                     this._value.set(value);
                 }
             } else {
-                if (this._validator) {
-                    value = this._validator(value);
-                }
                 this._value.set(value);
             }
             first = false;
@@ -142,166 +128,37 @@ export class SettingInitOnFirstRead<V> {
     }
 }
 
-function getValueValidator<V>(allowed: V[], fallback: V) {
-    const dict = new Set<V>(allowed);
-    return (value: V) => (dict.has(value) ? value : fallback);
-}
-
-function getArrayValidator<V>(allowed: V[]) {
-    const dict = new Set<V>(allowed);
-    return (value: V[]) => value.filter((v) => dict.has(v));
-}
-
-function getLayerValidator(allowed: Record<string, any>, fallback: string) {
-    return (layer: string) =>
-        allowed.hasOwnProperty(layer) ||
-        layer.startsWith('custom-') ||
-        layer.startsWith('extension-')
-            ? layer
-            : fallback;
-}
-
-function filterLayerTree(t: LayerTreeType, allowed: Record<string, any>): LayerTreeType {
-    const filtered: LayerTreeType = {};
-    Object.entries(t).forEach(([key, value]) => {
-        if (typeof value === 'object') {
-            filtered[key] = filterLayerTree(value, allowed);
-        } else if (
-            allowed.hasOwnProperty(key) ||
-            key.startsWith('custom-') ||
-            key.startsWith('extension-')
-        ) {
-            filtered[key] = value;
-        }
-    });
-    return filtered;
-}
-
-function getLayerTreeValidator(allowed: Record<string, any>) {
-    return (value: LayerTreeType) => filterLayerTree(value, allowed);
-}
-
-type DistanceUnits = 'metric' | 'imperial' | 'nautical';
-type VelocityUnits = 'speed' | 'pace';
-type TemperatureUnits = 'celsius' | 'fahrenheit';
-type AdditionalDataset = 'speed' | 'hr' | 'cad' | 'atemp' | 'power';
-type ElevationFill = 'slope' | 'surface' | undefined;
-type RoutingProfile =
-    | 'bike'
-    | 'racing_bike'
-    | 'gravel_bike'
-    | 'mountain_bike'
-    | 'foot'
-    | 'motorcycle'
-    | 'water'
-    | 'railway';
-type TerrainSource = 'maptiler-dem' | 'mapterhorn';
-type StreetViewSource = 'mapillary' | 'google';
-
 export const settings = {
-    distanceUnits: new Setting<DistanceUnits>(
-        'distanceUnits',
-        'metric',
-        getValueValidator<DistanceUnits>(['metric', 'imperial', 'nautical'], 'metric')
-    ),
-    velocityUnits: new Setting<VelocityUnits>(
-        'velocityUnits',
-        'speed',
-        getValueValidator<VelocityUnits>(['speed', 'pace'], 'speed')
-    ),
-    temperatureUnits: new Setting<TemperatureUnits>(
-        'temperatureUnits',
-        'celsius',
-        getValueValidator<TemperatureUnits>(['celsius', 'fahrenheit'], 'celsius')
-    ),
+    distanceUnits: new Setting<'metric' | 'imperial' | 'nautical'>('distanceUnits', 'metric'),
+    velocityUnits: new Setting<'speed' | 'pace'>('velocityUnits', 'speed'),
+    temperatureUnits: new Setting<'celsius' | 'fahrenheit'>('temperatureUnits', 'celsius'),
     elevationProfile: new Setting<boolean>('elevationProfile', true),
-    additionalDatasets: new Setting<AdditionalDataset[]>(
-        'additionalDatasets',
-        [],
-        getArrayValidator<AdditionalDataset>(['speed', 'hr', 'cad', 'atemp', 'power'])
-    ),
-    elevationFill: new Setting<ElevationFill>(
-        'elevationFill',
-        undefined,
-        getValueValidator(['slope', 'surface', undefined], undefined)
-    ),
+    additionalDatasets: new Setting<string[]>('additionalDatasets', []),
+    elevationFill: new Setting<'slope' | 'surface' | undefined>('elevationFill', undefined),
     treeFileView: new Setting<boolean>('fileView', false),
     minimizeRoutingMenu: new Setting('minimizeRoutingMenu', false),
     routing: new Setting('routing', true),
-    routingProfile: new Setting<RoutingProfile>(
-        'routingProfile',
-        'bike',
-        getValueValidator<RoutingProfile>(
-            [
-                'bike',
-                'racing_bike',
-                'gravel_bike',
-                'mountain_bike',
-                'foot',
-                'motorcycle',
-                'water',
-                'railway',
-            ],
-            'bike'
-        )
-    ),
+    routingProfile: new Setting('routingProfile', 'bike'),
     privateRoads: new Setting('privateRoads', false),
-    currentBasemap: new Setting(
-        'currentBasemap',
-        defaultBasemap,
-        getLayerValidator(basemaps, defaultBasemap)
-    ),
-    previousBasemap: new Setting(
-        'previousBasemap',
-        defaultBasemap,
-        getLayerValidator(Object.keys(basemaps), defaultBasemap)
-    ),
-    selectedBasemapTree: new Setting(
-        'selectedBasemapTree',
-        defaultBasemapTree,
-        getLayerTreeValidator(basemaps)
-    ),
-    currentOverlays: new SettingInitOnFirstRead(
-        'currentOverlays',
-        defaultOverlays,
-        getLayerTreeValidator(overlays)
-    ),
-    previousOverlays: new Setting(
-        'previousOverlays',
-        defaultOverlays,
-        getLayerTreeValidator(overlays)
-    ),
-    selectedOverlayTree: new Setting(
-        'selectedOverlayTree',
-        defaultOverlayTree,
-        getLayerTreeValidator(overlays)
-    ),
+    currentBasemap: new Setting('currentBasemap', defaultBasemap),
+    previousBasemap: new Setting('previousBasemap', defaultBasemap),
+    selectedBasemapTree: new Setting('selectedBasemapTree', defaultBasemapTree),
+    currentOverlays: new SettingInitOnFirstRead('currentOverlays', defaultOverlays),
+    previousOverlays: new Setting('previousOverlays', defaultOverlays),
+    selectedOverlayTree: new Setting('selectedOverlayTree', defaultOverlayTree),
     currentOverpassQueries: new SettingInitOnFirstRead(
         'currentOverpassQueries',
-        defaultOverpassQueries,
-        getLayerTreeValidator(overpassQueryData)
-    ),
-    selectedOverpassTree: new Setting(
-        'selectedOverpassTree',
-        defaultOverpassTree,
-        getLayerTreeValidator(overpassQueryData)
+        defaultOverpassQueries
     ),
+    selectedOverpassTree: new Setting('selectedOverpassTree', defaultOverpassTree),
     opacities: new Setting('opacities', defaultOpacities),
     customLayers: new Setting<Record<string, CustomLayer>>('customLayers', {}),
     customBasemapOrder: new Setting<string[]>('customBasemapOrder', []),
     customOverlayOrder: new Setting<string[]>('customOverlayOrder', []),
-    terrainSource: new Setting<TerrainSource>(
-        'terrainSource',
-        defaultTerrainSource,
-        getValueValidator(['maptiler-dem', 'mapterhorn'], defaultTerrainSource)
-    ),
+    terrainSource: new Setting('terrainSource', defaultTerrainSource),
     directionMarkers: new Setting('directionMarkers', false),
     distanceMarkers: new Setting('distanceMarkers', false),
-    streetViewSource: new Setting<StreetViewSource>(
-        'streetViewSource',
-        'mapillary',
-        getValueValidator<StreetViewSource>(['mapillary', 'google'], 'mapillary')
-    ),
+    streetViewSource: new Setting('streetViewSource', 'mapillary'),
     fileOrder: new Setting<string[]>('fileOrder', []),
     defaultOpacity: new Setting('defaultOpacity', 0.7),
     defaultWidth: new Setting('defaultWidth', browser && window.innerWidth < 600 ? 8 : 5),

website/src/lib/logic/statistics-tree.ts

@@ -1,24 +1,18 @@
 import { ListItem, ListLevel } from '$lib/components/file-list/file-list';
 import { GPXFile, GPXStatistics, GPXStatisticsGroup, type Track } from 'gpx';
-import maplibregl from 'maplibre-gl';
 
 export class GPXStatisticsTree {
     level: ListLevel;
     statistics: {
         [key: string]: GPXStatisticsTree | GPXStatistics;
     } = {};
-    wptBounds: maplibregl.LngLatBounds;
 
     constructor(element: GPXFile | Track) {
-        this.wptBounds = new maplibregl.LngLatBounds();
         if (element instanceof GPXFile) {
             this.level = ListLevel.FILE;
             element.children.forEach((child, index) => {
                 this.statistics[index] = new GPXStatisticsTree(child);
             });
-            element.wpt.forEach((wpt) => {
-                this.wptBounds.extend(wpt.getCoordinates());
-            });
         } else {
             this.level = ListLevel.TRACK;
             element.children.forEach((child, index) => {
@@ -48,27 +42,5 @@ export class GPXStatisticsTree {
         }
         return statistics;
     }
-
-    intersectsBBox(bounds: maplibregl.LngLatBounds): boolean {
-        for (let key in this.statistics) {
-            const stats = this.statistics[key];
-            if (stats instanceof GPXStatistics) {
-                const bbox = new maplibregl.LngLatBounds(
-                    stats.global.bounds.southWest,
-                    stats.global.bounds.northEast
-                );
-                if (!bbox.isEmpty() && bbox.intersects(bounds)) {
-                    return true;
-                }
-            } else if (stats.intersectsBBox(bounds)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    intersectsWaypointBBox(bounds: maplibregl.LngLatBounds): boolean {
-        return !this.wptBounds.isEmpty() && this.wptBounds.intersects(bounds);
-    }
 }
 export type GPXFileWithStatistics = { file: GPXFile; statistics: GPXStatisticsTree };

website/src/lib/logic/statistics.ts

@@ -1,5 +1,5 @@
 import { selection } from '$lib/logic/selection';
-import { GPXGlobalStatistics, GPXStatisticsGroup, type Coordinates } from 'gpx';
+import { GPXGlobalStatistics, GPXStatisticsGroup } from 'gpx';
 import { fileStateCollection, GPXFileState } from '$lib/logic/file-state';
 import {
     ListFileItem,
@@ -82,8 +82,6 @@ export const gpxStatistics = new SelectedGPXStatistics();
 export const slicedGPXStatistics: Writable<[GPXGlobalStatistics, number, number] | undefined> =
     writable(undefined);
 
-export const hoveredPoint: Writable<Coordinates | null> = writable(null);
-
 gpxStatistics.subscribe(() => {
     slicedGPXStatistics.set(undefined);
 });

website/src/lib/utils.ts

@@ -3,11 +3,12 @@ import { twMerge } from 'tailwind-merge';
 import { base } from '$app/paths';
 import { languages } from '$lib/languages';
 import { TrackPoint, Waypoint, type Coordinates, crossarcDistance, distance, GPXFile } from 'gpx';
-import maplibregl from 'maplibre-gl';
+import mapboxgl from 'mapbox-gl';
 import { pointToTile, pointToTileFraction } from '@mapbox/tilebelt';
+import { PUBLIC_MAPBOX_TOKEN } from '$env/static/public';
+import PNGReader from 'png.js';
 import type { GPXStatisticsTree } from '$lib/logic/statistics-tree';
 import { ListTrackSegmentItem } from '$lib/components/file-list/file-list';
-import { PUBLIC_MAPTILER_KEY } from '$env/static/public';
 
 export function cn(...inputs: ClassValue[]) {
     return twMerge(clsx(inputs));
@@ -61,7 +62,7 @@ export function getClosestTrackSegments(
         let segmentBounds = segmentStatistics.global.bounds;
         let northEast = segmentBounds.northEast;
         let southWest = segmentBounds.southWest;
-        let bounds = new maplibregl.LngLatBounds(southWest, northEast);
+        let bounds = new mapboxgl.LngLatBounds(southWest, northEast);
         if (bounds.contains(point)) {
             segmentBoundsDistances.push([0, trackIndex, segmentIndex]);
         } else {
@@ -109,49 +110,33 @@ export function getElevation(
     let coordinates = points.map((point) =>
         point instanceof TrackPoint || point instanceof Waypoint ? point.getCoordinates() : point
     );
-    let bbox = new maplibregl.LngLatBounds();
+    let bbox = new mapboxgl.LngLatBounds();
     coordinates.forEach((coord) => bbox.extend(coord));
 
     let tiles = coordinates.map((coord) => pointToTile(coord.lon, coord.lat, ELEVATION_ZOOM));
     let uniqueTiles = Array.from(new Set(tiles.map((tile) => tile.join(',')))).map((tile) =>
         tile.split(',').map((x) => parseInt(x))
     );
-    let images = new Map<string, ImageData>();
-
-    const getPixelFromImageData = (imageData: ImageData, x: number, y: number): number[] => {
-        const index = (y * imageData.width + x) * 4;
-        return [imageData.data[index], imageData.data[index + 1], imageData.data[index + 2]];
-    };
+    let pngs = new Map<string, any>();
 
     let promises = uniqueTiles.map((tile) =>
         fetch(
-            `https://api.maptiler.com/tiles/terrain-rgb-v2/${ELEVATION_ZOOM}/${tile[0]}/${tile[1]}.webp?key=${PUBLIC_MAPTILER_KEY}`,
+            `https://api.mapbox.com/v4/mapbox.mapbox-terrain-dem-v1/${ELEVATION_ZOOM}/${tile[0]}/${tile[1]}@2x.pngraw?access_token=${PUBLIC_MAPBOX_TOKEN}`,
             { cache: 'force-cache' }
         )
-            .then((response) => response.blob())
+            .then((response) => response.arrayBuffer())
             .then(
-                (blob) =>
-                    new Promise<void>((resolve) => {
-                        const url = URL.createObjectURL(blob);
-                        const img = new Image();
-                        img.onload = () => {
-                            const canvas = document.createElement('canvas');
-                            canvas.width = img.width;
-                            canvas.height = img.height;
-                            const ctx = canvas.getContext('2d');
-                            if (ctx) {
-                                ctx.drawImage(img, 0, 0);
-                                const imageData = ctx.getImageData(0, 0, img.width, img.height);
-                                images.set(tile.join(','), imageData);
+                (buffer) =>
+                    new Promise((resolve) => {
+                        let png = new PNGReader(new Uint8Array(buffer));
+                        png.parse((err, png) => {
+                            if (err) {
+                                resolve(false); // Also resolve so that Promise.all doesn't fail
+                            } else {
+                                pngs.set(tile.join(','), png);
+                                resolve(true);
                             }
-                            URL.revokeObjectURL(url);
-                            resolve();
-                        };
-                        img.onerror = () => {
-                            URL.revokeObjectURL(url);
-                            resolve();
-                        };
-                        img.src = url;
+                        });
                     })
             )
     );
@@ -159,9 +144,9 @@ export function getElevation(
     return Promise.all(promises).then(() =>
         coordinates.map((coord, index) => {
             let tile = tiles[index];
-            let imageData = images.get(tile.join(','));
+            let png = pngs.get(tile.join(','));
 
-            if (!imageData) {
+            if (!png) {
                 return 0;
             }
 
@@ -173,11 +158,10 @@ export function getElevation(
             let dx = x - _x;
             let dy = y - _y;
 
-            const p00 = getPixelFromImageData(imageData, _x, _y);
-            const p01 = getPixelFromImageData(imageData, _x, _y + (_y + 1 == tileSize ? 0 : 1));
-            const p10 = getPixelFromImageData(imageData, _x + (_x + 1 == tileSize ? 0 : 1), _y);
-            const p11 = getPixelFromImageData(
-                imageData,
+            const p00 = png.getPixel(_x, _y);
+            const p01 = png.getPixel(_x, _y + (_y + 1 == tileSize ? 0 : 1));
+            const p10 = png.getPixel(_x + (_x + 1 == tileSize ? 0 : 1), _y);
+            const p11 = png.getPixel(
                 _x + (_x + 1 == tileSize ? 0 : 1),
                 _y + (_y + 1 == tileSize ? 0 : 1)
             );
@@ -197,18 +181,6 @@ export function getElevation(
     );
 }
 
-export function loadSVGIcon(map: maplibregl.Map, id: string, svg: string, size: number = 100) {
-    if (!map.hasImage(id)) {
-        let icon = new Image(size, size);
-        icon.onload = () => {
-            if (!map.hasImage(id)) {
-                map.addImage(id, icon);
-            }
-        };
-        icon.src = 'data:image/svg+xml,' + encodeURIComponent(svg);
-    }
-}
-
 export function isMac() {
     return navigator.userAgent.toUpperCase().indexOf('MAC') >= 0;
 }

website/src/locales/be.json

@@ -190,6 +190,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },

website/src/locales/ca.json

@@ -28,7 +28,7 @@
         "undo": "Desfer",
         "redo": "Refer",
         "delete": "Elimina el track",
-        "delete_all": "Delete all",
+        "delete_all": "Esborra-ho tot",
         "select_all": "Seleccionar-ho tot",
         "view": "Vista",
         "elevation_profile": "Perfil d’elevacions",
@@ -80,7 +80,7 @@
         "center": "Centrar",
         "open_in": "Obrir amb",
         "copy_coordinates": "Copiar coordenades",
-        "edit_osm": "Edit in OpenStreetMap"
+        "edit_osm": "Edita a OpenStreetMap"
     },
     "toolbar": {
         "routing": {
@@ -190,6 +190,8 @@
                 "from": "El punt d'inici és massa lluny de la via més propera",
                 "via": "El punt és massa lluny de la via més propera",
                 "to": "El punt final és massa lluny de la via més propera",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "El càlcul de la ruta tarda més del compte, prova d'afegir punts més propers entre si"
             }
         },
@@ -282,7 +284,7 @@
             "update": "Actualitza la capa"
         },
         "opacity": "Opacitat de la superposició",
-        "terrain": "Terrain source",
+        "terrain": "Terreny",
         "label": {
             "basemaps": "Mapes base",
             "overlays": "Capes",
@@ -356,7 +358,7 @@
             "water": "Aigua",
             "shower": "Dutxa",
             "shelter": "Refugi",
-            "cemetery": "Cemetery",
+            "cemetery": "Cementiri",
             "motorized": "Cotxes i motos",
             "fuel-station": "Gasolinera",
             "parking": "Aparcament",

website/src/locales/cs.json

@@ -190,6 +190,8 @@
                 "from": "Počáteční bod je příliš daleko od nejbližší cesty",
                 "via": "Průchozí bod je příliš daleko od nejbližší cesty",
                 "to": "Koncový bod je příliš daleko od nejbližší cesty",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Výpočet trasy trval příliš dlouho, zkuste přidat body blíže k sobě"
             }
         },

website/src/locales/da.json

@@ -190,6 +190,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },

website/src/locales/de.json

@@ -21,14 +21,14 @@
         "export_all": "Alle exportieren...",
         "export_options": "Export-Einstellungen",
         "support_message": "Das Tool darf frei benutzt werden, aber es darf nicht woanders aufgesetzt werden. Bitte unterstützen Sie die Website, wenn Sie sie häufig benutzen. Vielen Dank!",
-        "support_button": "Hilf dabei, die Webseite kostenlos zu belassen",
+        "support_button": "Hilf uns, die Website weiterhin kostenlos bereitzustellen",
         "download_file": "Datei herunterladen",
         "download_files": "Dateien herunterladen",
         "edit": "Bearbeiten",
         "undo": "Rückgängig",
         "redo": "Wiederholen",
         "delete": "Löschen",
-        "delete_all": "Delete all",
+        "delete_all": "Alle löschen",
         "select_all": "Alle auswählen",
         "view": "Ansicht",
         "elevation_profile": "Höhenprofil",
@@ -80,7 +80,7 @@
         "center": "Zentrieren",
         "open_in": "Öffnen in",
         "copy_coordinates": "Koordinaten kopieren",
-        "edit_osm": "Edit in OpenStreetMap"
+        "edit_osm": "In OpenStreetMap bearbeiten"
     },
     "toolbar": {
         "routing": {
@@ -190,6 +190,8 @@
                 "from": "Der Startpunkt ist zu weit von der nächsten Straße entfernt",
                 "via": "Der Via-Punkt ist zu weit entfernt von der nächsten Straße",
                 "to": "Der Endpunkt ist zu weit von der nächsten Straße entfernt",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route-Berechnung benötigte zu viel Zeit; versuche, die Punkte näher aneinander zu setzen"
             }
         },
@@ -282,7 +284,7 @@
             "update": "Layer aktualisieren"
         },
         "opacity": "Deckkraft der Überlagerung",
-        "terrain": "Terrain source",
+        "terrain": "Geländequelle",
         "label": {
             "basemaps": "Basiskarte",
             "overlays": "Ebenen",
@@ -326,7 +328,7 @@
             "usgs": "USGS",
             "bikerouterGravel": "bikerouter.de Gravel",
             "cyclOSMlite": "CyclOSM Lite",
-            "mapterhornHillshade": "Mapterhorn Hillshade",
+            "mapterhornHillshade": "MapTiler Hillshade",
             "openRailwayMap": "OpenRailwayMap",
             "swisstopoSlope": "swisstopo Neigung",
             "swisstopoHiking": "swisstopo Wandern",
@@ -356,7 +358,7 @@
             "water": "Trinkwasser",
             "shower": "Dusche",
             "shelter": "Unterstand",
-            "cemetery": "Cemetery",
+            "cemetery": "Friedhof",
             "motorized": "Autos und Motorräder",
             "fuel-station": "Tankstelle",
             "parking": "Parken",

website/src/locales/el.json

@@ -190,6 +190,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },

website/src/locales/en.json

@@ -231,7 +231,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +273,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
+            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Basemap",
@@ -300,9 +300,8 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "mapboxOutdoors": "Mapbox Outdoors",
+            "mapboxSatellite": "Mapbox Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -382,7 +381,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
+            "mapbox-dem": "Mapbox DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -524,7 +523,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "maptiler_key": "MapTiler key",
+        "mapbox_token": "Mapbox access token",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",

website/src/locales/es.json

@@ -190,6 +190,8 @@
                 "from": "El punto de inicio está demasiado lejos de la carretera más cercana",
                 "via": "El punto de paso está demasiado lejos de la carretera más cercana",
                 "to": "El punto final está demasiado lejos de la carretera más cercana",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Calcular la ruta llevó demasiado tiempo, intente añadir puntos más cercanos entre ellos"
             }
         },

website/src/locales/eu.json

@@ -190,6 +190,8 @@
                 "from": "Hasiera puntua errepide hurbilenetik oso hurrun dago",
                 "via": "Puntua errepide hurbilenetik oso hurrun dago",
                 "to": "Bukaera puntua errepide hurbilenetik oso hurrun dago",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Ibilbidea kalkulatzea luzeegi joan da, saiatu hurbilago dauden puntuak gehitzen"
             }
         },
@@ -282,7 +284,7 @@
             "update": "Eguneratu geruza"
         },
         "opacity": "Geruzaren opakutasuna",
-        "terrain": "Terrain source",
+        "terrain": "Lurrazala",
         "label": {
             "basemaps": "Oinarrizko mapak",
             "overlays": "Geruzak",

website/src/locales/fi.json

@@ -190,6 +190,8 @@
                 "from": "Aloituspiste on liian kaukana lähimmästä tiestä",
                 "via": "Reittipiste on liian kaukana lähimmästä tiestä",
                 "to": "Päätepiste on liian kaukana lähimmästä tiestä",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Reitin laskenta kesti liian kauan. Tihennä reittipisteitä"
             }
         },

website/src/locales/fr.json

@@ -190,6 +190,8 @@
                 "from": "Le point de départ est trop éloigné de la route la plus proche",
                 "via": "Le point de passage est trop éloigné de la route la plus proche",
                 "to": "Le point d'arrivée est trop éloigné de la route la plus proche",
+                "distance": "Le point d'arrivée est trop loin du point de départ",
+                "connection": "Aucune connexion trouvée entre les points",
                 "timeout": "Le calcul de l'itinéraire a pris trop de temps, essayez d'ajouter des points plus rapprochés"
             }
         },

website/src/locales/he.json

@@ -190,6 +190,8 @@
                 "from": "נקודת ההתחלה רחוקה מדיי מהכביש הקרוב ביותר",
                 "via": "נקודת המעבר רחוקה מדיי מהכביש הקרוב ביותר",
                 "to": "נקודת הסיום רחוקה מדיי מהכביש הקרוב ביותר",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },

website/src/locales/hu.json

@@ -190,6 +190,8 @@
                 "from": "A kiindulási pont túl messze van a legközelebbi úttól",
                 "via": "A köztes pont túl messze van a legközelebbi úttól",
                 "to": "A végpont túl messze van a legközelebbi úttól",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Az útvonal kiszámítása túl sokáig tartott. Próbáljon meg közelebbi pontokat adni egymáshoz"
             }
         },
@@ -235,13 +237,13 @@
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
-            "tooltip": "Create and edit points of interest",
-            "icon": "Icon",
+            "tooltip": "PoI létrehozása és módosítása",
+            "icon": "Ikon",
             "link": "Link",
-            "longitude": "Longitude",
+            "longitude": "Földrajzi hosszúság",
             "latitude": "Szélesség",
             "create": "POI fájlba mentése",
-            "add": "Add point of interest to file",
+            "add": "PoI fájlhoz adása",
             "help": "Töltsd ki az űrlapot egy új POI létrehozásához, vagy kattints egy meglévőre a szerkesztéshez. Kattints a térképre a koordináták megadásához, vagy áthelyezéshez egérrel húzd el a POI-kat.",
             "help_no_selection": "Select a file to create or edit points of interest."
         },
@@ -249,8 +251,8 @@
             "tooltip": "Reduce the number of GPS points",
             "tolerance": "Tűréshatár",
             "number_of_points": "GPS pontok száma",
-            "button": "Minify",
-            "help": "Use the slider to choose the number of GPS points to keep.",
+            "button": "Minimalizálás",
+            "help": "",
             "help_no_selection": "Select a trace to reduce the number of its GPS points."
         },
         "clean": {

website/src/locales/id.json

@@ -190,6 +190,8 @@
                 "from": "Titik awal terlalu jauh dari jalan terdekat",
                 "via": "Titik via terlalu jauh dari jalan terdekat",
                 "to": "Titik akhir terlalu jauh dari jalan terdekat",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Perhitungan rute memakan waktu terlalu lama, coba tambahkan titik-titik yang lebih dekat satu sama lain"
             }
         },
@@ -491,7 +493,7 @@
         "support_button": "Support gpx.studio on Ko-fi",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
-        "file_processing": "Advanced file processing",
+        "file_processing": "Pengolahan file lanjutan",
         "file_processing_description": "A suite of tools for performing all common file processing tasks, and which can be applied to multiple files at once.",
         "maps": "Global and local maps",
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",

website/src/locales/it.json

@@ -190,6 +190,8 @@
                 "from": "Il punto di partenza è troppo lontano dalla strada più vicina",
                 "via": "Il punto di arrivo è troppo lontano dalla strada più vicina",
                 "to": "Il punto di arrivo è troppo lontano dalla strada più vicina",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Il calcolo del percorso ha richiesto troppo tempo, prova ad aggiungere punti più vicini"
             }
         },

website/src/locales/ko.json

@@ -190,6 +190,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },

website/src/locales/lt.json

@@ -190,6 +190,8 @@
                 "from": "Pradžios taškas yra per toli nuo artimiausio kelio",
                 "via": "Tarpinis taškas yra per toli nuo artimiausio kelio",
                 "to": "Pabaigos taškas yra per toli nuo artimiausio kelio",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Maršruto skaičiavimas užtruko per ilgai, pabandykite pridėti taškus arčiau vienas kito"
             }
         },

website/src/locales/lv.json

@@ -190,6 +190,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },

website/src/locales/nl.json

@@ -54,7 +54,7 @@
         "mapillary": "Mapillary",
         "google": "Google",
         "toggle_street_view": "Street view",
-        "layers": "Kaart lagen...",
+        "layers": "Kaartlagen...",
         "distance_markers": "Afstandsmarkeringen",
         "direction_markers": "Richtingspijlen",
         "help": "Help",
@@ -190,6 +190,8 @@
                 "from": "Het startpunt ligt te ver van de dichtstbijzijnde weg",
                 "via": "Het via punt ligt te ver van de dichtstbijzijnde weg",
                 "to": "Het eindpunt is te ver van de dichtstbijzijnde weg",
+                "distance": "Het eindpunt is te ver vanaf het startpunt",
+                "connection": "Geen verbinding gevonden tussen de punten",
                 "timeout": "Routeberekening heeft te lang geduurd, probeer punten dichter bij elkaar toe te voegen"
             }
         },

website/src/locales/no.json

@@ -28,7 +28,7 @@
         "undo": "Angre",
         "redo": "Gjenta",
         "delete": "Slett",
-        "delete_all": "Delete all",
+        "delete_all": "Slett alle",
         "select_all": "Velg alle",
         "view": "Visning",
         "elevation_profile": "Høydeprofil",
@@ -80,7 +80,7 @@
         "center": "Sentrer",
         "open_in": "Åpne I",
         "copy_coordinates": "Kopier koordinater",
-        "edit_osm": "Edit in OpenStreetMap"
+        "edit_osm": "Rediger i OpenStreetMap"
     },
     "toolbar": {
         "routing": {
@@ -190,6 +190,8 @@
                 "from": "Startpunktet er for langt unna nærmeste vei",
                 "via": "Via-punktet er for langt fra nærmeste vei",
                 "to": "Sluttpunktet er for langt unna nærmeste vei",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Ruteberegning tok for lang tid, prøv å legge til flere punkter"
             }
         },
@@ -356,7 +358,7 @@
             "water": "Vann",
             "shower": "Dusj",
             "shelter": "Ly",
-            "cemetery": "Cemetery",
+            "cemetery": "Gravplass",
             "motorized": "Biler og motorsykler",
             "fuel-station": "Bensinstasjon",
             "parking": "Parkering",

website/src/locales/pl.json

@@ -4,7 +4,7 @@
         "app_title": "Aplikacja",
         "embed_title": "Edytor plików GPX online",
         "help_title": "pomoc",
-        "404_title": "nie odnaleziono strony",
+        "404_title": "Strona nie odnaleziona",
         "description": "Przeglądaj, edytuj i twórz pliki GPX online z zaawansowanymi możliwościami planowania trasy i narzędziami do przetwarzania plików, pięknymi mapami i szczegółowymi wizualizacjami danych."
     },
     "menu": {
@@ -190,6 +190,8 @@
                 "from": "Punkt początkowy jest zbyt daleko od najbliższej drogi",
                 "via": "Punkt przelotowy jest zbyt daleko od najbliższej drogi",
                 "to": "Punkt końcowy jest zbyt daleko od najbliższej drogi",
+                "distance": "Punkt końcowy jest zbyt daleko od punktu początkowego",
+                "connection": "Nie znaleziono połączenia między punktami",
                 "timeout": "Obliczanie trasy trwało zbyt długo, spróbuj dodać punkty bliżej siebie"
             }
         },
@@ -326,7 +328,7 @@
             "usgs": "USGS",
             "bikerouterGravel": "bikerouter.de Gravel",
             "cyclOSMlite": "CyclOSM Lite",
-            "mapterhornHillshade": "Mapterhorn Hillshade",
+            "mapterhornHillshade": "Cieniowanie terenu Mapterhorn",
             "openRailwayMap": "OpenRailwayMap",
             "swisstopoSlope": "swisstopo Stoki",
             "swisstopoHiking": "swisstopo Szlaki Turystyczne",

website/src/locales/pt-BR.json

@@ -190,6 +190,8 @@
                 "from": "O ponto de partida está muito longe da estrada mais próxima",
                 "via": "O ponto intermediário está muito longe da estrada mais próxima",
                 "to": "O ponto de chegada está muito longe da estrada mais próxima",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "O cálculo da rota demorou muito tempo, tente adicionar pontos mais próximos"
             }
         },