drop file tabs to desktop

.prettierrc

@@ -1,16 +0,0 @@
-{
-	"useTabs": false,
-	"tabWidth": 4,
-	"singleQuote": true,
-	"trailingComma": "es5",
-	"printWidth": 100,
-	"overrides": [
-    {
-      "files": "**/*.svelte",
-      "options": {
-        "plugins": ["prettier-plugin-svelte"],
-		"parser": "svelte"
-      }
-    }
-  ]
-}

.vscode/extensions.json

@@ -1,7 +0,0 @@
-{
-    "recommendations": [
-      "esbenp.prettier-vscode",
-      "svelte.svelte-vscode"
-    ]
-  }
-  

.vscode/settings.json

@@ -1,13 +0,0 @@
-{
-    "editor.formatOnSave": true,
-    "[javascript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[typescript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[svelte]": {
-      "editor.defaultFormatter": "svelte.svelte-vscode"
-    }
-  }
-  

gpx/.prettierignore

@@ -1 +0,0 @@
-package-lock.json

gpx/package.json

@@ -12,20 +12,16 @@
     "private": true,
     "dependencies": {
         "fast-xml-parser": "^4.5.0",
-        "immer": "^10.1.1"
+        "immer": "^10.1.1",
+        "ts-node": "^10.9.2"
     },
     "devDependencies": {
         "@types/geojson": "^7946.0.14",
         "@types/node": "^20.16.10",
-        "@typescript-eslint/parser": "^8.22.0",
-        "prettier": "^3.4.2",
-        "ts-node": "^10.9.2",
         "typescript": "^5.6.2"
     },
     "scripts": {
         "build": "tsc",
-        "postinstall": "npm run build",
+        "postinstall": "npm run build"
-        "lint": "prettier --check . && eslint .",
-        "format": "prettier --write ."
     }
 }

gpx/src/index.ts

@@ -2,3 +2,4 @@ export * from './gpx';
 export { Coordinates, LineStyleExtension, WaypointType } from './types';
 export { parseGPX, buildGPX } from './io';
 export * from './simplify';
+

gpx/src/io.ts

@@ -1,68 +1,25 @@
-import { XMLParser, XMLBuilder } from 'fast-xml-parser';
+import { XMLParser, XMLBuilder } from "fast-xml-parser";
-import { GPXFileType } from './types';
+import { GPXFileType } from "./types";
-import { GPXFile } from './gpx';
+import { GPXFile } from "./gpx";
-
-const attributesWithNamespace = {
-    RoutePointExtension: 'gpxx:RoutePointExtension',
-    rpt: 'gpxx:rpt',
-    TrackPointExtension: 'gpxtpx:TrackPointExtension',
-    PowerExtension: 'gpxpx:PowerExtension',
-    atemp: 'gpxtpx:atemp',
-    hr: 'gpxtpx:hr',
-    cad: 'gpxtpx:cad',
-    Extensions: 'gpxtpx:Extensions',
-    PowerInWatts: 'gpxpx:PowerInWatts',
-    power: 'gpxpx:PowerExtension',
-    line: 'gpx_style:line',
-    color: 'gpx_style:color',
-    opacity: 'gpx_style:opacity',
-    width: 'gpx_style:width',
-};
-
-const floatPatterns = [
-    /[-+]?\d*\.\d+$/, // decimal
-    /[-+]?\d+$/, // integer
-];
-function safeParseFloat(value: string): number {
-    const parsed = parseFloat(value);
-    if (!isNaN(parsed)) {
-        return parsed;
-    }
-    for (const pattern of floatPatterns) {
-        const match = value.match(pattern);
-        if (match) {
-            return parseFloat(match[0]);
-        }
-    }
-    return 0.0;
-}
 
 export function parseGPX(gpxData: string): GPXFile {
     const parser = new XMLParser({
         ignoreAttributes: false,
-        attributeNamePrefix: '',
+        attributeNamePrefix: "",
         attributesGroupName: 'attributes',
-        removeNSPrefix: true,
         isArray(name: string) {
-            return (
+            return name === 'trk' || name === 'trkseg' || name === 'trkpt' || name === 'wpt' || name === 'rte' || name === 'rtept' || name === 'gpxx:rpt';
-                name === 'trk' ||
-                name === 'trkseg' ||
-                name === 'trkpt' ||
-                name === 'wpt' ||
-                name === 'rte' ||
-                name === 'rtept' ||
-                name === 'gpxx:rpt'
-            );
         },
         attributeValueProcessor(attrName, attrValue, jPath) {
             if (attrName === 'lat' || attrName === 'lon') {
-                return safeParseFloat(attrValue);
+                return parseFloat(attrValue);
             }
             return attrValue;
         },
         transformTagName(tagName: string) {
-            if (attributesWithNamespace[tagName]) {
+            if (tagName === 'power') {
-                return attributesWithNamespace[tagName];
+                // Transform the simple <power> tag to the more complex <gpxpx:PowerExtension> tag, the nested <gpxpx:PowerInWatts> tag is then handled by the tagValueProcessor
+                return 'gpxpx:PowerExtension';
             }
             return tagName;
         },
@@ -70,29 +27,22 @@ export function parseGPX(gpxData: string): GPXFile {
         tagValueProcessor(tagName, tagValue, jPath, hasAttributes, isLeafNode) {
             if (isLeafNode) {
                 if (tagName === 'ele') {
-                    return safeParseFloat(tagValue);
+                    return parseFloat(tagValue);
                 }
 
                 if (tagName === 'time') {
                     return new Date(tagValue);
                 }
 
-                if (
+                if (tagName === 'gpxtpx:atemp' || tagName === 'gpxtpx:hr' || tagName === 'gpxtpx:cad' || tagName === 'gpxpx:PowerInWatts' || tagName === 'opacity' || tagName === 'weight') {
-                    tagName === 'gpxtpx:atemp' ||
+                    return parseFloat(tagValue);
-                    tagName === 'gpxtpx:hr' ||
-                    tagName === 'gpxtpx:cad' ||
-                    tagName === 'gpxpx:PowerInWatts' ||
-                    tagName === 'gpx_style:opacity' ||
-                    tagName === 'gpx_style:width'
-                ) {
-                    return safeParseFloat(tagValue);
                 }
 
                 if (tagName === 'gpxpx:PowerExtension') {
                     // Finish the transformation of the simple <power> tag to the more complex <gpxpx:PowerExtension> tag
                     // Note that this only targets the transformed <power> tag, since it must be a leaf node
                     return {
-                        'gpxpx:PowerInWatts': safeParseFloat(tagValue),
+                        'gpxpx:PowerInWatts': parseFloat(tagValue)
                     };
                 }
             }
@@ -104,42 +54,35 @@ export function parseGPX(gpxData: string): GPXFile {
     const parsed: GPXFileType = parser.parse(gpxData).gpx;
 
     // @ts-ignore
-    if (parsed.metadata === '') {
+    if (parsed.metadata === "") {
         parsed.metadata = {};
     }
 
     return new GPXFile(parsed);
 }
 
-export function buildGPX(file: GPXFile, exclude: string[]): string {
+export function buildGPX(file: GPXFile, exclude: string[] = []): string {
     const gpx = file.toGPXFileType(exclude);
 
-    let lastDate = undefined;
     const builder = new XMLBuilder({
         format: true,
         ignoreAttributes: false,
-        attributeNamePrefix: '',
+        attributeNamePrefix: "",
         attributesGroupName: 'attributes',
         suppressEmptyNode: true,
-        tagValueProcessor: (tagName: string, tagValue: unknown): string | undefined => {
+        tagValueProcessor: (tagName: string, tagValue: unknown): string => {
             if (tagValue instanceof Date) {
-                if (isNaN(tagValue.getTime())) {
-                    return lastDate?.toISOString();
-                }
-                lastDate = tagValue;
                 return tagValue.toISOString();
             }
             return tagValue.toString();
         },
     });
 
-    if (!gpx.attributes) gpx.attributes = {};
+    gpx.attributes.creator = gpx.attributes.creator ?? 'https://gpx.studio';
-    gpx.attributes['creator'] = gpx.attributes['creator'] ?? 'https://gpx.studio';
     gpx.attributes['version'] = '1.1';
     gpx.attributes['xmlns'] = 'http://www.topografix.com/GPX/1/1';
     gpx.attributes['xmlns:xsi'] = 'http://www.w3.org/2001/XMLSchema-instance';
-    gpx.attributes['xsi:schemaLocation'] =
+    gpx.attributes['xsi:schemaLocation'] = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.garmin.com/xmlschemas/PowerExtension/v1 http://www.garmin.com/xmlschemas/PowerExtensionv1.xsd http://www.topografix.com/GPX/gpx_style/0/2 http://www.topografix.com/GPX/gpx_style/0/2/gpx_style.xsd';
-        'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.garmin.com/xmlschemas/PowerExtension/v1 http://www.garmin.com/xmlschemas/PowerExtensionv1.xsd http://www.topografix.com/GPX/gpx_style/0/2 http://www.topografix.com/GPX/gpx_style/0/2/gpx_style.xsd';
     gpx.attributes['xmlns:gpxtpx'] = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
     gpx.attributes['xmlns:gpxx'] = 'http://www.garmin.com/xmlschemas/GpxExtensions/v3';
     gpx.attributes['xmlns:gpxpx'] = 'http://www.garmin.com/xmlschemas/PowerExtension/v1';
@@ -150,24 +93,19 @@ export function buildGPX(file: GPXFile, exclude: string[]): string {
     }
 
     return builder.build({
-        '?xml': {
+        "?xml": {
             attributes: {
-                version: '1.0',
+                version: "1.0",
-                encoding: 'UTF-8',
+                encoding: "UTF-8",
+            }
         },
-        },
+        gpx: removeEmptyElements(gpx)
-        gpx: removeEmptyElements(gpx),
     });
 }
 
 function removeEmptyElements(obj: GPXFileType): GPXFileType {
     for (const key in obj) {
-        if (
+        if (obj[key] === null || obj[key] === undefined || obj[key] === '' || (Array.isArray(obj[key]) && obj[key].length === 0)) {
-            obj[key] === null ||
-            obj[key] === undefined ||
-            obj[key] === '' ||
-            (Array.isArray(obj[key]) && obj[key].length === 0)
-        ) {
             delete obj[key];
         } else if (typeof obj[key] === 'object' && !(obj[key] instanceof Date)) {
             removeEmptyElements(obj[key]);

gpx/src/simplify.ts

@@ -1,48 +1,33 @@
-import { TrackPoint } from './gpx';
+import { TrackPoint } from "./gpx";
-import { Coordinates } from './types';
+import { Coordinates } from "./types";
 
-export type SimplifiedTrackPoint = { point: TrackPoint; distance?: number };
+export type SimplifiedTrackPoint = { point: TrackPoint, distance?: number };
 
 const earthRadius = 6371008.8;
 
-export function ramerDouglasPeucker(
+export function ramerDouglasPeucker(points: TrackPoint[], epsilon: number = 50, measure: (a: TrackPoint, b: TrackPoint, c: TrackPoint) => number = crossarcDistance): SimplifiedTrackPoint[] {
-    points: TrackPoint[],
-    epsilon: number = 50,
-    measure: (a: TrackPoint, b: TrackPoint, c: TrackPoint) => number = crossarcDistance
-): SimplifiedTrackPoint[] {
     if (points.length == 0) {
         return [];
     } else if (points.length == 1) {
-        return [
+        return [{
-            {
+            point: points[0]
-                point: points[0],
+        }];
-            },
-        ];
     }
 
-    let simplified = [
+    let simplified = [{
-        {
+        point: points[0]
-            point: points[0],
+    }];
-        },
-    ];
     ramerDouglasPeuckerRecursive(points, epsilon, measure, 0, points.length - 1, simplified);
     simplified.push({
-        point: points[points.length - 1],
+        point: points[points.length - 1]
     });
     return simplified;
 }
 
-function ramerDouglasPeuckerRecursive(
+function ramerDouglasPeuckerRecursive(points: TrackPoint[], epsilon: number, measure: (a: TrackPoint, b: TrackPoint, c: TrackPoint) => number, start: number, end: number, simplified: SimplifiedTrackPoint[]) {
-    points: TrackPoint[],
-    epsilon: number,
-    measure: (a: TrackPoint, b: TrackPoint, c: TrackPoint) => number,
-    start: number,
-    end: number,
-    simplified: SimplifiedTrackPoint[]
-) {
     let largest = {
         index: 0,
-        distance: 0,
+        distance: 0
     };
 
     for (let i = start + 1; i < end; i++) {
@@ -60,16 +45,8 @@ function ramerDouglasPeuckerRecursive(
     }
 }
 
-export function crossarcDistance(
+export function crossarcDistance(point1: TrackPoint, point2: TrackPoint, point3: TrackPoint | Coordinates): number {
-    point1: TrackPoint,
+    return crossarc(point1.getCoordinates(), point2.getCoordinates(), point3 instanceof TrackPoint ? point3.getCoordinates() : point3);
-    point2: TrackPoint,
-    point3: TrackPoint | Coordinates
-): number {
-    return crossarc(
-        point1.getCoordinates(),
-        point2.getCoordinates(),
-        point3 instanceof TrackPoint ? point3.getCoordinates() : point3
-    );
 }
 
 function crossarc(coord1: Coordinates, coord2: Coordinates, coord3: Coordinates): number {
@@ -97,7 +74,7 @@ function crossarc(coord1: Coordinates, coord2: Coordinates, coord3: Coordinates)
     }
 
     // Is relative bearing obtuse?
-    if (diff > Math.PI / 2) {
+    if (diff > (Math.PI / 2)) {
         return dis13;
     }
 
@@ -106,8 +83,7 @@ function crossarc(coord1: Coordinates, coord2: Coordinates, coord3: Coordinates)
 
     // Is p4 beyond the arc?
     let dis12 = distance(lat1, lon1, lat2, lon2);
-    let dis14 =
+    let dis14 = Math.acos(Math.cos(dis13 / earthRadius) / Math.cos(dxt / earthRadius)) * earthRadius;
-        Math.acos(Math.cos(dis13 / earthRadius) / Math.cos(dxt / earthRadius)) * earthRadius;
     if (dis14 > dis12) {
         return distance(lat2, lon2, lat3, lon3);
     } else {
@@ -117,32 +93,18 @@ function crossarc(coord1: Coordinates, coord2: Coordinates, coord3: Coordinates)
 
 function distance(latA: number, lonA: number, latB: number, lonB: number): number {
     // Finds the distance between two lat / lon points.
-    return (
+    return Math.acos(Math.sin(latA) * Math.sin(latB) + Math.cos(latA) * Math.cos(latB) * Math.cos(lonB - lonA)) * earthRadius;
-        Math.acos(
-            Math.sin(latA) * Math.sin(latB) +
-                Math.cos(latA) * Math.cos(latB) * Math.cos(lonB - lonA)
-        ) * earthRadius
-    );
 }
 
+
 function bearing(latA: number, lonA: number, latB: number, lonB: number): number {
     // Finds the bearing from one lat / lon point to another.
-    return Math.atan2(
+    return Math.atan2(Math.sin(lonB - lonA) * Math.cos(latB),
-        Math.sin(lonB - lonA) * Math.cos(latB),
+        Math.cos(latA) * Math.sin(latB) - Math.sin(latA) * Math.cos(latB) * Math.cos(lonB - lonA));
-        Math.cos(latA) * Math.sin(latB) - Math.sin(latA) * Math.cos(latB) * Math.cos(lonB - lonA)
-    );
 }
 
-export function projectedPoint(
+export function projectedPoint(point1: TrackPoint, point2: TrackPoint, point3: TrackPoint | Coordinates): Coordinates {
-    point1: TrackPoint,
+    return projected(point1.getCoordinates(), point2.getCoordinates(), point3 instanceof TrackPoint ? point3.getCoordinates() : point3);
-    point2: TrackPoint,
-    point3: TrackPoint | Coordinates
-): Coordinates {
-    return projected(
-        point1.getCoordinates(),
-        point2.getCoordinates(),
-        point3 instanceof TrackPoint ? point3.getCoordinates() : point3
-    );
 }
 
 function projected(coord1: Coordinates, coord2: Coordinates, coord3: Coordinates): Coordinates {
@@ -170,7 +132,7 @@ function projected(coord1: Coordinates, coord2: Coordinates, coord3: Coordinates
     }
 
     // Is relative bearing obtuse?
-    if (diff > Math.PI / 2) {
+    if (diff > (Math.PI / 2)) {
         return coord1;
     }
 
@@ -179,22 +141,14 @@ function projected(coord1: Coordinates, coord2: Coordinates, coord3: Coordinates
 
     // Is p4 beyond the arc?
     let dis12 = distance(lat1, lon1, lat2, lon2);
-    let dis14 =
+    let dis14 = Math.acos(Math.cos(dis13 / earthRadius) / Math.cos(dxt / earthRadius)) * earthRadius;
-        Math.acos(Math.cos(dis13 / earthRadius) / Math.cos(dxt / earthRadius)) * earthRadius;
     if (dis14 > dis12) {
         return coord2;
     } else {
         // Determine the closest point (p4) on the great circle
         const f = dis14 / earthRadius;
-        const lat4 = Math.asin(
+        const lat4 = Math.asin(Math.sin(lat1) * Math.cos(f) + Math.cos(lat1) * Math.sin(f) * Math.cos(bear12));
-            Math.sin(lat1) * Math.cos(f) + Math.cos(lat1) * Math.sin(f) * Math.cos(bear12)
+        const lon4 = lon1 + Math.atan2(Math.sin(bear12) * Math.sin(f) * Math.cos(lat1), Math.cos(f) - Math.sin(lat1) * Math.sin(lat4));
-        );
-        const lon4 =
-            lon1 +
-            Math.atan2(
-                Math.sin(bear12) * Math.sin(f) * Math.cos(lat1),
-                Math.cos(f) - Math.sin(lat1) * Math.sin(lat4)
-            );
 
         return { lat: lat4 / rad, lon: lon4 / rad };
     }

gpx/src/types.ts

@@ -67,9 +67,9 @@ export type TrackExtensions = {
 };
 
 export type LineStyleExtension = {
-    'gpx_style:color'?: string;
+    color?: string;
-    'gpx_style:opacity'?: number;
+    opacity?: number;
-    'gpx_style:width'?: number;
+    weight?: number;
 };
 
 export type TrackSegmentType = {
@@ -92,12 +92,14 @@ export type TrackPointExtension = {
     'gpxtpx:atemp'?: number;
     'gpxtpx:hr'?: number;
     'gpxtpx:cad'?: number;
-    'gpxtpx:Extensions'?: Record<string, string>;
+    'gpxtpx:Extensions'?: {
-};
+        surface?: string;
+    };
+}
 
 export type PowerExtension = {
     'gpxpx:PowerInWatts'?: number;
-};
+}
 
 export type Author = {
     name?: string;
@@ -114,12 +116,12 @@ export type RouteType = {
     type?: string;
     extensions?: TrackExtensions;
     rtept: WaypointType[];
-};
+}
 
 export type RoutePointExtension = {
     'gpxx:rpt'?: GPXXRoutePoint[];
-};
+}
 
 export type GPXXRoutePoint = {
     attributes: Coordinates;
-};
+}

gpx/test-data/with_style.gpx

@@ -16,9 +16,9 @@
         <type>Cycling</type>
         <extensions>
             <gpx_style:line>
-                <gpx_style:color>2d3ee9</gpx_style:color>
+                <color>#2d3ee9</color>
-                <gpx_style:opacity>0.5</gpx_style:opacity>
+                <opacity>0.5</opacity>
-                <gpx_style:width>6</gpx_style:width>
+                <weight>6</weight>
             </gpx_style:line>
         </extensions>
         <trkseg>

gpx/tsconfig.json

@@ -4,7 +4,9 @@
         "target": "ES2015",
         "declaration": true,
         "outDir": "./dist",
-        "moduleResolution": "node"
+        "moduleResolution": "node",
     },
-    "include": ["src"]
+    "include": [
+        "src"
+    ],
 }

website/.eslintrc.cjs

@@ -5,27 +5,27 @@ module.exports = {
 		'eslint:recommended',
 		'plugin:@typescript-eslint/recommended',
 		'plugin:svelte/recommended',
-        'prettier',
+		'prettier'
 	],
 	parser: '@typescript-eslint/parser',
 	plugins: ['@typescript-eslint'],
 	parserOptions: {
 		sourceType: 'module',
 		ecmaVersion: 2020,
-        extraFileExtensions: ['.svelte'],
+		extraFileExtensions: ['.svelte']
 	},
 	env: {
 		browser: true,
 		es2017: true,
-        node: true,
+		node: true
 	},
 	overrides: [
 		{
 			files: ['*.svelte'],
 			parser: 'svelte-eslint-parser',
 			parserOptions: {
-                parser: '@typescript-eslint/parser',
+				parser: '@typescript-eslint/parser'
-            },
+			}
-        },
+		}
-    ],
+	]
 };

website/.prettierignore

@@ -2,5 +2,3 @@
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
-src/lib/components/ui
-*.mdx

website/.prettierrc

@@ -0,0 +1,8 @@
+{
+	"useTabs": true,
+	"singleQuote": true,
+	"trailingComma": "none",
+	"printWidth": 100,
+	"plugins": ["prettier-plugin-svelte"],
+	"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
+}

website/package.json

@@ -5,7 +5,6 @@
     "scripts": {
         "dev": "vite dev",
         "build": "vite build",
-        "prebuild": "npx tsx src/lib/pwa-manifest.ts",
         "postbuild": "npx tsx src/lib/sitemap.ts",
         "preview": "vite preview",
         "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
@@ -21,7 +20,7 @@
         "@sveltejs/vite-plugin-svelte": "^3.1.2",
         "@types/eslint": "^8.56.12",
         "@types/events": "^3.0.3",
-        "@types/file-saver": "^2.0.7",
+        "@types/mapbox__mapbox-gl-geocoder": "^5.0.0",
         "@types/mapbox__tilebelt": "^1.0.4",
         "@types/mapbox-gl": "^3.4.0",
         "@types/node": "^20.16.10",
@@ -36,7 +35,7 @@
         "eslint-plugin-svelte": "^2.44.1",
         "events": "^3.3.0",
         "glob": "^10.4.5",
-        "mdsvex": "^0.12.6",
+        "mdsvex": "^0.11.2",
         "postcss": "^8.4.47",
         "prettier": "^3.3.3",
         "prettier-plugin-svelte": "^3.2.7",
@@ -62,13 +61,11 @@
         "chartjs-plugin-zoom": "^2.0.1",
         "clsx": "^2.1.1",
         "dexie": "^4.0.8",
-        "file-saver": "^2.0.5",
         "gpx": "file:../gpx",
         "immer": "^10.1.1",
-        "jszip": "^3.10.1",
+        "lucide-static": "^0.427.0",
-        "lucide-static": "^0.460.0",
+        "lucide-svelte": "^0.427.0",
-        "lucide-svelte": "^0.460.1",
+        "mapbox-gl": "^3.7.0",
-        "mapbox-gl": "^3.11.1",
         "mapillary-js": "^4.1.2",
         "mode-watcher": "^0.3.1",
         "png.js": "^0.2.1",

website/postcss.config.js

@@ -3,4 +3,4 @@ export default {
     tailwindcss: {},
     autoprefixer: {},
   },
-};
+}

website/src/app.html

@@ -1,14 +1,15 @@
 <!doctype html>
 <html>
-    <head>
+
+<head>
     <meta charset="utf-8" />
     <link rel="icon" href="%sveltekit.assets%/favicon.png" />
-        <link rel="apple-touch-icon" href="%sveltekit.assets%/apple-touch-icon.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     %sveltekit.head%
-    </head>
+</head>
 
-    <body data-sveltekit-preload-data="hover">
+<body data-sveltekit-preload-data="hover">
     <div style="display: contents">%sveltekit.body%</div>
-    </body>
+</body>
+
 </html>

website/src/app.pcss

@@ -72,7 +72,7 @@
 
     --link: 80 190 255;
  
-        --ring: hsl(212.7, 26.8%, 83.9);
+    --ring: hsl(212.7,26.8%,83.9);
   }
 }
  

website/src/hooks.server.js

@@ -38,18 +38,31 @@ export async function handle({ event, resolve }) {
     <meta name="twitter:url" content="https://gpx.studio/" />
     <meta name="twitter:site" content="@gpxstudio" />
     <meta name="twitter:creator" content="@gpxstudio" />
-    <link rel="alternate" hreflang="x-default" href="https://gpx.studio${getURLForLanguage('en', path)}" />
+    <link rel="alternate" hreflang="x-default" href="https://gpx.studio${getURLForLanguage('en', path)}" />`;
-    <link rel="manifest" href="/${language}.manifest.webmanifest" />`;
 
     for (let lang of Object.keys(languages)) {
         headTag += `   <link rel="alternate" hreflang="${lang}" href="https://gpx.studio${getURLForLanguage(lang, path)}" />
 `;
     }
 
+    const stringsHTML = page === 'app' ? stringsToHTML(strings) : '';
+
     const response = await resolve(event, {
-        transformPageChunk: ({ html }) =>
+        transformPageChunk: ({ html }) => html.replace('<html>', htmlTag).replace('<head>', headTag).replace('</body>', `<div class="fixed -z-10 text-transparent">${stringsHTML}</div></body>`)
-            html.replace('<html>', htmlTag).replace('<head>', headTag),
     });
 
     return response;
 }
+
+function stringsToHTML(dictionary, strings = new Set(), root = true) {
+    Object.values(dictionary).forEach((value) => {
+        if (typeof value === 'object') {
+            stringsToHTML(value, strings, false);
+        } else {
+            strings.add(value);
+        }
+    });
+    if (root) {
+        return Array.from(strings).map((string) => `<p>${string}</p>`).join('');
+    }
+}

website/src/lib/assets/colors.ts

@@ -1,171 +0,0 @@
-export const surfaceColors: { [key: string]: string } = {
-    missing: '#d1d1d1',
-    paved: '#8c8c8c',
-    unpaved: '#6b443a',
-    asphalt: '#8c8c8c',
-    concrete: '#8c8c8c',
-    cobblestone: '#ffd991',
-    paving_stones: '#8c8c8c',
-    sett: '#ffd991',
-    metal: '#8c8c8c',
-    wood: '#6b443a',
-    compacted: '#ffffa8',
-    fine_gravel: '#ffffa8',
-    gravel: '#ffffa8',
-    pebblestone: '#ffffa8',
-    rock: '#ffd991',
-    dirt: '#ffffa8',
-    ground: '#6b443a',
-    earth: '#6b443a',
-    mud: '#6b443a',
-    sand: '#ffffc4',
-    grass: '#61b55c',
-    grass_paver: '#61b55c',
-    clay: '#6b443a',
-    stone: '#ffd991',
-};
-
-export function getSurfaceColor(surface: string): string {
-    return surfaceColors[surface] ? surfaceColors[surface] : surfaceColors.missing;
-}
-
-export const highwayColors: { [key: string]: string } = {
-    missing: '#d1d1d1',
-    motorway: '#ff4d33',
-    motorway_link: '#ff4d33',
-    trunk: '#ff5e4d',
-    trunk_link: '#ff947f',
-    primary: '#ff6e5c',
-    primary_link: '#ff6e5c',
-    secondary: '#ff8d7b',
-    secondary_link: '#ff8d7b',
-    tertiary: '#ffd75f',
-    tertiary_link: '#ffd75f',
-    unclassified: '#f1f2a5',
-    road: '#f1f2a5',
-    residential: '#73b2ff',
-    living_street: '#73b2ff',
-    service: '#9c9cd9',
-    track: '#a8e381',
-    footway: '#a8e381',
-    path: '#a8e381',
-    pedestrian: '#a8e381',
-    cycleway: '#9de2ff',
-    construction: '#e09a4a',
-    bridleway: '#946f43',
-    raceway: '#ff0000',
-    rest_area: '#9c9cd9',
-    services: '#9c9cd9',
-    corridor: '#474747',
-    elevator: '#474747',
-    steps: '#474747',
-    bus_stop: '#8545a3',
-    busway: '#8545a3',
-    via_ferrata: '#474747',
-};
-
-export const sacScaleColors: { [key: string]: string } = {
-    hiking: '#007700',
-    mountain_hiking: '#1843ad',
-    demanding_mountain_hiking: '#ffff00',
-    alpine_hiking: '#ff9233',
-    demanding_alpine_hiking: '#ff0000',
-    difficult_alpine_hiking: '#000000',
-};
-
-export const mtbScaleColors: { [key: string]: string } = {
-    '0-': '#007700',
-    '0': '#007700',
-    '0+': '#007700',
-    '1-': '#1843ad',
-    '1': '#1843ad',
-    '1+': '#1843ad',
-    '2-': '#ffff00',
-    '2': '#ffff00',
-    '2+': '#ffff00',
-    '3': '#ff0000',
-    '4': '#00ff00',
-    '5': '#000000',
-    '6': '#b105eb',
-};
-
-function createPattern(
-    backgroundColor: string,
-    sacScaleColor: string | undefined,
-    mtbScaleColor: string | undefined,
-    size: number = 16,
-    lineWidth: number = 4
-) {
-    let canvas = document.createElement('canvas');
-    canvas.width = size;
-    canvas.height = size;
-    let ctx = canvas.getContext('2d');
-    if (ctx) {
-        ctx.fillStyle = backgroundColor;
-        ctx.fillRect(0, 0, size, size);
-        ctx.lineWidth = lineWidth;
-
-        const halfSize = size / 2;
-        const halfLineWidth = lineWidth / 2;
-        if (sacScaleColor) {
-            ctx.strokeStyle = sacScaleColor;
-            ctx.beginPath();
-            ctx.moveTo(halfSize - halfLineWidth, -halfLineWidth);
-            ctx.lineTo(size + halfLineWidth, halfSize + halfLineWidth);
-            ctx.stroke();
-            ctx.beginPath();
-            ctx.moveTo(-halfLineWidth, halfSize - halfLineWidth);
-            ctx.lineTo(halfSize + halfLineWidth, size + halfLineWidth);
-            ctx.stroke();
-        }
-        if (mtbScaleColor) {
-            ctx.strokeStyle = mtbScaleColor;
-            ctx.beginPath();
-            ctx.moveTo(halfSize - halfLineWidth, size + halfLineWidth);
-            ctx.lineTo(size + halfLineWidth, halfSize - halfLineWidth);
-            ctx.stroke();
-            ctx.beginPath();
-            ctx.moveTo(-halfLineWidth, halfSize + halfLineWidth);
-            ctx.lineTo(halfSize + halfLineWidth, -halfLineWidth);
-            ctx.stroke();
-        }
-    }
-    return ctx?.createPattern(canvas, 'repeat') || backgroundColor;
-}
-
-const patterns: Record<string, string | CanvasPattern> = {};
-export function getHighwayColor(
-    highway: string,
-    sacScale: string | undefined,
-    mtbScale: string | undefined
-) {
-    let backgroundColor = highwayColors[highway] ? highwayColors[highway] : highwayColors.missing;
-    let sacScaleColor = sacScale ? sacScaleColors[sacScale] : undefined;
-    let mtbScaleColor = mtbScale ? mtbScaleColors[mtbScale] : undefined;
-    if (sacScale || mtbScale) {
-        let patternId = `${backgroundColor}-${[sacScale, mtbScale].filter((x) => x).join('-')}`;
-        if (!patterns[patternId]) {
-            patterns[patternId] = createPattern(backgroundColor, sacScaleColor, mtbScaleColor);
-        }
-        return patterns[patternId];
-    }
-    return backgroundColor;
-}
-
-const maxSlope = 20;
-export function getSlopeColor(slope: number): string {
-    if (slope > maxSlope) {
-        slope = maxSlope;
-    } else if (slope < -maxSlope) {
-        slope = -maxSlope;
-    }
-
-    let v = slope / maxSlope;
-    v = 1 / (1 + Math.exp(-6 * v));
-    v = v - 0.5;
-
-    let hue = ((0.5 - v) * 120).toString(10);
-    let lightness = 90 - Math.abs(v) * 70;
-
-    return `hsl(${hue},70%,${lightness}%)`;
-}

website/src/lib/assets/surfaces.ts

@@ -0,0 +1,31 @@
+export const surfaceColors: { [key: string]: string } = {
+    'missing': '#d1d1d1',
+    'paved': '#8c8c8c',
+    'unpaved': '#6b443a',
+    'asphalt': '#8c8c8c',
+    'concrete': '#8c8c8c',
+    'chipseal': '#8c8c8c',
+    'cobblestone': '#ffd991',
+    'unhewn_cobblestone': '#ffd991',
+    'paving_stones': '#8c8c8c',
+    'stepping_stones': '#c7b2db',
+    'sett': '#ffd991',
+    'metal': '#8c8c8c',
+    'wood': '#6b443a',
+    'compacted': '#ffffa8',
+    'fine_gravel': '#ffffa8',
+    'gravel': '#ffffa8',
+    'pebblestone': '#ffffa8',
+    'rock': '#ffd991',
+    'dirt': '#ffffa8',
+    'ground': '#6b443a',
+    'earth': '#6b443a',
+    'snow': '#bdfffc',
+    'ice': '#bdfffc',
+    'salt': '#b6c0f2',
+    'mud': '#6b443a',
+    'sand': '#ffffc4',
+    'woodchips': '#6b443a',
+    'grass': '#61b55c',
+    'grass_paver': '#61b55c'
+}

website/src/lib/assets/symbols.ts

@@ -1,67 +1,6 @@
-import {
+import { Landmark, Icon, Shell, Bike, Building, Tent, Car, Wrench, ShoppingBasket, Droplet, DoorOpen, Trees, Fuel, Home, Info, TreeDeciduous, CircleParking, Cross, Utensils, Construction, BrickWall, ShowerHead, Mountain, Phone, TrainFront, Bed, Binoculars, TriangleAlert, Anchor } from "lucide-svelte";
-    Landmark,
+import { Landmark as LandmarkSvg, Shell as ShellSvg, Bike as BikeSvg, Building as BuildingSvg, Tent as TentSvg, Car as CarSvg, Wrench as WrenchSvg, ShoppingBasket as ShoppingBasketSvg, Droplet as DropletSvg, DoorOpen as DoorOpenSvg, Trees as TreesSvg, Fuel as FuelSvg, Home as HomeSvg, Info as InfoSvg, TreeDeciduous as TreeDeciduousSvg, CircleParking as CircleParkingSvg, Cross as CrossSvg, Utensils as UtensilsSvg, Construction as ConstructionSvg, BrickWall as BrickWallSvg, ShowerHead as ShowerHeadSvg, Mountain as MountainSvg, Phone as PhoneSvg, TrainFront as TrainFrontSvg, Bed as BedSvg, Binoculars as BinocularsSvg, TriangleAlert as TriangleAlertSvg, Anchor as AnchorSvg } from "lucide-static";
-    Icon,
+import type { ComponentType } from "svelte";
-    Shell,
-    Bike,
-    Building,
-    Tent,
-    Car,
-    Wrench,
-    ShoppingBasket,
-    Droplet,
-    DoorOpen,
-    Trees,
-    Fuel,
-    Home,
-    Info,
-    TreeDeciduous,
-    CircleParking,
-    Cross,
-    Utensils,
-    Construction,
-    BrickWall,
-    ShowerHead,
-    Mountain,
-    Phone,
-    TrainFront,
-    Bed,
-    Binoculars,
-    TriangleAlert,
-    Anchor,
-    Toilet,
-} from 'lucide-svelte';
-import {
-    Landmark as LandmarkSvg,
-    Shell as ShellSvg,
-    Bike as BikeSvg,
-    Building as BuildingSvg,
-    Tent as TentSvg,
-    Car as CarSvg,
-    Wrench as WrenchSvg,
-    ShoppingBasket as ShoppingBasketSvg,
-    Droplet as DropletSvg,
-    DoorOpen as DoorOpenSvg,
-    Trees as TreesSvg,
-    Fuel as FuelSvg,
-    Home as HomeSvg,
-    Info as InfoSvg,
-    TreeDeciduous as TreeDeciduousSvg,
-    CircleParking as CircleParkingSvg,
-    Cross as CrossSvg,
-    Utensils as UtensilsSvg,
-    Construction as ConstructionSvg,
-    BrickWall as BrickWallSvg,
-    ShowerHead as ShowerHeadSvg,
-    Mountain as MountainSvg,
-    Phone as PhoneSvg,
-    TrainFront as TrainFrontSvg,
-    Bed as BedSvg,
-    Binoculars as BinocularsSvg,
-    TriangleAlert as TriangleAlertSvg,
-    Anchor as AnchorSvg,
-    Toilet as ToiletSvg,
-} from 'lucide-static';
-import type { ComponentType } from 'svelte';
 
 export type Symbol = {
     value: string;
@@ -81,28 +20,16 @@ export const symbols: { [key: string]: Symbol } = {
     campground: { value: 'Campground', icon: Tent, iconSvg: TentSvg },
     car: { value: 'Car', icon: Car, iconSvg: CarSvg },
     car_repair: { value: 'Car Repair', icon: Wrench, iconSvg: WrenchSvg },
-    convenience_store: {
+    convenience_store: { value: 'Convenience Store', icon: ShoppingBasket, iconSvg: ShoppingBasketSvg },
-        value: 'Convenience Store',
-        icon: ShoppingBasket,
-        iconSvg: ShoppingBasketSvg,
-    },
     crossing: { value: 'Crossing' },
-    department_store: {
+    department_store: { value: 'Department Store', icon: ShoppingBasket, iconSvg: ShoppingBasketSvg },
-        value: 'Department Store',
-        icon: ShoppingBasket,
-        iconSvg: ShoppingBasketSvg,
-    },
     drinking_water: { value: 'Drinking Water', icon: Droplet, iconSvg: DropletSvg },
     exit: { value: 'Exit', icon: DoorOpen, iconSvg: DoorOpenSvg },
     lodge: { value: 'Lodge', icon: Home, iconSvg: HomeSvg },
     lodging: { value: 'Lodging', icon: Bed, iconSvg: BedSvg },
     forest: { value: 'Forest', icon: Trees, iconSvg: TreesSvg },
     gas_station: { value: 'Gas Station', icon: Fuel, iconSvg: FuelSvg },
-    ground_transportation: {
+    ground_transportation: { value: 'Ground Transportation', icon: TrainFront, iconSvg: TrainFrontSvg },
-        value: 'Ground Transportation',
-        icon: TrainFront,
-        iconSvg: TrainFrontSvg,
-    },
     hotel: { value: 'Hotel', icon: Bed, iconSvg: BedSvg },
     house: { value: 'House', icon: Home, iconSvg: HomeSvg },
     information: { value: 'Information', icon: Info, iconSvg: InfoSvg },
@@ -112,7 +39,7 @@ export const symbols: { [key: string]: Symbol } = {
     picnic_area: { value: 'Picnic Area', icon: Utensils, iconSvg: UtensilsSvg },
     restaurant: { value: 'Restaurant', icon: Utensils, iconSvg: UtensilsSvg },
     restricted_area: { value: 'Restricted Area', icon: Construction, iconSvg: ConstructionSvg },
-    restroom: { value: 'Restroom', icon: Toilet, iconSvg: ToiletSvg },
+    restroom: { value: 'Restroom' },
     road: { value: 'Road', icon: BrickWall, iconSvg: BrickWallSvg },
     scenic_area: { value: 'Scenic Area', icon: Binoculars, iconSvg: BinocularsSvg },
     shelter: { value: 'Shelter', icon: Tent, iconSvg: TentSvg },
@@ -128,6 +55,6 @@ export function getSymbolKey(value: string | undefined): string | undefined {
     if (value === undefined) {
         return undefined;
     } else {
-        return Object.keys(symbols).find((key) => symbols[key].value === value);
+        return Object.keys(symbols).find(key => symbols[key].value === value);
     }
 }

website/src/lib/components/AlgoliaDocSearch.svelte

@@ -13,14 +13,14 @@
 			indexName: 'gpx',
 			container: '#docsearch',
 			searchParameters: {
-                facetFilters: ['lang:' + ($locale ?? 'en')],
+				facetFilters: ['lang:' + ($locale ?? 'en')]
 			},
 			placeholder: $_('docs.search.search'),
 			disableUserPersonalization: true,
 			translations: {
 				button: {
 					buttonText: $_('docs.search.search'),
-                    buttonAriaLabel: $_('docs.search.search'),
+					buttonAriaLabel: $_('docs.search.search')
 				},
 				modal: {
 					searchBox: {
@@ -28,19 +28,19 @@
 						resetButtonAriaLabel: $_('docs.search.clear'),
 						cancelButtonText: $_('docs.search.cancel'),
 						cancelButtonAriaLabel: $_('docs.search.cancel'),
-                        searchInputLabel: $_('docs.search.search'),
+						searchInputLabel: $_('docs.search.search')
 					},
 					footer: {
 						selectText: $_('docs.search.to_select'),
 						navigateText: $_('docs.search.to_navigate'),
-                        closeText: $_('docs.search.to_close'),
+						closeText: $_('docs.search.to_close')
 					},
 					noResultsScreen: {
 						noResultsText: $_('docs.search.no_results'),
-                        suggestedQueryText: $_('docs.search.no_results_suggestion'),
+						suggestedQueryText: $_('docs.search.no_results_suggestion')
-                    },
+					}
-                },
+				}
-            },
+			}
 		});
 	}
 

website/src/lib/components/ButtonWithTooltip.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { Button } from '$lib/components/ui/button/index.js';
 	import * as Tooltip from '$lib/components/ui/tooltip/index.js';
-    import type { Builder } from 'bits-ui';
 
 	export let variant:
 		| 'default'
@@ -13,12 +12,11 @@
 		| undefined = 'default';
 	export let label: string;
 	export let side: 'top' | 'right' | 'bottom' | 'left' = 'top';
-    export let builders: Builder[] = [];
 </script>
 
 <Tooltip.Root>
 	<Tooltip.Trigger asChild let:builder>
-        <Button builders={[...builders, builder]} {variant} {...$$restProps} on:click>
+		<Button builders={[builder]} {variant} {...$$restProps}>
 			<slot />
 		</Button>
 	</Tooltip.Trigger>

website/src/lib/components/CoordinatesPopup.svelte

@@ -1,18 +0,0 @@
-<script lang="ts">
-    import { map } from '$lib/stores';
-    import { trackpointPopup } from '$lib/components/gpx-layer/GPXLayerPopup';
-    import { TrackPoint } from 'gpx';
-
-    $: if ($map) {
-        $map.on('contextmenu', (e) => {
-            trackpointPopup?.setItem({
-                item: new TrackPoint({
-                    attributes: {
-                        lat: e.lngLat.lat,
-                        lon: e.lngLat.lng,
-                    },
-                }),
-            });
-        });
-    }
-</script>

website/src/lib/components/ElevationProfile.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
-    import ButtonWithTooltip from '$lib/components/ButtonWithTooltip.svelte';
-    import * as Popover from '$lib/components/ui/popover';
 	import * as ToggleGroup from '$lib/components/ui/toggle-group';
+	import Tooltip from '$lib/components/Tooltip.svelte';
 	import Chart from 'chart.js/auto';
 	import mapboxgl from 'mapbox-gl';
 	import { map } from '$lib/stores';
@@ -13,15 +12,12 @@
 		Orbit,
 		SquareActivity,
 		Thermometer,
-        Zap,
+		Zap
-        Circle,
-        Check,
-        ChartNoAxesColumn,
-        Construction,
 	} from 'lucide-svelte';
-    import { getSlopeColor, getSurfaceColor, getHighwayColor } from '$lib/assets/colors';
+	import { surfaceColors } from '$lib/assets/surfaces';
-    import { _ } from 'svelte-i18n';
+	import { _, locale } from 'svelte-i18n';
 	import {
+		getCadenceUnits,
 		getCadenceWithUnits,
 		getConvertedDistance,
 		getConvertedElevation,
@@ -30,26 +26,45 @@
 		getDistanceUnits,
 		getDistanceWithUnits,
 		getElevationWithUnits,
+		getHeartRateUnits,
 		getHeartRateWithUnits,
+		getPowerUnits,
 		getPowerWithUnits,
+		getTemperatureUnits,
 		getTemperatureWithUnits,
+		getVelocityUnits,
 		getVelocityWithUnits,
+		secondsToHHMMSS
 	} from '$lib/units';
 	import type { Writable } from 'svelte/store';
+	import { DateFormatter } from '@internationalized/date';
 	import type { GPXStatistics } from 'gpx';
 	import { settings } from '$lib/db';
 	import { mode } from 'mode-watcher';
-    import { df } from '$lib/utils';
 
 	export let gpxStatistics: Writable<GPXStatistics>;
 	export let slicedGPXStatistics: Writable<[GPXStatistics, number, number] | undefined>;
+	export let panelSize: number;
 	export let additionalDatasets: string[];
-    export let elevationFill: 'slope' | 'surface' | 'highway' | undefined;
+	export let elevationFill: 'slope' | 'surface' | undefined;
 	export let showControls: boolean = true;
 
 	const { distanceUnits, velocityUnits, temperatureUnits } = settings;
 
+	let df: DateFormatter;
+
+	$: if ($locale) {
+		df = new DateFormatter($locale, {
+			dateStyle: 'medium',
+			timeStyle: 'medium'
+		});
+	}
+
 	let canvas: HTMLCanvasElement;
+	let showAdditionalScales = true;
+	let updateShowAdditionalScales = () => {
+		showAdditionalScales = canvas.width / window.devicePixelRatio >= 600;
+	};
 	let overlay: HTMLCanvasElement;
 	let chart: Chart;
 
@@ -68,41 +83,42 @@
 			x: {
 				type: 'linear',
 				ticks: {
-                    callback: function (value: number) {
+					callback: function (value: number, index: number, ticks: { value: number }[]) {
+						if (index === ticks.length - 1) {
+							return `${value.toFixed(1).replace(/\.0+$/, '')}`;
+						}
 						return `${value.toFixed(1).replace(/\.0+$/, '')} ${getDistanceUnits()}`;
-                    },
+					}
-                    align: 'inner',
+				}
-                    maxRotation: 0,
-                },
 			},
 			y: {
 				type: 'linear',
 				ticks: {
 					callback: function (value: number) {
 						return getElevationWithUnits(value, false);
-                    },
+					}
-                },
+				}
-            },
+			}
 		},
 		datasets: {
 			line: {
 				pointRadius: 0,
 				tension: 0.4,
 				borderWidth: 2,
-                cubicInterpolationMode: 'monotone',
+				cubicInterpolationMode: 'monotone'
-            },
+			}
 		},
 		interaction: {
 			mode: 'nearest',
 			axis: 'x',
-            intersect: false,
+			intersect: false
 		},
 		plugins: {
 			legend: {
-                display: false,
+				display: false
 			},
 			decimation: {
-                enabled: true,
+				enabled: true
 			},
 			tooltip: {
 				enabled: () => !dragging && !panning,
@@ -141,20 +157,13 @@
 						let slope = {
 							at: point.slope.at.toFixed(1),
 							segment: point.slope.segment.toFixed(1),
-                            length: getDistanceWithUnits(point.slope.length),
+							length: getDistanceWithUnits(point.slope.length)
 						};
-                        let surface = point.extensions.surface
+						let surface = point.surface ? point.surface : 'unknown';
-                            ? point.extensions.surface
-                            : 'unknown';
-                        let highway = point.extensions.highway
-                            ? point.extensions.highway
-                            : 'unknown';
-                        let sacScale = point.extensions.sac_scale;
-                        let mtbScale = point.extensions.mtb_scale;
 
 						let labels = [
 							`    ${$_('quantities.distance')}: ${getDistanceWithUnits(point.x, false)}`,
-                            `    ${$_('quantities.slope')}: ${slope.at} %${elevationFill === 'slope' ? ` (${slope.length} @${slope.segment} %)` : ''}`,
+							`    ${$_('quantities.slope')}: ${slope.at} %${elevationFill === 'slope' ? ` (${slope.length} @${slope.segment} %)` : ''}`
 						];
 
 						if (elevationFill === 'surface') {
@@ -163,26 +172,13 @@
 							);
 						}
 
-                        if (elevationFill === 'highway') {
-                            labels.push(
-                                `    ${$_('quantities.highway')}: ${$_(`toolbar.routing.highway.${highway}`)}${
-                                    sacScale
-                                        ? ` (${$_(`toolbar.routing.sac_scale.${sacScale}`)})`
-                                        : ''
-                                }`
-                            );
-                            if (mtbScale) {
-                                labels.push(`    ${$_('toolbar.routing.mtb_scale')}: ${mtbScale}`);
-                            }
-                        }
-
 						if (point.time) {
 							labels.push(`    ${$_('quantities.time')}: ${df.format(point.time)}`);
 						}
 
 						return labels;
-                    },
+					}
-                },
+				}
 			},
 			zoom: {
 				pan: {
@@ -196,19 +192,18 @@
 					},
 					onPanComplete: function () {
 						panning = false;
-                    },
+					}
 				},
 				zoom: {
 					wheel: {
-                        enabled: true,
+						enabled: true
 					},
 					mode: 'x',
 					onZoomStart: function ({ chart, event }: { chart: Chart; event: any }) {
 						if (
 							event.deltaY < 0 &&
 							Math.abs(
-                                chart.getInitialScaleBounds().x.max /
+								chart.getInitialScaleBounds().x.max / chart.options.plugins.zoom.limits.x.minRange -
-                                    chart.options.plugins.zoom.limits.x.minRange -
 									chart.getZoomLevel()
 							) < 0.01
 						) {
@@ -217,35 +212,86 @@
 						}
 
 						$slicedGPXStatistics = undefined;
-                    },
+					}
 				},
 				limits: {
 					x: {
 						min: 'original',
 						max: 'original',
-                        minRange: 1,
+						minRange: 1
-                    },
+					}
-                },
+				}
-            },
+			}
 		},
 		stacked: false,
 		onResize: function () {
 			updateOverlay();
-        },
+			updateShowAdditionalScales();
+		}
 	};
 
-    let datasets: string[] = ['speed', 'hr', 'cad', 'atemp', 'power'];
+	let datasets: {
-    datasets.forEach((id) => {
+		[key: string]: {
+			id: string;
+			getLabel: () => string;
+			getUnits: () => string;
+		};
+	} = {
+		speed: {
+			id: 'speed',
+			getLabel: () => ($velocityUnits === 'speed' ? $_('quantities.speed') : $_('quantities.pace')),
+			getUnits: () => getVelocityUnits()
+		},
+		hr: {
+			id: 'hr',
+			getLabel: () => $_('quantities.heartrate'),
+			getUnits: () => getHeartRateUnits()
+		},
+		cad: {
+			id: 'cad',
+			getLabel: () => $_('quantities.cadence'),
+			getUnits: () => getCadenceUnits()
+		},
+		atemp: {
+			id: 'atemp',
+			getLabel: () => $_('quantities.temperature'),
+			getUnits: () => getTemperatureUnits()
+		},
+		power: {
+			id: 'power',
+			getLabel: () => $_('quantities.power'),
+			getUnits: () => getPowerUnits()
+		}
+	};
+
+	for (let [id, dataset] of Object.entries(datasets)) {
 		options.scales[`y${id}`] = {
 			type: 'linear',
 			position: 'right',
+			title: {
+				display: true,
+				text: dataset.getLabel() + ' (' + dataset.getUnits() + ')',
+				padding: {
+					top: 6,
+					bottom: 0
+				}
+			},
 			grid: {
-                display: false,
+				display: false
 			},
 			reverse: () => id === 'speed' && $velocityUnits === 'pace',
-            display: false,
+			display: false
+		};
+	}
+	options.scales.yspeed['ticks'] = {
+		callback: function (value: number) {
+			if ($velocityUnits === 'speed') {
+				return value;
+			} else {
+				return secondsToHHMMSS(value);
+			}
+		}
 	};
-    });
 
 	onMount(async () => {
 		Chart.register((await import('chartjs-plugin-zoom')).default); // dynamic import to avoid SSR and 'window is not defined' error
@@ -253,7 +299,7 @@
 		chart = new Chart(canvas, {
 			type: 'line',
 			data: {
-                datasets: [],
+				datasets: []
 			},
 			options,
 			plugins: [
@@ -266,18 +312,20 @@
 								marker.remove();
 							}
 						}
-                    },
+					}
-                },
+				}
-            ],
+			]
 		});
 
 		// Map marker to show on hover
 		let element = document.createElement('div');
 		element.className = 'h-4 w-4 rounded-full bg-cyan-500 border-2 border-white';
 		marker = new mapboxgl.Marker({
-            element,
+			element
 		});
 
+		updateShowAdditionalScales();
+
 		let startIndex = 0;
 		let endIndex = 0;
 		function getIndex(evt) {
@@ -285,7 +333,7 @@
 				evt,
 				'x',
 				{
-                    intersect: false,
+					intersect: false
 				},
 				true
 			);
@@ -328,12 +376,9 @@
 						startIndex = endIndex;
 					} else if (startIndex !== endIndex) {
 						$slicedGPXStatistics = [
-                            $gpxStatistics.slice(
+							$gpxStatistics.slice(Math.min(startIndex, endIndex), Math.max(startIndex, endIndex)),
 							Math.min(startIndex, endIndex),
 							Math.max(startIndex, endIndex)
-                            ),
-                            Math.min(startIndex, endIndex),
-                            Math.max(startIndex, endIndex),
 						];
 					}
 				}
@@ -367,111 +412,126 @@
 					slope: {
 						at: data.local.slope.at[index],
 						segment: data.local.slope.segment[index],
-                        length: data.local.slope.length[index],
+						length: data.local.slope.length[index]
 					},
-                    extensions: point.getExtensions(),
+					surface: point.getSurface(),
 					coordinates: point.getCoordinates(),
-                    index: index,
+					index: index
 				};
 			}),
 			normalized: true,
 			fill: 'start',
-            order: 1,
+			order: 1
 		};
 		chart.data.datasets[1] = {
+			label: datasets.speed.getLabel(),
 			data: data.local.points.map((point, index) => {
 				return {
 					x: getConvertedDistance(data.local.distance.total[index]),
 					y: getConvertedVelocity(data.local.speed[index]),
-                    index: index,
+					index: index
 				};
 			}),
 			normalized: true,
-            yAxisID: 'yspeed',
+			yAxisID: `y${datasets.speed.id}`,
-            hidden: true,
+			hidden: true
 		};
 		chart.data.datasets[2] = {
+			label: datasets.hr.getLabel(),
 			data: data.local.points.map((point, index) => {
 				return {
 					x: getConvertedDistance(data.local.distance.total[index]),
 					y: point.getHeartRate(),
-                    index: index,
+					index: index
 				};
 			}),
 			normalized: true,
-            yAxisID: 'yhr',
+			yAxisID: `y${datasets.hr.id}`,
-            hidden: true,
+			hidden: true
 		};
 		chart.data.datasets[3] = {
+			label: datasets.cad.getLabel(),
 			data: data.local.points.map((point, index) => {
 				return {
 					x: getConvertedDistance(data.local.distance.total[index]),
 					y: point.getCadence(),
-                    index: index,
+					index: index
 				};
 			}),
 			normalized: true,
-            yAxisID: 'ycad',
+			yAxisID: `y${datasets.cad.id}`,
-            hidden: true,
+			hidden: true
 		};
 		chart.data.datasets[4] = {
+			label: datasets.atemp.getLabel(),
 			data: data.local.points.map((point, index) => {
 				return {
 					x: getConvertedDistance(data.local.distance.total[index]),
 					y: getConvertedTemperature(point.getTemperature()),
-                    index: index,
+					index: index
 				};
 			}),
 			normalized: true,
-            yAxisID: 'yatemp',
+			yAxisID: `y${datasets.atemp.id}`,
-            hidden: true,
+			hidden: true
 		};
 		chart.data.datasets[5] = {
+			label: datasets.power.getLabel(),
 			data: data.local.points.map((point, index) => {
 				return {
 					x: getConvertedDistance(data.local.distance.total[index]),
 					y: point.getPower(),
-                    index: index,
+					index: index
 				};
 			}),
 			normalized: true,
-            yAxisID: 'ypower',
+			yAxisID: `y${datasets.power.id}`,
-            hidden: true,
+			hidden: true
 		};
 		chart.options.scales.x['min'] = 0;
 		chart.options.scales.x['max'] = getConvertedDistance(data.global.distance.total);
 
+		// update units
+		for (let [id, dataset] of Object.entries(datasets)) {
+			chart.options.scales[`y${id}`].title.text =
+				dataset.getLabel() + ' (' + dataset.getUnits() + ')';
+		}
+
 		chart.update();
 	}
 
+	let maxSlope = 20;
 	function slopeFillCallback(context) {
-        return getSlopeColor(context.p0.raw.slope.segment);
+		let slope = context.p0.raw.slope.segment;
+		if (slope > maxSlope) {
+			slope = maxSlope;
+		} else if (slope < -maxSlope) {
+			slope = -maxSlope;
+		}
+
+		let v = slope / maxSlope;
+		v = 1 / (1 + Math.exp(-6 * v));
+		v = v - 0.5;
+
+		let hue = ((0.5 - v) * 120).toString(10);
+		let lightness = 90 - Math.abs(v) * 70;
+
+		return ['hsl(', hue, ',70%,', lightness, '%)'].join('');
 	}
 
 	function surfaceFillCallback(context) {
-        return getSurfaceColor(context.p0.raw.extensions.surface);
+		let surface = context.p0.raw.surface;
-    }
+		return surfaceColors[surface] ? surfaceColors[surface] : surfaceColors.missing;
-
-    function highwayFillCallback(context) {
-        return getHighwayColor(
-            context.p0.raw.extensions.highway,
-            context.p0.raw.extensions.sac_scale,
-            context.p0.raw.extensions.mtb_scale
-        );
 	}
 
 	$: if (chart) {
 		if (elevationFill === 'slope') {
 			chart.data.datasets[0]['segment'] = {
-                backgroundColor: slopeFillCallback,
+				backgroundColor: slopeFillCallback
 			};
 		} else if (elevationFill === 'surface') {
 			chart.data.datasets[0]['segment'] = {
-                backgroundColor: surfaceFillCallback,
+				backgroundColor: surfaceFillCallback
-            };
-        } else if (elevationFill === 'highway') {
-            chart.data.datasets[0]['segment'] = {
-                backgroundColor: highwayFillCallback,
 			};
 		} else {
 			chart.data.datasets[0]['segment'] = {};
@@ -492,6 +552,12 @@
 			chart.data.datasets[4].hidden = !includeTemperature;
 			chart.data.datasets[5].hidden = !includePower;
 		}
+		chart.options.scales[`y${datasets.speed.id}`].display = includeSpeed && showAdditionalScales;
+		chart.options.scales[`y${datasets.hr.id}`].display = includeHeartRate && showAdditionalScales;
+		chart.options.scales[`y${datasets.cad.id}`].display = includeCadence && showAdditionalScales;
+		chart.options.scales[`y${datasets.atemp.id}`].display =
+			includeTemperature && showAdditionalScales;
+		chart.options.scales[`y${datasets.power.id}`].display = includePower && showAdditionalScales;
 		chart.update();
 	}
 
@@ -502,8 +568,6 @@
 
 		overlay.width = canvas.width / window.devicePixelRatio;
 		overlay.height = canvas.height / window.devicePixelRatio;
-        overlay.style.width = `${overlay.width}px`;
-        overlay.style.height = `${overlay.height}px`;
 
 		if ($slicedGPXStatistics) {
 			let startIndex = $slicedGPXStatistics[1];
@@ -527,7 +591,7 @@
 					startPixel,
 					chart.chartArea.top,
 					endPixel - startPixel,
-                    chart.chartArea.height
+					chart.chartArea.bottom - chart.chartArea.top
 				);
 			}
 		} else if (overlay) {
@@ -547,141 +611,75 @@
 	});
 </script>
 
-<div class="h-full grow min-w-0 relative py-2">
+<div class="h-full grow min-w-0 flex flex-row gap-4 items-center {$$props.class ?? ''}">
-    <canvas bind:this={overlay} class="w-full h-full absolute pointer-events-none"></canvas>
+	<div class="grow h-full min-w-0 relative">
-    <canvas bind:this={canvas} class="w-full h-full absolute"></canvas>
+		<canvas bind:this={overlay} class=" w-full h-full absolute pointer-events-none"></canvas>
+		<canvas bind:this={canvas} class="w-full h-full"></canvas>
+	</div>
 	{#if showControls}
-        <div class="absolute bottom-10 right-1.5">
+		<div class="h-full flex flex-col justify-center" style="width: {panelSize > 158 ? 22 : 42}px">
-            <Popover.Root>
-                <Popover.Trigger asChild let:builder>
-                    <ButtonWithTooltip
-                        label={$_('chart.settings')}
-                        builders={[builder]}
-                        variant="outline"
-                        class="w-7 h-7 p-0 flex justify-center opacity-70 hover:opacity-100 transition-opacity duration-300 hover:bg-background"
-                    >
-                        <ChartNoAxesColumn size="18" />
-                    </ButtonWithTooltip>
-                </Popover.Trigger>
-                <Popover.Content
-                    class="w-fit p-0 flex flex-col divide-y"
-                    side="top"
-                    sideOffset={-32}
-                >
 			<ToggleGroup.Root
-                        class="flex flex-col items-start gap-0 p-1"
+				class="{panelSize > 158
+					? 'flex-col'
+					: 'flex-row'} flex-wrap gap-0 min-h-0 content-center border rounded-t-md"
 				type="single"
 				bind:value={elevationFill}
 			>
-                        <ToggleGroup.Item
+				<ToggleGroup.Item class="p-0 w-5 h-5" value="slope" aria-label={$_('chart.show_slope')}>
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+					<Tooltip side="left" label={$_('chart.show_slope')}>
-                            value="slope"
+						<TriangleRight size="15" />
-                        >
+					</Tooltip>
-                            <div class="w-6 flex justify-center items-center">
-                                {#if elevationFill === 'slope'}
-                                    <Circle class="h-1.5 w-1.5 fill-current text-current" />
-                                {/if}
-                            </div>
-                            <TriangleRight size="15" class="mr-1" />
-                            {$_('quantities.slope')}
 				</ToggleGroup.Item>
-                        <ToggleGroup.Item
+				<ToggleGroup.Item class="p-0 w-5 h-5" value="surface" aria-label={$_('chart.show_surface')}>
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+					<Tooltip side="left" label={$_('chart.show_surface')}>
-                            value="surface"
+						<BrickWall size="15" />
-                            variant="outline"
+					</Tooltip>
-                        >
-                            <div class="w-6 flex justify-center items-center">
-                                {#if elevationFill === 'surface'}
-                                    <Circle class="h-1.5 w-1.5 fill-current text-current" />
-                                {/if}
-                            </div>
-                            <BrickWall size="15" class="mr-1" />
-                            {$_('quantities.surface')}
-                        </ToggleGroup.Item>
-                        <ToggleGroup.Item
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
-                            value="highway"
-                            variant="outline"
-                        >
-                            <div class="w-6 flex justify-center items-center">
-                                {#if elevationFill === 'highway'}
-                                    <Circle class="h-1.5 w-1.5 fill-current text-current" />
-                                {/if}
-                            </div>
-                            <Construction size="15" class="mr-1" />
-                            {$_('quantities.highway')}
 				</ToggleGroup.Item>
 			</ToggleGroup.Root>
 			<ToggleGroup.Root
-                        class="flex flex-col items-start gap-0 p-1"
+				class="{panelSize > 158
+					? 'flex-col'
+					: 'flex-row'} flex-wrap gap-0 min-h-0 content-center border rounded-b-md -mt-[1px]"
 				type="multiple"
 				bind:value={additionalDatasets}
 			>
 				<ToggleGroup.Item
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+					class="p-0 w-5 h-5"
 					value="speed"
+					aria-label={$velocityUnits === 'speed' ? $_('chart.show_speed') : $_('chart.show_pace')}
 				>
-                            <div class="w-6 flex justify-center items-center">
+					<Tooltip
-                                {#if additionalDatasets.includes('speed')}
+						side="left"
-                                    <Check size="14" />
+						label={$velocityUnits === 'speed' ? $_('chart.show_speed') : $_('chart.show_pace')}
-                                {/if}
+					>
-                            </div>
+						<Zap size="15" />
-                            <Zap size="15" class="mr-1" />
+					</Tooltip>
-                            {$velocityUnits === 'speed'
+				</ToggleGroup.Item>
-                                ? $_('quantities.speed')
+				<ToggleGroup.Item class="p-0 w-5 h-5" value="hr" aria-label={$_('chart.show_heartrate')}>
-                                : $_('quantities.pace')}
+					<Tooltip side="left" label={$_('chart.show_heartrate')}>
+						<HeartPulse size="15" />
+					</Tooltip>
+				</ToggleGroup.Item>
+				<ToggleGroup.Item class="p-0 w-5 h-5" value="cad" aria-label={$_('chart.show_cadence')}>
+					<Tooltip side="left" label={$_('chart.show_cadence')}>
+						<Orbit size="15" />
+					</Tooltip>
 				</ToggleGroup.Item>
 				<ToggleGroup.Item
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+					class="p-0 w-5 h-5"
-                            value="hr"
-                        >
-                            <div class="w-6 flex justify-center items-center">
-                                {#if additionalDatasets.includes('hr')}
-                                    <Check size="14" />
-                                {/if}
-                            </div>
-                            <HeartPulse size="15" class="mr-1" />
-                            {$_('quantities.heartrate')}
-                        </ToggleGroup.Item>
-                        <ToggleGroup.Item
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
-                            value="cad"
-                        >
-                            <div class="w-6 flex justify-center items-center">
-                                {#if additionalDatasets.includes('cad')}
-                                    <Check size="14" />
-                                {/if}
-                            </div>
-                            <Orbit size="15" class="mr-1" />
-                            {$_('quantities.cadence')}
-                        </ToggleGroup.Item>
-                        <ToggleGroup.Item
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
 					value="atemp"
+					aria-label={$_('chart.show_temperature')}
 				>
-                            <div class="w-6 flex justify-center items-center">
+					<Tooltip side="left" label={$_('chart.show_temperature')}>
-                                {#if additionalDatasets.includes('atemp')}
+						<Thermometer size="15" />
-                                    <Check size="14" />
+					</Tooltip>
-                                {/if}
-                            </div>
-                            <Thermometer size="15" class="mr-1" />
-                            {$_('quantities.temperature')}
 				</ToggleGroup.Item>
-                        <ToggleGroup.Item
+				<ToggleGroup.Item class="p-0 w-5 h-5" value="power" aria-label={$_('chart.show_power')}>
-                            class="p-0 pr-1.5 h-6 w-full rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+					<Tooltip side="left" label={$_('chart.show_power')}>
-                            value="power"
+						<SquareActivity size="15" />
-                        >
+					</Tooltip>
-                            <div class="w-6 flex justify-center items-center">
-                                {#if additionalDatasets.includes('power')}
-                                    <Check size="14" />
-                                {/if}
-                            </div>
-                            <SquareActivity size="15" class="mr-1" />
-                            {$_('quantities.power')}
 				</ToggleGroup.Item>
 			</ToggleGroup.Root>
-                </Popover.Content>
-            </Popover.Root>
 		</div>
 	{/if}
 </div>

website/src/lib/components/Export.svelte

@@ -10,17 +10,17 @@
 		exportSelectedFiles,
 		ExportState,
 		exportState,
-        gpxStatistics,
+		gpxStatistics
 	} from '$lib/stores';
 	import { fileObservers } from '$lib/db';
 	import {
 		Download,
 		Zap,
-        Earth,
+		BrickWall,
 		HeartPulse,
 		Orbit,
 		Thermometer,
-        SquareActivity,
+		SquareActivity
 	} from 'lucide-svelte';
 	import { _ } from 'svelte-i18n';
 	import { selection } from './file-list/Selection';
@@ -31,19 +31,19 @@
 	let open = false;
 	let exportOptions: Record<string, boolean> = {
 		time: true,
+		surface: true,
 		hr: true,
 		cad: true,
 		atemp: true,
-        power: true,
+		power: true
-        extensions: true,
 	};
 	let hide: Record<string, boolean> = {
 		time: false,
+		surface: false,
 		hr: false,
 		cad: false,
 		atemp: false,
-        power: false,
+		power: false
-        extensions: false,
 	};
 
 	$: if ($exportState !== ExportState.NONE) {
@@ -63,11 +63,11 @@
 		}
 
 		hide.time = statistics.global.time.total === 0;
+		hide.surface = !Object.keys(statistics.global.surface).some((key) => key !== 'unknown');
 		hide.hr = statistics.global.hr.count === 0;
 		hide.cad = statistics.global.cad.count === 0;
 		hide.atemp = statistics.global.atemp.count === 0;
 		hide.power = statistics.global.power.count === 0;
-        hide.extensions = Object.keys(statistics.global.extensions).length === 0;
 	}
 
 	$: exclude = Object.keys(exportOptions).filter((key) => !exportOptions[key]);
@@ -121,9 +121,7 @@
 				</Button>
 			</div>
 			<div
-                class="w-full max-w-xl flex flex-col items-center gap-2 {Object.values(hide).some(
+				class="w-full max-w-xl flex flex-col items-center gap-2 {Object.values(hide).some((v) => !v)
-                    (v) => !v
-                )
 					? ''
 					: 'hidden'}"
 			>
@@ -146,13 +144,11 @@
 							{$_('quantities.time')}
 						</Label>
 					</div>
-                    <div
+					<div class="flex flex-row items-center gap-1.5 {hide.surface ? 'hidden' : ''}">
-                        class="flex flex-row items-center gap-1.5 {hide.extensions ? 'hidden' : ''}"
+						<Checkbox id="export-surface" bind:checked={exportOptions.surface} />
-                    >
+						<Label for="export-surface" class="flex flex-row items-center gap-1">
-                        <Checkbox id="export-extensions" bind:checked={exportOptions.extensions} />
+							<BrickWall size="16" />
-                        <Label for="export-extensions" class="flex flex-row items-center gap-1">
+							{$_('quantities.surface')}
-                            <Earth size="16" />
-                            {$_('quantities.osm_extensions')}
 						</Label>
 					</div>
 					<div class="flex flex-row items-center gap-1.5 {hide.hr ? 'hidden' : ''}">

website/src/lib/components/GPXStatistics.svelte

@@ -28,7 +28,7 @@
 
 <Card.Root
 	class="h-full {orientation === 'vertical'
-        ? 'min-w-40 sm:min-w-44 text-sm sm:text-base'
+		? 'min-w-44 sm:min-w-52 text-sm sm:text-base'
 		: 'w-full'} border-none shadow-none"
 >
 	<Card.Content
@@ -38,32 +38,28 @@
 	>
 		<Tooltip label={$_('quantities.distance')}>
 			<span class="flex flex-row items-center">
-                <Ruler size="16" class="mr-1" />
+				<Ruler size="18" class="mr-1" />
 				<WithUnits value={statistics.global.distance.total} type="distance" />
 			</span>
 		</Tooltip>
 		<Tooltip label={$_('quantities.elevation_gain_loss')}>
 			<span class="flex flex-row items-center">
-                <MoveUpRight size="16" class="mr-1" />
+				<MoveUpRight size="18" class="mr-1" />
 				<WithUnits value={statistics.global.elevation.gain} type="elevation" />
-                <MoveDownRight size="16" class="mx-1" />
+				<MoveDownRight size="18" class="mx-1" />
 				<WithUnits value={statistics.global.elevation.loss} type="elevation" />
 			</span>
 		</Tooltip>
 		{#if panelSize > 120 || orientation === 'horizontal'}
 			<Tooltip
 				class={orientation === 'horizontal' ? 'hidden xs:block' : ''}
-                label="{$velocityUnits === 'speed'
+				label="{$velocityUnits === 'speed' ? $_('quantities.speed') : $_('quantities.pace')} ({$_(
-                    ? $_('quantities.speed')
+					'quantities.moving'
-                    : $_('quantities.pace')} ({$_('quantities.moving')} / {$_('quantities.total')})"
+				)} / {$_('quantities.total')})"
 			>
 				<span class="flex flex-row items-center">
-                    <Zap size="16" class="mr-1" />
+					<Zap size="18" class="mr-1" />
-                    <WithUnits
+					<WithUnits value={statistics.global.speed.moving} type="speed" showUnits={false} />
-                        value={statistics.global.speed.moving}
-                        type="speed"
-                        showUnits={false}
-                    />
 					<span class="mx-1">/</span>
 					<WithUnits value={statistics.global.speed.total} type="speed" />
 				</span>
@@ -72,12 +68,10 @@
 		{#if panelSize > 160 || orientation === 'horizontal'}
 			<Tooltip
 				class={orientation === 'horizontal' ? 'hidden md:block' : ''}
-                label="{$_('quantities.time')} ({$_('quantities.moving')} / {$_(
+				label="{$_('quantities.time')} ({$_('quantities.moving')} / {$_('quantities.total')})"
-                    'quantities.total'
-                )})"
 			>
 				<span class="flex flex-row items-center">
-                    <Timer size="16" class="mr-1" />
+					<Timer size="18" class="mr-1" />
 					<WithUnits value={statistics.global.time.moving} type="time" />
 					<span class="mx-1">/</span>
 					<WithUnits value={statistics.global.time.total} type="time" />

website/src/lib/components/LanguageSelect.svelte

@@ -8,13 +8,13 @@
 
 	let selected = {
 		value: '',
-        label: '',
+		label: ''
 	};
 
 	$: if ($locale) {
 		selected = {
 			value: $locale,
-            label: languages[$locale],
+			label: languages[$locale]
 		};
 	}
 </script>

website/src/lib/components/Map.svelte

@@ -22,17 +22,16 @@
 	mapboxgl.accessToken = accessToken;
 
 	let webgl2Supported = true;
-    let embeddedApp = false;
 	let fitBoundsOptions: mapboxgl.FitBoundsOptions = {
 		maxZoom: 15,
 		linear: true,
-        easing: () => 1,
+		easing: () => 1
 	};
 
-    const { distanceUnits, elevationProfile, treeFileView, bottomPanelSize, rightPanelSize } =
+	const { distanceUnits, elevationProfile, verticalFileView, bottomPanelSize, rightPanelSize } =
 		settings;
 	let scaleControl = new mapboxgl.ScaleControl({
-        unit: $distanceUnits,
+		unit: $distanceUnits
 	});
 
 	onMount(() => {
@@ -41,10 +40,6 @@
 			webgl2Supported = false;
 			return;
 		}
-        if (window.top !== window.self && !$page.route.id?.includes('embed')) {
-            embeddedApp = true;
-            return;
-        }
 
 		let language = $page.params.language;
 		if (language === 'zh') {
@@ -70,12 +65,12 @@
 							sources: {},
 							layers: [],
 							glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf',
-                            sprite: `https://api.mapbox.com/styles/v1/mapbox/outdoors-v12/sprite?access_token=${PUBLIC_MAPBOX_TOKEN}`,
+							sprite: `https://api.mapbox.com/styles/v1/mapbox/outdoors-v12/sprite?access_token=${PUBLIC_MAPBOX_TOKEN}`
-                        },
+						}
 					},
 					{
 						id: 'basemap',
-                        url: '',
+						url: ''
 					},
 					{
 						id: 'overlays',
@@ -83,18 +78,17 @@
 						data: {
 							version: 8,
 							sources: {},
-                            layers: [],
+							layers: []
+						}
+					}
+				]
 			},
-                    },
-                ],
-            },
-            projection: 'globe',
 			zoom: 0,
 			hash: hash,
 			language,
 			attributionControl: false,
 			logoPosition: 'bottom-right',
-            boxZoom: false,
+			boxZoom: false
 		});
 		newMap.on('load', () => {
 			$map = newMap; // only set the store after the map has loaded
@@ -104,13 +98,13 @@
 
 		newMap.addControl(
 			new mapboxgl.AttributionControl({
-                compact: true,
+				compact: true
 			})
 		);
 
 		newMap.addControl(
 			new mapboxgl.NavigationControl({
-                visualizePitch: true,
+				visualizePitch: true
 			})
 		);
 
@@ -134,12 +128,12 @@
 									type: 'Feature',
 									geometry: {
 										type: 'Point',
-                                        coordinates: [result.lon, result.lat],
+										coordinates: [result.lon, result.lat]
 									},
-                                    place_name: result.display_name,
+									place_name: result.display_name
 								};
 							});
-                        }),
+						})
 			});
 			let onKeyDown = geocoder._onKeyDown;
 			geocoder._onKeyDown = (e: KeyboardEvent) => {
@@ -157,11 +151,11 @@
 			newMap.addControl(
 				new mapboxgl.GeolocateControl({
 					positionOptions: {
-                        enableHighAccuracy: true,
+						enableHighAccuracy: true
 					},
 					fitBoundsOptions,
 					trackUserLocation: true,
-                    showUserHeading: true,
+					showUserHeading: true
 				})
 			);
 		}
@@ -173,25 +167,25 @@
 				type: 'raster-dem',
 				url: 'mapbox://mapbox.mapbox-terrain-dem-v1',
 				tileSize: 512,
-                maxzoom: 14,
+				maxzoom: 14
 			});
 			if (newMap.getPitch() > 0) {
 				newMap.setTerrain({
 					source: 'mapbox-dem',
-                    exaggeration: 1,
+					exaggeration: 1
 				});
 			}
 			newMap.setFog({
 				color: 'rgb(186, 210, 235)',
 				'high-color': 'rgb(36, 92, 223)',
 				'horizon-blend': 0.1,
-                'space-color': 'rgb(156, 240, 255)',
+				'space-color': 'rgb(156, 240, 255)'
 			});
 			newMap.on('pitch', () => {
 				if (newMap.getPitch() > 0) {
 					newMap.setTerrain({
 						source: 'mapbox-dem',
-                        exaggeration: 1,
+						exaggeration: 1
 					});
 				} else {
 					newMap.setTerrain(null);
@@ -207,30 +201,23 @@
 		}
 	});
 
-    $: if ($map && (!$treeFileView || !$elevationProfile || $bottomPanelSize || $rightPanelSize)) {
+	$: if (
+		$map &&
+		(!$verticalFileView || !$elevationProfile || $bottomPanelSize || $rightPanelSize)
+	) {
 		$map.resize();
 	}
 </script>
 
 <div {...$$restProps}>
-    <div id="map" class="h-full {webgl2Supported && !embeddedApp ? '' : 'hidden'}"></div>
+	<div id="map" class="h-full {webgl2Supported ? '' : 'hidden'}"></div>
 	<div
-        class="flex flex-col items-center justify-center gap-3 h-full {webgl2Supported &&
+		class="flex flex-col items-center justify-center gap-3 h-full {webgl2Supported ? 'hidden' : ''}"
-        !embeddedApp
-            ? 'hidden'
-            : ''} {embeddedApp ? 'z-30' : ''}"
 	>
-        {#if !webgl2Supported}
 		<p>{$_('webgl2_required')}</p>
 		<Button href="https://get.webgl.org/webgl2/" target="_blank">
 			{$_('enable_webgl2')}
 		</Button>
-        {:else if embeddedApp}
-            <p>The app cannot be embedded in an iframe.</p>
-            <Button href="https://gpx.studio/help/integration" target="_blank">
-                Learn how to create a map for your website
-            </Button>
-        {/if}
 	</div>
 </div>
 
@@ -347,7 +334,7 @@
 
 	div :global(.mapboxgl-popup) {
 		@apply w-fit;
-        @apply z-50;
+		@apply z-20;
 	}
 
 	div :global(.mapboxgl-popup-content) {

website/src/lib/components/MapPopup.svelte

@@ -1,25 +0,0 @@
-<svelte:options accessors />
-
-<script lang="ts">
-    import { TrackPoint, Waypoint } from 'gpx';
-    import type { Writable } from 'svelte/store';
-    import WaypointPopup from '$lib/components/gpx-layer/WaypointPopup.svelte';
-    import TrackpointPopup from '$lib/components/gpx-layer/TrackpointPopup.svelte';
-    import OverpassPopup from '$lib/components/layer-control/OverpassPopup.svelte';
-    import type { PopupItem } from './MapPopup';
-
-    export let item: Writable<PopupItem | null>;
-    export let container: HTMLDivElement | null = null;
-</script>
-
-<div bind:this={container}>
-    {#if $item}
-        {#if $item.item instanceof Waypoint}
-            <WaypointPopup waypoint={$item} />
-        {:else if $item.item instanceof TrackPoint}
-            <TrackpointPopup trackpoint={$item} />
-        {:else}
-            <OverpassPopup poi={$item} />
-        {/if}
-    {/if}
-</div>

website/src/lib/components/MapPopup.ts

@@ -1,82 +0,0 @@
-import { TrackPoint, Waypoint } from 'gpx';
-import mapboxgl from 'mapbox-gl';
-import { tick } from 'svelte';
-import { get, writable, type Writable } from 'svelte/store';
-import MapPopupComponent from './MapPopup.svelte';
-
-export type PopupItem<T = Waypoint | TrackPoint | any> = {
-    item: T;
-    fileId?: string;
-    hide?: () => void;
-};
-
-export class MapPopup {
-    map: mapboxgl.Map;
-    popup: mapboxgl.Popup;
-    item: Writable<PopupItem | null> = writable(null);
-    maybeHideBinded = this.maybeHide.bind(this);
-
-    constructor(map: mapboxgl.Map, options?: mapboxgl.PopupOptions) {
-        this.map = map;
-        this.popup = new mapboxgl.Popup(options);
-
-        let component = new MapPopupComponent({
-            target: document.body,
-            props: {
-                item: this.item,
-            },
-        });
-
-        tick().then(() => this.popup.setDOMContent(component.container));
-    }
-
-    setItem(item: PopupItem | null) {
-        if (item) item.hide = () => this.hide();
-        this.item.set(item);
-        if (item === null) {
-            this.hide();
-        } else {
-            tick().then(() => this.show());
-        }
-    }
-
-    show() {
-        const i = get(this.item);
-        if (i === null) {
-            this.hide();
-            return;
-        }
-        this.popup.setLngLat(this.getCoordinates()).addTo(this.map);
-        this.map.on('mousemove', this.maybeHideBinded);
-    }
-
-    maybeHide(e: mapboxgl.MapMouseEvent) {
-        const i = get(this.item);
-        if (i === null) {
-            this.hide();
-            return;
-        }
-        if (this.map.project(this.getCoordinates()).dist(this.map.project(e.lngLat)) > 60) {
-            this.hide();
-        }
-    }
-
-    hide() {
-        this.popup.remove();
-        this.map.off('mousemove', this.maybeHideBinded);
-    }
-
-    remove() {
-        this.popup.remove();
-    }
-
-    getCoordinates() {
-        const i = get(this.item);
-        if (i === null) {
-            return new mapboxgl.LngLat(0, 0);
-        }
-        return i.item instanceof Waypoint || i.item instanceof TrackPoint
-            ? i.item.getCoordinates()
-            : new mapboxgl.LngLat(i.item.lon, i.item.lat);
-    }
-}

website/src/lib/components/Menu.svelte

@@ -22,7 +22,7 @@
 		Sun,
 		Moon,
 		Layers,
-        ListTree,
+		GalleryVertical,
 		Languages,
 		Settings,
 		Info,
@@ -42,7 +42,7 @@
 		FileX,
 		BookOpenText,
 		ChartArea,
-        Maximize,
+		Maximize
 	} from 'lucide-svelte';
 
 	import {
@@ -56,7 +56,7 @@
 		editStyle,
 		exportState,
 		ExportState,
-        centerMapOnSelection,
+		centerMapOnSelection
 	} from '$lib/stores';
 	import {
 		copied,
@@ -64,7 +64,7 @@
 		cutSelection,
 		pasteSelection,
 		selectAll,
-        selection,
+		selection
 	} from '$lib/components/file-list/Selection';
 	import { derived } from 'svelte/store';
 	import { canUndo, canRedo, dbUtils, fileObservers, settings } from '$lib/db';
@@ -83,7 +83,7 @@
 		velocityUnits,
 		temperatureUnits,
 		elevationProfile,
-        treeFileView,
+		verticalFileView,
 		currentBasemap,
 		previousBasemap,
 		currentOverlays,
@@ -91,7 +91,7 @@
 		distanceMarkers,
 		directionMarkers,
 		streetViewSource,
-        routing,
+		routing
 	} = settings;
 
 	let undoDisabled = derived(canUndo, ($canUndo) => !$canUndo);
@@ -128,7 +128,7 @@
 	<div
 		class="w-fit flex flex-row items-center justify-center p-1 bg-background rounded-b-md md:rounded-md pointer-events-auto shadow-md"
 	>
-        <a href={getURLForLanguage($locale, '/')} target="_blank" class="shrink-0">
+		<a href="./" target="_blank" class="shrink-0">
 			<Logo class="h-5 mt-0.5 mx-2 md:hidden" iconOnly={true} width="16" />
 			<Logo class="h-5 mt-0.5 mx-2 hidden md:block" width="96" />
 		</a>
@@ -151,27 +151,18 @@
 						<Shortcut key="O" ctrl={true} />
 					</Menubar.Item>
 					<Menubar.Separator />
-                    <Menubar.Item
+					<Menubar.Item on:click={dbUtils.duplicateSelection} disabled={$selection.size == 0}>
-                        on:click={dbUtils.duplicateSelection}
-                        disabled={$selection.size == 0}
-                    >
 						<Copy size="16" class="mr-1" />
 						{$_('menu.duplicate')}
 						<Shortcut key="D" ctrl={true} />
 					</Menubar.Item>
 					<Menubar.Separator />
-                    <Menubar.Item
+					<Menubar.Item on:click={dbUtils.deleteSelectedFiles} disabled={$selection.size == 0}>
-                        on:click={dbUtils.deleteSelectedFiles}
-                        disabled={$selection.size == 0}
-                    >
 						<FileX size="16" class="mr-1" />
 						{$_('menu.close')}
 						<Shortcut key="⌫" ctrl={true} />
 					</Menubar.Item>
-                    <Menubar.Item
+					<Menubar.Item on:click={dbUtils.deleteAllFiles} disabled={$fileObservers.size == 0}>
-                        on:click={dbUtils.deleteAllFiles}
-                        disabled={$fileObservers.size == 0}
-                    >
 						<FileX size="16" class="mr-1" />
 						{$_('menu.close_all')}
 						<Shortcut key="⌫" ctrl={true} shift={true} />
@@ -216,11 +207,7 @@
 						disabled={$selection.size !== 1 ||
 							!$selection
 								.getSelected()
-                                .every(
+								.every((item) => item instanceof ListFileItem || item instanceof ListTrackItem)}
-                                    (item) =>
-                                        item instanceof ListFileItem ||
-                                        item instanceof ListTrackItem
-                                )}
 						on:click={() => ($editMetadata = true)}
 					>
 						<Info size="16" class="mr-1" />
@@ -231,11 +218,7 @@
 						disabled={$selection.size === 0 ||
 							!$selection
 								.getSelected()
-                                .every(
+								.every((item) => item instanceof ListFileItem || item instanceof ListTrackItem)}
-                                    (item) =>
-                                        item instanceof ListFileItem ||
-                                        item instanceof ListTrackItem
-                                )}
 						on:click={() => ($editStyle = true)}
 					>
 						<PaintBucket size="16" class="mr-1" />
@@ -260,20 +243,17 @@
 						{/if}
 						<Shortcut key="H" ctrl={true} />
 					</Menubar.Item>
-                    {#if $treeFileView}
+					{#if $verticalFileView}
 						{#if $selection.getSelected().some((item) => item instanceof ListFileItem)}
 							<Menubar.Separator />
 							<Menubar.Item
-                                on:click={() =>
+								on:click={() => dbUtils.addNewTrack($selection.getSelected()[0].getFileId())}
-                                    dbUtils.addNewTrack($selection.getSelected()[0].getFileId())}
 								disabled={$selection.size !== 1}
 							>
 								<Plus size="16" class="mr-1" />
 								{$_('menu.new_track')}
 							</Menubar.Item>
-                        {:else if $selection
+						{:else if $selection.getSelected().some((item) => item instanceof ListTrackItem)}
-                            .getSelected()
-                            .some((item) => item instanceof ListTrackItem)}
 							<Menubar.Separator />
 							<Menubar.Item
 								on:click={() => {
@@ -304,7 +284,7 @@
 						{$_('menu.center')}
 						<Shortcut key="⏎" ctrl={true} />
 					</Menubar.Item>
-                    {#if $treeFileView}
+					{#if $verticalFileView}
 						<Menubar.Separator />
 						<Menubar.Item on:click={copySelection} disabled={$selection.size === 0}>
 							<ClipboardCopy size="16" class="mr-1" />
@@ -320,9 +300,7 @@
 							disabled={$copied === undefined ||
 								$copied.length === 0 ||
 								($selection.size > 0 &&
-                                    !allowedPastes[$copied[0].level].includes(
+									!allowedPastes[$copied[0].level].includes($selection.getSelected().pop()?.level))}
-                                        $selection.getSelected().pop()?.level
-                                    ))}
 							on:click={pasteSelection}
 						>
 							<ClipboardPaste size="16" class="mr-1" />
@@ -331,10 +309,7 @@
 						</Menubar.Item>
 					{/if}
 					<Menubar.Separator />
-                    <Menubar.Item
+					<Menubar.Item on:click={dbUtils.deleteSelection} disabled={$selection.size == 0}>
-                        on:click={dbUtils.deleteSelection}
-                        disabled={$selection.size == 0}
-                    >
 						<Trash2 size="16" class="mr-1" />
 						{$_('menu.delete')}
 						<Shortcut key="⌫" ctrl={true} />
@@ -352,32 +327,24 @@
 						{$_('menu.elevation_profile')}
 						<Shortcut key="P" ctrl={true} />
 					</Menubar.CheckboxItem>
-                    <Menubar.CheckboxItem bind:checked={$treeFileView}>
+					<Menubar.CheckboxItem bind:checked={$verticalFileView}>
-                        <ListTree size="16" class="mr-1" />
+						<GalleryVertical size="16" class="mr-1" />
-                        {$_('menu.tree_file_view')}
+						{$_('menu.vertical_file_view')}
 						<Shortcut key="L" ctrl={true} />
 					</Menubar.CheckboxItem>
 					<Menubar.Separator />
 					<Menubar.Item inset on:click={switchBasemaps}>
-                        <Map size="16" class="mr-1" />{$_('menu.switch_basemap')}<Shortcut
+						<Map size="16" class="mr-1" />{$_('menu.switch_basemap')}<Shortcut key="F1" />
-                            key="F1"
-                        />
 					</Menubar.Item>
 					<Menubar.Item inset on:click={toggleOverlays}>
-                        <Layers2 size="16" class="mr-1" />{$_('menu.toggle_overlays')}<Shortcut
+						<Layers2 size="16" class="mr-1" />{$_('menu.toggle_overlays')}<Shortcut key="F2" />
-                            key="F2"
-                        />
 					</Menubar.Item>
 					<Menubar.Separator />
 					<Menubar.CheckboxItem bind:checked={$distanceMarkers}>
-                        <Coins size="16" class="mr-1" />{$_('menu.distance_markers')}<Shortcut
+						<Coins size="16" class="mr-1" />{$_('menu.distance_markers')}<Shortcut key="F3" />
-                            key="F3"
-                        />
 					</Menubar.CheckboxItem>
 					<Menubar.CheckboxItem bind:checked={$directionMarkers}>
-                        <Milestone size="16" class="mr-1" />{$_('menu.direction_markers')}<Shortcut
+						<Milestone size="16" class="mr-1" />{$_('menu.direction_markers')}<Shortcut key="F4" />
-                            key="F4"
-                        />
 					</Menubar.CheckboxItem>
 					<Menubar.Separator />
 					<Menubar.Item inset on:click={toggle3D}>
@@ -401,15 +368,9 @@
 						</Menubar.SubTrigger>
 						<Menubar.SubContent>
 							<Menubar.RadioGroup bind:value={$distanceUnits}>
-                                <Menubar.RadioItem value="metric"
+								<Menubar.RadioItem value="metric">{$_('menu.metric')}</Menubar.RadioItem>
-                                    >{$_('menu.metric')}</Menubar.RadioItem
+								<Menubar.RadioItem value="imperial">{$_('menu.imperial')}</Menubar.RadioItem>
-                                >
+								<Menubar.RadioItem value="nautical">{$_('menu.nautical')}</Menubar.RadioItem>
-                                <Menubar.RadioItem value="imperial"
-                                    >{$_('menu.imperial')}</Menubar.RadioItem
-                                >
-                                <Menubar.RadioItem value="nautical"
-                                    >{$_('menu.nautical')}</Menubar.RadioItem
-                                >
 							</Menubar.RadioGroup>
 						</Menubar.SubContent>
 					</Menubar.Sub>
@@ -419,12 +380,8 @@
 						</Menubar.SubTrigger>
 						<Menubar.SubContent>
 							<Menubar.RadioGroup bind:value={$velocityUnits}>
-                                <Menubar.RadioItem value="speed"
+								<Menubar.RadioItem value="speed">{$_('quantities.speed')}</Menubar.RadioItem>
-                                    >{$_('quantities.speed')}</Menubar.RadioItem
+								<Menubar.RadioItem value="pace">{$_('quantities.pace')}</Menubar.RadioItem>
-                                >
-                                <Menubar.RadioItem value="pace"
-                                    >{$_('quantities.pace')}</Menubar.RadioItem
-                                >
 							</Menubar.RadioGroup>
 						</Menubar.SubContent>
 					</Menubar.Sub>
@@ -434,12 +391,8 @@
 						</Menubar.SubTrigger>
 						<Menubar.SubContent>
 							<Menubar.RadioGroup bind:value={$temperatureUnits}>
-                                <Menubar.RadioItem value="celsius"
+								<Menubar.RadioItem value="celsius">{$_('menu.celsius')}</Menubar.RadioItem>
-                                    >{$_('menu.celsius')}</Menubar.RadioItem
+								<Menubar.RadioItem value="fahrenheit">{$_('menu.fahrenheit')}</Menubar.RadioItem>
-                                >
-                                <Menubar.RadioItem value="fahrenheit"
-                                    >{$_('menu.fahrenheit')}</Menubar.RadioItem
-                                >
 							</Menubar.RadioGroup>
 						</Menubar.SubContent>
 					</Menubar.Sub>
@@ -475,11 +428,8 @@
 									setMode(value);
 								}}
 							>
-                                <Menubar.RadioItem value="light"
+								<Menubar.RadioItem value="light">{$_('menu.light')}</Menubar.RadioItem>
-                                    >{$_('menu.light')}</Menubar.RadioItem
+								<Menubar.RadioItem value="dark">{$_('menu.dark')}</Menubar.RadioItem>
-                                >
-                                <Menubar.RadioItem value="dark">{$_('menu.dark')}</Menubar.RadioItem
-                                >
 							</Menubar.RadioGroup>
 						</Menubar.SubContent>
 					</Menubar.Sub>
@@ -491,12 +441,8 @@
 						</Menubar.SubTrigger>
 						<Menubar.SubContent>
 							<Menubar.RadioGroup bind:value={$streetViewSource}>
-                                <Menubar.RadioItem value="mapillary"
+								<Menubar.RadioItem value="mapillary">{$_('menu.mapillary')}</Menubar.RadioItem>
-                                    >{$_('menu.mapillary')}</Menubar.RadioItem
+								<Menubar.RadioItem value="google">{$_('menu.google')}</Menubar.RadioItem>
-                                >
-                                <Menubar.RadioItem value="google"
-                                    >{$_('menu.google')}</Menubar.RadioItem
-                                >
 							</Menubar.RadioGroup>
 						</Menubar.SubContent>
 					</Menubar.Sub>
@@ -621,7 +567,7 @@
 			$elevationProfile = !$elevationProfile;
 			e.preventDefault();
 		} else if (e.key === 'l' && (e.metaKey || e.ctrlKey)) {
-            $treeFileView = !$treeFileView;
+			$verticalFileView = !$verticalFileView;
 			e.preventDefault();
 		} else if (e.key === 'h' && (e.metaKey || e.ctrlKey)) {
 			if ($allHidden) {

website/src/lib/components/Resizer.svelte

@@ -12,8 +12,7 @@
 
 		const handleMouseMove = (event: PointerEvent) => {
 			const newAfter =
-                startAfter +
+				startAfter + (orientation === 'col' ? startX - event.clientX : startY - event.clientY);
-                (orientation === 'col' ? startX - event.clientX : startY - event.clientY);
 			if (newAfter >= minAfter && newAfter <= maxAfter) {
 				after = newAfter;
 			} else if (newAfter < minAfter && after !== minAfter) {

website/src/lib/components/WithUnits.svelte

@@ -8,7 +8,7 @@
 		getDistanceUnits,
 		getElevationUnits,
 		getVelocityUnits,
-        secondsToHHMMSS,
+		secondsToHHMMSS
 	} from '$lib/units';
 
 	import { _ } from 'svelte-i18n';

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

@@ -43,7 +43,6 @@
 	:global(.markdown > a) {
 		@apply text-link;
 		@apply hover:underline;
-        @apply contents;
 	}
 
 	:global(.markdown p > a) {

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

@@ -18,11 +18,7 @@
 				class="w-full max-w-3xl"
 			/>
 		{:else if src === 'tools/split'}
-            <enhanced:img
+			<enhanced:img src="/src/lib/assets/img/docs/tools/split.png" {alt} class="w-full max-w-3xl" />
-                src="/src/lib/assets/img/docs/tools/split.png"
-                {alt}
-                class="w-full max-w-3xl"
-            />
 		{/if}
 	</div>
 	<p class="text-center text-sm text-muted-foreground mt-2">{alt}</p>

website/src/lib/components/docs/docs.ts

@@ -1,64 +1,39 @@
-import {
+import { File, FilePen, View, type Icon, Settings, Pencil, MapPin, Scissors, CalendarClock, Group, Ungroup, Filter, SquareDashedMousePointer, MountainSnow } from "lucide-svelte";
-    File,
+import type { ComponentType } from "svelte";
-    FilePen,
-    View,
-    type Icon,
-    Settings,
-    Pencil,
-    MapPin,
-    Scissors,
-    CalendarClock,
-    Group,
-    Ungroup,
-    Filter,
-    SquareDashedMousePointer,
-    MountainSnow,
-} from 'lucide-svelte';
-import type { ComponentType } from 'svelte';
 
 export const guides: Record<string, string[]> = {
     'getting-started': [],
     menu: ['file', 'edit', 'view', 'settings'],
     'files-and-stats': [],
-    toolbar: [
+    toolbar: ['routing', 'poi', 'scissors', 'time', 'merge', 'extract', 'elevation', 'minify', 'clean'],
-        'routing',
-        'poi',
-        'scissors',
-        'time',
-        'merge',
-        'extract',
-        'elevation',
-        'minify',
-        'clean',
-    ],
     'map-controls': [],
-    gpx: [],
+    'gpx': [],
-    integration: [],
+    'integration': [],
-    faq: [],
+    'faq': [],
 };
 
 export const guideIcons: Record<string, string | ComponentType<Icon>> = {
-    'getting-started': '🚀',
+    "getting-started": "🚀",
-    menu: '📂 ⚙️',
+    "menu": "📂 ⚙️",
-    file: File,
+    "file": File,
-    edit: FilePen,
+    "edit": FilePen,
-    view: View,
+    "view": View,
-    settings: Settings,
+    "settings": Settings,
-    'files-and-stats': '🗂 📈',
+    "files-and-stats": "🗂 📈",
-    toolbar: '🧰',
+    "toolbar": "🧰",
-    routing: Pencil,
+    "routing": Pencil,
-    poi: MapPin,
+    "poi": MapPin,
-    scissors: Scissors,
+    "scissors": Scissors,
-    time: CalendarClock,
+    "time": CalendarClock,
-    merge: Group,
+    "merge": Group,
-    extract: Ungroup,
+    "extract": Ungroup,
-    elevation: MountainSnow,
+    "elevation": MountainSnow,
-    minify: Filter,
+    "minify": Filter,
-    clean: SquareDashedMousePointer,
+    "clean": SquareDashedMousePointer,
-    'map-controls': '🗺',
+    "map-controls": "🗺",
-    gpx: '💾',
+    "gpx": "💾",
-    integration: '{ 👩‍💻 }',
+    "integration": "{ 👩‍💻 }",
-    faq: '🔮',
+    "faq": "🔮",
 };
 
 export function getPreviousGuide(currentGuide: string): string | undefined {

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

@@ -12,7 +12,7 @@
 		embedding,
 		loadFile,
 		map,
-        updateGPXData,
+		updateGPXData
 	} from '$lib/stores';
 	import { onDestroy, onMount } from 'svelte';
 	import { fileObservers, settings, GPXStatisticsTree } from '$lib/db';
@@ -23,7 +23,7 @@
 	import {
 		allowedEmbeddingBasemaps,
 		getFilesFromEmbeddingOptions,
-        type EmbeddingOptions,
+		type EmbeddingOptions
 	} from './Embedding';
 	import { mode, setMode } from 'mode-watcher';
 	import { browser } from '$app/environment';
@@ -37,7 +37,7 @@
 		temperatureUnits,
 		fileOrder,
 		distanceMarkers,
-        directionMarkers,
+		directionMarkers
 	} = settings;
 
 	export let useHash = true;
@@ -50,7 +50,7 @@
 		distanceUnits: 'metric',
 		velocityUnits: 'speed',
 		temperatureUnits: 'celsius',
-        theme: 'system',
+		theme: 'system'
 	};
 
 	function applyOptions() {
@@ -74,12 +74,12 @@
 			let bounds = {
 				southWest: {
 					lat: 90,
-                    lon: 180,
+					lon: 180
 				},
 				northEast: {
 					lat: -90,
-                    lon: -180,
+					lon: -180
-                },
+				}
 			};
 
 			fileObservers.update(($fileObservers) => {
@@ -96,13 +96,12 @@
 						id,
 						readable({
 							file,
-                            statistics,
+							statistics
 						})
 					);
 
 					ids.push(id);
-                    let fileBounds = statistics.getStatisticsFor(new ListFileItem(id)).global
+					let fileBounds = statistics.getStatisticsFor(new ListFileItem(id)).global.bounds;
-                        .bounds;
 
 					bounds.southWest.lat = Math.min(bounds.southWest.lat, fileBounds.southWest.lat);
 					bounds.southWest.lon = Math.min(bounds.southWest.lon, fileBounds.southWest.lon);
@@ -131,12 +130,12 @@
 								bounds.southWest.lon,
 								bounds.southWest.lat,
 								bounds.northEast.lon,
-                                bounds.northEast.lat,
+								bounds.northEast.lat
 							],
 							{
 								padding: 80,
 								linear: true,
-                                easing: () => 1,
+								easing: () => 1
 							}
 						);
 					}
@@ -144,10 +143,7 @@
 			}
 		});
 
-        if (
+		if (options.basemap !== $currentBasemap && allowedEmbeddingBasemaps.includes(options.basemap)) {
-            options.basemap !== $currentBasemap &&
-            allowedEmbeddingBasemaps.includes(options.basemap)
-        ) {
 			$currentBasemap = options.basemap;
 		}
 
@@ -261,10 +257,12 @@
 					options.elevation.hr ? 'hr' : null,
 					options.elevation.cad ? 'cad' : null,
 					options.elevation.temp ? 'temp' : null,
-                    options.elevation.power ? 'power' : null,
+					options.elevation.power ? 'power' : null
 				].filter((dataset) => dataset !== null)}
 				elevationFill={options.elevation.fill}
+				panelSize={options.elevation.height}
 				showControls={options.elevation.controls}
+				class="py-2"
 			/>
 		{/if}
 	</div>

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

@@ -10,7 +10,7 @@ export type EmbeddingOptions = {
         show: boolean;
         height: number;
         controls: boolean;
-        fill: 'slope' | 'surface' | 'highway' | undefined;
+        fill: 'slope' | 'surface' | undefined;
         speed: boolean;
         hr: boolean;
         cad: boolean;
@@ -39,14 +39,14 @@ export const defaultEmbeddingOptions = {
         hr: false,
         cad: false,
         temp: false,
-        power: false,
+        power: false
     },
     distanceMarkers: false,
     directionMarkers: false,
     distanceUnits: 'metric',
     velocityUnits: 'speed',
     temperatureUnits: 'celsius',
-    theme: 'system',
+    theme: 'system'
 };
 
 export function getDefaultEmbeddingOptions(): EmbeddingOptions {
@@ -59,11 +59,7 @@ export function getMergedEmbeddingOptions(
 ): EmbeddingOptions {
     const mergedOptions = JSON.parse(JSON.stringify(defaultOptions));
     for (const key in options) {
-        if (
+        if (typeof options[key] === 'object' && options[key] !== null && !Array.isArray(options[key])) {
-            typeof options[key] === 'object' &&
-            options[key] !== null &&
-            !Array.isArray(options[key])
-        ) {
             mergedOptions[key] = getMergedEmbeddingOptions(options[key], defaultOptions[key]);
         } else {
             mergedOptions[key] = options[key];
@@ -83,10 +79,7 @@ export function getCleanedEmbeddingOptions(
             cleanedOptions[key] !== null &&
             !Array.isArray(cleanedOptions[key])
         ) {
-            cleanedOptions[key] = getCleanedEmbeddingOptions(
+            cleanedOptions[key] = getCleanedEmbeddingOptions(cleanedOptions[key], defaultOptions[key]);
-                cleanedOptions[key],
-                defaultOptions[key]
-            );
             if (Object.keys(cleanedOptions[key]).length === 0) {
                 delete cleanedOptions[key];
             }
@@ -148,7 +141,7 @@ export function convertOldEmbeddingOptions(options: URLSearchParams): any {
     }
     if (options.has('slope')) {
         newOptions.elevation = {
-            fill: 'slope',
+            fill: 'slope'
         };
     }
     return newOptions;

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

@@ -13,13 +13,13 @@
 		SquareActivity,
 		Coins,
 		Milestone,
-        Video,
+		Video
 	} from 'lucide-svelte';
 	import { _ } from 'svelte-i18n';
 	import {
 		allowedEmbeddingBasemaps,
 		getCleanedEmbeddingOptions,
-        getDefaultEmbeddingOptions,
+		getDefaultEmbeddingOptions
 	} from './Embedding';
 	import { PUBLIC_MAPBOX_TOKEN } from '$env/static/public';
 	import Embedding from './Embedding.svelte';
@@ -30,7 +30,7 @@
 	let options = getDefaultEmbeddingOptions();
 	options.token = 'YOUR_MAPBOX_TOKEN';
 	options.files = [
-        'https://raw.githubusercontent.com/gpxstudio/gpx.studio/main/gpx/test-data/simple.gpx',
+		'https://raw.githubusercontent.com/gpxstudio/gpx.studio/main/gpx/test-data/simple.gpx'
 	];
 
 	let files = options.files[0];
@@ -130,11 +130,7 @@
 				<div class="grid grid-cols-2 gap-x-6 gap-y-3 rounded-md border p-3 mt-1">
 					<Label class="flex flex-row items-center gap-2">
 						{$_('embedding.height')}
-                        <Input
+						<Input type="number" bind:value={options.elevation.height} class="h-8 w-20" />
-                            type="number"
-                            bind:value={options.elevation.height}
-                            class="h-8 w-20"
-                        />
 					</Label>
 					<div class="flex flex-row items-center gap-2">
 						<span class="shrink-0">
@@ -146,11 +142,7 @@
 								let value = selected?.value;
 								if (value === 'none') {
 									options.elevation.fill = undefined;
-                                } else if (
+								} else if (value === 'slope' || value === 'surface') {
-                                    value === 'slope' ||
-                                    value === 'surface' ||
-                                    value === 'highway'
-                                ) {
 									options.elevation.fill = value;
 								}
 							}}
@@ -160,10 +152,7 @@
 							</Select.Trigger>
 							<Select.Content>
 								<Select.Item value="slope">{$_('quantities.slope')}</Select.Item>
-                                <Select.Item value="surface">{$_('quantities.surface')}</Select.Item
+								<Select.Item value="surface">{$_('quantities.surface')}</Select.Item>
-                                >
-                                <Select.Item value="highway">{$_('quantities.highway')}</Select.Item
-                                >
 								<Select.Item value="none">{$_('embedding.none')}</Select.Item>
 							</Select.Content>
 						</Select.Root>
@@ -176,35 +165,35 @@
 						<Checkbox id="show-speed" bind:checked={options.elevation.speed} />
 						<Label for="show-speed" class="flex flex-row items-center gap-1">
 							<Zap size="16" />
-                            {$_('quantities.speed')}
+							{$_('chart.show_speed')}
 						</Label>
 					</div>
 					<div class="flex flex-row items-center gap-2">
 						<Checkbox id="show-hr" bind:checked={options.elevation.hr} />
 						<Label for="show-hr" class="flex flex-row items-center gap-1">
 							<HeartPulse size="16" />
-                            {$_('quantities.heartrate')}
+							{$_('chart.show_heartrate')}
 						</Label>
 					</div>
 					<div class="flex flex-row items-center gap-2">
 						<Checkbox id="show-cad" bind:checked={options.elevation.cad} />
 						<Label for="show-cad" class="flex flex-row items-center gap-1">
 							<Orbit size="16" />
-                            {$_('quantities.cadence')}
+							{$_('chart.show_cadence')}
 						</Label>
 					</div>
 					<div class="flex flex-row items-center gap-2">
 						<Checkbox id="show-temp" bind:checked={options.elevation.temp} />
 						<Label for="show-temp" class="flex flex-row items-center gap-1">
 							<Thermometer size="16" />
-                            {$_('quantities.temperature')}
+							{$_('chart.show_temperature')}
 						</Label>
 					</div>
 					<div class="flex flex-row items-center gap-2">
 						<Checkbox id="show-power" bind:checked={options.elevation.power} />
 						<Label for="show-power" class="flex flex-row items-center gap-1">
 							<SquareActivity size="16" />
-                            {$_('quantities.power')}
+							{$_('chart.show_power')}
 						</Label>
 					</div>
 				</div>
@@ -328,8 +317,7 @@
 			<Label>
 				{$_('embedding.code')}
 			</Label>
-            <pre
+			<pre class="bg-primary text-primary-foreground p-3 rounded-md whitespace-normal break-all">
-                class="bg-primary text-primary-foreground p-3 rounded-md whitespace-normal break-all">
                 <code class="language-html">
                     {`<iframe src="https://gpx.studio${base}/embed?options=${encodeURIComponent(JSON.stringify(getCleanedEmbeddingOptions(options)))}${hash}" width="100%" height="600px" frameborder="0" style="outline: none;"/>`}
                 </code>

website/src/lib/components/file-list/FileList.svelte

@@ -17,9 +17,9 @@
 	setContext('orientation', orientation);
 	setContext('recursive', recursive);
 
-    const { treeFileView } = settings;
+	const { verticalFileView } = settings;
 
-    treeFileView.subscribe(($vertical) => {
+	verticalFileView.subscribe(($vertical) => {
 		if ($vertical) {
 			selection.update(($selection) => {
 				$selection.forEach((item) => {

website/src/lib/components/file-list/FileList.ts

@@ -1,8 +1,8 @@
-import { dbUtils, getFile } from '$lib/db';
+import { dbUtils, getFile } from "$lib/db";
-import { freeze } from 'immer';
+import { freeze } from "immer";
-import { GPXFile, Track, TrackSegment, Waypoint } from 'gpx';
+import { GPXFile, Track, TrackSegment, Waypoint } from "gpx";
-import { selection } from './Selection';
+import { selection } from "./Selection";
-import { newGPXFile } from '$lib/stores';
+import { newGPXFile } from "$lib/stores";
 
 export enum ListLevel {
     ROOT,
@@ -10,7 +10,7 @@ export enum ListLevel {
     TRACK,
     SEGMENT,
     WAYPOINTS,
-    WAYPOINT,
+    WAYPOINT
 }
 
 export const allowedMoves: Record<ListLevel, ListLevel[]> = {
@@ -19,7 +19,7 @@ export const allowedMoves: Record<ListLevel, ListLevel[]> = {
     [ListLevel.TRACK]: [ListLevel.FILE, ListLevel.TRACK],
     [ListLevel.SEGMENT]: [ListLevel.FILE, ListLevel.TRACK, ListLevel.SEGMENT],
     [ListLevel.WAYPOINTS]: [ListLevel.WAYPOINTS],
-    [ListLevel.WAYPOINT]: [ListLevel.WAYPOINTS, ListLevel.WAYPOINT],
+    [ListLevel.WAYPOINT]: [ListLevel.WAYPOINTS, ListLevel.WAYPOINT]
 };
 
 export const allowedPastes: Record<ListLevel, ListLevel[]> = {
@@ -28,7 +28,7 @@ export const allowedPastes: Record<ListLevel, ListLevel[]> = {
     [ListLevel.TRACK]: [ListLevel.ROOT, ListLevel.FILE, ListLevel.TRACK],
     [ListLevel.SEGMENT]: [ListLevel.ROOT, ListLevel.FILE, ListLevel.TRACK, ListLevel.SEGMENT],
     [ListLevel.WAYPOINTS]: [ListLevel.FILE, ListLevel.WAYPOINTS, ListLevel.WAYPOINT],
-    [ListLevel.WAYPOINT]: [ListLevel.FILE, ListLevel.WAYPOINTS, ListLevel.WAYPOINT],
+    [ListLevel.WAYPOINT]: [ListLevel.FILE, ListLevel.WAYPOINTS, ListLevel.WAYPOINT]
 };
 
 export abstract class ListItem {
@@ -322,13 +322,7 @@ export function sortItems(items: ListItem[], reverse: boolean = false) {
     }
 }
 
-export function moveItems(
+export function moveItems(fromParent: ListItem, toParent: ListItem, fromItems: ListItem[], toItems: ListItem[], remove: boolean = true) {
-    fromParent: ListItem,
-    toParent: ListItem,
-    fromItems: ListItem[],
-    toItems: ListItem[],
-    remove: boolean = true
-) {
     if (fromItems.length === 0) {
         return;
     }
@@ -344,18 +338,11 @@ export function moveItems(
                 context.push(file.clone());
             } else if (item instanceof ListTrackItem && item.getTrackIndex() < file.trk.length) {
                 context.push(file.trk[item.getTrackIndex()].clone());
-            } else if (
+            } else if (item instanceof ListTrackSegmentItem && item.getTrackIndex() < file.trk.length && item.getSegmentIndex() < file.trk[item.getTrackIndex()].trkseg.length) {
-                item instanceof ListTrackSegmentItem &&
-                item.getTrackIndex() < file.trk.length &&
-                item.getSegmentIndex() < file.trk[item.getTrackIndex()].trkseg.length
-            ) {
                 context.push(file.trk[item.getTrackIndex()].trkseg[item.getSegmentIndex()].clone());
             } else if (item instanceof ListWaypointsItem) {
                 context.push(file.wpt.map((wpt) => wpt.clone()));
-            } else if (
+            } else if (item instanceof ListWaypointItem && item.getWaypointIndex() < file.wpt.length) {
-                item instanceof ListWaypointItem &&
-                item.getWaypointIndex() < file.wpt.length
-            ) {
                 context.push(file.wpt[item.getWaypointIndex()].clone());
             }
         }
@@ -372,12 +359,7 @@ export function moveItems(
                 if (item instanceof ListTrackItem) {
                     file.replaceTracks(item.getTrackIndex(), item.getTrackIndex(), []);
                 } else if (item instanceof ListTrackSegmentItem) {
-                    file.replaceTrackSegments(
+                    file.replaceTrackSegments(item.getTrackIndex(), item.getSegmentIndex(), item.getSegmentIndex(), []);
-                        item.getTrackIndex(),
-                        item.getSegmentIndex(),
-                        item.getSegmentIndex(),
-                        []
-                    );
                 } else if (item instanceof ListWaypointsItem) {
                     file.replaceWaypoints(0, file.wpt.length - 1, []);
                 } else if (item instanceof ListWaypointItem) {
@@ -389,43 +371,25 @@ export function moveItems(
             toItems.forEach((item, i) => {
                 if (item instanceof ListTrackItem) {
                     if (context[i] instanceof Track) {
-                        file.replaceTracks(item.getTrackIndex(), item.getTrackIndex() - 1, [
+                        file.replaceTracks(item.getTrackIndex(), item.getTrackIndex() - 1, [context[i]]);
-                            context[i],
-                        ]);
                     } else if (context[i] instanceof TrackSegment) {
-                        file.replaceTracks(item.getTrackIndex(), item.getTrackIndex() - 1, [
+                        file.replaceTracks(item.getTrackIndex(), item.getTrackIndex() - 1, [new Track({
-                            new Track({
+                            trkseg: [context[i]]
-                                trkseg: [context[i]],
+                        })]);
-                            }),
-                        ]);
                     }
-                } else if (
+                } else if (item instanceof ListTrackSegmentItem && context[i] instanceof TrackSegment) {
-                    item instanceof ListTrackSegmentItem &&
+                    file.replaceTrackSegments(item.getTrackIndex(), item.getSegmentIndex(), item.getSegmentIndex() - 1, [context[i]]);
-                    context[i] instanceof TrackSegment
-                ) {
-                    file.replaceTrackSegments(
-                        item.getTrackIndex(),
-                        item.getSegmentIndex(),
-                        item.getSegmentIndex() - 1,
-                        [context[i]]
-                    );
                 } else if (item instanceof ListWaypointsItem) {
-                    if (
+                    if (Array.isArray(context[i]) && context[i].length > 0 && context[i][0] instanceof Waypoint) {
-                        Array.isArray(context[i]) &&
-                        context[i].length > 0 &&
-                        context[i][0] instanceof Waypoint
-                    ) {
                         file.replaceWaypoints(file.wpt.length, file.wpt.length - 1, context[i]);
                     } else if (context[i] instanceof Waypoint) {
                         file.replaceWaypoints(file.wpt.length, file.wpt.length - 1, [context[i]]);
                     }
                 } else if (item instanceof ListWaypointItem && context[i] instanceof Waypoint) {
-                    file.replaceWaypoints(item.getWaypointIndex(), item.getWaypointIndex() - 1, [
+                    file.replaceWaypoints(item.getWaypointIndex(), item.getWaypointIndex() - 1, [context[i]]);
-                        context[i],
-                    ]);
                 }
             });
-        },
+        }
     ];
 
     if (fromParent instanceof ListRootItem) {
@@ -436,10 +400,7 @@ export function moveItems(
         callbacks.splice(0, 1);
     }
 
-    dbUtils.applyEachToFilesAndGlobal(
+    dbUtils.applyEachToFilesAndGlobal(files, callbacks, (files, context: (GPXFile | Track | TrackSegment | Waypoint[] | Waypoint)[]) => {
-        files,
-        callbacks,
-        (files, context: (GPXFile | Track | TrackSegment | Waypoint[] | Waypoint)[]) => {
         toItems.forEach((item, i) => {
             if (item instanceof ListFileItem) {
                 if (context[i] instanceof GPXFile) {
@@ -460,18 +421,14 @@ export function moveItems(
                 } else if (context[i] instanceof TrackSegment) {
                     let newFile = newGPXFile();
                     newFile._data.id = item.getFileId();
-                        newFile.replaceTracks(0, 0, [
+                    newFile.replaceTracks(0, 0, [new Track({
-                            new Track({
+                        trkseg: [context[i]]
-                                trkseg: [context[i]],
+                    })]);
-                            }),
-                        ]);
                     files.set(item.getFileId(), freeze(newFile));
                 }
             }
         });
-        },
+    }, context);
-        context
-    );
 
     selection.update(($selection) => {
         $selection.clear();

website/src/lib/components/file-list/FileListNode.svelte

@@ -5,7 +5,7 @@
 		TrackSegment,
 		Waypoint,
 		type AnyGPXTreeElement,
-        type GPXTreeElement,
+		type GPXTreeElement
 	} from 'gpx';
 	import { CollapsibleTreeNode } from '$lib/components/collapsible-tree/index';
 	import { settings, type GPXFileWithStatistics } from '$lib/db';
@@ -19,7 +19,7 @@
 		ListWaypointItem,
 		ListWaypointsItem,
 		type ListItem,
-        type ListTrackItem,
+		type ListTrackItem
 	} from './FileList';
 	import { _ } from 'svelte-i18n';
 	import { selection } from './Selection';
@@ -39,20 +39,19 @@
 		node instanceof GPXFile && item instanceof ListFileItem
 			? node.metadata.name
 			: node instanceof Track
-              ? (node.name ?? `${$_('gpx.track')} ${(item as ListTrackItem).trackIndex + 1}`)
+				? node.name ?? `${$_('gpx.track')} ${(item as ListTrackItem).trackIndex + 1}`
 				: node instanceof TrackSegment
 					? `${$_('gpx.segment')} ${(item as ListTrackSegmentItem).segmentIndex + 1}`
 					: node instanceof Waypoint
-                  ? (node.name ??
+						? node.name ?? `${$_('gpx.waypoint')} ${(item as ListWaypointItem).waypointIndex + 1}`
-                    `${$_('gpx.waypoint')} ${(item as ListWaypointItem).waypointIndex + 1}`)
 						: node instanceof GPXFile && item instanceof ListWaypointsItem
 							? $_('gpx.waypoints')
 							: '';
 
-    const { treeFileView } = settings;
+	const { verticalFileView } = settings;
 
 	function openIfSelectedChild() {
-        if (collapsible && get(treeFileView) && $selection.hasAnyChildren(item, false)) {
+		if (collapsible && get(verticalFileView) && $selection.hasAnyChildren(item, false)) {
 			collapsible.openNode();
 		}
 	}

website/src/lib/components/file-list/FileListNodeContent.svelte

@@ -5,10 +5,17 @@
 </script>
 
 <script lang="ts">
-    import { GPXFile, Track, Waypoint, type AnyGPXTreeElement, type GPXTreeElement } from 'gpx';
+	import {
+		buildGPX,
+		GPXFile,
+		Track,
+		Waypoint,
+		type AnyGPXTreeElement,
+		type GPXTreeElement
+	} from 'gpx';
 	import { afterUpdate, getContext, onDestroy, onMount } from 'svelte';
 	import Sortable from 'sortablejs/Sortable';
-    import { getFileIds, settings, type GPXFileWithStatistics } from '$lib/db';
+	import { getFile, getFileIds, settings, type GPXFileWithStatistics } from '$lib/db';
 	import { get, writable, type Readable, type Writable } from 'svelte/store';
 	import FileListNodeStore from './FileListNodeStore.svelte';
 	import FileListNode from './FileListNode.svelte';
@@ -19,7 +26,7 @@
 		ListWaypointsItem,
 		allowedMoves,
 		moveItems,
-        type ListItem,
+		type ListItem
 	} from './FileList';
 	import { selection } from './Selection';
 	import { isMac } from '$lib/utils';
@@ -78,13 +85,8 @@
 
 						if (
 							e.originalEvent &&
-                            !(
+							!(e.originalEvent.ctrlKey || e.originalEvent.metaKey || e.originalEvent.shiftKey) &&
-                                e.originalEvent.ctrlKey ||
+							($selection.size > 1 || !$selection.has(item.extend(getRealId(changed[0]))))
-                                e.originalEvent.metaKey ||
-                                e.originalEvent.shiftKey
-                            ) &&
-                            ($selection.size > 1 ||
-                                !$selection.has(item.extend(getRealId(changed[0]))))
 						) {
 							// Fix bug that sometimes causes a single select to be treated as a multi-select
 							$selection.clear();
@@ -113,7 +115,7 @@
 					Sortable.utils.select(element);
 					element.scrollIntoView({
 						behavior: 'smooth',
-                        block: 'nearest',
+						block: 'nearest'
 					});
 				} else {
 					Sortable.utils.deselect(element);
@@ -155,7 +157,7 @@
 			group: {
 				name: sortableLevel,
 				pull: allowedMoves[sortableLevel],
-                put: true,
+				put: true
 			},
 			direction: orientation,
 			forceAutoScrollFallback: true,
@@ -197,9 +199,7 @@
 						fromItems = [fromItem.extend('waypoints')];
 					} else {
 						let oldIndices: number[] =
-                            e.oldIndicies.length > 0
+							e.oldIndicies.length > 0 ? e.oldIndicies.map((i) => i.index) : [e.oldIndex];
-                                ? e.oldIndicies.map((i) => i.index)
-                                : [e.oldIndex];
 						oldIndices = oldIndices.filter((i) => i >= 0);
 						oldIndices.sort((a, b) => a - b);
 
@@ -214,9 +214,7 @@
 						}
 
 						let newIndices: number[] =
-                            e.newIndicies.length > 0
+							e.newIndicies.length > 0 ? e.newIndicies.map((i) => i.index) : [e.newIndex];
-                                ? e.newIndicies.map((i) => i.index)
-                                : [e.newIndex];
 						newIndices = newIndices.filter((i) => i >= 0);
 						newIndices.sort((a, b) => a - b);
 
@@ -234,15 +232,31 @@
 					moveItems(fromItem, toItem, fromItems, toItems);
 				}
 			},
+			setData: function (dataTransfer: DataTransfer, dragEl: HTMLElement) {
+				if (sortableLevel === ListLevel.FILE) {
+					const fileId = dragEl.getAttribute('data-id');
+					const file = fileId ? getFile(fileId) : null;
+
+					if (file) {
+						const data = buildGPX(file);
+						dataTransfer.setData(
+							'DownloadURL',
+							`application/gpx+xml:${file.metadata.name}.gpx:data:text/octet-stream;charset=utf-8,${encodeURIComponent(data)}`
+						);
+						dataTransfer.dropEffect = 'copy';
+						dataTransfer.effectAllowed = 'copy';
+					}
+				}
+			}
 		});
 		Object.defineProperty(sortable, '_item', {
 			value: item,
-            writable: true,
+			writable: true
 		});
 
 		Object.defineProperty(sortable, '_waypointRoot', {
 			value: waypointRoot,
-            writable: true,
+			writable: true
 		});
 	}
 

website/src/lib/components/file-list/FileListNodeLabel.svelte

@@ -18,7 +18,7 @@
 		Maximize,
 		Scissors,
 		FileStack,
-        FileX,
+		FileX
 	} from 'lucide-svelte';
 	import {
 		ListFileItem,
@@ -26,7 +26,7 @@
 		ListTrackItem,
 		ListWaypointItem,
 		allowedPastes,
-        type ListItem,
+		type ListItem
 	} from './FileList';
 	import {
 		copied,
@@ -36,7 +36,7 @@
 		pasteSelection,
 		selectAll,
 		selectItem,
-        selection,
+		selection
 	} from './Selection';
 	import { getContext } from 'svelte';
 	import { get } from 'svelte/store';
@@ -47,14 +47,19 @@
 		embedding,
 		centerMapOnSelection,
 		gpxLayers,
-        map,
+		map
 	} from '$lib/stores';
-    import { GPXTreeElement, Track, type AnyGPXTreeElement, Waypoint, GPXFile } from 'gpx';
+	import {
+		GPXTreeElement,
+		Track,
+		TrackSegment,
+		type AnyGPXTreeElement,
+		Waypoint,
+		GPXFile
+	} from 'gpx';
 	import { _ } from 'svelte-i18n';
 	import MetadataDialog from './MetadataDialog.svelte';
 	import StyleDialog from './StyleDialog.svelte';
-    import { waypointPopup } from '$lib/components/gpx-layer/GPXLayerPopup';
-    import { getSymbolKey, symbols } from '$lib/assets/symbols';
 
 	export let node: GPXTreeElement<AnyGPXTreeElement> | Waypoint[] | Waypoint;
 	export let item: ListItem;
@@ -70,14 +75,13 @@
 		nodeColors = [];
 
 		if (node instanceof GPXFile) {
-            let defaultColor = undefined;
+			let style = node.getStyle();
 
 			let layer = gpxLayers.get(item.getFileId());
 			if (layer) {
-                defaultColor = layer.layerColor;
+				style.color.push(layer.layerColor);
 			}
 
-            let style = node.getStyle(defaultColor);
 			style.color.forEach((c) => {
 				if (!nodeColors.includes(c)) {
 					nodeColors.push(c);
@@ -86,8 +90,8 @@
 		} else if (node instanceof Track) {
 			let style = node.getStyle();
 			if (style) {
-                if (style['gpx_style:color'] && !nodeColors.includes(style['gpx_style:color'])) {
+				if (style.color && !nodeColors.includes(style.color)) {
-                    nodeColors.push(style['gpx_style:color']);
+					nodeColors.push(style.color);
 				}
 			}
 			if (nodeColors.length === 0) {
@@ -99,8 +103,6 @@
 		}
 	}
 
-    $: symbolKey = node instanceof Waypoint ? getSymbolKey(node.sym) : undefined;
-
 	let openEditMetadata: boolean = false;
 	let openEditStyle: boolean = false;
 
@@ -177,10 +179,7 @@
 						if (layer && file) {
 							let waypoint = file.wpt[item.getWaypointIndex()];
 							if (waypoint) {
-                                waypointPopup?.setItem({
+								layer.showWaypointPopup(waypoint);
-                                    item: waypoint,
-                                    fileId: item.getFileId(),
-                                });
 							}
 						}
 					}
@@ -189,7 +188,7 @@
 					if (item instanceof ListWaypointItem) {
 						let layer = gpxLayers.get(item.getFileId());
 						if (layer) {
-                            waypointPopup?.setItem(null);
+							layer.hideWaypointPopup();
 						}
 					}
 				}}
@@ -197,30 +196,16 @@
 				{#if item.level === ListLevel.SEGMENT}
 					<Waypoints size="16" class="mr-1 shrink-0" />
 				{:else if item.level === ListLevel.WAYPOINT}
-                    {#if symbolKey && symbols[symbolKey].icon}
-                        <svelte:component
-                            this={symbols[symbolKey].icon}
-                            size="16"
-                            class="mr-1 shrink-0"
-                        />
-                    {:else}
 					<MapPin size="16" class="mr-1 shrink-0" />
 				{/if}
-                {/if}
+				<span class="grow select-none truncate {orientation === 'vertical' ? 'last:mr-2' : ''}">
-                <span
-                    class="grow select-none truncate {orientation === 'vertical'
-                        ? 'last:mr-2'
-                        : ''}"
-                >
 					{label}
 				</span>
 				{#if hidden}
 					<EyeOff
 						size="12"
-                        class="shrink-0 mt-1 ml-1 {orientation === 'vertical'
+						class="shrink-0 mt-1 ml-1 {orientation === 'vertical' ? 'mr-2' : ''} {item.level ===
-                            ? 'mr-2'
+							ListLevel.SEGMENT || item.level === ListLevel.WAYPOINT
-                            : ''} {item.level === ListLevel.SEGMENT ||
-                        item.level === ListLevel.WAYPOINT
 							? 'mr-3'
 							: ''}"
 					/>

website/src/lib/components/file-list/MetadataDialog.svelte

@@ -17,15 +17,15 @@
 
     let name: string =
         node instanceof GPXFile
-            ? (node.metadata.name ?? '')
+            ? node.metadata.name ?? ''
             : node instanceof Track
-              ? (node.name ?? '')
+              ? node.name ?? ''
               : '';
     let description: string =
         node instanceof GPXFile
-            ? (node.metadata.desc ?? '')
+            ? node.metadata.desc ?? ''
             : node instanceof Track
-              ? (node.desc ?? '')
+              ? node.desc ?? ''
               : '';
 
     $: if (!open) {

website/src/lib/components/file-list/Selection.ts

@@ -1,23 +1,12 @@
-import { get, writable } from 'svelte/store';
+import { get, writable } from "svelte/store";
-import {
+import { ListFileItem, ListItem, ListRootItem, ListTrackItem, ListTrackSegmentItem, ListWaypointItem, ListLevel, sortItems, ListWaypointsItem, moveItems } from "./FileList";
-    ListFileItem,
+import { fileObservers, getFile, getFileIds, settings } from "$lib/db";
-    ListItem,
-    ListRootItem,
-    ListTrackItem,
-    ListTrackSegmentItem,
-    ListWaypointItem,
-    ListLevel,
-    sortItems,
-    ListWaypointsItem,
-    moveItems,
-} from './FileList';
-import { fileObservers, getFile, getFileIds, settings } from '$lib/db';
 
 export class SelectionTreeType {
     item: ListItem;
     selected: boolean;
     children: {
-        [key: string | number]: SelectionTreeType;
+        [key: string | number]: SelectionTreeType
     };
     size: number = 0;
 
@@ -78,11 +67,7 @@ export class SelectionTreeType {
     }
 
     hasAnyParent(item: ListItem, self: boolean = true): boolean {
-        if (
+        if (this.selected && this.item.level <= item.level && (self || this.item.level < item.level)) {
-            this.selected &&
-            this.item.level <= item.level &&
-            (self || this.item.level < item.level)
-        ) {
             return this.selected;
         }
         let id = item.getIdAtLevel(this.item.level);
@@ -95,11 +80,7 @@ export class SelectionTreeType {
     }
 
     hasAnyChildren(item: ListItem, self: boolean = true, ignoreIds?: (string | number)[]): boolean {
-        if (
+        if (this.selected && this.item.level >= item.level && (self || this.item.level > item.level)) {
-            this.selected &&
-            this.item.level >= item.level &&
-            (self || this.item.level > item.level)
-        ) {
             return this.selected;
         }
         let id = item.getIdAtLevel(this.item.level);
@@ -150,7 +131,7 @@ export class SelectionTreeType {
             delete this.children[id];
         }
     }
-}
+};
 
 export const selection = writable<SelectionTreeType>(new SelectionTreeType(new ListRootItem()));
 
@@ -200,10 +181,7 @@ export function selectAll() {
             let file = getFile(item.getFileId());
             if (file) {
                 file.trk[item.getTrackIndex()].trkseg.forEach((_segment, segmentId) => {
-                    $selection.set(
+                    $selection.set(new ListTrackSegmentItem(item.getFileId(), item.getTrackIndex(), segmentId), true);
-                        new ListTrackSegmentItem(item.getFileId(), item.getTrackIndex(), segmentId),
-                        true
-                    );
                 });
             }
         } else if (item instanceof ListWaypointItem) {
@@ -227,24 +205,14 @@ export function getOrderedSelection(reverse: boolean = false): ListItem[] {
     return selected;
 }
 
-export function applyToOrderedItemsFromFile(
+export function applyToOrderedItemsFromFile(selectedItems: ListItem[], callback: (fileId: string, level: ListLevel | undefined, items: ListItem[]) => void, reverse: boolean = true) {
-    selectedItems: ListItem[],
-    callback: (fileId: string, level: ListLevel | undefined, items: ListItem[]) => void,
-    reverse: boolean = true
-) {
     get(settings.fileOrder).forEach((fileId) => {
         let level: ListLevel | undefined = undefined;
         let items: ListItem[] = [];
         selectedItems.forEach((item) => {
             if (item.getFileId() === fileId) {
                 level = item.level;
-                if (
+                if (item instanceof ListFileItem || item instanceof ListTrackItem || item instanceof ListTrackSegmentItem || item instanceof ListWaypointsItem || item instanceof ListWaypointItem) {
-                    item instanceof ListFileItem ||
-                    item instanceof ListTrackItem ||
-                    item instanceof ListTrackSegmentItem ||
-                    item instanceof ListWaypointsItem ||
-                    item instanceof ListWaypointItem
-                ) {
                     items.push(item);
                 }
             }
@@ -257,10 +225,7 @@ export function applyToOrderedItemsFromFile(
     });
 }
 
-export function applyToOrderedSelectedItemsFromFile(
+export function applyToOrderedSelectedItemsFromFile(callback: (fileId: string, level: ListLevel | undefined, items: ListItem[]) => void, reverse: boolean = true) {
-    callback: (fileId: string, level: ListLevel | undefined, items: ListItem[]) => void,
-    reverse: boolean = true
-) {
     applyToOrderedItemsFromFile(get(selection).getSelected(), callback, reverse);
 }
 
@@ -305,11 +270,7 @@ export function pasteSelection() {
     let startIndex: number | undefined = undefined;
 
     if (fromItems[0].level === toParent.level) {
-        if (
+        if (toParent instanceof ListTrackItem || toParent instanceof ListTrackSegmentItem || toParent instanceof ListWaypointItem) {
-            toParent instanceof ListTrackItem ||
-            toParent instanceof ListTrackSegmentItem ||
-            toParent instanceof ListWaypointItem
-        ) {
             startIndex = toParent.getId() + 1;
         }
         toParent = toParent.getParent();
@@ -327,41 +288,20 @@ export function pasteSelection() {
             fromItems.forEach((item, index) => {
                 if (toParent instanceof ListFileItem) {
                     if (item instanceof ListTrackItem || item instanceof ListTrackSegmentItem) {
-                        toItems.push(
+                        toItems.push(new ListTrackItem(toParent.getFileId(), (startIndex ?? toFile.trk.length) + index));
-                            new ListTrackItem(
-                                toParent.getFileId(),
-                                (startIndex ?? toFile.trk.length) + index
-                            )
-                        );
                     } else if (item instanceof ListWaypointsItem) {
                         toItems.push(new ListWaypointsItem(toParent.getFileId()));
                     } else if (item instanceof ListWaypointItem) {
-                        toItems.push(
+                        toItems.push(new ListWaypointItem(toParent.getFileId(), (startIndex ?? toFile.wpt.length) + index));
-                            new ListWaypointItem(
-                                toParent.getFileId(),
-                                (startIndex ?? toFile.wpt.length) + index
-                            )
-                        );
                     }
                 } else if (toParent instanceof ListTrackItem) {
                     if (item instanceof ListTrackSegmentItem) {
                         let toTrackIndex = toParent.getTrackIndex();
-                        toItems.push(
+                        toItems.push(new ListTrackSegmentItem(toParent.getFileId(), toTrackIndex, (startIndex ?? toFile.trk[toTrackIndex].trkseg.length) + index));
-                            new ListTrackSegmentItem(
-                                toParent.getFileId(),
-                                toTrackIndex,
-                                (startIndex ?? toFile.trk[toTrackIndex].trkseg.length) + index
-                            )
-                        );
                     }
                 } else if (toParent instanceof ListWaypointsItem) {
                     if (item instanceof ListWaypointItem) {
-                        toItems.push(
+                        toItems.push(new ListWaypointItem(toParent.getFileId(), (startIndex ?? toFile.wpt.length) + index));
-                            new ListWaypointItem(
-                                toParent.getFileId(),
-                                (startIndex ?? toFile.wpt.length) + index
-                            )
-                        );
                     }
                 }
             });

website/src/lib/components/file-list/StyleDialog.svelte

@@ -14,20 +14,20 @@
 	export let item: ListItem;
 	export let open = false;
 
-    const { defaultOpacity, defaultWidth } = settings;
+	const { defaultOpacity, defaultWeight } = settings;
 
 	let colors: string[] = [];
 	let color: string | undefined = undefined;
 	let opacity: number[] = [];
-    let width: number[] = [];
+	let weight: number[] = [];
 	let colorChanged = false;
 	let opacityChanged = false;
-    let widthChanged = false;
+	let weightChanged = false;
 
 	function setStyleInputs() {
 		colors = [];
 		opacity = [];
-        width = [];
+		weight = [];
 
 		$selection.forEach((item) => {
 			if (item instanceof ListFileItem) {
@@ -47,9 +47,9 @@
 							opacity.push(o);
 						}
 					});
-                    style.width.forEach((w) => {
+					style.weight.forEach((w) => {
-                        if (!width.includes(w)) {
+						if (!weight.includes(w)) {
-                            width.push(w);
+							weight.push(w);
 						}
 					});
 				}
@@ -60,20 +60,14 @@
 					let track = file.trk[item.getTrackIndex()];
 					let style = track.getStyle();
 					if (style) {
-                        if (
+						if (style.color && !colors.includes(style.color)) {
-                            style['gpx_style:color'] &&
+							colors.push(style.color);
-                            !colors.includes(style['gpx_style:color'])
-                        ) {
-                            colors.push(style['gpx_style:color']);
 						}
-                        if (
+						if (style.opacity && !opacity.includes(style.opacity)) {
-                            style['gpx_style:opacity'] &&
+							opacity.push(style.opacity);
-                            !opacity.includes(style['gpx_style:opacity'])
-                        ) {
-                            opacity.push(style['gpx_style:opacity']);
 						}
-                        if (style['gpx_style:width'] && !width.includes(style['gpx_style:width'])) {
+						if (style.weight && !weight.includes(style.weight)) {
-                            width.push(style['gpx_style:width']);
+							weight.push(style.weight);
 						}
 					}
 					if (!colors.includes(layer.layerColor)) {
@@ -85,11 +79,11 @@
 
 		color = colors[0];
 		opacity = [opacity[0] ?? $defaultOpacity];
-        width = [width[0] ?? $defaultWidth];
+		weight = [weight[0] ?? $defaultWeight];
 
 		colorChanged = false;
 		opacityChanged = false;
-        widthChanged = false;
+		weightChanged = false;
 	}
 
 	$: if ($selection && open) {
@@ -129,37 +123,37 @@
 			{$_('menu.style.width')}
 			<div class="w-40 p-2">
 				<Slider
-                    bind:value={width}
+					bind:value={weight}
-                    id="width"
+					id="weight"
 					min={1}
 					max={10}
 					step={1}
-                    onValueChange={() => (widthChanged = true)}
+					onValueChange={() => (weightChanged = true)}
 				/>
 			</div>
 		</Label>
 		<Button
 			variant="outline"
-            disabled={!colorChanged && !opacityChanged && !widthChanged}
+			disabled={!colorChanged && !opacityChanged && !weightChanged}
 			on:click={() => {
 				let style = {};
 				if (colorChanged) {
-                    style['gpx_style:color'] = color;
+					style.color = color;
 				}
 				if (opacityChanged) {
-                    style['gpx_style:opacity'] = opacity[0];
+					style.opacity = opacity[0];
 				}
-                if (widthChanged) {
+				if (weightChanged) {
-                    style['gpx_style:width'] = width[0];
+					style.weight = weight[0];
 				}
 				dbUtils.setStyleToSelection(style);
 
 				if (item instanceof ListFileItem && $selection.size === gpxLayers.size) {
-                    if (style['gpx_style:opacity']) {
+					if (style.opacity) {
-                        $defaultOpacity = style['gpx_style:opacity'];
+						$defaultOpacity = style.opacity;
 					}
-                    if (style['gpx_style:width']) {
+					if (style.weight) {
-                        $defaultWidth = style['gpx_style:width'];
+						$defaultWeight = style.weight;
 					}
 				}
 

website/src/lib/components/gpx-layer/CopyCoordinates.svelte

@@ -1,23 +0,0 @@
-<script lang="ts">
-    import { Button } from '$lib/components/ui/button';
-    import { ClipboardCopy } from 'lucide-svelte';
-    import { _ } from 'svelte-i18n';
-    import type { Coordinates } from 'gpx';
-
-    export let coordinates: Coordinates;
-    export let onCopy: () => void = () => {};
-</script>
-
-<Button
-    class="w-full px-2 py-1 h-8 justify-start {$$props.class}"
-    variant="outline"
-    on:click={() => {
-        navigator.clipboard.writeText(
-            `${coordinates.lat.toFixed(6)}, ${coordinates.lon.toFixed(6)}`
-        );
-        onCopy();
-    }}
->
-    <ClipboardCopy size="16" class="mr-1" />
-    {$_('menu.copy_coordinates')}
-</Button>

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

@@ -1,18 +1,10 @@
-import { settings } from '$lib/db';
+
-import { gpxStatistics } from '$lib/stores';
+import { settings } from "$lib/db";
-import { get } from 'svelte/store';
+import { gpxStatistics } from "$lib/stores";
+import { get } from "svelte/store";
 
 const { distanceMarkers, distanceUnits } = settings;
 
-const stops = [
-    [100, 0],
-    [50, 7],
-    [25, 8, 10],
-    [10, 10],
-    [5, 11],
-    [1, 13],
-];
-
 export class DistanceMarkers {
     map: mapboxgl.Map;
     updateBinded: () => void = this.update.bind(this);
@@ -36,55 +28,41 @@ export class DistanceMarkers {
                 } else {
                     this.map.addSource('distance-markers', {
                         type: 'geojson',
-                        data: this.getDistanceMarkersGeoJSON(),
+                        data: this.getDistanceMarkersGeoJSON()
                     });
                 }
-                stops.forEach(([d, minzoom, maxzoom]) => {
+                if (!this.map.getLayer('distance-markers')) {
-                    if (!this.map.getLayer(`distance-markers-${d}`)) {
                     this.map.addLayer({
-                            id: `distance-markers-${d}`,
+                        id: 'distance-markers',
                         type: 'symbol',
                         source: 'distance-markers',
-                            filter:
-                                d === 5
-                                    ? [
-                                          'any',
-                                          ['==', ['get', 'level'], 5],
-                                          ['==', ['get', 'level'], 25],
-                                      ]
-                                    : ['==', ['get', 'level'], d],
-                            minzoom: minzoom,
-                            maxzoom: maxzoom ?? 24,
                         layout: {
                             'text-field': ['get', 'distance'],
                             'text-size': 14,
                             'text-font': ['Open Sans Bold'],
+                            'text-padding': 20,
                         },
                         paint: {
                             'text-color': 'black',
                             'text-halo-width': 2,
                             'text-halo-color': 'white',
-                            },
-                        });
-                    } else {
-                        this.map.moveLayer(`distance-markers-${d}`);
                         }
                     });
                 } else {
-                stops.forEach(([d]) => {
+                    this.map.moveLayer('distance-markers');
-                    if (this.map.getLayer(`distance-markers-${d}`)) {
-                        this.map.removeLayer(`distance-markers-${d}`);
                 }
-                });
+            } else {
+                if (this.map.getLayer('distance-markers')) {
+                    this.map.removeLayer('distance-markers');
                 }
-        } catch (e) {
+            }
-            // No reliable way to check if the map is ready to add sources and layers
+        } catch (e) { // No reliable way to check if the map is ready to add sources and layers
             return;
         }
     }
 
     remove() {
-        this.unsubscribes.forEach((unsubscribe) => unsubscribe());
+        this.unsubscribes.forEach(unsubscribe => unsubscribe());
     }
 
     getDistanceMarkersGeoJSON(): GeoJSON.FeatureCollection {
@@ -93,28 +71,17 @@ export class DistanceMarkers {
         let features = [];
         let currentTargetDistance = 1;
         for (let i = 0; i < statistics.local.distance.total.length; i++) {
-            if (
+            if (statistics.local.distance.total[i] >= currentTargetDistance * (get(distanceUnits) === 'metric' ? 1 : 1.60934)) {
-                statistics.local.distance.total[i] >=
-                currentTargetDistance * (get(distanceUnits) === 'metric' ? 1 : 1.60934)
-            ) {
                 let distance = currentTargetDistance.toFixed(0);
-                let [level, minzoom] = stops.find(([d]) => currentTargetDistance % d === 0) ?? [
-                    0, 0,
-                ];
                 features.push({
                     type: 'Feature',
                     geometry: {
                         type: 'Point',
-                        coordinates: [
+                        coordinates: [statistics.local.points[i].getLongitude(), statistics.local.points[i].getLatitude()]
-                            statistics.local.points[i].getLongitude(),
-                            statistics.local.points[i].getLatitude(),
-                        ],
                     },
                     properties: {
                         distance,
-                        level,
+                    }
-                        minzoom,
-                    },
                 } as GeoJSON.Feature);
                 currentTargetDistance += 1;
             }
@@ -122,7 +89,7 @@ export class DistanceMarkers {
 
         return {
             type: 'FeatureCollection',
-            features,
+            features
         };
     }
 }

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

@@ -1,28 +1,15 @@
-import { currentTool, map, Tool } from '$lib/stores';
+import { currentTool, map, Tool } from "$lib/stores";
-import { settings, type GPXFileWithStatistics, dbUtils } from '$lib/db';
+import { settings, type GPXFileWithStatistics, dbUtils } from "$lib/db";
-import { get, type Readable } from 'svelte/store';
+import { get, type Readable } from "svelte/store";
-import mapboxgl from 'mapbox-gl';
+import mapboxgl from "mapbox-gl";
-import { waypointPopup, deleteWaypoint, trackpointPopup } from './GPXLayerPopup';
+import { currentPopupWaypoint, deleteWaypoint, waypointPopup } from "./WaypointPopup";
-import { addSelectItem, selectItem, selection } from '$lib/components/file-list/Selection';
+import { addSelectItem, selectItem, selection } from "$lib/components/file-list/Selection";
-import {
+import { ListTrackSegmentItem, ListWaypointItem, ListWaypointsItem, ListTrackItem, ListFileItem, ListRootItem } from "$lib/components/file-list/FileList";
-    ListTrackSegmentItem,
+import type { Waypoint } from "gpx";
-    ListWaypointItem,
+import { getElevation, resetCursor, setGrabbingCursor, setPointerCursor, setScissorsCursor } from "$lib/utils";
-    ListWaypointsItem,
+import { selectedWaypoint } from "$lib/components/toolbar/tools/Waypoint.svelte";
-    ListTrackItem,
+import { MapPin, Square } from "lucide-static";
-    ListFileItem,
+import { getSymbolKey, symbols } from "$lib/assets/symbols";
-    ListRootItem,
-} from '$lib/components/file-list/FileList';
-import {
-    getClosestLinePoint,
-    getElevation,
-    resetCursor,
-    setGrabbingCursor,
-    setPointerCursor,
-    setScissorsCursor,
-} from '$lib/utils';
-import { selectedWaypoint } from '$lib/components/toolbar/tools/Waypoint.svelte';
-import { MapPin, Square } from 'lucide-static';
-import { getSymbolKey, symbols } from '$lib/assets/symbols';
 
 const colors = [
     '#ff0000',
@@ -35,7 +22,7 @@ const colors = [
     '#288228',
     '#9933ff',
     '#50f0be',
-    '#8c645a',
+    '#8c645a'
 ];
 
 const colorCount: { [key: string]: number } = {};
@@ -59,30 +46,26 @@ function decrementColor(color: string) {
 function getMarkerForSymbol(symbol: string | undefined, layerColor: string) {
     let symbolSvg = symbol ? symbols[symbol]?.iconSvg : undefined;
     return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    ${Square.replace('width="24"', 'width="12"')
+    ${Square
+            .replace('width="24"', 'width="12"')
             .replace('height="24"', 'height="12"')
             .replace('stroke="currentColor"', 'stroke="SteelBlue"')
             .replace('stroke-width="2"', 'stroke-width="1.5" x="9.6" y="0.4"')
             .replace('fill="none"', `fill="${layerColor}"`)}
-    ${MapPin.replace('width="24"', '')
+    ${MapPin
+            .replace('width="24"', '')
             .replace('height="24"', '')
             .replace('stroke="currentColor"', '')
             .replace('path', `path fill="#3fb1ce" stroke="SteelBlue" stroke-width="1"`)
-        .replace(
+            .replace('circle', `circle fill="${symbolSvg ? 'none' : 'white'}" stroke="${symbolSvg ? 'none' : 'white'}" stroke-width="2"`)} 
-            'circle',
+    ${symbolSvg?.replace('width="24"', 'width="10"')
-            `circle fill="${symbolSvg ? 'none' : 'white'}" stroke="${symbolSvg ? 'none' : 'white'}" stroke-width="2"`
-        )} 
-    ${
-        symbolSvg
-            ?.replace('width="24"', 'width="10"')
             .replace('height="24"', 'height="10"')
             .replace('stroke="currentColor"', 'stroke="white"')
-            .replace('stroke-width="2"', 'stroke-width="2.5" x="7" y="5"') ?? ''
+            .replace('stroke-width="2"', 'stroke-width="2.5" x="7" y="5"') ?? ''}
-    }
     </svg>`;
 }
 
-const { directionMarkers, treeFileView, defaultOpacity, defaultWidth } = settings;
+const { directionMarkers, verticalFileView, defaultOpacity, defaultWeight } = settings;
 
 export class GPXLayer {
     map: mapboxgl.Map;
@@ -97,22 +80,17 @@ export class GPXLayer {
     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: any) => void = this.layerOnClick.bind(this);
     layerOnContextMenuBinded: (e: any) => void = this.layerOnContextMenu.bind(this);
+    maybeHideWaypointPopupBinded: (e: any) => void = this.maybeHideWaypointPopup.bind(this);
 
-    constructor(
+    constructor(map: mapboxgl.Map, fileId: string, file: Readable<GPXFileWithStatistics | undefined>) {
-        map: mapboxgl.Map,
-        fileId: string,
-        file: Readable<GPXFileWithStatistics | undefined>
-    ) {
         this.map = map;
         this.fileId = fileId;
         this.file = file;
         this.layerColor = getColor();
         this.unsubscribe.push(file.subscribe(this.updateBinded));
-        this.unsubscribe.push(
+        this.unsubscribe.push(selection.subscribe($selection => {
-            selection.subscribe(($selection) => {
             let newSelected = $selection.hasAnyChildren(new ListFileItem(this.fileId));
             if (this.selected || newSelected) {
                 this.selected = newSelected;
@@ -121,20 +99,17 @@ export class GPXLayer {
             if (newSelected) {
                 this.moveToFront();
             }
-            })
+        }));
-        );
         this.unsubscribe.push(directionMarkers.subscribe(this.updateBinded));
-        this.unsubscribe.push(
+        this.unsubscribe.push(currentTool.subscribe(tool => {
-            currentTool.subscribe((tool) => {
             if (tool === Tool.WAYPOINT && !this.draggable) {
                 this.draggable = true;
-                    this.markers.forEach((marker) => marker.setDraggable(true));
+                this.markers.forEach(marker => marker.setDraggable(true));
             } else if (tool !== Tool.WAYPOINT && this.draggable) {
                 this.draggable = false;
-                    this.markers.forEach((marker) => marker.setDraggable(false));
+                this.markers.forEach(marker => marker.setDraggable(false));
             }
-            })
+        }));
-        );
         this.draggable = get(currentTool) === Tool.WAYPOINT;
 
         this.map.on('style.import.load', this.updateBinded);
@@ -146,11 +121,7 @@ export class GPXLayer {
             return;
         }
 
-        if (
+        if (file._data.style && file._data.style.color && this.layerColor !== `#${file._data.style.color}`) {
-            file._data.style &&
-            file._data.style.color &&
-            this.layerColor !== `#${file._data.style.color}`
-        ) {
             decrementColor(this.layerColor);
             this.layerColor = `#${file._data.style.color}`;
         }
@@ -162,7 +133,7 @@ export class GPXLayer {
             } else {
                 this.map.addSource(this.fileId, {
                     type: 'geojson',
-                    data: this.getGeoJSON(),
+                    data: this.getGeoJSON()
                 });
             }
 
@@ -173,26 +144,24 @@ export class GPXLayer {
                     source: this.fileId,
                     layout: {
                         'line-join': 'round',
-                        'line-cap': 'round',
+                        'line-cap': 'round'
                     },
                     paint: {
                         'line-color': ['get', 'color'],
-                        'line-width': ['get', 'width'],
+                        'line-width': ['get', 'weight'],
-                        'line-opacity': ['get', 'opacity'],
+                        'line-opacity': ['get', 'opacity']
-                    },
+                    }
                 });
 
                 this.map.on('click', this.fileId, this.layerOnClickBinded);
                 this.map.on('contextmenu', this.fileId, this.layerOnContextMenuBinded);
                 this.map.on('mouseenter', this.fileId, this.layerOnMouseEnterBinded);
                 this.map.on('mouseleave', this.fileId, this.layerOnMouseLeaveBinded);
-                this.map.on('mousemove', this.fileId, this.layerOnMouseMoveBinded);
             }
 
             if (get(directionMarkers)) {
                 if (!this.map.getLayer(this.fileId + '-direction')) {
-                    this.map.addLayer(
+                    this.map.addLayer({
-                        {
                         id: this.fileId + '-direction',
                         type: 'symbol',
                         source: this.fileId,
@@ -210,11 +179,9 @@ export class GPXLayer {
                             'text-color': 'white',
                             'text-opacity': 0.7,
                             'text-halo-width': 0.2,
-                                'text-halo-color': 'white',
+                            'text-halo-color': 'white'
-                            },
+                        }
-                        },
+                    }, this.map.getLayer('distance-markers') ? 'distance-markers' : undefined);
-                        this.map.getLayer('distance-markers') ? 'distance-markers' : undefined
-                    );
                 }
             } else {
                 if (this.map.getLayer(this.fileId + '-direction')) {
@@ -229,53 +196,23 @@ export class GPXLayer {
                 }
             });
 
-            this.map.setFilter(
+            this.map.setFilter(this.fileId, ['any', ...visibleItems.map(([trackIndex, segmentIndex]) => ['all', ['==', 'trackIndex', trackIndex], ['==', 'segmentIndex', segmentIndex]])], { validate: false });
-                this.fileId,
-                [
-                    'any',
-                    ...visibleItems.map(([trackIndex, segmentIndex]) => [
-                        'all',
-                        ['==', 'trackIndex', trackIndex],
-                        ['==', 'segmentIndex', segmentIndex],
-                    ]),
-                ],
-                { validate: false }
-            );
             if (this.map.getLayer(this.fileId + '-direction')) {
-                this.map.setFilter(
+                this.map.setFilter(this.fileId + '-direction', ['any', ...visibleItems.map(([trackIndex, segmentIndex]) => ['all', ['==', 'trackIndex', trackIndex], ['==', 'segmentIndex', segmentIndex]])], { validate: false });
-                    this.fileId + '-direction',
-                    [
-                        'any',
-                        ...visibleItems.map(([trackIndex, segmentIndex]) => [
-                            'all',
-                            ['==', 'trackIndex', trackIndex],
-                            ['==', 'segmentIndex', segmentIndex],
-                        ]),
-                    ],
-                    { validate: false }
-                );
             }
-        } catch (e) {
+        } catch (e) { // No reliable way to check if the map is ready to add sources and layers
-            // No reliable way to check if the map is ready to add sources and layers
             return;
         }
 
         let markerIndex = 0;
 
         if (get(selection).hasAnyChildren(new ListFileItem(this.fileId))) {
-            file.wpt.forEach((waypoint) => {
+            file.wpt.forEach((waypoint) => { // Update markers
-                // Update markers
                 let symbolKey = getSymbolKey(waypoint.sym);
                 if (markerIndex < this.markers.length) {
-                    this.markers[markerIndex].getElement().innerHTML = getMarkerForSymbol(
+                    this.markers[markerIndex].getElement().innerHTML = getMarkerForSymbol(symbolKey, this.layerColor);
-                        symbolKey,
-                        this.layerColor
-                    );
                     this.markers[markerIndex].setLngLat(waypoint.getCoordinates());
-                    Object.defineProperty(this.markers[markerIndex], '_waypoint', {
+                    Object.defineProperty(this.markers[markerIndex], '_waypoint', { value: waypoint, writable: true });
-                        value: waypoint,
-                        writable: true,
-                    });
                 } else {
                     let element = document.createElement('div');
                     element.classList.add('w-8', 'h-8', 'drop-shadow-xl');
@@ -283,15 +220,15 @@ export class GPXLayer {
                     let marker = new mapboxgl.Marker({
                         draggable: this.draggable,
                         element,
-                        anchor: 'bottom',
+                        anchor: 'bottom'
                     }).setLngLat(waypoint.getCoordinates());
                     Object.defineProperty(marker, '_waypoint', { value: waypoint, writable: true });
                     let dragEndTimestamp = 0;
-                    marker.getElement().addEventListener('mousemove', (e) => {
+                    marker.getElement().addEventListener('mouseover', (e) => {
                         if (marker._isDragging) {
                             return;
                         }
-                        waypointPopup?.setItem({ item: marker._waypoint, fileId: this.fileId });
+                        this.showWaypointPopup(marker._waypoint);
                         e.stopPropagation();
                     });
                     marker.getElement().addEventListener('click', (e) => {
@@ -305,33 +242,23 @@ export class GPXLayer {
                             return;
                         }
 
-                        if (get(treeFileView)) {
+                        if (get(verticalFileView)) {
-                            if (
+                            if ((e.ctrlKey || e.metaKey) && get(selection).hasAnyChildren(new ListWaypointsItem(this.fileId), false)) {
-                                (e.ctrlKey || e.metaKey) &&
+                                addSelectItem(new ListWaypointItem(this.fileId, marker._waypoint._data.index));
-                                get(selection).hasAnyChildren(
-                                    new ListWaypointsItem(this.fileId),
-                                    false
-                                )
-                            ) {
-                                addSelectItem(
-                                    new ListWaypointItem(this.fileId, marker._waypoint._data.index)
-                                );
                             } else {
-                                selectItem(
+                                selectItem(new ListWaypointItem(this.fileId, marker._waypoint._data.index));
-                                    new ListWaypointItem(this.fileId, marker._waypoint._data.index)
-                                );
                             }
                         } else if (get(currentTool) === Tool.WAYPOINT) {
                             selectedWaypoint.set([marker._waypoint, this.fileId]);
                         } else {
-                            waypointPopup?.setItem({ item: marker._waypoint, fileId: this.fileId });
+                            this.showWaypointPopup(marker._waypoint);
                         }
                         e.stopPropagation();
                     });
                     marker.on('dragstart', () => {
                         setGrabbingCursor();
                         marker.getElement().style.cursor = 'grabbing';
-                        waypointPopup?.hide();
+                        this.hideWaypointPopup();
                     });
                     marker.on('dragend', (e) => {
                         resetCursor();
@@ -342,12 +269,12 @@ export class GPXLayer {
                                 let wpt = file.wpt[marker._waypoint._data.index];
                                 wpt.setCoordinates({
                                     lat: latLng.lat,
-                                    lon: latLng.lng,
+                                    lon: latLng.lng
                                 });
                                 wpt.ele = ele[0];
                             });
                         });
-                        dragEndTimestamp = Date.now();
+                        dragEndTimestamp = Date.now()
                     });
                     this.markers.push(marker);
                 }
@@ -355,8 +282,7 @@ export class GPXLayer {
             });
         }
 
-        while (markerIndex < this.markers.length) {
+        while (markerIndex < this.markers.length) { // Remove extra markers
-            // Remove extra markers
             this.markers.pop()?.remove();
         }
 
@@ -381,7 +307,6 @@ export class GPXLayer {
             this.map.off('contextmenu', this.fileId, this.layerOnContextMenuBinded);
             this.map.off('mouseenter', this.fileId, this.layerOnMouseEnterBinded);
             this.map.off('mouseleave', this.fileId, this.layerOnMouseLeaveBinded);
-            this.map.off('mousemove', this.fileId, this.layerOnMouseMoveBinded);
             this.map.off('style.import.load', this.updateBinded);
 
             if (this.map.getLayer(this.fileId + '-direction')) {
@@ -409,10 +334,7 @@ export class GPXLayer {
             this.map.moveLayer(this.fileId);
         }
         if (this.map.getLayer(this.fileId + '-direction')) {
-            this.map.moveLayer(
+            this.map.moveLayer(this.fileId + '-direction', this.map.getLayer('distance-markers') ? 'distance-markers' : undefined);
-                this.fileId + '-direction',
-                this.map.getLayer('distance-markers') ? 'distance-markers' : undefined
-            );
         }
     }
 
@@ -420,12 +342,7 @@ export class GPXLayer {
         let trackIndex = e.features[0].properties.trackIndex;
         let segmentIndex = e.features[0].properties.segmentIndex;
 
-        if (
+        if (get(currentTool) === Tool.SCISSORS && get(selection).hasAnyParent(new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex))) {
-            get(currentTool) === Tool.SCISSORS &&
-            get(selection).hasAnyParent(
-                new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
-            )
-        ) {
             setScissorsCursor();
         } else {
             setPointerCursor();
@@ -436,43 +353,16 @@ export class GPXLayer {
         resetCursor();
     }
 
-    layerOnMouseMove(e: any) {
-        if (e.originalEvent.shiftKey) {
-            let trackIndex = e.features[0].properties.trackIndex;
-            let segmentIndex = e.features[0].properties.segmentIndex;
-
-            const file = get(this.file)?.file;
-            if (file) {
-                const closest = getClosestLinePoint(
-                    file.trk[trackIndex].trkseg[segmentIndex].trkpt,
-                    { lat: e.lngLat.lat, lon: e.lngLat.lng }
-                );
-                trackpointPopup?.setItem({ item: closest, fileId: this.fileId });
-            }
-        }
-    }
-
     layerOnClick(e: any) {
-        if (
+        if (get(currentTool) === Tool.ROUTING && get(selection).hasAnyChildren(new ListRootItem(), true, ['waypoints'])) {
-            get(currentTool) === Tool.ROUTING &&
-            get(selection).hasAnyChildren(new ListRootItem(), true, ['waypoints'])
-        ) {
             return;
         }
 
         let trackIndex = e.features[0].properties.trackIndex;
         let segmentIndex = e.features[0].properties.segmentIndex;
 
-        if (
+        if (get(currentTool) === Tool.SCISSORS && get(selection).hasAnyParent(new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex))) {
-            get(currentTool) === Tool.SCISSORS &&
+            dbUtils.split(this.fileId, trackIndex, segmentIndex, { lat: e.lngLat.lat, lon: e.lngLat.lng });
-            get(selection).hasAnyParent(
-                new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
-            )
-        ) {
-            dbUtils.split(this.fileId, trackIndex, segmentIndex, {
-                lat: e.lngLat.lat,
-                lon: e.lngLat.lng,
-            });
             return;
         }
 
@@ -482,12 +372,8 @@ export class GPXLayer {
         }
 
         let item = undefined;
-        if (get(treeFileView) && file.getSegments().length > 1) {
+        if (get(verticalFileView) && file.getSegments().length > 1) { // Select inner item
-            // Select inner item
+            item = file.children[trackIndex].children.length > 1 ? new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex) : new ListTrackItem(this.fileId, trackIndex);
-            item =
-                file.children[trackIndex].children.length > 1
-                    ? new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
-                    : new ListTrackItem(this.fileId, trackIndex);
         } else {
             item = new ListFileItem(this.fileId);
         }
@@ -505,19 +391,55 @@ export class GPXLayer {
         }
     }
 
+    showWaypointPopup(waypoint: Waypoint) {
+        if (get(currentPopupWaypoint) !== null) {
+            this.hideWaypointPopup();
+        }
+        let marker = this.markers[waypoint._data.index];
+        if (marker) {
+            currentPopupWaypoint.set([waypoint, this.fileId]);
+            marker.setPopup(waypointPopup);
+            marker.togglePopup();
+            this.map.on('mousemove', this.maybeHideWaypointPopupBinded);
+        }
+    }
+
+    maybeHideWaypointPopup(e: any) {
+        let waypoint = get(currentPopupWaypoint)?.[0];
+        if (waypoint) {
+            let marker = this.markers[waypoint._data.index];
+            if (marker) {
+                if (this.map.project(marker.getLngLat()).dist(this.map.project(e.lngLat)) > 100) {
+                    this.hideWaypointPopup();
+                }
+            } else {
+                this.hideWaypointPopup();
+            }
+        }
+    }
+
+    hideWaypointPopup() {
+        let waypoint = get(currentPopupWaypoint)?.[0];
+        if (waypoint) {
+            let marker = this.markers[waypoint._data.index];
+            marker?.getPopup()?.remove();
+            currentPopupWaypoint.set(null);
+            this.map.off('mousemove', this.maybeHideWaypointPopupBinded);
+        }
+    }
+
     getGeoJSON(): GeoJSON.FeatureCollection {
         let file = get(this.file)?.file;
         if (!file) {
             return {
                 type: 'FeatureCollection',
-                features: [],
+                features: []
             };
         }
 
         let data = file.toGeoJSON();
 
-        let trackIndex = 0,
+        let trackIndex = 0, segmentIndex = 0;
-            segmentIndex = 0;
         for (let feature of data.features) {
             if (!feature.properties) {
                 feature.properties = {};
@@ -525,19 +447,14 @@ export class GPXLayer {
             if (!feature.properties.color) {
                 feature.properties.color = this.layerColor;
             }
+            if (!feature.properties.weight) {
+                feature.properties.weight = get(defaultWeight);
+            }
             if (!feature.properties.opacity) {
                 feature.properties.opacity = get(defaultOpacity);
             }
-            if (!feature.properties.width) {
+            if (get(selection).hasAnyParent(new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)) || get(selection).hasAnyChildren(new ListWaypointsItem(this.fileId), true)) {
-                feature.properties.width = get(defaultWidth);
+                feature.properties.weight = feature.properties.weight + 2;
-            }
-            if (
-                get(selection).hasAnyParent(
-                    new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
-                ) ||
-                get(selection).hasAnyChildren(new ListWaypointsItem(this.fileId), true)
-            ) {
-                feature.properties.width = feature.properties.width + 2;
                 feature.properties.opacity = Math.min(1, feature.properties.opacity + 0.1);
             }
             feature.properties.trackIndex = trackIndex;

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

@@ -1,44 +0,0 @@
-import { dbUtils } from '$lib/db';
-import { MapPopup } from '$lib/components/MapPopup';
-
-export let waypointPopup: MapPopup | null = null;
-export let trackpointPopup: MapPopup | null = null;
-
-export function createPopups(map: mapboxgl.Map) {
-    removePopups();
-    waypointPopup = new MapPopup(map, {
-        closeButton: false,
-        focusAfterOpen: false,
-        maxWidth: undefined,
-        offset: {
-            top: [0, 0],
-            'top-left': [0, 0],
-            'top-right': [0, 0],
-            bottom: [0, -30],
-            'bottom-left': [0, -30],
-            'bottom-right': [0, -30],
-            left: [10, -15],
-            right: [-10, -15],
-        },
-    });
-    trackpointPopup = new MapPopup(map, {
-        closeButton: false,
-        focusAfterOpen: false,
-        maxWidth: undefined,
-    });
-}
-
-export function removePopups() {
-    if (waypointPopup !== null) {
-        waypointPopup.remove();
-        waypointPopup = null;
-    }
-    if (trackpointPopup !== null) {
-        trackpointPopup.remove();
-        trackpointPopup = null;
-    }
-}
-
-export function deleteWaypoint(fileId: string, waypointIndex: number) {
-    dbUtils.applyToFile(fileId, (file) => file.replaceWaypoints(waypointIndex, waypointIndex, []));
-}

website/src/lib/components/gpx-layer/GPXLayers.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
 	import { map, gpxLayers } from '$lib/stores';
 	import { GPXLayer } from './GPXLayer';
+	import WaypointPopup from './WaypointPopup.svelte';
 	import { fileObservers } from '$lib/db';
 	import { DistanceMarkers } from './DistanceMarkers';
 	import { StartEndMarkers } from './StartEndMarkers';
 	import { onDestroy } from 'svelte';
-    import { createPopups, removePopups } from './GPXLayerPopup';
 
 	let distanceMarkers: DistanceMarkers | undefined = undefined;
 	let startEndMarkers: StartEndMarkers | undefined = undefined;
@@ -35,7 +35,6 @@
 		if (startEndMarkers) {
 			startEndMarkers.remove();
 		}
-        createPopups($map);
 		distanceMarkers = new DistanceMarkers($map);
 		startEndMarkers = new StartEndMarkers($map);
 	}
@@ -43,14 +42,17 @@
 	onDestroy(() => {
 		gpxLayers.forEach((layer) => layer.remove());
 		gpxLayers.clear();
-        removePopups();
+
 		if (distanceMarkers) {
 			distanceMarkers.remove();
 			distanceMarkers = undefined;
 		}
+
 		if (startEndMarkers) {
 			startEndMarkers.remove();
 			startEndMarkers = undefined;
 		}
 	});
 </script>
+
+<WaypointPopup />

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

@@ -1,6 +1,6 @@
-import { gpxStatistics, slicedGPXStatistics, currentTool, Tool } from '$lib/stores';
+import { gpxStatistics, slicedGPXStatistics, currentTool, Tool } from "$lib/stores";
-import mapboxgl from 'mapbox-gl';
+import mapboxgl from "mapbox-gl";
-import { get } from 'svelte/store';
+import { get } from "svelte/store";
 
 export class StartEndMarkers {
     map: mapboxgl.Map;
@@ -16,8 +16,7 @@ export class StartEndMarkers {
         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 =
+        endElement.style.background = 'repeating-conic-gradient(#fff 0 90deg, #000 0 180deg) 0 0/8px 8px round';
-            '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 });
@@ -32,11 +31,7 @@ export class StartEndMarkers {
         let statistics = get(slicedGPXStatistics)?.[0] ?? get(gpxStatistics);
         if (statistics.local.points.length > 0 && tool !== Tool.ROUTING) {
             this.start.setLngLat(statistics.local.points[0].getCoordinates()).addTo(this.map);
-            this.end
+            this.end.setLngLat(statistics.local.points[statistics.local.points.length - 1].getCoordinates()).addTo(this.map);
-                .setLngLat(
-                    statistics.local.points[statistics.local.points.length - 1].getCoordinates()
-                )
-                .addTo(this.map);
         } else {
             this.start.remove();
             this.end.remove();
@@ -44,7 +39,7 @@ export class StartEndMarkers {
     }
 
     remove() {
-        this.unsubscribes.forEach((unsubscribe) => unsubscribe());
+        this.unsubscribes.forEach(unsubscribe => unsubscribe());
 
         this.start.remove();
         this.end.remove();

website/src/lib/components/gpx-layer/TrackpointPopup.svelte

@@ -1,43 +0,0 @@
-<script lang="ts">
-    import type { TrackPoint } from 'gpx';
-    import type { PopupItem } from '$lib/components/MapPopup';
-    import CopyCoordinates from '$lib/components/gpx-layer/CopyCoordinates.svelte';
-    import * as Card from '$lib/components/ui/card';
-    import WithUnits from '$lib/components/WithUnits.svelte';
-    import { Compass, Mountain, Timer } from 'lucide-svelte';
-    import { df } from '$lib/utils';
-    import { _ } from 'svelte-i18n';
-
-    export let trackpoint: PopupItem<TrackPoint>;
-</script>
-
-<Card.Root class="border-none shadow-md text-base p-2">
-    <Card.Header class="p-0">
-        <Card.Title class="text-md"></Card.Title>
-    </Card.Header>
-    <Card.Content class="flex flex-col p-0 text-xs gap-1">
-        <div class="flex flex-row items-center gap-1">
-            <Compass size="14" />
-            {trackpoint.item.getLatitude().toFixed(6)}&deg; {trackpoint.item
-                .getLongitude()
-                .toFixed(6)}&deg;
-        </div>
-        {#if trackpoint.item.ele !== undefined}
-            <div class="flex flex-row items-center gap-1">
-                <Mountain size="14" />
-                <WithUnits value={trackpoint.item.ele} type="elevation" />
-            </div>
-        {/if}
-        {#if trackpoint.item.time}
-            <div class="flex flex-row items-center gap-1">
-                <Timer size="14" />
-                {df.format(trackpoint.item.time)}
-            </div>
-        {/if}
-        <CopyCoordinates
-            coordinates={trackpoint.item.attributes}
-            onCopy={() => trackpoint.hide?.()}
-            class="mt-0.5"
-        />
-    </Card.Content>
-</Card.Root>

website/src/lib/components/gpx-layer/WaypointPopup.svelte

@@ -2,21 +2,23 @@
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
 	import Shortcut from '$lib/components/Shortcut.svelte';
-    import CopyCoordinates from '$lib/components/gpx-layer/CopyCoordinates.svelte';
+	import { waypointPopup, currentPopupWaypoint, deleteWaypoint } from './WaypointPopup';
-    import { deleteWaypoint } from './GPXLayerPopup';
 	import WithUnits from '$lib/components/WithUnits.svelte';
 	import { Dot, ExternalLink, Trash2 } from 'lucide-svelte';
+	import { onMount } from 'svelte';
 	import { Tool, currentTool } from '$lib/stores';
 	import { getSymbolKey, symbols } from '$lib/assets/symbols';
 	import { _ } from 'svelte-i18n';
 	import sanitizeHtml from 'sanitize-html';
-    import type { Waypoint } from 'gpx';
-    import type { PopupItem } from '$lib/components/MapPopup';
-    import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
 
-    export let waypoint: PopupItem<Waypoint>;
+	let popupElement: HTMLDivElement;
 
-    $: symbolKey = waypoint ? getSymbolKey(waypoint.item.sym) : undefined;
+	onMount(() => {
+		waypointPopup.setDOMContent(popupElement);
+		popupElement.classList.remove('hidden');
+	});
+
+	$: symbolKey = $currentPopupWaypoint ? getSymbolKey($currentPopupWaypoint[0].sym) : undefined;
 
 	function sanitize(text: string | undefined): string {
 		if (text === undefined) {
@@ -26,26 +28,28 @@
 			allowedTags: ['a', 'br', 'img'],
 			allowedAttributes: {
 				a: ['href', 'target'],
-                img: ['src'],
+				img: ['src']
-            },
+			}
 		}).trim();
 	}
 </script>
 
-<Card.Root class="border-none shadow-md text-base p-2 max-w-[50dvw]">
+<div bind:this={popupElement} class="hidden">
+	{#if $currentPopupWaypoint}
+		<Card.Root class="border-none shadow-md text-base max-w-80 p-2">
 			<Card.Header class="p-0">
 				<Card.Title class="text-md">
-            {#if waypoint.item.link && waypoint.item.link.attributes && waypoint.item.link.attributes.href}
+					{#if $currentPopupWaypoint[0].link && $currentPopupWaypoint[0].link.attributes && $currentPopupWaypoint[0].link.attributes.href}
-                <a href={waypoint.item.link.attributes.href} target="_blank">
+						<a href={$currentPopupWaypoint[0].link.attributes.href} target="_blank">
-                    {waypoint.item.name ?? waypoint.item.link.attributes.href}
+							{$currentPopupWaypoint[0].name ?? $currentPopupWaypoint[0].link.attributes.href}
 							<ExternalLink size="12" class="inline-block mb-1.5" />
 						</a>
 					{:else}
-                {waypoint.item.name ?? $_('gpx.waypoint')}
+						{$currentPopupWaypoint[0].name ?? $_('gpx.waypoint')}
 					{/if}
 				</Card.Title>
 			</Card.Header>
-    <Card.Content class="flex flex-col text-sm p-0">
+			<Card.Content class="flex flex-col p-0 text-sm">
 				<div class="flex flex-row items-center text-muted-foreground text-xs whitespace-nowrap">
 					{#if symbolKey}
 						<span>
@@ -62,38 +66,36 @@
 						</span>
 						<Dot size="16" />
 					{/if}
-            {waypoint.item.getLatitude().toFixed(6)}&deg; {waypoint.item
+					{$currentPopupWaypoint[0].getLatitude().toFixed(6)}&deg; {$currentPopupWaypoint[0]
 						.getLongitude()
 						.toFixed(6)}&deg;
-            {#if waypoint.item.ele !== undefined}
+					{#if $currentPopupWaypoint[0].ele !== undefined}
 						<Dot size="16" />
-                <WithUnits value={waypoint.item.ele} type="elevation" />
+						<WithUnits value={$currentPopupWaypoint[0].ele} type="elevation" />
 					{/if}
 				</div>
-        <ScrollArea class="flex flex-col" viewportClasses="max-h-[30dvh]">
+				{#if $currentPopupWaypoint[0].desc}
-            {#if waypoint.item.desc}
+					<span class="whitespace-pre-wrap">{@html sanitize($currentPopupWaypoint[0].desc)}</span>
-                <span class="whitespace-pre-wrap">{@html sanitize(waypoint.item.desc)}</span>
 				{/if}
-            {#if waypoint.item.cmt && waypoint.item.cmt !== waypoint.item.desc}
+				{#if $currentPopupWaypoint[0].cmt && $currentPopupWaypoint[0].cmt !== $currentPopupWaypoint[0].desc}
-                <span class="whitespace-pre-wrap">{@html sanitize(waypoint.item.cmt)}</span>
+					<span class="whitespace-pre-wrap">{@html sanitize($currentPopupWaypoint[0].cmt)}</span>
 				{/if}
-        </ScrollArea>
-        <div class="mt-2 flex flex-col gap-1">
-            <CopyCoordinates coordinates={waypoint.item.attributes} />
 				{#if $currentTool === Tool.WAYPOINT}
 					<Button
-                    class="w-full px-2 py-1 h-8 justify-start"
+						class="mt-2 w-full px-2 py-1 h-8 justify-start"
 						variant="outline"
-                    on:click={() => deleteWaypoint(waypoint.fileId, waypoint.item._data.index)}
+						on:click={() =>
+							deleteWaypoint($currentPopupWaypoint[1], $currentPopupWaypoint[0]._data.index)}
 					>
 						<Trash2 size="16" class="mr-1" />
 						{$_('menu.delete')}
 						<Shortcut shift={true} click={true} />
 					</Button>
 				{/if}
-        </div>
 			</Card.Content>
-</Card.Root>
+		</Card.Root>
+	{/if}
+</div>
 
 <style lang="postcss">
 	div :global(a) {

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

@@ -0,0 +1,25 @@
+import { dbUtils } from "$lib/db";
+import type { Waypoint } from "gpx";
+import mapboxgl from "mapbox-gl";
+import { writable } from "svelte/store";
+
+export const currentPopupWaypoint = writable<[Waypoint, string] | null>(null);
+
+export const waypointPopup = new mapboxgl.Popup({
+    closeButton: false,
+    maxWidth: undefined,
+    offset: {
+        'top': [0, 0],
+        'top-left': [0, 0],
+        'top-right': [0, 0],
+        'bottom': [0, -30],
+        'bottom-left': [0, -30],
+        'bottom-right': [0, -30],
+        'left': [0, 0],
+        'right': [0, 0]
+    },
+});
+
+export function deleteWaypoint(fileId: string, waypointIndex: number) {
+    dbUtils.applyToFile(fileId, (file) => file.replaceWaypoints(waypointIndex, waypointIndex, []));
+}

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

@@ -15,7 +15,7 @@
         Trash2,
         Move,
         Map,
-        Layers2,
+        Layers2
     } from 'lucide-svelte';
     import { _ } from 'svelte-i18n';
     import { settings } from '$lib/db';
@@ -34,7 +34,7 @@
         currentOverlays,
         previousOverlays,
         customBasemapOrder,
-        customOverlayOrder,
+        customOverlayOrder
     } = settings;
 
     let name: string = '';
@@ -68,7 +68,7 @@
                     acc[id] = true;
                     return acc;
                 }, {});
-            },
+            }
         });
         overlaySortable = Sortable.create(overlayContainer, {
             onSort: (e) => {
@@ -77,7 +77,7 @@
                     acc[id] = true;
                     return acc;
                 }, {});
-            },
+            }
         });
 
         basemapSortable.sort($customBasemapOrder);
@@ -108,7 +108,6 @@
         if (typeof maxZoom === 'string') {
             maxZoom = parseInt(maxZoom);
         }
-        let is512 = tileUrls.some((url) => url.includes('512'));
 
         let layerId = selectedLayerId ?? getLayerId();
         let layer: CustomLayer = {
@@ -118,7 +117,7 @@
             maxZoom: maxZoom,
             layerType: layerType,
             resourceType: resourceType,
-            value: '',
+            value: ''
         };
 
         if (resourceType === 'vector') {
@@ -130,17 +129,17 @@
                     [layerId]: {
                         type: 'raster',
                         tiles: layer.tileUrls,
-                        tileSize: is512 ? 512 : 256,
+                        tileSize: 256,
-                        maxzoom: maxZoom,
+                        maxzoom: maxZoom
-                    },
+                    }
                 },
                 layers: [
                     {
                         id: layerId,
                         type: 'raster',
-                        source: layerId,
+                        source: layerId
-                    },
+                    }
-                ],
+                ]
             };
         }
         $customLayers[layerId] = layer;

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

@@ -13,6 +13,7 @@
 	import { get, writable } from 'svelte/store';
 	import { customBasemapUpdate, getLayers } from './utils';
 	import { OverpassLayer } from './OverpassLayer';
+	import OverpassPopup from './OverpassPopup.svelte';
 
 	let container: HTMLDivElement;
 	let overpassLayer: OverpassLayer;
@@ -26,14 +27,14 @@
 		selectedOverlayTree,
 		selectedOverpassTree,
 		customLayers,
-        opacities,
+		opacities
 	} = settings;
 
 	function setStyle() {
 		if ($map) {
 			let basemap = basemaps.hasOwnProperty($currentBasemap)
 				? basemaps[$currentBasemap]
-                : ($customLayers[$currentBasemap]?.value ?? basemaps[defaultBasemap]);
+				: $customLayers[$currentBasemap]?.value ?? basemaps[defaultBasemap];
 			$map.removeImport('basemap');
 			if (typeof basemap === 'string') {
 				$map.addImport({ id: 'basemap', url: basemap }, 'overlays');
@@ -41,7 +42,7 @@
 				$map.addImport(
 					{
 						id: 'basemap',
-                        data: basemap,
+						data: basemap
 					},
 					'overlays'
 				);
@@ -70,12 +71,12 @@
 								layer.paint['raster-opacity'] = $opacities[id];
 							}
 							return layer;
-                        }),
+						})
 					};
 				}
 				$map.addImport({
 					id,
-                    data: overlay,
+					data: overlay
 				});
 			}
 		} catch (e) {
@@ -84,21 +85,18 @@
 	}
 
 	function updateOverlays() {
-        if ($map && $currentOverlays && $opacities) {
+		if ($map && $currentOverlays) {
 			let overlayLayers = getLayers($currentOverlays);
 			try {
-                let activeOverlays = $map.getStyle().imports.reduce((acc, i) => {
+				let activeOverlays = $map
-                    if (!['basemap', 'overlays', 'glyphs-and-sprite'].includes(i.id)) {
+					.getStyle()
-                        acc[i.id] = i;
+					.imports.filter((i) => i.id !== 'basemap' && i.id !== 'overlays');
-                    }
+				let toRemove = activeOverlays.filter((i) => !overlayLayers[i.id]);
-                    return acc;
+				toRemove.forEach((i) => {
-                }, {});
+					$map.removeImport(i.id);
-                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))
+					.filter(([id, selected]) => selected && !activeOverlays.some((j) => j.id === id))
 					.map(([id]) => id);
 				toAdd.forEach((id) => {
 					addOverlay(id);
@@ -109,7 +107,7 @@
 		}
 	}
 
-    $: if ($map && $currentOverlays && $opacities) {
+	$: if ($map && $currentOverlays) {
 		updateOverlays();
 	}
 
@@ -132,9 +130,7 @@
 	});
 	currentBasemap.subscribe((value) => {
 		// Updates coming from the database, or from the user swapping basemaps
-        if (value !== get(selectedBasemap)) {
 		selectedBasemap.set(value);
-        }
 	});
 
 	let open = false;
@@ -213,6 +209,8 @@
 	</div>
 </CustomControl>
 
+<OverpassPopup />
+
 <svelte:window
 	on:click={(e) => {
 		if (open && !cancelEvents && !container.contains(e.target)) {

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

@@ -14,7 +14,7 @@
 		defaultBasemap,
 		overlays,
 		overlayTree,
-        overpassTree,
+		overpassTree
 	} from '$lib/assets/layers';
 	import { getLayers, isSelected, toggle } from '$lib/components/layer-control/utils';
 	import { settings } from '$lib/db';
@@ -31,7 +31,7 @@
 		currentBasemap,
 		currentOverlays,
 		customLayers,
-        opacities,
+		opacities
 	} = settings;
 
 	export let open: boolean;
@@ -137,9 +137,7 @@
 									<Select.Content class="h-fit max-h-[40dvh] overflow-y-auto">
 										{#each Object.keys(overlays) as id}
 											{#if isSelected($selectedOverlayTree, id)}
-                                                <Select.Item value={id}
+												<Select.Item value={id}>{$_(`layers.label.${id}`)}</Select.Item>
-                                                    >{$_(`layers.label.${id}`)}</Select.Item
-                                                >
 											{/if}
 										{/each}
 										{#each Object.entries($customLayers) as [id, layer]}
@@ -159,22 +157,15 @@
 										max={1}
 										step={0.1}
 										disabled={$selectedOverlay === undefined}
-                                        onValueChange={(value) => {
+										onValueChange={() => {
 											if ($selectedOverlay) {
-                                                if (
+												$opacities[$selectedOverlay.value] = $overlayOpacity[0];
-                                                    $map &&
+												if ($map) {
-                                                    isSelected(
+													if ($map.getLayer($selectedOverlay.value)) {
-                                                        $currentOverlays,
+														$map.removeLayer($selectedOverlay.value);
-                                                        $selectedOverlay.value
+														$currentOverlays = $currentOverlays;
-                                                    )
-                                                ) {
-                                                    try {
-                                                        $map.removeImport($selectedOverlay.value);
-                                                    } catch (e) {
-                                                        // No reliable way to check if the map is ready to remove sources and layers
 													}
 												}
-                                                $opacities[$selectedOverlay.value] = value[0];
 											}
 										}}
 									/>

website/src/lib/components/layer-control/LayerTreeNode.svelte

@@ -49,13 +49,7 @@
 							aria-label={$_(`layers.label.${id}`)}
 						/>
 					{:else}
-                        <input
+						<input id="{name}-{id}" type="radio" {name} value={id} bind:group={selected} />
-                            id="{name}-{id}"
-                            type="radio"
-                            {name}
-                            value={id}
-                            bind:group={selected}
-                        />
 					{/if}
 					<Label for="{name}-{id}" class="flex flex-row items-center gap-1">
 						{#if $customLayers.hasOwnProperty(id)}
@@ -70,13 +64,7 @@
 			<CollapsibleTreeNode {id}>
 				<span slot="trigger">{$_(`layers.label.${id}`)}</span>
 				<div slot="content">
-                    <svelte:self
+					<svelte:self node={node[id]} {name} bind:selected {multiple} bind:checked={checked[id]} />
-                        node={node[id]}
-                        {name}
-                        bind:selected
-                        {multiple}
-                        bind:checked={checked[id]}
-                    />
 				</div>
 			</CollapsibleTreeNode>
 		{/if}

website/src/lib/components/layer-control/OverpassLayer.ts

@@ -1,17 +1,27 @@
-import SphericalMercator from '@mapbox/sphericalmercator';
+import SphericalMercator from "@mapbox/sphericalmercator";
-import { getLayers } from './utils';
+import { getLayers } from "./utils";
-import { get, writable } from 'svelte/store';
+import mapboxgl from "mapbox-gl";
-import { liveQuery } from 'dexie';
+import { get, writable } from "svelte/store";
-import { db, settings } from '$lib/db';
+import { liveQuery } from "dexie";
-import { overpassQueryData } from '$lib/assets/layers';
+import { db, settings } from "$lib/db";
-import { MapPopup } from '$lib/components/MapPopup';
+import { overpassQueryData } from "$lib/assets/layers";
 
-const { currentOverpassQueries } = settings;
+const {
+    currentOverpassQueries
+} = settings;
 
 const mercator = new SphericalMercator({
     size: 256,
 });
 
+export const overpassPopupPOI = writable<Record<string, any> | null>(null);
+
+export const overpassPopup = new mapboxgl.Popup({
+    closeButton: false,
+    maxWidth: undefined,
+    offset: 15,
+});
+
 let data = writable<GeoJSON.FeatureCollection>({ type: 'FeatureCollection', features: [] });
 
 liveQuery(() => db.overpassdata.toArray()).subscribe((pois) => {
@@ -24,36 +34,28 @@ export class OverpassLayer {
     queryZoom = 12;
     expirationTime = 7 * 24 * 3600 * 1000;
     map: mapboxgl.Map;
-    popup: MapPopup;
 
     currentQueries: Set<string> = new Set();
-    nextQueries: Map<string, { x: number; y: number; queries: string[] }> = new Map();
+    nextQueries: Map<string, { x: number, y: number, queries: string[] }> = new Map();
 
     unsubscribes: (() => void)[] = [];
     queryIfNeededBinded = this.queryIfNeeded.bind(this);
     updateBinded = this.update.bind(this);
     onHoverBinded = this.onHover.bind(this);
+    maybeHidePopupBinded = this.maybeHidePopup.bind(this);
 
     constructor(map: mapboxgl.Map) {
         this.map = map;
-        this.popup = new MapPopup(map, {
-            closeButton: false,
-            focusAfterOpen: false,
-            maxWidth: undefined,
-            offset: 15,
-        });
     }
 
     add() {
         this.map.on('moveend', this.queryIfNeededBinded);
         this.map.on('style.import.load', this.updateBinded);
         this.unsubscribes.push(data.subscribe(this.updateBinded));
-        this.unsubscribes.push(
+        this.unsubscribes.push(currentOverpassQueries.subscribe(() => {
-            currentOverpassQueries.subscribe(() => {
             this.updateBinded();
             this.queryIfNeededBinded();
-            })
+        }));
-        );
 
         this.update();
     }
@@ -123,12 +125,27 @@ export class OverpassLayer {
     }
 
     onHover(e: any) {
-        this.popup.setItem({
+        overpassPopupPOI.set({
-            item: {
             ...e.features[0].properties,
-                sym: overpassQueryData[e.features[0].properties.query].symbol ?? '',
+            sym: overpassQueryData[e.features[0].properties.query].symbol ?? ''
-            },
         });
+        overpassPopup.setLngLat(e.features[0].geometry.coordinates);
+        overpassPopup.addTo(this.map);
+        this.map.on('mousemove', this.maybeHidePopupBinded);
+    }
+
+    maybeHidePopup(e: any) {
+        let poi = get(overpassPopupPOI);
+        if (poi && this.map.project([poi.lon, poi.lat]).dist(this.map.project(e.lngLat)) > 100) {
+            this.hideWaypointPopup();
+        }
+    }
+
+    hideWaypointPopup() {
+        overpassPopupPOI.set(null);
+        overpassPopup.remove();
+
+        this.map.off('mousemove', this.maybeHidePopupBinded);
     }
 
     query(bbox: [number, number, number, number]) {
@@ -146,19 +163,8 @@ export class OverpassLayer {
                     continue;
                 }
 
-                db.overpasstiles
+                db.overpasstiles.where('[x+y]').equals([x, y]).toArray().then((querytiles) => {
-                    .where('[x+y]')
+                    let missingQueries = queries.filter((query) => !querytiles.some((querytile) => querytile.query === query && time - querytile.time < this.expirationTime));
-                    .equals([x, y])
-                    .toArray()
-                    .then((querytiles) => {
-                        let missingQueries = queries.filter(
-                            (query) =>
-                                !querytiles.some(
-                                    (querytile) =>
-                                        querytile.query === query &&
-                                        time - querytile.time < this.expirationTime
-                                )
-                        );
                     if (missingQueries.length > 0) {
                         this.queryTile(x, y, missingQueries);
                     }
@@ -176,16 +182,13 @@ export class OverpassLayer {
 
         const bounds = mercator.bbox(x, y, this.queryZoom);
         fetch(`${this.overpassUrl}?data=${getQueryForBounds(bounds, queries)}`)
-            .then(
+            .then((response) => {
-                (response) => {
                 if (response.ok) {
                     return response.json();
                 }
                 this.currentQueries.delete(`${x},${y}`);
                 return Promise.reject();
-                },
+            }, () => (this.currentQueries.delete(`${x},${y}`)))
-                () => this.currentQueries.delete(`${x},${y}`)
-            )
             .then((data) => this.storeOverpassData(x, y, queries, data))
             .catch(() => this.currentQueries.delete(`${x},${y}`));
     }
@@ -193,7 +196,7 @@ export class OverpassLayer {
     storeOverpassData(x: number, y: number, queries: string[], data: any) {
         let time = Date.now();
         let queryTiles = queries.map((query) => ({ x, y, query, time }));
-        let pois: { query: string; id: number; poi: GeoJSON.Feature }[] = [];
+        let pois: { query: string, id: number, poi: GeoJSON.Feature }[] = [];
 
         if (data.elements === undefined) {
             return;
@@ -209,9 +212,7 @@ export class OverpassLayer {
                             type: 'Feature',
                             geometry: {
                                 type: 'Point',
-                                coordinates: element.center
+                                coordinates: element.center ? [element.center.lon, element.center.lat] : [element.lon, element.lat],
-                                    ? [element.center.lon, element.center.lat]
-                                    : [element.lon, element.lat],
                             },
                             properties: {
                                 id: element.id,
@@ -219,10 +220,9 @@ export class OverpassLayer {
                                 lon: element.center ? element.center.lon : element.lon,
                                 query: query,
                                 icon: `overpass-${query}`,
-                                tags: element.tags,
+                                tags: element.tags
-                                type: element.type,
-                            },
                             },
+                        }
                     });
                 }
             }
@@ -245,13 +245,11 @@ export class OverpassLayer {
                     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 =
+                icon.src = 'data:image/svg+xml,' + encodeURIComponent(`
-                    '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)">
@@ -283,14 +281,9 @@ function getQuery(query: string) {
 function getQueryItem(tags: Record<string, string | boolean | string[]>) {
     let arrayEntry = Object.entries(tags).find(([_, value]) => Array.isArray(value));
     if (arrayEntry !== undefined) {
-        return arrayEntry[1]
+        return arrayEntry[1].map((val) => `nwr${Object.entries(tags)
-            .map(
-                (val) =>
-                    `nwr${Object.entries(tags)
             .map(([tag, value]) => `[${tag}=${tag === arrayEntry[0] ? val : value}]`)
-                        .join('')};`
+            .join('')};`).join('');
-            )
-            .join('');
     } else {
         return `nwr${Object.entries(tags)
             .map(([tag, value]) => `[${tag}=${value}]`)
@@ -307,9 +300,8 @@ function belongsToQuery(element: any, query: string) {
 }
 
 function belongsToQueryItem(element: any, tags: Record<string, string | boolean | string[]>) {
-    return Object.entries(tags).every(([tag, value]) =>
+    return Object.entries(tags)
-        Array.isArray(value) ? value.includes(element.tags[tag]) : element.tags[tag] === value
+        .every(([tag, value]) => Array.isArray(value) ? value.includes(element.tags[tag]) : element.tags[tag] === value);
-    );
 }
 
 function getCurrentQueries() {
@@ -318,7 +310,5 @@ function getCurrentQueries() {
         return [];
     }
 
-    return Object.entries(getLayers(currentQueries))
+    return Object.entries(getLayers(currentQueries)).filter(([_, selected]) => selected).map(([query, _]) => query);
-        .filter(([_, selected]) => selected)
-        .map(([query, _]) => query);
 }

website/src/lib/components/layer-control/OverpassPopup.svelte

@@ -1,67 +1,48 @@
 <script lang="ts">
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
+	import { overpassPopup, overpassPopupPOI } from './OverpassLayer';
 	import { selection } from '$lib/components/file-list/Selection';
 	import { PencilLine, MapPin } from 'lucide-svelte';
+	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import { dbUtils } from '$lib/db';
-    import type { PopupItem } from '$lib/components/MapPopup';
-    import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
-    import type { WaypointType } from 'gpx';
 
-    export let poi: PopupItem<any>;
+	let popupElement: HTMLDivElement;
 
-    let tags: { [key: string]: string } = {};
+	onMount(() => {
+		overpassPopup.setDOMContent(popupElement);
+		popupElement.classList.remove('hidden');
+	});
+
+	let tags = {};
 	let name = '';
-    $: if (poi) {
+	$: if ($overpassPopupPOI) {
-        tags = JSON.parse(poi.item.tags);
+		tags = JSON.parse($overpassPopupPOI.tags);
 		if (tags.name !== undefined && tags.name !== '') {
 			name = tags.name;
 		} else {
-            name = $_(`layers.label.${poi.item.query}`);
+			name = $_(`layers.label.${$overpassPopupPOI.query}`);
 		}
 	}
-
-    function addToFile() {
-        const desc = Object.entries(tags)
-            .map(([key, value]) => `${key}: ${value}`)
-            .join('\n');
-        let wpt: WaypointType = {
-            attributes: {
-                lat: poi.item.lat,
-                lon: poi.item.lon,
-            },
-            name: name,
-            desc: desc,
-            cmt: desc,
-            sym: poi.item.sym,
-        };
-        if (tags.website) {
-            wpt.link = {
-                attributes: {
-                    href: tags.website,
-                },
-            };
-        }
-        dbUtils.addOrUpdateWaypoint(wpt);
-    }
 </script>
 
-<Card.Root class="border-none shadow-md text-base p-2 max-w-[50dvw]">
+<div bind:this={popupElement} class="hidden">
+	{#if $overpassPopupPOI}
+		<Card.Root class="border-none shadow-md text-base p-2 max-w-[50dvw]">
 			<Card.Header class="p-0">
 				<Card.Title class="text-md">
 					<div class="flex flex-row gap-3">
 						<div class="flex flex-col">
 							{name}
 							<div class="text-muted-foreground text-sm font-normal">
-                        {poi.item.lat.toFixed(6)}&deg; {poi.item.lon.toFixed(6)}&deg;
+								{$overpassPopupPOI.lat.toFixed(6)}&deg; {$overpassPopupPOI.lon.toFixed(6)}&deg;
 							</div>
 						</div>
 						<Button
 							class="ml-auto p-1.5 h-8"
 							variant="outline"
-                    href="https://www.openstreetmap.org/edit?editor=id&{poi.item.type ??
+							href="https://www.openstreetmap.org/edit?editor=id&node={$overpassPopupPOI.id}"
-                        'node'}={poi.item.id}"
 							target="_blank"
 						>
 							<PencilLine size="16" />
@@ -69,19 +50,18 @@
 					</div>
 				</Card.Title>
 			</Card.Header>
-    <Card.Content class="flex flex-col p-0 text-sm mt-1 whitespace-normal break-all">
-        <ScrollArea class="flex flex-col" viewportClasses="max-h-[30dvh]">
 			{#if tags.image || tags['image:0']}
 				<div class="w-full rounded-md overflow-clip my-2 max-w-96 mx-auto">
 					<!-- svelte-ignore a11y-missing-attribute -->
 					<img src={tags.image ?? tags['image:0']} />
 				</div>
 			{/if}
+			<Card.Content class="flex flex-col p-0 text-sm mt-1 whitespace-normal break-all">
 				<div class="grid grid-cols-[auto_auto] gap-x-3">
 					{#each Object.entries(tags) as [key, value]}
 						{#if key !== 'name' && !key.includes('image')}
 							<span class="font-mono">{key}</span>
-                        {#if key === 'website' || key.startsWith('website:') || key === 'contact:website' || key === 'contact:facebook' || key === 'contact:instagram' || key === 'contact:twitter'}
+							{#if key === 'website' || key === 'contact:website' || key === 'contact:facebook' || key === 'contact:instagram' || key === 'contact:twitter'}
 								<a href={value} target="_blank" class="text-link underline">{value}</a>
 							{:else if key === 'phone' || key === 'contact:phone'}
 								<a href={'tel:' + value} class="text-link underline">{value}</a>
@@ -93,15 +73,30 @@
 						{/if}
 					{/each}
 				</div>
-        </ScrollArea>
 				<Button
 					class="mt-2"
 					variant="outline"
 					disabled={$selection.size === 0}
-            on:click={addToFile}
+					on:click={() => {
+						let desc = Object.entries(tags)
+							.map(([key, value]) => `${key}: ${value}`)
+							.join('\n');
+						dbUtils.addOrUpdateWaypoint({
+							attributes: {
+								lat: $overpassPopupPOI.lat,
+								lon: $overpassPopupPOI.lon
+							},
+							name: name,
+							desc: desc,
+							cmt: desc,
+							sym: $overpassPopupPOI.sym
+						});
+					}}
 				>
 					<MapPin size="16" class="mr-1" />
 					{$_('toolbar.waypoint.add')}
 				</Button>
 			</Card.Content>
-</Card.Root>
+		</Card.Root>
+	{/if}
+</div>

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

@@ -1,10 +1,9 @@
-import type { LayerTreeType } from '$lib/assets/layers';
+import type { LayerTreeType } from "$lib/assets/layers";
-import { writable } from 'svelte/store';
+import { writable } from "svelte/store";
 
 export function anySelectedLayer(node: LayerTreeType) {
-    return (
+    return Object.keys(node).find((id) => {
-        Object.keys(node).find((id) => {
+        if (typeof node[id] == "boolean") {
-            if (typeof node[id] == 'boolean') {
             if (node[id]) {
                 return true;
             }
@@ -14,16 +13,12 @@ export function anySelectedLayer(node: LayerTreeType) {
             }
         }
         return false;
-        }) !== undefined
+    }) !== undefined;
-    );
 }
 
-export function getLayers(
+export function getLayers(node: LayerTreeType, layers: { [key: string]: boolean } = {}): { [key: string]: boolean } {
-    node: LayerTreeType,
-    layers: { [key: string]: boolean } = {}
-): { [key: string]: boolean } {
     Object.keys(node).forEach((id) => {
-        if (typeof node[id] == 'boolean') {
+        if (typeof node[id] == "boolean") {
             layers[id] = node[id];
         } else {
             getLayers(node[id], layers);
@@ -37,7 +32,7 @@ export function isSelected(node: LayerTreeType, id: string) {
         if (key === id) {
             return node[key];
         }
-        if (typeof node[key] !== 'boolean' && isSelected(node[key], id)) {
+        if (typeof node[key] !== "boolean" && isSelected(node[key], id)) {
             return true;
         }
         return false;
@@ -48,7 +43,7 @@ export function toggle(node: LayerTreeType, id: string) {
     Object.keys(node).forEach((key) => {
         if (key === id) {
             node[key] = !node[key];
-        } else if (typeof node[key] !== 'boolean') {
+        } else if (typeof node[key] !== "boolean") {
             toggle(node[key], id);
         }
     });

website/src/lib/components/street-view-control/Google.ts

@@ -1,5 +1,5 @@
-import { resetCursor, setCrosshairCursor } from '$lib/utils';
+import { resetCursor, setCrosshairCursor } from "$lib/utils";
-import type mapboxgl from 'mapbox-gl';
+import type mapboxgl from "mapbox-gl";
 
 export class GoogleRedirect {
     map: mapboxgl.Map;

website/src/lib/components/street-view-control/Mapillary.ts

@@ -1,19 +1,16 @@
-import mapboxgl, { type LayerSpecification, type VectorSourceSpecification } from 'mapbox-gl';
+import mapboxgl from "mapbox-gl";
-import { Viewer, type ViewerBearingEvent } from 'mapillary-js/dist/mapillary.module';
+import { Viewer } from 'mapillary-js/dist/mapillary.module';
 import 'mapillary-js/dist/mapillary.css';
-import { resetCursor, setPointerCursor } from '$lib/utils';
+import { resetCursor, setPointerCursor } from "$lib/utils";
-import type { Writable } from 'svelte/store';
 
-const mapillarySource: VectorSourceSpecification = {
+const mapillarySource = {
     type: 'vector',
-    tiles: [
+    tiles: ['https://tiles.mapillary.com/maps/vtp/mly1_computed_public/2/{z}/{x}/{y}?access_token=MLY|4381405525255083|3204871ec181638c3c31320490f03011'],
-        'https://tiles.mapillary.com/maps/vtp/mly1_computed_public/2/{z}/{x}/{y}?access_token=MLY|4381405525255083|3204871ec181638c3c31320490f03011',
-    ],
     minzoom: 6,
     maxzoom: 14,
 };
 
-const mapillarySequenceLayer: LayerSpecification = {
+const mapillarySequenceLayer = {
     id: 'mapillary-sequence',
     type: 'line',
     source: 'mapillary',
@@ -29,7 +26,7 @@ const mapillarySequenceLayer: LayerSpecification = {
     },
 };
 
-const mapillaryImageLayer: LayerSpecification = {
+const mapillaryImageLayer = {
     id: 'mapillary-image',
     type: 'circle',
     source: 'mapillary',
@@ -43,56 +40,35 @@ const mapillaryImageLayer: LayerSpecification = {
 
 export class MapillaryLayer {
     map: mapboxgl.Map;
-    marker: mapboxgl.Marker;
+    popup: mapboxgl.Popup;
     viewer: Viewer;
-
-    active = false;
-    popupOpen: Writable<boolean>;
-
     addBinded = this.add.bind(this);
     onMouseEnterBinded = this.onMouseEnter.bind(this);
     onMouseLeaveBinded = this.onMouseLeave.bind(this);
 
-    constructor(map: mapboxgl.Map, container: HTMLElement, popupOpen: Writable<boolean>) {
+    constructor(map: mapboxgl.Map, container: HTMLElement) {
         this.map = map;
 
         this.viewer = new Viewer({
             accessToken: 'MLY|4381405525255083|3204871ec181638c3c31320490f03011',
             container,
         });
+        container.classList.remove('hidden');
 
-        const element = document.createElement('div');
+        this.popup = new mapboxgl.Popup({
-        element.className = 'mapboxgl-user-location mapboxgl-user-location-show-heading';
+            closeButton: false,
-        const dot = document.createElement('div');
+            maxWidth: container.style.width,
-        dot.className = 'mapboxgl-user-location-dot';
+        }).setDOMContent(container);
-        const heading = document.createElement('div');
-        heading.className = 'mapboxgl-user-location-heading';
-        element.appendChild(dot);
-        element.appendChild(heading);
-
-        this.marker = new mapboxgl.Marker({
-            rotationAlignment: 'map',
-            element,
-        });
 
         this.viewer.on('position', async () => {
-            if (this.active) {
+            if (this.popup.isOpen()) {
-                popupOpen.set(true);
                 let latLng = await this.viewer.getPosition();
-                this.marker.setLngLat(latLng).addTo(this.map);
+                this.popup.setLngLat(latLng);
-                if (!this.map.getBounds()?.contains(latLng)) {
+                if (!this.map.getBounds().contains(latLng)) {
                     this.map.panTo(latLng);
                 }
             }
         });
-
-        this.viewer.on('bearing', (e: ViewerBearingEvent) => {
-            if (this.active) {
-                this.marker.setRotation(e.bearing);
-            }
-        });
-
-        this.popupOpen = popupOpen;
     }
 
     add() {
@@ -125,19 +101,15 @@ export class MapillaryLayer {
             this.map.removeSource('mapillary');
         }
 
-        this.marker.remove();
+        this.popup.remove();
-        this.popupOpen.set(false);
     }
 
     closePopup() {
-        this.active = false;
+        this.popup.remove();
-        this.marker.remove();
-        this.popupOpen.set(false);
     }
 
-    onMouseEnter(e: mapboxgl.MapMouseEvent) {
+    onMouseEnter(e: mapboxgl.MapLayerMouseEvent) {
-        this.active = true;
+        this.popup.addTo(this.map).setLngLat(e.lngLat);
-
         this.viewer.resize();
         this.viewer.moveTo(e.features[0].properties.id);
 

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

@@ -8,18 +8,16 @@
 	import { map, streetViewEnabled } from '$lib/stores';
 	import { settings } from '$lib/db';
 	import { _ } from 'svelte-i18n';
-    import { writable } from 'svelte/store';
 
 	const { streetViewSource } = settings;
 
 	let googleRedirect: GoogleRedirect;
 	let mapillaryLayer: MapillaryLayer;
-    let mapillaryOpen = writable(false);
 	let container: HTMLElement;
 
 	$: if ($map) {
 		googleRedirect = new GoogleRedirect($map);
-        mapillaryLayer = new MapillaryLayer($map, container, mapillaryOpen);
+		mapillaryLayer = new MapillaryLayer($map, container);
 	}
 
 	$: if (mapillaryLayer) {
@@ -55,9 +53,7 @@
 
 <div
 	bind:this={container}
-    class="{$mapillaryOpen
+	class="hidden relative w-[50vw] h-[40vh] rounded-md border-background border-2"
-        ? ''
-        : 'hidden'} !absolute bottom-[44px] right-2.5 z-10 w-[40%] h-[40%] bg-background rounded-md overflow-hidden border-background border-2"
 >
 	<!-- svelte-ignore a11y-click-events-have-key-events -->
 	<!-- svelte-ignore a11y-no-static-element-interactions -->

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

@@ -10,7 +10,7 @@
 		MapPin,
 		Filter,
 		Scissors,
-        MountainSnow,
+		MountainSnow
 	} from 'lucide-svelte';
 
 	import { _ } from 'svelte-i18n';

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

@@ -24,7 +24,7 @@
 	onMount(() => {
 		popup = new mapboxgl.Popup({
 			closeButton: false,
-            maxWidth: undefined,
+			maxWidth: undefined
 		});
 		popup.setDOMContent(popupElement);
 		popupElement.classList.remove('hidden');

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

@@ -1,7 +1,7 @@
 <script lang="ts" context="module">
 	enum CleanType {
 		INSIDE = 'inside',
-        OUTSIDE = 'outside',
+		OUTSIDE = 'outside'
 	}
 </script>
 
@@ -41,10 +41,10 @@
 								[rectangleCoordinates[1].lng, rectangleCoordinates[0].lat],
 								[rectangleCoordinates[1].lng, rectangleCoordinates[1].lat],
 								[rectangleCoordinates[0].lng, rectangleCoordinates[1].lat],
-                                [rectangleCoordinates[0].lng, rectangleCoordinates[0].lat],
+								[rectangleCoordinates[0].lng, rectangleCoordinates[0].lat]
-                            ],
+							]
-                        ],
+						]
-                    },
+					}
 				};
 				let source = $map.getSource('rectangle');
 				if (source) {
@@ -52,7 +52,7 @@
 				} else {
 					$map.addSource('rectangle', {
 						type: 'geojson',
-                        data: data,
+						data: data
 					});
 				}
 				if (!$map.getLayer('rectangle')) {
@@ -62,8 +62,8 @@
 						source: 'rectangle',
 						paint: {
 							'fill-color': 'SteelBlue',
-                            'fill-opacity': 0.5,
+							'fill-opacity': 0.5
-                        },
+						}
 					});
 				}
 			}
@@ -161,12 +161,12 @@
 				[
 					{
 						lat: Math.min(rectangleCoordinates[0].lat, rectangleCoordinates[1].lat),
-                        lon: Math.min(rectangleCoordinates[0].lng, rectangleCoordinates[1].lng),
+						lon: Math.min(rectangleCoordinates[0].lng, rectangleCoordinates[1].lng)
 					},
 					{
 						lat: Math.max(rectangleCoordinates[0].lat, rectangleCoordinates[1].lat),
-                        lon: Math.max(rectangleCoordinates[0].lng, rectangleCoordinates[1].lng),
+						lon: Math.max(rectangleCoordinates[0].lng, rectangleCoordinates[1].lng)
-                    },
+					}
 				],
 				cleanType === CleanType.INSIDE,
 				deleteTrackpoints,

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

@@ -7,7 +7,7 @@
 		ListTrackItem,
 		ListTrackSegmentItem,
 		ListWaypointItem,
-        ListWaypointsItem,
+		ListWaypointsItem
 	} from '$lib/components/file-list/FileList';
 	import Help from '$lib/components/Help.svelte';
 	import { dbUtils, getFile } from '$lib/db';

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

@@ -1,7 +1,7 @@
 <script lang="ts" context="module">
 	enum MergeType {
 		TRACES = 'traces',
-        CONTENTS = 'contents',
+		CONTENTS = 'contents'
 	}
 </script>
 
@@ -11,18 +11,15 @@
 	import { selection } from '$lib/components/file-list/Selection';
 	import { Button } from '$lib/components/ui/button';
 	import { Label } from '$lib/components/ui/label/index.js';
-    import { Checkbox } from '$lib/components/ui/checkbox';
 	import * as RadioGroup from '$lib/components/ui/radio-group';
 	import { _, locale } from 'svelte-i18n';
 	import { dbUtils, getFile } from '$lib/db';
 	import { Group } from 'lucide-svelte';
 	import { getURLForLanguage } from '$lib/utils';
 	import Shortcut from '$lib/components/Shortcut.svelte';
-    import { gpxStatistics } from '$lib/stores';
 
 	let canMergeTraces = false;
 	let canMergeContents = false;
-    let removeGaps = false;
 
 	$: if ($selection.size > 1) {
 		canMergeTraces = true;
@@ -59,31 +56,22 @@
 
 <div class="flex flex-col gap-3 w-full max-w-80 {$$props.class ?? ''}">
 	<RadioGroup.Root bind:value={mergeType}>
-        <Label class="flex flex-row items-center gap-1.5 leading-5">
+		<Label class="flex flex-row items-center gap-2 leading-5">
 			<RadioGroup.Item value={MergeType.TRACES} />
 			{$_('toolbar.merge.merge_traces')}
 		</Label>
-        <Label class="flex flex-row items-center gap-1.5 leading-5">
+		<Label class="flex flex-row items-center gap-2 leading-5">
 			<RadioGroup.Item value={MergeType.CONTENTS} />
 			{$_('toolbar.merge.merge_contents')}
 		</Label>
 	</RadioGroup.Root>
-    {#if mergeType === MergeType.TRACES && $gpxStatistics.global.time.total > 0}
-        <div class="flex flex-row items-center gap-1.5">
-            <Checkbox id="remove-gaps" bind:checked={removeGaps} />
-            <Label for="remove-gaps">{$_('toolbar.merge.remove_gaps')}</Label>
-        </div>
-    {/if}
 	<Button
 		variant="outline"
 		class="whitespace-normal h-fit"
 		disabled={(mergeType === MergeType.TRACES && !canMergeTraces) ||
 			(mergeType === MergeType.CONTENTS && !canMergeContents)}
 		on:click={() => {
-            dbUtils.mergeSelection(
+			dbUtils.mergeSelection(mergeType === MergeType.TRACES);
-                mergeType === MergeType.TRACES,
-                mergeType === MergeType.TRACES && $gpxStatistics.global.time.total > 0 && removeGaps
-            );
 		}}
 	>
 		<Group size="16" class="mr-1 shrink-0" />

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

@@ -3,11 +3,7 @@
 	import { Button } from '$lib/components/ui/button';
 	import { Slider } from '$lib/components/ui/slider';
 	import { selection } from '$lib/components/file-list/Selection';
-    import {
+	import { ListItem, ListRootItem, ListTrackSegmentItem } from '$lib/components/file-list/FileList';
-        ListItem,
-        ListRootItem,
-        ListTrackSegmentItem,
-    } from '$lib/components/file-list/FileList';
 	import Help from '$lib/components/Help.svelte';
 	import { Filter } from 'lucide-svelte';
 	import { _, locale } from 'svelte-i18n';
@@ -22,13 +18,10 @@
 	let sliderValue = [50];
 	let maxPoints = 0;
 	let currentPoints = 0;
-    const minTolerance = 0.1;
-    const maxTolerance = 10000;
 
 	$: validSelection = $selection.hasAnyChildren(new ListRootItem(), true, ['waypoints']);
 
-    $: tolerance =
+	$: tolerance = 2 ** (sliderValue[0] / (100 / Math.log2(10000)));
-        minTolerance * 2 ** (sliderValue[0] / (100 / Math.log2(maxTolerance / minTolerance)));
 
 	let simplified = new Map<string, [ListItem, number, SimplifiedTrackPoint[]]>();
 	let unsubscribes = new Map<string, () => void>();
@@ -39,7 +32,7 @@
 
 		let data: GeoJSON.FeatureCollection = {
 			type: 'FeatureCollection',
-            features: [],
+			features: []
 		};
 
 		simplified.forEach(([item, maxPts, points], itemFullId) => {
@@ -56,10 +49,10 @@
 					type: 'LineString',
 					coordinates: current.map((point) => [
 						point.point.getLongitude(),
-                        point.point.getLatitude(),
+						point.point.getLatitude()
-                    ]),
+					])
 				},
-                properties: {},
+				properties: {}
 			});
 		});
 
@@ -70,7 +63,7 @@
 			} else {
 				$map.addSource('simplified', {
 					type: 'geojson',
-                    data: data,
+					data: data
 				});
 			}
 			if (!$map.getLayer('simplified')) {
@@ -80,8 +73,8 @@
 					source: 'simplified',
 					paint: {
 						'line-color': 'white',
-                        'line-width': 3,
+						'line-width': 3
-                    },
+					}
 				});
 			} else {
 				$map.moveLayer('simplified');
@@ -98,23 +91,17 @@
 		});
 		$fileObservers.forEach((fileStore, fileId) => {
 			if (!unsubscribes.has(fileId)) {
-                let unsubscribe = derived([fileStore, selection], ([fs, sel]) => [
+				let unsubscribe = derived([fileStore, selection], ([fs, sel]) => [fs, sel]).subscribe(
-                    fs,
+					([fs, sel]) => {
-                    sel,
-                ]).subscribe(([fs, sel]) => {
 						if (fs) {
 							fs.file.forEachSegment((segment, trackIndex, segmentIndex) => {
-                            let segmentItem = new ListTrackSegmentItem(
+								let segmentItem = new ListTrackSegmentItem(fileId, trackIndex, segmentIndex);
-                                fileId,
-                                trackIndex,
-                                segmentIndex
-                            );
 								if (sel.hasAnyParent(segmentItem)) {
 									let statistics = fs.statistics.getStatisticsFor(segmentItem);
 									simplified.set(segmentItem.getFullId(), [
 										segmentItem,
 										statistics.local.points.length,
-                                    ramerDouglasPeucker(statistics.local.points, minTolerance),
+										ramerDouglasPeucker(statistics.local.points, 1)
 									]);
 									update();
 								} else if (simplified.has(segmentItem.getFullId())) {
@@ -123,7 +110,8 @@
 								}
 							});
 						}
-                });
+					}
+				);
 				unsubscribes.set(fileId, unsubscribe);
 			}
 		});
@@ -166,7 +154,7 @@
 	</div>
 	<Label class="flex flex-row justify-between">
 		<span>{$_('toolbar.reduce.tolerance')}</span>
-        <WithUnits value={tolerance / 1000} type="distance" decimals={4} class="font-normal" />
+		<WithUnits value={tolerance / 1000} type="distance" decimals={3} class="font-normal" />
 	</Label>
 	<Label class="flex flex-row justify-between">
 		<span>{$_('toolbar.reduce.number_of_points')}</span>

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

@@ -11,7 +11,7 @@
 		distancePerHourToSecondsPerDistance,
 		getConvertedVelocity,
 		milesToKilometers,
-        nauticalMilesToKilometers,
+		nauticalMilesToKilometers
 	} from '$lib/units';
 	import { CalendarDate, type DateValue } from '@internationalized/date';
 	import { CalendarClock, CirclePlay, CircleStop, CircleX, Timer, Zap } from 'lucide-svelte';
@@ -23,7 +23,7 @@
 		ListFileItem,
 		ListRootItem,
 		ListTrackItem,
-        ListTrackSegmentItem,
+		ListTrackSegmentItem
 	} from '$lib/components/file-list/FileList';
 	import Help from '$lib/components/Help.svelte';
 	import { getURLForLanguage } from '$lib/utils';
@@ -69,14 +69,14 @@
 			endDate = undefined;
 			endTime = undefined;
 		}
-        if ($gpxStatistics.global.time.moving && $gpxStatistics.global.speed.moving) {
+		if ($gpxStatistics.global.time.moving) {
 			movingTime = $gpxStatistics.global.time.moving;
-            setSpeed($gpxStatistics.global.speed.moving);
-        } else if ($gpxStatistics.global.time.total && $gpxStatistics.global.speed.total) {
-            movingTime = $gpxStatistics.global.time.total;
-            setSpeed($gpxStatistics.global.speed.total);
 		} else {
 			movingTime = undefined;
+		}
+		if ($gpxStatistics.global.speed.moving) {
+			setSpeed($gpxStatistics.global.speed.moving);
+		} else {
 			speed = undefined;
 		}
 	}
@@ -305,11 +305,7 @@
 			class="grow whitespace-normal h-fit"
 			on:click={() => {
 				let effectiveSpeed = getSpeed();
-                if (
+				if (startDate === undefined || startTime === undefined || effectiveSpeed === undefined) {
-                    startDate === undefined ||
-                    startTime === undefined ||
-                    effectiveSpeed === undefined
-                ) {
 					return;
 				}
 
@@ -329,20 +325,13 @@
 				let fileId = item.getFileId();
 				dbUtils.applyToFile(fileId, (file) => {
 					if (item instanceof ListFileItem) {
-                        if (artificial || !$gpxStatistics.global.time.moving) {
+						if (artificial) {
-                            file.createArtificialTimestamps(
+							file.createArtificialTimestamps(getDate(startDate, startTime), movingTime);
-                                getDate(startDate, startTime),
-                                movingTime
-                            );
 						} else {
-                            file.changeTimestamps(
+							file.changeTimestamps(getDate(startDate, startTime), effectiveSpeed, ratio);
-                                getDate(startDate, startTime),
-                                effectiveSpeed,
-                                ratio
-                            );
 						}
 					} else if (item instanceof ListTrackItem) {
-                        if (artificial || !$gpxStatistics.global.time.moving) {
+						if (artificial) {
 							file.createArtificialTimestamps(
 								getDate(startDate, startTime),
 								movingTime,
@@ -357,7 +346,7 @@
 							);
 						}
 					} else if (item instanceof ListTrackSegmentItem) {
-                        if (artificial || !$gpxStatistics.global.time.moving) {
+						if (artificial) {
 							file.createArtificialTimestamps(
 								getDate(startDate, startTime),
 								movingTime,

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

@@ -31,14 +31,14 @@
 
 	let selectedSymbol = {
 		value: '',
-        label: '',
+		label: ''
 	};
 
-    const { treeFileView } = settings;
+	const { verticalFileView } = settings;
 
 	$: canCreate = $selection.size > 0;
 
-    $: if ($treeFileView && $selection) {
+	$: if ($verticalFileView && $selection) {
 		selectedWaypoint.update(() => {
 			if ($selection.size === 1) {
 				let item = $selection.getSelected()[0];
@@ -74,12 +74,12 @@
 					if (symbolKey) {
 						selectedSymbol = {
 							value: symbol,
-                            label: $_(`gpx.symbol.${symbolKey}`),
+							label: $_(`gpx.symbol.${symbolKey}`)
 						};
 					} else {
 						selectedSymbol = {
 							value: symbol,
-                            label: '',
+							label: ''
 						};
 					}
 					longitude = parseFloat($selectedWaypoint[0].getLongitude().toFixed(6));
@@ -99,7 +99,7 @@
 		link = '';
 		selectedSymbol = {
 			value: '',
-            label: '',
+			label: ''
 		};
 		longitude = 0;
 		latitude = 0;
@@ -134,13 +134,13 @@
 			{
 				attributes: {
 					lat: latitude,
-                    lon: longitude,
+					lon: longitude
 				},
 				name: name.length > 0 ? name : undefined,
 				desc: description.length > 0 ? description : undefined,
 				cmt: description.length > 0 ? description : undefined,
 				link: link.length > 0 ? { attributes: { href: link } } : undefined,
-                sym: selectedSymbol.value.length > 0 ? selectedSymbol.value : undefined,
+				sym: selectedSymbol.value.length > 0 ? selectedSymbol.value : undefined
 			},
 			$selectedWaypoint
 				? new ListWaypointItem($selectedWaypoint[1], $selectedWaypoint[0]._data.index)
@@ -195,11 +195,7 @@
 		/>
 		<Label for="symbol">{$_('toolbar.waypoint.icon')}</Label>
 		<Select.Root bind:selected={selectedSymbol}>
-            <Select.Trigger
+			<Select.Trigger id="symbol" class="w-full h-8" disabled={!canCreate && !$selectedWaypoint}>
-                id="symbol"
-                class="w-full h-8"
-                disabled={!canCreate && !$selectedWaypoint}
-            >
 				<Select.Value />
 			</Select.Trigger>
 			<Select.Content class="max-h-60 overflow-y-scroll">
@@ -222,12 +218,7 @@
 			</Select.Content>
 		</Select.Root>
 		<Label for="link">{$_('toolbar.waypoint.link')}</Label>
-        <Input
+		<Input bind:value={link} id="link" class="h-8" disabled={!canCreate && !$selectedWaypoint} />
-            bind:value={link}
-            id="link"
-            class="h-8"
-            disabled={!canCreate && !$selectedWaypoint}
-        />
 		<div class="flex flex-row gap-2">
 			<div class="grow">
 				<Label for="latitude">{$_('toolbar.waypoint.latitude')}</Label>

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

@@ -19,7 +19,7 @@
 		RouteOff,
 		Repeat,
 		SquareArrowUpLeft,
-        SquareArrowOutDownRight,
+		SquareArrowOutDownRight
 	} from 'lucide-svelte';
 
 	import { map, newGPXFile, routingControls, selectFileWhenLoaded } from '$lib/stores';
@@ -37,7 +37,7 @@
 		ListRootItem,
 		ListTrackItem,
 		ListTrackSegmentItem,
-        type ListItem,
+		type ListItem
 	} from '$lib/components/file-list/FileList';
 	import { flyAndScale, getURLForLanguage, resetCursor, setCrosshairCursor } from '$lib/utils';
 	import { onDestroy, onMount } from 'svelte';
@@ -68,10 +68,7 @@
 		// add controls for new files
 		$fileObservers.forEach((file, fileId) => {
 			if (!routingControls.has(fileId)) {
-                routingControls.set(
+				routingControls.set(fileId, new RoutingControls($map, fileId, file, popup, popupElement));
-                    fileId,
-                    new RoutingControls($map, fileId, file, popup, popupElement)
-                );
 			}
 		});
 	}
@@ -85,9 +82,9 @@
 				new TrackPoint({
 					attributes: {
 						lat: e.lngLat.lat,
-                        lon: e.lngLat.lng,
+						lon: e.lngLat.lng
-                    },
+					}
-                }),
+				})
 			]);
 			file._data.id = getFileIds(1)[0];
 			dbUtils.add(file);
@@ -198,8 +195,7 @@
 								if (selected[0] instanceof ListFileItem) {
 									return firstFile.trk[0]?.trkseg[0]?.trkpt[0];
 								} else if (selected[0] instanceof ListTrackItem) {
-                                    return firstFile.trk[selected[0].getTrackIndex()]?.trkseg[0]
+									return firstFile.trk[selected[0].getTrackIndex()]?.trkseg[0]?.trkpt[0];
-                                        ?.trkpt[0];
 								} else if (selected[0] instanceof ListTrackSegmentItem) {
 									return firstFile.trk[selected[0].getTrackIndex()]?.trkseg[
 										selected[0].getSegmentIndex()

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

@@ -1,9 +1,10 @@
-import type { Coordinates } from 'gpx';
+import type { Coordinates } from "gpx";
-import { TrackPoint, distance } from 'gpx';
+import { TrackPoint, distance } from "gpx";
-import { derived, get, writable } from 'svelte/store';
+import { derived, get, writable } from "svelte/store";
-import { settings } from '$lib/db';
+import { settings } from "$lib/db";
-import { _, isLoading, locale } from 'svelte-i18n';
+import { _, isLoading, locale } from "svelte-i18n";
-import { getElevation } from '$lib/utils';
+import { map } from "$lib/stores";
+import { getElevation } from "$lib/utils";
 
 const { routing, routingProfile, privateRoads } = settings;
 
@@ -15,31 +16,22 @@ export const brouterProfiles: { [key: string]: string } = {
     foot: 'Hiking-Alpine-SAC6',
     motorcycle: 'Car-FastEco',
     water: 'river',
-    railway: 'rail',
+    railway: 'rail'
 };
 export const routingProfileSelectItem = writable({
     value: '',
-    label: '',
+    label: ''
 });
 
-derived([routingProfile, locale, isLoading], ([profile, l, i]) => [profile, l, i]).subscribe(
+derived([routingProfile, locale, isLoading], ([profile, l, i]) => [profile, l, i]).subscribe(([profile, l, i]) => {
-    ([profile, l, i]) => {
+    if (!i && profile !== '' && (profile !== get(routingProfileSelectItem).value || get(_)(`toolbar.routing.activities.${profile}`) !== get(routingProfileSelectItem).label) && l !== null) {
-        if (
-            !i &&
-            profile !== '' &&
-            (profile !== get(routingProfileSelectItem).value ||
-                get(_)(`toolbar.routing.activities.${profile}`) !==
-                    get(routingProfileSelectItem).label) &&
-            l !== null
-        ) {
         routingProfileSelectItem.update((item) => {
             item.value = profile;
             item.label = get(_)(`toolbar.routing.activities.${profile}`);
             return item;
         });
     }
-    }
+});
-);
 routingProfileSelectItem.subscribe((item) => {
     if (item.value !== '' && item.value !== get(routingProfile)) {
         routingProfile.set(item.value);
@@ -54,12 +46,8 @@ export function route(points: Coordinates[]): Promise<TrackPoint[]> {
     }
 }
 
-async function getRoute(
+async function getRoute(points: Coordinates[], brouterProfile: string, privateRoads: boolean): Promise<TrackPoint[]> {
-    points: Coordinates[],
+    let url = `https://routing.gpx.studio?lonlats=${points.map(point => `${point.lon.toFixed(8)},${point.lat.toFixed(8)}`).join('|')}&profile=${brouterProfile + (privateRoads ? '-private' : '')}&format=geojson&alternativeidx=0`;
-    brouterProfile: string,
-    privateRoads: boolean
-): Promise<TrackPoint[]> {
-    let url = `https://brouter.gpx.studio?lonlats=${points.map((point) => `${point.lon.toFixed(8)},${point.lat.toFixed(8)}`).join('|')}&profile=${brouterProfile + (privateRoads ? '-private' : '')}&format=geojson&alternativeidx=0`;
 
     let response = await fetch(url);
 
@@ -74,81 +62,71 @@ async function getRoute(
     let coordinates = geojson.features[0].geometry.coordinates;
     let messages = geojson.features[0].properties.messages;
 
-    const lngIdx = messages[0].indexOf('Longitude');
+    const lngIdx = messages[0].indexOf("Longitude");
-    const latIdx = messages[0].indexOf('Latitude');
+    const latIdx = messages[0].indexOf("Latitude");
-    const tagIdx = messages[0].indexOf('WayTags');
+    const tagIdx = messages[0].indexOf("WayTags");
     let messageIdx = 1;
-    let tags = messageIdx < messages.length ? getTags(messages[messageIdx][tagIdx]) : {};
+    let surface = messageIdx < messages.length ? getSurface(messages[messageIdx][tagIdx]) : undefined;
 
     for (let i = 0; i < coordinates.length; i++) {
         let coord = coordinates[i];
-        route.push(
+        route.push(new TrackPoint({
-            new TrackPoint({
             attributes: {
                 lat: coord[1],
-                    lon: coord[0],
+                lon: coord[0]
             },
-                ele: coord[2] ?? (i > 0 ? route[i - 1].ele : 0),
+            ele: coord[2] ?? (i > 0 ? route[i - 1].ele : 0)
-            })
+        }));
-        );
 
-        if (
+        if (messageIdx < messages.length &&
-            messageIdx < messages.length &&
             coordinates[i][0] == Number(messages[messageIdx][lngIdx]) / 1000000 &&
-            coordinates[i][1] == Number(messages[messageIdx][latIdx]) / 1000000
+            coordinates[i][1] == Number(messages[messageIdx][latIdx]) / 1000000) {
-        ) {
             messageIdx++;
 
-            if (messageIdx == messages.length) tags = {};
+            if (messageIdx == messages.length) surface = undefined;
-            else tags = getTags(messages[messageIdx][tagIdx]);
+            else surface = getSurface(messages[messageIdx][tagIdx]);
         }
 
-        route[route.length - 1].setExtensions(tags);
+        if (surface) {
+            route[route.length - 1].setSurface(surface);
+        }
     }
 
     return route;
 }
 
-function getTags(message: string): { [key: string]: string } {
+function getSurface(message: string): string | undefined {
-    const fields = message.split(' ');
+    const fields = message.split(" ");
-    let tags: { [key: string]: string } = {};
+    for (let i = 0; i < fields.length; i++) if (fields[i].startsWith("surface=")) {
-    for (let i = 0; i < fields.length; i++) {
+        return fields[i].substring(8);
-        let [key, value] = fields[i].split('=');
-        key = key.replace(/:/g, '_');
-        tags[key] = value;
     }
-    return tags;
+    return undefined;
-}
+};
 
 function getIntermediatePoints(points: Coordinates[]): Promise<TrackPoint[]> {
     let route: TrackPoint[] = [];
     let step = 0.05;
 
-    for (let i = 0; i < points.length - 1; i++) {
+    for (let i = 0; i < points.length - 1; i++) { // Add intermediate points between each pair of points
-        // Add intermediate points between each pair of points
         let dist = distance(points[i], points[i + 1]) / 1000;
         for (let d = 0; d < dist; d += step) {
-            let lat = points[i].lat + (d / dist) * (points[i + 1].lat - points[i].lat);
+            let lat = points[i].lat + d / dist * (points[i + 1].lat - points[i].lat);
-            let lon = points[i].lon + (d / dist) * (points[i + 1].lon - points[i].lon);
+            let lon = points[i].lon + d / dist * (points[i + 1].lon - points[i].lon);
-            route.push(
+            route.push(new TrackPoint({
-                new TrackPoint({
                 attributes: {
                     lat: lat,
-                        lon: lon,
+                    lon: lon
-                    },
+                }
-                })
+            }));
-            );
         }
     }
 
-    route.push(
+    route.push(new TrackPoint({
-        new TrackPoint({
         attributes: {
             lat: points[points.length - 1].lat,
-                lon: points[points.length - 1].lon,
+            lon: points[points.length - 1].lon
-            },
+        }
-        })
+    }));
-    );
 
     return getElevation(route).then((elevations) => {
         route.forEach((point, i) => {

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

@@ -1,20 +1,17 @@
-import { distance, type Coordinates, TrackPoint, TrackSegment, Track, projectedPoint } from 'gpx';
+import { distance, type Coordinates, TrackPoint, TrackSegment, Track, projectedPoint } from "gpx";
-import { get, writable, type Readable } from 'svelte/store';
+import { get, writable, type Readable } from "svelte/store";
-import mapboxgl from 'mapbox-gl';
+import mapboxgl from "mapbox-gl";
-import { route } from './Routing';
+import { route } from "./Routing";
-import { toast } from 'svelte-sonner';
+
-import { _ } from 'svelte-i18n';
+import { toast } from "svelte-sonner";
-import { dbUtils, settings, type GPXFileWithStatistics } from '$lib/db';
+
-import { getOrderedSelection, selection } from '$lib/components/file-list/Selection';
+import { _ } from "svelte-i18n";
-import {
+import { dbUtils, type GPXFileWithStatistics } from "$lib/db";
-    ListFileItem,
+import { getOrderedSelection, selection } from "$lib/components/file-list/Selection";
-    ListTrackItem,
+import { ListFileItem, ListTrackItem, ListTrackSegmentItem } from "$lib/components/file-list/FileList";
-    ListTrackSegmentItem,
+import { currentTool, streetViewEnabled, Tool } from "$lib/stores";
-} from '$lib/components/file-list/FileList';
+import { getClosestLinePoint, resetCursor, setGrabbingCursor } from "$lib/utils";
-import { currentTool, streetViewEnabled, Tool } from '$lib/stores';
-import { getClosestLinePoint, resetCursor, setGrabbingCursor } from '$lib/utils';
 
-const { streetViewSource } = settings;
 export const canChangeStart = writable(false);
 
 function stopPropagation(e: any) {
@@ -32,22 +29,15 @@ export class RoutingControls {
     popupElement: HTMLElement;
     temporaryAnchor: AnchorWithMarker;
     lastDragEvent = 0;
-    fileUnsubscribe: () => void = () => {};
+    fileUnsubscribe: () => void = () => { };
     unsubscribes: Function[] = [];
 
-    toggleAnchorsForZoomLevelAndBoundsBinded: () => void =
+    toggleAnchorsForZoomLevelAndBoundsBinded: () => void = this.toggleAnchorsForZoomLevelAndBounds.bind(this);
-        this.toggleAnchorsForZoomLevelAndBounds.bind(this);
     showTemporaryAnchorBinded: (e: any) => void = this.showTemporaryAnchor.bind(this);
     updateTemporaryAnchorBinded: (e: any) => void = this.updateTemporaryAnchor.bind(this);
     appendAnchorBinded: (e: mapboxgl.MapMouseEvent) => void = this.appendAnchor.bind(this);
 
-    constructor(
+    constructor(map: mapboxgl.Map, fileId: string, file: Readable<GPXFileWithStatistics | undefined>, popup: mapboxgl.Popup, popupElement: HTMLElement) {
-        map: mapboxgl.Map,
-        fileId: string,
-        file: Readable<GPXFileWithStatistics | undefined>,
-        popup: mapboxgl.Popup,
-        popupElement: HTMLElement
-    ) {
         this.map = map;
         this.fileId = fileId;
         this.file = file;
@@ -57,8 +47,8 @@ export class RoutingControls {
         let point = new TrackPoint({
             attributes: {
                 lat: 0,
-                lon: 0,
+                lon: 0
-            },
+            }
         });
         this.temporaryAnchor = this.createAnchor(point, new TrackSegment(), 0, 0);
         this.temporaryAnchor.marker.getElement().classList.remove('z-10'); // Show below the other markers
@@ -76,9 +66,7 @@ export class RoutingControls {
             return;
         }
 
-        let selected = get(selection).hasAnyChildren(new ListFileItem(this.fileId), true, [
+        let selected = get(selection).hasAnyChildren(new ListFileItem(this.fileId), true, ['waypoints']);
-            'waypoints',
-        ]);
         if (selected) {
             if (this.active) {
                 this.updateControls();
@@ -101,8 +89,7 @@ export class RoutingControls {
         this.fileUnsubscribe = this.file.subscribe(this.updateControls.bind(this));
     }
 
-    updateControls() {
+    updateControls() { // Update the markers when the file changes
-        // Update the markers when the file changes
         let file = get(this.file)?.file;
         if (!file) {
             return;
@@ -110,13 +97,8 @@ export class RoutingControls {
 
         let anchorIndex = 0;
         file.forEachSegment((segment, trackIndex, segmentIndex) => {
-            if (
+            if (get(selection).hasAnyParent(new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex))) {
-                get(selection).hasAnyParent(
+                for (let point of segment.trkpt) { // Update the existing anchors (could be improved by matching the existing anchors with the new ones?)
-                    new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
-                )
-            ) {
-                for (let point of segment.trkpt) {
-                    // Update the existing anchors (could be improved by matching the existing anchors with the new ones?)
                     if (point._data.anchor) {
                         if (anchorIndex < this.anchors.length) {
                             this.anchors[anchorIndex].point = point;
@@ -125,9 +107,7 @@ export class RoutingControls {
                             this.anchors[anchorIndex].segmentIndex = segmentIndex;
                             this.anchors[anchorIndex].marker.setLngLat(point.getCoordinates());
                         } else {
-                            this.anchors.push(
+                            this.anchors.push(this.createAnchor(point, segment, trackIndex, segmentIndex));
-                                this.createAnchor(point, segment, trackIndex, segmentIndex)
-                            );
                         }
                         anchorIndex++;
                     }
@@ -135,8 +115,7 @@ export class RoutingControls {
             }
         });
 
-        while (anchorIndex < this.anchors.length) {
+        while (anchorIndex < this.anchors.length) { // Remove the extra anchors
-            // Remove the extra anchors
             this.anchors.pop()?.marker.remove();
         }
 
@@ -163,19 +142,14 @@ export class RoutingControls {
         this.map = map;
     }
 
-    createAnchor(
+    createAnchor(point: TrackPoint, segment: TrackSegment, trackIndex: number, segmentIndex: number): AnchorWithMarker {
-        point: TrackPoint,
-        segment: TrackSegment,
-        trackIndex: number,
-        segmentIndex: number
-    ): AnchorWithMarker {
         let element = document.createElement('div');
         element.className = `h-5 w-5 xs:h-4 xs:w-4 md:h-3 md:w-3 rounded-full bg-white border-2 border-black cursor-pointer`;
 
         let marker = new mapboxgl.Marker({
             draggable: true,
             className: 'z-10',
-            element,
+            element
         }).setLngLat(point.getCoordinates());
 
         let anchor = {
@@ -184,7 +158,7 @@ export class RoutingControls {
             trackIndex,
             segmentIndex,
             marker,
-            inZoom: false,
+            inZoom: false
         };
 
         marker.on('dragstart', (e) => {
@@ -212,8 +186,7 @@ export class RoutingControls {
             e.preventDefault();
             e.stopPropagation();
 
-            if (Date.now() - this.lastDragEvent < 100) {
+            if (Date.now() - this.lastDragEvent < 100) { // Prevent click event during drag
-                // Prevent click event during drag
                 return;
             }
 
@@ -232,12 +205,7 @@ export class RoutingControls {
                     return false;
                 }
                 let segment = anchor.segment;
-                if (
+                if (distance(segment.trkpt[0].getCoordinates(), segment.trkpt[segment.trkpt.length - 1].getCoordinates()) > 1000) {
-                    distance(
-                        segment.trkpt[0].getCoordinates(),
-                        segment.trkpt[segment.trkpt.length - 1].getCoordinates()
-                    ) > 1000
-                ) {
                     return false;
                 }
                 return true;
@@ -257,8 +225,7 @@ export class RoutingControls {
         };
     }
 
-    toggleAnchorsForZoomLevelAndBounds() {
+    toggleAnchorsForZoomLevelAndBounds() { // Show markers only if they are in the current zoom level and bounds
-        // Show markers only if they are in the current zoom level and bounds
         this.shownAnchors.splice(0, this.shownAnchors.length);
 
         let center = this.map.getCenter();
@@ -279,8 +246,7 @@ export class RoutingControls {
     }
 
     showTemporaryAnchor(e: any) {
-        if (this.temporaryAnchor.marker.getElement().classList.contains('cursor-grabbing')) {
+        if (this.temporaryAnchor.marker.getElement().classList.contains('cursor-grabbing')) { // Do not not change the source point if it is already being dragged
-            // Do not not change the source point if it is already being dragged
             return;
         }
 
@@ -288,15 +254,7 @@ export class RoutingControls {
             return;
         }
 
-        if (
+        if (!get(selection).hasAnyParent(new ListTrackSegmentItem(this.fileId, e.features[0].properties.trackIndex, e.features[0].properties.segmentIndex))) {
-            !get(selection).hasAnyParent(
-                new ListTrackSegmentItem(
-                    this.fileId,
-                    e.features[0].properties.trackIndex,
-                    e.features[0].properties.segmentIndex
-                )
-            )
-        ) {
             return;
         }
 
@@ -306,7 +264,7 @@ export class RoutingControls {
 
         this.temporaryAnchor.point.setCoordinates({
             lat: e.lngLat.lat,
-            lon: e.lngLat.lng,
+            lon: e.lngLat.lng
         });
         this.temporaryAnchor.marker.setLngLat(e.lngLat).addTo(this.map);
 
@@ -314,17 +272,12 @@ export class RoutingControls {
     }
 
     updateTemporaryAnchor(e: any) {
-        if (this.temporaryAnchor.marker.getElement().classList.contains('cursor-grabbing')) {
+        if (this.temporaryAnchor.marker.getElement().classList.contains('cursor-grabbing')) { // Do not hide if it is being dragged, and stop listening for mousemove
-            // Do not hide if it is being dragged, and stop listening for mousemove
             this.map.off('mousemove', this.updateTemporaryAnchorBinded);
             return;
         }
 
-        if (
+        if (e.point.dist(this.map.project(this.temporaryAnchor.point.getCoordinates())) > 20 || this.temporaryAnchorCloseToOtherAnchor(e)) { // Hide if too far from the layer
-            e.point.dist(this.map.project(this.temporaryAnchor.point.getCoordinates())) > 20 ||
-            this.temporaryAnchorCloseToOtherAnchor(e)
-        ) {
-            // Hide if too far from the layer
             this.temporaryAnchor.marker.remove();
             this.map.off('mousemove', this.updateTemporaryAnchorBinded);
             return;
@@ -342,16 +295,14 @@ export class RoutingControls {
         return false;
     }
 
-    async moveAnchor(anchorWithMarker: AnchorWithMarker) {
+    async moveAnchor(anchorWithMarker: AnchorWithMarker) { // Move the anchor and update the route from and to the neighbouring anchors
-        // Move the anchor and update the route from and to the neighbouring anchors
         let coordinates = {
             lat: anchorWithMarker.marker.getLngLat().lat,
-            lon: anchorWithMarker.marker.getLngLat().lng,
+            lon: anchorWithMarker.marker.getLngLat().lng
         };
 
         let anchor = anchorWithMarker as Anchor;
-        if (anchorWithMarker === this.temporaryAnchor) {
+        if (anchorWithMarker === this.temporaryAnchor) { // Temporary anchor, need to find the closest point of the segment and create an anchor for it
-            // Temporary anchor, need to find the closest point of the segment and create an anchor for it
             this.temporaryAnchor.marker.remove();
             anchor = this.getPermanentAnchor();
         }
@@ -376,8 +327,7 @@ export class RoutingControls {
 
         let success = await this.routeBetweenAnchors(anchors, targetCoordinates);
 
-        if (!success) {
+        if (!success) { // Route failed, revert the anchor to the previous position
-            // Route failed, revert the anchor to the previous position
             anchorWithMarker.marker.setLngLat(anchorWithMarker.point.getCoordinates());
         }
     }
@@ -389,24 +339,16 @@ export class RoutingControls {
         let minDetails: any = { distance: Number.MAX_VALUE };
         let minAnchor = this.temporaryAnchor as Anchor;
         file?.forEachSegment((segment, trackIndex, segmentIndex) => {
-            if (
+            if (get(selection).hasAnyParent(new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex))) {
-                get(selection).hasAnyParent(
-                    new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
-                )
-            ) {
                 let details: any = {};
-                let closest = getClosestLinePoint(
+                let closest = getClosestLinePoint(segment.trkpt, this.temporaryAnchor.point, details);
-                    segment.trkpt,
-                    this.temporaryAnchor.point,
-                    details
-                );
                 if (details.distance < minDetails.distance) {
                     minDetails = details;
                     minAnchor = {
                         point: closest,
                         segment,
                         trackIndex,
-                        segmentIndex,
+                        segmentIndex
                     };
                 }
             }
@@ -433,67 +375,41 @@ export class RoutingControls {
             point: this.temporaryAnchor.point,
             trackIndex: -1,
             segmentIndex: -1,
-            trkptIndex: -1,
+            trkptIndex: -1
         };
 
         file?.forEachSegment((segment, trackIndex, segmentIndex) => {
-            if (
+            if (get(selection).hasAnyParent(new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex))) {
-                get(selection).hasAnyParent(
-                    new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
-                )
-            ) {
                 let details: any = {};
                 getClosestLinePoint(segment.trkpt, this.temporaryAnchor.point, details);
                 if (details.distance < minDetails.distance) {
                     minDetails = details;
                     let before = details.before ? details.index : details.index - 1;
 
-                    let projectedPt = projectedPoint(
+                    let projectedPt = projectedPoint(segment.trkpt[before], segment.trkpt[before + 1], this.temporaryAnchor.point);
-                        segment.trkpt[before],
+                    let ratio = distance(segment.trkpt[before], projectedPt) / distance(segment.trkpt[before], segment.trkpt[before + 1]);
-                        segment.trkpt[before + 1],
-                        this.temporaryAnchor.point
-                    );
-                    let ratio =
-                        distance(segment.trkpt[before], projectedPt) /
-                        distance(segment.trkpt[before], segment.trkpt[before + 1]);
 
                     let point = segment.trkpt[before].clone();
                     point.setCoordinates(projectedPt);
-                    point.ele =
+                    point.ele = (1 - ratio) * (segment.trkpt[before].ele ?? 0) + ratio * (segment.trkpt[before + 1].ele ?? 0);
-                        (1 - ratio) * (segment.trkpt[before].ele ?? 0) +
+                    point.time = (segment.trkpt[before].time && segment.trkpt[before + 1].time) ? new Date((1 - ratio) * segment.trkpt[before].time.getTime() + ratio * segment.trkpt[before + 1].time.getTime()) : undefined;
-                        ratio * (segment.trkpt[before + 1].ele ?? 0);
-                    point.time =
-                        segment.trkpt[before].time && segment.trkpt[before + 1].time
-                            ? new Date(
-                                  (1 - ratio) * segment.trkpt[before].time.getTime() +
-                                      ratio * segment.trkpt[before + 1].time.getTime()
-                              )
-                            : undefined;
                     point._data = {
                         anchor: true,
-                        zoom: 0,
+                        zoom: 0
                     };
 
                     minInfo = {
                         point,
                         trackIndex,
                         segmentIndex,
-                        trkptIndex: before + 1,
+                        trkptIndex: before + 1
                     };
                 }
             }
         });
 
         if (minInfo.trackIndex !== -1) {
-            dbUtils.applyToFile(this.fileId, (file) =>
+            dbUtils.applyToFile(this.fileId, (file) => file.replaceTrackPoints(minInfo.trackIndex, minInfo.segmentIndex, minInfo.trkptIndex, minInfo.trkptIndex - 1, [minInfo.point]));
-                file.replaceTrackPoints(
-                    minInfo.trackIndex,
-                    minInfo.segmentIndex,
-                    minInfo.trkptIndex,
-                    minInfo.trkptIndex - 1,
-                    [minInfo.point]
-                )
-            );
         }
     }
 
@@ -501,46 +417,22 @@ export class RoutingControls {
         return () => this.deleteAnchor(anchor);
     }
 
-    async deleteAnchor(anchor: Anchor) {
+    async deleteAnchor(anchor: Anchor) { // Remove the anchor and route between the neighbouring anchors if they exist
-        // Remove the anchor and route between the neighbouring anchors if they exist
         this.popup.remove();
 
         let [previousAnchor, nextAnchor] = this.getNeighbouringAnchors(anchor);
 
-        if (previousAnchor === null && nextAnchor === null) {
+        if (previousAnchor === null && nextAnchor === null) { // Only one point, remove it
-            // Only one point, remove it
+            dbUtils.applyToFile(this.fileId, (file) => file.replaceTrackPoints(anchor.trackIndex, anchor.segmentIndex, 0, 0, []));
-            dbUtils.applyToFile(this.fileId, (file) =>
+        } else if (previousAnchor === null) { // First point, remove trackpoints until nextAnchor
-                file.replaceTrackPoints(anchor.trackIndex, anchor.segmentIndex, 0, 0, [])
+            dbUtils.applyToFile(this.fileId, (file) => file.replaceTrackPoints(anchor.trackIndex, anchor.segmentIndex, 0, nextAnchor.point._data.index - 1, []));
-            );
+        } else if (nextAnchor === null) { // Last point, remove trackpoints from previousAnchor
-        } else if (previousAnchor === null) {
-            // First point, remove trackpoints until nextAnchor
-            dbUtils.applyToFile(this.fileId, (file) =>
-                file.replaceTrackPoints(
-                    anchor.trackIndex,
-                    anchor.segmentIndex,
-                    0,
-                    nextAnchor.point._data.index - 1,
-                    []
-                )
-            );
-        } else if (nextAnchor === null) {
-            // Last point, remove trackpoints from previousAnchor
             dbUtils.applyToFile(this.fileId, (file) => {
                 let segment = file.getSegment(anchor.trackIndex, anchor.segmentIndex);
-                file.replaceTrackPoints(
+                file.replaceTrackPoints(anchor.trackIndex, anchor.segmentIndex, previousAnchor.point._data.index + 1, segment.trkpt.length - 1, []);
-                    anchor.trackIndex,
-                    anchor.segmentIndex,
-                    previousAnchor.point._data.index + 1,
-                    segment.trkpt.length - 1,
-                    []
-                );
             });
-        } else {
+        } else { // Route between previousAnchor and nextAnchor
-            // Route between previousAnchor and nextAnchor
+            this.routeBetweenAnchors([previousAnchor, nextAnchor], [previousAnchor.point.getCoordinates(), nextAnchor.point.getCoordinates()]);
-            this.routeBetweenAnchors(
-                [previousAnchor, nextAnchor],
-                [previousAnchor.point.getCoordinates(), nextAnchor.point.getCoordinates()]
-            );
         }
     }
 
@@ -556,43 +448,27 @@ export class RoutingControls {
             return;
         }
 
-        let speed = fileWithStats.statistics.getStatisticsFor(
+        let speed = fileWithStats.statistics.getStatisticsFor(new ListTrackSegmentItem(this.fileId, anchor.trackIndex, anchor.segmentIndex)).global.speed.moving;
-            new ListTrackSegmentItem(this.fileId, anchor.trackIndex, anchor.segmentIndex)
-        ).global.speed.moving;
 
         let segment = anchor.segment;
         dbUtils.applyToFile(this.fileId, (file) => {
-            file.replaceTrackPoints(
+            file.replaceTrackPoints(anchor.trackIndex, anchor.segmentIndex, segment.trkpt.length, segment.trkpt.length - 1, segment.trkpt.slice(0, anchor.point._data.index), speed > 0 ? speed : undefined);
-                anchor.trackIndex,
+            file.crop(anchor.point._data.index, anchor.point._data.index + segment.trkpt.length - 1, [anchor.trackIndex], [anchor.segmentIndex]);
-                anchor.segmentIndex,
-                segment.trkpt.length,
-                segment.trkpt.length - 1,
-                segment.trkpt.slice(0, anchor.point._data.index),
-                speed > 0 ? speed : undefined
-            );
-            file.crop(
-                anchor.point._data.index,
-                anchor.point._data.index + segment.trkpt.length - 1,
-                [anchor.trackIndex],
-                [anchor.segmentIndex]
-            );
         });
     }
 
-    async appendAnchor(e: mapboxgl.MapMouseEvent) {
+    async appendAnchor(e: mapboxgl.MapMouseEvent) { // Add a new anchor to the end of the last segment
-        // Add a new anchor to the end of the last segment
+        if (get(streetViewEnabled)) {
-        if (get(streetViewEnabled) && get(streetViewSource) === 'google') {
             return;
         }
 
         this.appendAnchorWithCoordinates({
             lat: e.lngLat.lat,
-            lon: e.lngLat.lng,
+            lon: e.lngLat.lng
         });
     }
 
-    async appendAnchorWithCoordinates(coordinates: Coordinates) {
+    async appendAnchorWithCoordinates(coordinates: Coordinates) { // Add a new anchor to the end of the last segment
-        // Add a new anchor to the end of the last segment
         let selected = getOrderedSelection();
         if (selected.length === 0 || selected[selected.length - 1].getFileId() !== this.fileId) {
             return;
@@ -602,7 +478,7 @@ export class RoutingControls {
         let lastAnchor = this.anchors[this.anchors.length - 1];
 
         let newPoint = new TrackPoint({
-            attributes: coordinates,
+            attributes: coordinates
         });
         newPoint._data.anchor = true;
         newPoint._data.zoom = 0;
@@ -613,10 +489,7 @@ export class RoutingControls {
                 if (item instanceof ListTrackItem || item instanceof ListTrackSegmentItem) {
                     trackIndex = item.getTrackIndex();
                 }
-                let segmentIndex =
+                let segmentIndex = (file.trk.length > 0 && file.trk[trackIndex].trkseg.length > 0) ? file.trk[trackIndex].trkseg.length - 1 : 0;
-                    file.trk.length > 0 && file.trk[trackIndex].trkseg.length > 0
-                        ? file.trk[trackIndex].trkseg.length - 1
-                        : 0;
                 if (item instanceof ListTrackSegmentItem) {
                     segmentIndex = item.getSegmentIndex();
                 }
@@ -640,13 +513,10 @@ export class RoutingControls {
             point: newPoint,
             segment: lastAnchor.segment,
             trackIndex: lastAnchor.trackIndex,
-            segmentIndex: lastAnchor.segmentIndex,
+            segmentIndex: lastAnchor.segmentIndex
         };
 
-        await this.routeBetweenAnchors(
+        await this.routeBetweenAnchors([lastAnchor, newAnchor], [lastAnchor.point.getCoordinates(), newAnchor.point.getCoordinates()]);
-            [lastAnchor, newAnchor],
-            [lastAnchor.point.getCoordinates(), newAnchor.point.getCoordinates()]
-        );
     }
 
     getNeighbouringAnchors(anchor: Anchor): [Anchor | null, Anchor | null] {
@@ -656,17 +526,11 @@ export class RoutingControls {
         for (let i = 0; i < this.anchors.length; i++) {
             if (this.anchors[i].segment === anchor.segment && this.anchors[i].inZoom) {
                 if (this.anchors[i].point._data.index < anchor.point._data.index) {
-                    if (
+                    if (!previousAnchor || this.anchors[i].point._data.index > previousAnchor.point._data.index) {
-                        !previousAnchor ||
-                        this.anchors[i].point._data.index > previousAnchor.point._data.index
-                    ) {
                         previousAnchor = this.anchors[i];
                     }
                 } else if (this.anchors[i].point._data.index > anchor.point._data.index) {
-                    if (
+                    if (!nextAnchor || this.anchors[i].point._data.index < nextAnchor.point._data.index) {
-                        !nextAnchor ||
-                        this.anchors[i].point._data.index < nextAnchor.point._data.index
-                    ) {
                         nextAnchor = this.anchors[i];
                     }
                 }
@@ -676,10 +540,7 @@ export class RoutingControls {
         return [previousAnchor, nextAnchor];
     }
 
-    async routeBetweenAnchors(
+    async routeBetweenAnchors(anchors: Anchor[], targetCoordinates: Coordinates[]): Promise<boolean> {
-        anchors: Anchor[],
-        targetCoordinates: Coordinates[]
-    ): Promise<boolean> {
         let segment = anchors[0].segment;
 
         let fileWithStats = get(this.file);
@@ -687,15 +548,10 @@ export class RoutingControls {
             return false;
         }
 
-        if (anchors.length === 1) {
+        if (anchors.length === 1) { // Only one anchor, update the point in the segment
-            // Only one anchor, update the point in the segment
+            dbUtils.applyToFile(this.fileId, (file) => file.replaceTrackPoints(anchors[0].trackIndex, anchors[0].segmentIndex, 0, 0, [new TrackPoint({
-            dbUtils.applyToFile(this.fileId, (file) =>
-                file.replaceTrackPoints(anchors[0].trackIndex, anchors[0].segmentIndex, 0, 0, [
-                    new TrackPoint({
                 attributes: targetCoordinates[0],
-                    }),
+            })]));
-                ])
-            );
             return true;
         }
 
@@ -704,28 +560,23 @@ export class RoutingControls {
             response = await route(targetCoordinates);
         } catch (e: any) {
             if (e.message.includes('from-position not mapped in existing datafile')) {
-                toast.error(get(_)('toolbar.routing.error.from'));
+                toast.error(get(_)("toolbar.routing.error.from"));
             } else if (e.message.includes('via1-position not mapped in existing datafile')) {
-                toast.error(get(_)('toolbar.routing.error.via'));
+                toast.error(get(_)("toolbar.routing.error.via"));
             } else if (e.message.includes('to-position not mapped in existing datafile')) {
-                toast.error(get(_)('toolbar.routing.error.to'));
+                toast.error(get(_)("toolbar.routing.error.to"));
             } else if (e.message.includes('Time-out')) {
-                toast.error(get(_)('toolbar.routing.error.timeout'));
+                toast.error(get(_)("toolbar.routing.error.timeout"));
             } else {
                 toast.error(e.message);
             }
             return false;
         }
 
-        if (anchors[0].point._data.index === 0) {
+        if (anchors[0].point._data.index === 0) { // First anchor is the first point of the segment
-            // First anchor is the first point of the segment
             anchors[0].point = response[0]; // replace the first anchor
             anchors[0].point._data.index = 0;
-        } else if (
+        } else if (anchors[0].point._data.index === segment.trkpt.length - 1 && distance(anchors[0].point.getCoordinates(), response[0].getCoordinates()) < 1) { // First anchor is the last point of the segment, and the new point is close enough
-            anchors[0].point._data.index === segment.trkpt.length - 1 &&
-            distance(anchors[0].point.getCoordinates(), response[0].getCoordinates()) < 1
-        ) {
-            // First anchor is the last point of the segment, and the new point is close enough
             anchors[0].point = response[0]; // replace the first anchor
             anchors[0].point._data.index = segment.trkpt.length - 1;
         } else {
@@ -733,8 +584,7 @@ export class RoutingControls {
             response.splice(0, 0, anchors[0].point); // Insert it in the response to keep it
         }
 
-        if (anchors[anchors.length - 1].point._data.index === segment.trkpt.length - 1) {
+        if (anchors[anchors.length - 1].point._data.index === segment.trkpt.length - 1) { // Last anchor is the last point of the segment
-            // Last anchor is the last point of the segment
             anchors[anchors.length - 1].point = response[response.length - 1]; // replace the last anchor
             anchors[anchors.length - 1].point._data.index = segment.trkpt.length - 1;
         } else {
@@ -745,7 +595,7 @@ export class RoutingControls {
         for (let i = 1; i < anchors.length - 1; i++) {
             // Find the closest point to the intermediate anchor
             // and transfer the marker to that point
-            anchors[i].point = getClosestLinePoint(response.slice(1, -1), targetCoordinates[i]);
+            anchors[i].point = getClosestLinePoint(response.slice(1, - 1), targetCoordinates[i]);
         }
 
         anchors.forEach((anchor) => {
@@ -753,64 +603,36 @@ export class RoutingControls {
             anchor.point._data.zoom = 0; // Make these anchors permanent
         });
 
-        let stats = fileWithStats.statistics.getStatisticsFor(
+        let stats = fileWithStats.statistics.getStatisticsFor(new ListTrackSegmentItem(this.fileId, anchors[0].trackIndex, anchors[0].segmentIndex));
-            new ListTrackSegmentItem(this.fileId, anchors[0].trackIndex, anchors[0].segmentIndex)
-        );
         let speed: number | undefined = undefined;
         let startTime = anchors[0].point.time;
 
         if (stats.global.speed.moving > 0) {
             let replacingDistance = 0;
             for (let i = 1; i < response.length; i++) {
-                replacingDistance +=
+                replacingDistance += distance(response[i - 1].getCoordinates(), response[i].getCoordinates()) / 1000;
-                    distance(response[i - 1].getCoordinates(), response[i].getCoordinates()) / 1000;
             }
-            let replacedDistance =
+            let replacedDistance = stats.local.distance.moving[anchors[anchors.length - 1].point._data.index] - stats.local.distance.moving[anchors[0].point._data.index];
-                stats.local.distance.moving[anchors[anchors.length - 1].point._data.index] -
-                stats.local.distance.moving[anchors[0].point._data.index];
 
             let newDistance = stats.global.distance.moving + replacingDistance - replacedDistance;
-            let newTime = (newDistance / stats.global.speed.moving) * 3600;
+            let newTime = newDistance / stats.global.speed.moving * 3600;
 
-            let remainingTime =
+            let remainingTime = stats.global.time.moving - (stats.local.time.moving[anchors[anchors.length - 1].point._data.index] - stats.local.time.moving[anchors[0].point._data.index]);
-                stats.global.time.moving -
-                (stats.local.time.moving[anchors[anchors.length - 1].point._data.index] -
-                    stats.local.time.moving[anchors[0].point._data.index]);
             let replacingTime = newTime - remainingTime;
 
-            if (replacingTime <= 0) {
+            if (replacingTime <= 0) { // Fallback to simple time difference
-                // Fallback to simple time difference
+                replacingTime = stats.local.time.total[anchors[anchors.length - 1].point._data.index] - stats.local.time.total[anchors[0].point._data.index];
-                replacingTime =
-                    stats.local.time.total[anchors[anchors.length - 1].point._data.index] -
-                    stats.local.time.total[anchors[0].point._data.index];
             }
 
-            speed = (replacingDistance / replacingTime) * 3600;
+            speed = replacingDistance / replacingTime * 3600;
 
-            if (startTime === undefined) {
+            if (startTime === undefined) { // Replacing the first point
-                // Replacing the first point
                 let endIndex = anchors[anchors.length - 1].point._data.index;
-                startTime = new Date(
+                startTime = new Date((segment.trkpt[endIndex].time?.getTime() ?? 0) - (replacingTime + stats.local.time.total[endIndex] - stats.local.time.moving[endIndex]) * 1000);
-                    (segment.trkpt[endIndex].time?.getTime() ?? 0) -
-                        (replacingTime +
-                            stats.local.time.total[endIndex] -
-                            stats.local.time.moving[endIndex]) *
-                            1000
-                );
             }
         }
 
-        dbUtils.applyToFile(this.fileId, (file) =>
+        dbUtils.applyToFile(this.fileId, (file) => file.replaceTrackPoints(anchors[0].trackIndex, anchors[0].segmentIndex, anchors[0].point._data.index, anchors[anchors.length - 1].point._data.index, response, speed, startTime));
-            file.replaceTrackPoints(
-                anchors[0].trackIndex,
-                anchors[0].segmentIndex,
-                anchors[0].point._data.index,
-                anchors[anchors.length - 1].point._data.index,
-                response,
-                speed,
-                startTime
-            )
-        );
 
         return true;
     }

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

@@ -1,4 +1,4 @@
-import { ramerDouglasPeucker, type GPXFile, type TrackSegment } from 'gpx';
+import { ramerDouglasPeucker, type GPXFile, type TrackSegment } from "gpx";
 
 const earthRadius = 6371008.8;
 
@@ -17,8 +17,7 @@ export function updateAnchorPoints(file: GPXFile) {
     let segments = file.getSegments();
 
     for (let segment of segments) {
-        if (!segment._data.anchors) {
+        if (!segment._data.anchors) { // New segment, compute anchor points for it
-            // New segment, compute anchor points for it
             computeAnchorPoints(segment);
             continue;
         }
@@ -43,3 +42,4 @@ function computeAnchorPoints(segment: TrackSegment) {
     });
     segment._data.anchors = true;
 }
+

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

@@ -2,7 +2,7 @@
 	export enum SplitType {
 		FILES = 'files',
 		TRACKS = 'tracks',
-        SEGMENTS = 'segments',
+		SEGMENTS = 'segments'
 	}
 </script>
 
@@ -50,7 +50,7 @@
 			$slicedGPXStatistics = [
 				get(gpxStatistics).slice(sliderValues[0], sliderValues[1]),
 				sliderValues[0],
-                sliderValues[1],
+				sliderValues[1]
 			];
 		} else {
 			$slicedGPXStatistics = undefined;
@@ -93,10 +93,10 @@
 	const splitTypes = [
 		{ value: SplitType.FILES, label: $_('gpx.files') },
 		{ value: SplitType.TRACKS, label: $_('gpx.tracks') },
-        { value: SplitType.SEGMENTS, label: $_('gpx.segments') },
+		{ value: SplitType.SEGMENTS, label: $_('gpx.segments') }
 	];
 
-    let splitType = splitTypes.find((type) => type.value === $splitAs) ?? splitTypes[0];
+	let splitType = splitTypes[0];
 
 	$: splitAs.set(splitType.value);
 
@@ -111,12 +111,7 @@
 
 <div class="flex flex-col gap-3 w-full max-w-80 {$$props.class ?? ''}">
 	<div class="p-2">
-        <Slider
+		<Slider bind:value={sliderValues} max={maxSliderValue} step={1} disabled={!validSelection} />
-            bind:value={sliderValues}
-            max={maxSliderValue}
-            step={1}
-            disabled={!validSelection}
-        />
 	</div>
 	<Button
 		variant="outline"

website/src/lib/components/toolbar/tools/scissors/SplitControls.ts

@@ -1,15 +1,12 @@
-import { TrackPoint, TrackSegment } from 'gpx';
+import { TrackPoint, TrackSegment } from "gpx";
-import { get } from 'svelte/store';
+import { get } from "svelte/store";
-import mapboxgl from 'mapbox-gl';
+import mapboxgl from "mapbox-gl";
-import { dbUtils, getFile } from '$lib/db';
+import { dbUtils, getFile } from "$lib/db";
-import {
+import { applyToOrderedSelectedItemsFromFile, selection } from "$lib/components/file-list/Selection";
-    applyToOrderedSelectedItemsFromFile,
+import { ListTrackSegmentItem } from "$lib/components/file-list/FileList";
-    selection,
+import { currentTool, gpxStatistics, Tool } from "$lib/stores";
-} from '$lib/components/file-list/Selection';
+import { _ } from "svelte-i18n";
-import { ListTrackSegmentItem } from '$lib/components/file-list/FileList';
+import { Scissors } from "lucide-static";
-import { currentTool, gpxStatistics, Tool } from '$lib/stores';
-import { _ } from 'svelte-i18n';
-import { Scissors } from 'lucide-static';
 
 export class SplitControls {
     active: boolean = false;
@@ -18,8 +15,7 @@ export class SplitControls {
     shownControls: ControlWithMarker[] = [];
     unsubscribes: Function[] = [];
 
-    toggleControlsForZoomLevelAndBoundsBinded: () => void =
+    toggleControlsForZoomLevelAndBoundsBinded: () => void = this.toggleControlsForZoomLevelAndBounds.bind(this);
-        this.toggleControlsForZoomLevelAndBounds.bind(this);
 
     constructor(map: mapboxgl.Map) {
         this.map = map;
@@ -52,21 +48,15 @@ export class SplitControls {
         this.map.on('move', this.toggleControlsForZoomLevelAndBoundsBinded);
     }
 
-    updateControls() {
+    updateControls() { // Update the markers when the files change
-        // Update the markers when the files change
         let controlIndex = 0;
         applyToOrderedSelectedItemsFromFile((fileId, level, items) => {
             let file = getFile(fileId);
 
             if (file) {
                 file.forEachSegment((segment, trackIndex, segmentIndex) => {
-                    if (
+                    if (get(selection).hasAnyParent(new ListTrackSegmentItem(fileId, trackIndex, segmentIndex))) {
-                        get(selection).hasAnyParent(
+                        for (let point of segment.trkpt.slice(1, -1)) { // Update the existing controls (could be improved by matching the existing controls with the new ones?)
-                            new ListTrackSegmentItem(fileId, trackIndex, segmentIndex)
-                        )
-                    ) {
-                        for (let point of segment.trkpt.slice(1, -1)) {
-                            // Update the existing controls (could be improved by matching the existing controls with the new ones?)
                             if (point._data.anchor) {
                                 if (controlIndex < this.controls.length) {
                                     this.controls[controlIndex].fileId = fileId;
@@ -74,30 +64,20 @@ export class SplitControls {
                                     this.controls[controlIndex].segment = segment;
                                     this.controls[controlIndex].trackIndex = trackIndex;
                                     this.controls[controlIndex].segmentIndex = segmentIndex;
-                                    this.controls[controlIndex].marker.setLngLat(
+                                    this.controls[controlIndex].marker.setLngLat(point.getCoordinates());
-                                        point.getCoordinates()
-                                    );
                                 } else {
-                                    this.controls.push(
+                                    this.controls.push(this.createControl(point, segment, fileId, trackIndex, segmentIndex));
-                                        this.createControl(
-                                            point,
-                                            segment,
-                                            fileId,
-                                            trackIndex,
-                                            segmentIndex
-                                        )
-                                    );
                                 }
                                 controlIndex++;
                             }
                         }
                     }
                 });
+
             }
         }, false);
 
-        while (controlIndex < this.controls.length) {
+        while (controlIndex < this.controls.length) { // Remove the extra controls
-            // Remove the extra controls
             this.controls.pop()?.marker.remove();
         }
 
@@ -114,8 +94,7 @@ export class SplitControls {
         this.map.off('move', this.toggleControlsForZoomLevelAndBoundsBinded);
     }
 
-    toggleControlsForZoomLevelAndBounds() {
+    toggleControlsForZoomLevelAndBounds() { // Show markers only if they are in the current zoom level and bounds
-        // Show markers only if they are in the current zoom level and bounds
         this.shownControls.splice(0, this.shownControls.length);
 
         let southWest = this.map.unproject([0, this.map.getCanvas().height]);
@@ -134,23 +113,15 @@ export class SplitControls {
         });
     }
 
-    createControl(
+    createControl(point: TrackPoint, segment: TrackSegment, fileId: string, trackIndex: number, segmentIndex: number): ControlWithMarker {
-        point: TrackPoint,
-        segment: TrackSegment,
-        fileId: string,
-        trackIndex: number,
-        segmentIndex: number
-    ): ControlWithMarker {
         let element = document.createElement('div');
         element.className = `h-6 w-6 p-0.5 rounded-full bg-white border-2 border-black cursor-pointer`;
-        element.innerHTML = Scissors.replace('width="24"', '')
+        element.innerHTML = Scissors.replace('width="24"', "").replace('height="24"', "").replace('stroke="currentColor"', 'stroke="black"');
-            .replace('height="24"', '')
-            .replace('stroke="currentColor"', 'stroke="black"');
 
         let marker = new mapboxgl.Marker({
             draggable: true,
             className: 'z-10',
-            element,
+            element
         }).setLngLat(point.getCoordinates());
 
         let control = {
@@ -160,18 +131,12 @@ export class SplitControls {
             trackIndex,
             segmentIndex,
             marker,
-            inZoom: false,
+            inZoom: false
         };
 
         marker.getElement().addEventListener('click', (e) => {
             e.stopPropagation();
-            dbUtils.split(
+            dbUtils.split(control.fileId, control.trackIndex, control.segmentIndex, control.point.getCoordinates(), control.point._data.index);
-                control.fileId,
-                control.trackIndex,
-                control.segmentIndex,
-                control.point.getCoordinates(),
-                control.point._data.index
-            );
         });
 
         return control;

website/src/lib/components/ui/scroll-area/scroll-area.svelte

@@ -1,33 +1,31 @@
 <script lang="ts">
-	import { ScrollArea as ScrollAreaPrimitive } from 'bits-ui';
+	import { ScrollArea as ScrollAreaPrimitive } from "bits-ui";
-	import { Scrollbar } from './index.js';
+	import { Scrollbar } from "./index.js";
-	import { cn } from '$lib/utils.js';
+	import { cn } from "$lib/utils.js";
 
 	type $$Props = ScrollAreaPrimitive.Props & {
-		orientation?: 'vertical' | 'horizontal' | 'both';
+		orientation?: "vertical" | "horizontal" | "both";
 		scrollbarXClasses?: string;
 		scrollbarYClasses?: string;
-		viewportClasses?: string;
 	};
 
-	let className: $$Props['class'] = undefined;
+	let className: $$Props["class"] = undefined;
 	export { className as class };
-	export let orientation = 'vertical';
+	export let orientation = "vertical";
-	export let scrollbarXClasses: string = '';
+	export let scrollbarXClasses: string = "";
-	export let scrollbarYClasses: string = '';
+	export let scrollbarYClasses: string = "";
-	export let viewportClasses: string = '';
 </script>
 
-<ScrollAreaPrimitive.Root {...$$restProps} class={cn('relative overflow-hidden', className)}>
+<ScrollAreaPrimitive.Root {...$$restProps} class={cn("relative overflow-hidden", className)}>
-	<ScrollAreaPrimitive.Viewport class={cn('h-full w-full rounded-[inherit]', viewportClasses)}>
+	<ScrollAreaPrimitive.Viewport class="h-full w-full rounded-[inherit]">
 		<ScrollAreaPrimitive.Content>
 			<slot />
 		</ScrollAreaPrimitive.Content>
 	</ScrollAreaPrimitive.Viewport>
-	{#if orientation === 'vertical' || orientation === 'both'}
+	{#if orientation === "vertical" || orientation === "both"}
 		<Scrollbar orientation="vertical" class={scrollbarYClasses} />
 	{/if}
-	{#if orientation === 'horizontal' || orientation === 'both'}
+	{#if orientation === "horizontal" || orientation === "both"}
 		<Scrollbar orientation="horizontal" class={scrollbarXClasses} />
 	{/if}
 	<ScrollAreaPrimitive.Corner />

website/src/lib/db.ts

@@ -1,83 +1,32 @@
 import Dexie, { liveQuery } from 'dexie';
-import {
+import { GPXFile, GPXStatistics, Track, TrackSegment, Waypoint, TrackPoint, type Coordinates, distance, type LineStyleExtension, type WaypointType } from 'gpx';
-    GPXFile,
+import { enableMapSet, enablePatches, applyPatches, type Patch, type WritableDraft, freeze, produceWithPatches } from 'immer';
-    GPXStatistics,
-    Track,
-    TrackSegment,
-    Waypoint,
-    TrackPoint,
-    type Coordinates,
-    distance,
-    type LineStyleExtension,
-    type WaypointType,
-} from 'gpx';
-import {
-    enableMapSet,
-    enablePatches,
-    applyPatches,
-    type Patch,
-    type WritableDraft,
-    freeze,
-    produceWithPatches,
-} from 'immer';
 import { writable, get, derived, type Readable, type Writable } from 'svelte/store';
-import {
+import { gpxStatistics, initTargetMapBounds, map, splitAs, updateAllHidden, updateTargetMapBounds } from './stores';
-    gpxStatistics,
+import { defaultBasemap, defaultBasemapTree, defaultOverlayTree, defaultOverlays, type CustomLayer, defaultOpacities, defaultOverpassQueries, defaultOverpassTree } from './assets/layers';
-    initTargetMapBounds,
+import { applyToOrderedItemsFromFile, applyToOrderedSelectedItemsFromFile, selection } from '$lib/components/file-list/Selection';
-    map,
+import { ListFileItem, ListItem, ListTrackItem, ListLevel, ListTrackSegmentItem, ListWaypointItem, ListRootItem } from '$lib/components/file-list/FileList';
-    splitAs,
-    updateAllHidden,
-    updateTargetMapBounds,
-} from './stores';
-import {
-    defaultBasemap,
-    defaultBasemapTree,
-    defaultOverlayTree,
-    defaultOverlays,
-    type CustomLayer,
-    defaultOpacities,
-    defaultOverpassQueries,
-    defaultOverpassTree,
-} from './assets/layers';
-import {
-    applyToOrderedItemsFromFile,
-    applyToOrderedSelectedItemsFromFile,
-    selection,
-} from '$lib/components/file-list/Selection';
-import {
-    ListFileItem,
-    ListItem,
-    ListTrackItem,
-    ListLevel,
-    ListTrackSegmentItem,
-    ListWaypointItem,
-    ListRootItem,
-} from '$lib/components/file-list/FileList';
 import { updateAnchorPoints } from '$lib/components/toolbar/tools/routing/Simplify';
 import { SplitType } from '$lib/components/toolbar/tools/scissors/Scissors.svelte';
 import { getClosestLinePoint, getElevation } from '$lib/utils';
 import { browser } from '$app/environment';
+import type mapboxgl from 'mapbox-gl';
 
 enableMapSet();
 enablePatches();
 
 class Database extends Dexie {
+
     fileids!: Dexie.Table<string, string>;
     files!: Dexie.Table<GPXFile, string>;
-    patches!: Dexie.Table<{ patch: Patch[]; inversePatch: Patch[]; index: number }, number>;
+    patches!: Dexie.Table<{ patch: Patch[], inversePatch: Patch[], index: number }, number>;
     settings!: Dexie.Table<any, string>;
-    overpasstiles!: Dexie.Table<
+    overpasstiles!: Dexie.Table<{ query: string, x: number, y: number, time: number }, [string, number, number]>;
-        { query: string; x: number; y: number; time: number },
+    overpassdata!: Dexie.Table<{ query: string, id: number, poi: GeoJSON.Feature }, [string, number]>;
-        [string, number, number]
-    >;
-    overpassdata!: Dexie.Table<
-        { query: string; id: number; poi: GeoJSON.Feature },
-        [string, number]
-    >;
 
     constructor() {
-        super('Database', {
+        super("Database", {
-            cache: 'immutable',
+            cache: 'immutable'
         });
         this.version(1).stores({
             fileids: ',&fileid',
@@ -93,15 +42,10 @@ class Database extends Dexie {
 export const db = new Database();
 
 // Wrap Dexie live queries in a Svelte store to avoid triggering the query for every subscriber, and updates to the store are pushed to the DB
-export function bidirectionalDexieStore<K, V>(
+export function bidirectionalDexieStore<K, V>(table: Dexie.Table<V, K>, key: K, initial: V, initialize: boolean = true): Writable<V | undefined> {
-    table: Dexie.Table<V, K>,
-    key: K,
-    initial: V,
-    initialize: boolean = true
-): Writable<V | undefined> {
     let first = true;
     let store = writable<V | undefined>(initialize ? initial : undefined);
-    liveQuery(() => table.get(key)).subscribe((value) => {
+    liveQuery(() => table.get(key)).subscribe(value => {
         if (value === undefined) {
             if (first) {
                 if (!initialize) {
@@ -127,15 +71,11 @@ export function bidirectionalDexieStore<K, V>(
             if (typeof newValue === 'object' || newValue !== get(store)) {
                 table.put(newValue, key);
             }
-        },
+        }
     };
 }
 
-export function dexieSettingStore<T>(
+export function dexieSettingStore<T>(key: string, initial: T, initialize: boolean = true): Writable<T> {
-    key: string,
-    initial: T,
-    initialize: boolean = true
-): Writable<T> {
     return bidirectionalDexieStore(db.settings, key, initial, initialize);
 }
 
@@ -146,7 +86,7 @@ export const settings = {
     elevationProfile: dexieSettingStore('elevationProfile', true),
     additionalDatasets: dexieSettingStore<string[]>('additionalDatasets', []),
     elevationFill: dexieSettingStore<'slope' | 'surface' | undefined>('elevationFill', undefined),
-    treeFileView: dexieSettingStore<boolean>('fileView', false),
+    verticalFileView: dexieSettingStore<boolean>('fileView', false),
     minimizeRoutingMenu: dexieSettingStore('minimizeRoutingMenu', false),
     routing: dexieSettingStore('routing', true),
     routingProfile: dexieSettingStore('routingProfile', 'bike'),
@@ -157,11 +97,7 @@ export const settings = {
     currentOverlays: dexieSettingStore('currentOverlays', defaultOverlays, false),
     previousOverlays: dexieSettingStore('previousOverlays', defaultOverlays),
     selectedOverlayTree: dexieSettingStore('selectedOverlayTree', defaultOverlayTree),
-    currentOverpassQueries: dexieSettingStore(
+    currentOverpassQueries: dexieSettingStore('currentOverpassQueries', defaultOverpassQueries, false),
-        'currentOverpassQueries',
-        defaultOverpassQueries,
-        false
-    ),
     selectedOverpassTree: dexieSettingStore('selectedOverpassTree', defaultOverpassTree),
     opacities: dexieSettingStore('opacities', defaultOpacities),
     customLayers: dexieSettingStore<Record<string, CustomLayer>>('customLayers', {}),
@@ -172,7 +108,7 @@ export const settings = {
     streetViewSource: dexieSettingStore('streetViewSource', 'mapillary'),
     fileOrder: dexieSettingStore<string[]>('fileOrder', []),
     defaultOpacity: dexieSettingStore('defaultOpacity', 0.7),
-    defaultWidth: dexieSettingStore('defaultWidth', browser && window.innerWidth < 600 ? 8 : 5),
+    defaultWeight: dexieSettingStore('defaultWeight', (browser && window.innerWidth < 600) ? 8 : 5),
     bottomPanelSize: dexieSettingStore('bottomPanelSize', 170),
     rightPanelSize: dexieSettingStore('rightPanelSize', 240),
 };
@@ -180,7 +116,7 @@ export const settings = {
 // Wrap Dexie live queries in a Svelte store to avoid triggering the query for every subscriber
 function dexieStore<T>(querier: () => T | Promise<T>, initial?: T): Readable<T> {
     let store = writable<T>(initial);
-    liveQuery(querier).subscribe((value) => {
+    liveQuery(querier).subscribe(value => {
         if (value !== undefined) {
             store.set(value);
         }
@@ -214,7 +150,7 @@ export class GPXStatisticsTree {
         let statistics = new GPXStatistics();
         let id = item.getIdAtLevel(this.level);
         if (id === undefined || id === 'waypoints') {
-            Object.keys(this.statistics).forEach((key) => {
+            Object.keys(this.statistics).forEach(key => {
                 if (this.statistics[key] instanceof GPXStatistics) {
                     statistics.mergeWith(this.statistics[key]);
                 } else {
@@ -231,30 +167,26 @@ export class GPXStatisticsTree {
         }
         return statistics;
     }
-}
+};
-export type GPXFileWithStatistics = { file: GPXFile; statistics: GPXStatisticsTree };
+export type GPXFileWithStatistics = { file: GPXFile, statistics: GPXStatisticsTree };
 
 // Wrap Dexie live queries in a Svelte store to avoid triggering the query for every subscriber, also takes care of the conversion to a GPXFile object
 function dexieGPXFileStore(id: string): Readable<GPXFileWithStatistics> & { destroy: () => void } {
     let store = writable<GPXFileWithStatistics>(undefined);
-    let query = liveQuery(() => db.files.get(id)).subscribe((value) => {
+    let query = liveQuery(() => db.files.get(id)).subscribe(value => {
         if (value !== undefined) {
             let gpx = new GPXFile(value);
             updateAnchorPoints(gpx);
 
             let statistics = new GPXStatisticsTree(gpx);
-            if (!fileState.has(id)) {
+            if (!fileState.has(id)) { // Update the map bounds for new files
-                // Update the map bounds for new files
+                updateTargetMapBounds(id, statistics.getStatisticsFor(new ListFileItem(id)).global.bounds);
-                updateTargetMapBounds(
-                    id,
-                    statistics.getStatisticsFor(new ListFileItem(id)).global.bounds
-                );
             }
 
             fileState.set(id, gpx);
             store.set({
                 file: gpx,
-                statistics,
+                statistics
             });
 
             if (get(selection).hasAnyChildren(new ListFileItem(id))) {
@@ -267,7 +199,7 @@ function dexieGPXFileStore(id: string): Readable<GPXFileWithStatistics> & { dest
         destroy: () => {
             fileState.delete(id);
             query.unsubscribe();
-        },
+        }
     };
 }
 
@@ -279,30 +211,22 @@ function updateSelection(updatedFiles: GPXFile[], deletedFileIds: string[]) {
         if (file) {
             items.forEach((item) => {
                 if (item instanceof ListTrackItem) {
-                    let newTrackIndex = file.trk.findIndex(
+                    let newTrackIndex = file.trk.findIndex((track) => track._data.trackIndex === item.getTrackIndex());
-                        (track) => track._data.trackIndex === item.getTrackIndex()
-                    );
                     if (newTrackIndex === -1) {
                         removedItems.push(item);
                     }
                 } else if (item instanceof ListTrackSegmentItem) {
-                    let newTrackIndex = file.trk.findIndex(
+                    let newTrackIndex = file.trk.findIndex((track) => track._data.trackIndex === item.getTrackIndex());
-                        (track) => track._data.trackIndex === item.getTrackIndex()
-                    );
                     if (newTrackIndex === -1) {
                         removedItems.push(item);
                     } else {
-                        let newSegmentIndex = file.trk[newTrackIndex].trkseg.findIndex(
+                        let newSegmentIndex = file.trk[newTrackIndex].trkseg.findIndex((segment) => segment._data.segmentIndex === item.getSegmentIndex());
-                            (segment) => segment._data.segmentIndex === item.getSegmentIndex()
-                        );
                         if (newSegmentIndex === -1) {
                             removedItems.push(item);
                         }
                     }
                 } else if (item instanceof ListWaypointItem) {
-                    let newWaypointIndex = file.wpt.findIndex(
+                    let newWaypointIndex = file.wpt.findIndex((wpt) => wpt._data.index === item.getWaypointIndex());
-                        (wpt) => wpt._data.index === item.getWaypointIndex()
-                    );
                     if (newWaypointIndex === -1) {
                         removedItems.push(item);
                     }
@@ -332,10 +256,9 @@ function updateSelection(updatedFiles: GPXFile[], deletedFileIds: string[]) {
 // Commit the changes to the file state to the database
 function commitFileStateChange(newFileState: ReadonlyMap<string, GPXFile>, patch: Patch[]) {
     let changedFileIds = getChangedFileIds(patch);
-    let updatedFileIds: string[] = [],
+    let updatedFileIds: string[] = [], deletedFileIds: string[] = [];
-        deletedFileIds: string[] = [];
 
-    changedFileIds.forEach((id) => {
+    changedFileIds.forEach(id => {
         if (newFileState.has(id)) {
             updatedFileIds.push(id);
         } else {
@@ -343,10 +266,8 @@ function commitFileStateChange(newFileState: ReadonlyMap<string, GPXFile>, patch
         }
     });
 
-    let updatedFiles = updatedFileIds
+    let updatedFiles = updatedFileIds.map(id => newFileState.get(id)).filter(file => file !== undefined) as GPXFile[];
-        .map((id) => newFileState.get(id))
+    updatedFileIds = updatedFiles.map(file => file._data.id);
-        .filter((file) => file !== undefined) as GPXFile[];
-    updatedFileIds = updatedFiles.map((file) => file._data.id);
 
     updateSelection(updatedFiles, deletedFileIds);
 
@@ -362,15 +283,13 @@ function commitFileStateChange(newFileState: ReadonlyMap<string, GPXFile>, patch
     });
 }
 
-export const fileObservers: Writable<
+export const fileObservers: Writable<Map<string, Readable<GPXFileWithStatistics | undefined> & { destroy?: () => void }>> = writable(new Map());
-    Map<string, Readable<GPXFileWithStatistics | undefined> & { destroy?: () => void }>
-> = writable(new Map());
 const fileState: Map<string, GPXFile> = new Map(); // Used to generate patches
 
 // Observe the file ids in the database, and maintain a map of file observers for the corresponding files
 export function observeFilesFromDatabase(fitBounds: boolean) {
     let initialize = true;
-    liveQuery(() => db.fileids.toArray()).subscribe((dbFileIds) => {
+    liveQuery(() => db.fileids.toArray()).subscribe(dbFileIds => {
         if (initialize) {
             if (fitBounds && dbFileIds.length > 0) {
                 initTargetMapBounds(dbFileIds);
@@ -378,21 +297,17 @@ export function observeFilesFromDatabase(fitBounds: boolean) {
             initialize = false;
         }
         // Find new files to observe
-        let newFiles = dbFileIds
+        let newFiles = dbFileIds.filter(id => !get(fileObservers).has(id)).sort((a, b) => parseInt(a.split('-')[1]) - parseInt(b.split('-')[1]));
-            .filter((id) => !get(fileObservers).has(id))
-            .sort((a, b) => parseInt(a.split('-')[1]) - parseInt(b.split('-')[1]));
         // Find deleted files to stop observing
-        let deletedFiles = Array.from(get(fileObservers).keys()).filter(
+        let deletedFiles = Array.from(get(fileObservers).keys()).filter(id => !dbFileIds.find(fileId => fileId === id));
-            (id) => !dbFileIds.find((fileId) => fileId === id)
-        );
 
         // Update the store
         if (newFiles.length > 0 || deletedFiles.length > 0) {
-            fileObservers.update(($files) => {
+            fileObservers.update($files => {
-                newFiles.forEach((id) => {
+                newFiles.forEach(id => {
                     $files.set(id, dexieGPXFileStore(id));
                 });
-                deletedFiles.forEach((id) => {
+                deletedFiles.forEach(id => {
                     $files.get(id)?.destroy?.();
                     $files.delete(id);
                 });
@@ -427,28 +342,15 @@ export function getStatistics(fileId: string): GPXStatisticsTree | undefined {
 }
 
 const patchIndex: Readable<number> = dexieStore(() => db.settings.get('patchIndex'), -1);
-const patchMinMaxIndex: Readable<{ min: number; max: number }> = dexieStore(
+const patchMinMaxIndex: Readable<{ min: number, max: number }> = dexieStore(() => db.patches.orderBy(':id').keys().then(keys => {
-    () =>
-        db.patches
-            .orderBy(':id')
-            .keys()
-            .then((keys) => {
     if (keys.length === 0) {
         return { min: 0, max: 0 };
     } else {
         return { min: keys[0], max: keys[keys.length - 1] + 1 };
     }
-            }),
+}), { min: 0, max: 0 });
-    { min: 0, max: 0 }
+export const canUndo: Readable<boolean> = derived([patchIndex, patchMinMaxIndex], ([$patchIndex, $patchMinMaxIndex]) => $patchIndex >= $patchMinMaxIndex.min);
-);
+export const canRedo: Readable<boolean> = derived([patchIndex, patchMinMaxIndex], ([$patchIndex, $patchMinMaxIndex]) => $patchIndex < $patchMinMaxIndex.max - 1);
-export const canUndo: Readable<boolean> = derived(
-    [patchIndex, patchMinMaxIndex],
-    ([$patchIndex, $patchMinMaxIndex]) => $patchIndex >= $patchMinMaxIndex.min
-);
-export const canRedo: Readable<boolean> = derived(
-    [patchIndex, patchMinMaxIndex],
-    ([$patchIndex, $patchMinMaxIndex]) => $patchIndex < $patchMinMaxIndex.max - 1
-);
 
 // Helper function to apply a callback to the global file state
 function applyGlobal(callback: (files: Map<string, GPXFile>) => void) {
@@ -476,12 +378,7 @@ function applyToFiles(fileIds: string[], callback: (file: WritableDraft<GPXFile>
 }
 
 // Helper function to apply different callbacks to multiple files
-function applyEachToFilesAndGlobal(
+function applyEachToFilesAndGlobal(fileIds: string[], callbacks: ((file: WritableDraft<GPXFile>, context?: any) => void)[], globalCallback: (files: Map<string, GPXFile>, context?: any) => void, context?: any) {
-    fileIds: string[],
-    callbacks: ((file: WritableDraft<GPXFile>, context?: any) => void)[],
-    globalCallback: (files: Map<string, GPXFile>, context?: any) => void,
-    context?: any
-) {
     const [newFileState, patch, inversePatch] = produceWithPatches(fileState, (draft) => {
         fileIds.forEach((fileId, index) => {
             let file = draft.get(fileId);
@@ -504,22 +401,16 @@ async function storePatches(patch: Patch[], inversePatch: Patch[]) {
         db.patches.where(':id').above(get(patchIndex)).delete(); // Delete all patches after the current patch to avoid redoing them
         let minmax = get(patchMinMaxIndex);
         if (minmax.max - minmax.min + 1 > MAX_PATCHES) {
-            db.patches
+            db.patches.where(':id').belowOrEqual(get(patchMinMaxIndex).max - MAX_PATCHES).delete();
-                .where(':id')
-                .belowOrEqual(get(patchMinMaxIndex).max - MAX_PATCHES)
-                .delete();
         }
     }
     db.transaction('rw', db.patches, db.settings, async () => {
         let index = get(patchIndex) + 1;
-        await db.patches.put(
+        await db.patches.put({
-            {
             patch,
             inversePatch,
-                index,
-            },
             index
-        );
+        }, index);
         await db.settings.put(index, 'patchIndex');
     });
 }
@@ -577,12 +468,7 @@ export const dbUtils = {
     applyToFiles: (ids: string[], callback: (file: WritableDraft<GPXFile>) => void) => {
         applyToFiles(ids, callback);
     },
-    applyEachToFilesAndGlobal: (
+    applyEachToFilesAndGlobal: (ids: string[], callbacks: ((file: WritableDraft<GPXFile>, context?: any) => void)[], globalCallback: (files: Map<string, GPXFile>, context?: any) => void, context?: any) => {
-        ids: string[],
-        callbacks: ((file: WritableDraft<GPXFile>, context?: any) => void)[],
-        globalCallback: (files: Map<string, GPXFile>, context?: any) => void,
-        context?: any
-    ) => {
         applyEachToFilesAndGlobal(ids, callbacks, globalCallback, context);
     },
     duplicateSelection: () => {
@@ -606,33 +492,20 @@ export const dbUtils = {
                         if (level === ListLevel.TRACK) {
                             for (let item of items) {
                                 let trackIndex = (item as ListTrackItem).getTrackIndex();
-                                file.replaceTracks(trackIndex + 1, trackIndex, [
+                                file.replaceTracks(trackIndex + 1, trackIndex, [file.trk[trackIndex].clone()]);
-                                    file.trk[trackIndex].clone(),
-                                ]);
                             }
                         } else if (level === ListLevel.SEGMENT) {
                             for (let item of items) {
                                 let trackIndex = (item as ListTrackSegmentItem).getTrackIndex();
                                 let segmentIndex = (item as ListTrackSegmentItem).getSegmentIndex();
-                                file.replaceTrackSegments(
+                                file.replaceTrackSegments(trackIndex, segmentIndex + 1, segmentIndex, [file.trk[trackIndex].trkseg[segmentIndex].clone()]);
-                                    trackIndex,
-                                    segmentIndex + 1,
-                                    segmentIndex,
-                                    [file.trk[trackIndex].trkseg[segmentIndex].clone()]
-                                );
                             }
                         } else if (level === ListLevel.WAYPOINTS) {
-                            file.replaceWaypoints(
+                            file.replaceWaypoints(file.wpt.length, file.wpt.length - 1, file.wpt.map((wpt) => wpt.clone()));
-                                file.wpt.length,
-                                file.wpt.length - 1,
-                                file.wpt.map((wpt) => wpt.clone())
-                            );
                         } else if (level === ListLevel.WAYPOINT) {
                             for (let item of items) {
                                 let waypointIndex = (item as ListWaypointItem).getWaypointIndex();
-                                file.replaceWaypoints(waypointIndex + 1, waypointIndex, [
+                                file.replaceWaypoints(waypointIndex + 1, waypointIndex, [file.wpt[waypointIndex].clone()]);
-                                    file.wpt[waypointIndex].clone(),
-                                ]);
                             }
                         }
                     }
@@ -641,23 +514,16 @@ export const dbUtils = {
         });
     },
     addNewTrack: (fileId: string) => {
-        dbUtils.applyToFile(fileId, (file) =>
+        dbUtils.applyToFile(fileId, (file) => file.replaceTracks(file.trk.length, file.trk.length, [new Track()]));
-            file.replaceTracks(file.trk.length, file.trk.length, [new Track()])
-        );
     },
     addNewSegment: (fileId: string, trackIndex: number) => {
         dbUtils.applyToFile(fileId, (file) => {
             let track = file.trk[trackIndex];
-            track.replaceTrackSegments(track.trkseg.length, track.trkseg.length, [
+            track.replaceTrackSegments(track.trkseg.length, track.trkseg.length, [new TrackSegment()]);
-                new TrackSegment(),
-            ]);
         });
     },
     reverseSelection: () => {
-        if (
+        if (!get(selection).hasAnyChildren(new ListRootItem(), true, ['waypoints']) || get(gpxStatistics).local.points?.length <= 1) {
-            !get(selection).hasAnyChildren(new ListRootItem(), true, ['waypoints']) ||
-            get(gpxStatistics).local.points?.length <= 1
-        ) {
             return;
         }
         applyGlobal((draft) => {
@@ -708,19 +574,19 @@ export const dbUtils = {
             });
         });
     },
-    mergeSelection: (mergeTraces: boolean, removeGaps: boolean) => {
+    mergeSelection: (mergeTraces: boolean) => {
         applyGlobal((draft) => {
             let first = true;
             let target: ListItem = new ListRootItem();
             let targetFile: GPXFile | undefined = undefined;
             let toMerge: {
-                trk: Track[];
+                trk: Track[],
-                trkseg: TrackSegment[];
+                trkseg: TrackSegment[],
-                wpt: Waypoint[];
+                wpt: Waypoint[]
             } = {
                 trk: [],
                 trkseg: [],
-                wpt: [],
+                wpt: []
             };
             applyToOrderedSelectedItemsFromFile((fileId, level, items) => {
                 let file = draft.get(fileId);
@@ -728,11 +594,7 @@ export const dbUtils = {
                 if (file && originalFile) {
                     if (level === ListLevel.FILE) {
                         toMerge.trk.push(...originalFile.trk.map((track) => track.clone()));
-                        for (const wpt of originalFile.wpt) {
+                        toMerge.wpt.push(...originalFile.wpt.map((wpt) => wpt.clone()));
-                            if (!toMerge.wpt.some((w) => w.equals(wpt))) {
-                                toMerge.wpt.push(wpt.clone());
-                            }
-                        }
                         if (first) {
                             target = items[0];
                             targetFile = file;
@@ -743,15 +605,8 @@ export const dbUtils = {
                         if (level === ListLevel.TRACK) {
                             items.forEach((item, index) => {
                                 let trackIndex = (item as ListTrackItem).getTrackIndex();
-                                toMerge.trkseg.splice(
+                                toMerge.trkseg.splice(0, 0, ...originalFile.trk[trackIndex].trkseg.map((segment) => segment.clone()));
-                                    0,
+                                if (index === items.length - 1) { // Order is reversed, so the last track is the first one and the one to keep
-                                    0,
-                                    ...originalFile.trk[trackIndex].trkseg.map((segment) =>
-                                        segment.clone()
-                                    )
-                                );
-                                if (index === items.length - 1) {
-                                    // Order is reversed, so the last track is the first one and the one to keep
                                     target = item;
                                     file.trk[trackIndex].trkseg = [];
                                 } else {
@@ -762,15 +617,10 @@ export const dbUtils = {
                             items.forEach((item, index) => {
                                 let trackIndex = (item as ListTrackSegmentItem).getTrackIndex();
                                 let segmentIndex = (item as ListTrackSegmentItem).getSegmentIndex();
-                                if (index === items.length - 1) {
+                                if (index === items.length - 1) { // Order is reversed, so the last segment is the first one and the one to keep
-                                    // Order is reversed, so the last segment is the first one and the one to keep
                                     target = item;
                                 }
-                                toMerge.trkseg.splice(
+                                toMerge.trkseg.splice(0, 0, originalFile.trk[trackIndex].trkseg[segmentIndex].clone());
-                                    0,
-                                    0,
-                                    originalFile.trk[trackIndex].trkseg[segmentIndex].clone()
-                                );
                                 file.trk[trackIndex].trkseg.splice(segmentIndex, 1);
                             });
                         }
@@ -782,24 +632,15 @@ export const dbUtils = {
 
             if (mergeTraces) {
                 let statistics = get(gpxStatistics);
-                let speed =
+                let speed = statistics.global.speed.moving > 0 ? statistics.global.speed.moving : undefined;
-                    statistics.global.speed.moving > 0 ? statistics.global.speed.moving : undefined;
                 let startTime: Date | undefined = undefined;
                 if (speed !== undefined) {
-                    if (
+                    if (statistics.local.points.length > 0 && statistics.local.points[0].time !== undefined) {
-                        statistics.local.points.length > 0 &&
-                        statistics.local.points[0].time !== undefined
-                    ) {
                         startTime = statistics.local.points[0].time;
                     } else {
-                        let index = statistics.local.points.findIndex(
+                        let index = statistics.local.points.findIndex((point) => point.time !== undefined);
-                            (point) => point.time !== undefined
-                        );
                         if (index !== -1) {
-                            startTime = new Date(
+                            startTime = new Date(statistics.local.points[index].time.getTime() - 1000 * 3600 * statistics.local.distance.total[index] / speed);
-                                statistics.local.points[index].time.getTime() -
-                                    (1000 * 3600 * statistics.local.distance.total[index]) / speed
-                            );
                         }
                     }
                 }
@@ -808,14 +649,7 @@ export const dbUtils = {
                     let s = new TrackSegment();
                     toMerge.trk.map((track) => {
                         track.trkseg.forEach((segment) => {
-                            s.replaceTrackPoints(
+                            s.replaceTrackPoints(s.trkpt.length, s.trkpt.length, segment.trkpt.slice(), speed, startTime);
-                                s.trkpt.length,
-                                s.trkpt.length,
-                                segment.trkpt.slice(),
-                                speed,
-                                startTime,
-                                removeGaps
-                            );
                         });
                     });
                     toMerge.trk = [toMerge.trk[0]];
@@ -824,14 +658,7 @@ export const dbUtils = {
                 if (toMerge.trkseg.length > 0) {
                     let s = new TrackSegment();
                     toMerge.trkseg.forEach((segment) => {
-                        s.replaceTrackPoints(
+                        s.replaceTrackPoints(s.trkpt.length, s.trkpt.length, segment.trkpt.slice(), speed, startTime);
-                            s.trkpt.length,
-                            s.trkpt.length,
-                            segment.trkpt.slice(),
-                            speed,
-                            startTime,
-                            removeGaps
-                        );
                     });
                     toMerge.trkseg = [s];
                 }
@@ -847,12 +674,7 @@ export const dbUtils = {
                 } else if (target instanceof ListTrackSegmentItem) {
                     let trackIndex = target.getTrackIndex();
                     let segmentIndex = target.getSegmentIndex();
-                    targetFile.replaceTrackSegments(
+                    targetFile.replaceTrackSegments(trackIndex, segmentIndex, segmentIndex - 1, toMerge.trkseg);
-                        trackIndex,
-                        segmentIndex,
-                        segmentIndex - 1,
-                        toMerge.trkseg
-                    );
                 }
             }
         });
@@ -875,15 +697,11 @@ export const dbUtils = {
                         start -= length;
                         end -= length;
                     } else if (level === ListLevel.TRACK) {
-                        let trackIndices = items.map((item) =>
+                        let trackIndices = items.map((item) => (item as ListTrackItem).getTrackIndex());
-                            (item as ListTrackItem).getTrackIndex()
-                        );
                         file.crop(start, end, trackIndices);
                     } else if (level === ListLevel.SEGMENT) {
                         let trackIndices = [(items[0] as ListTrackSegmentItem).getTrackIndex()];
-                        let segmentIndices = items.map((item) =>
+                        let segmentIndices = items.map((item) => (item as ListTrackSegmentItem).getSegmentIndex());
-                            (item as ListTrackSegmentItem).getSegmentIndex()
-                        );
                         file.crop(start, end, trackIndices, segmentIndices);
                     }
                 }
@@ -903,17 +721,14 @@ export const dbUtils = {
                                 return {
                                     wptIndex: wptIndex,
                                     index: [0],
-                                    distance: Number.MAX_VALUE,
+                                    distance: Number.MAX_VALUE
                                 };
-                            });
+                            })
                             file.trk.forEach((track, index) => {
                                 track.getSegments().forEach((segment) => {
                                     segment.trkpt.forEach((point) => {
                                         file.wpt.forEach((wpt, wptIndex) => {
-                                            let dist = distance(
+                                            let dist = distance(point.getCoordinates(), wpt.getCoordinates());
-                                                point.getCoordinates(),
-                                                wpt.getCoordinates()
-                                            );
                                             if (dist < closest[wptIndex].distance) {
                                                 closest[wptIndex].distance = dist;
                                                 closest[wptIndex].index = [index];
@@ -921,7 +736,7 @@ export const dbUtils = {
                                                 closest[wptIndex].index.push(index);
                                             }
                                         });
-                                    });
+                                    })
                                 });
                             });
 
@@ -936,16 +751,9 @@ export const dbUtils = {
                                     return t;
                                 });
                                 newFile.replaceTracks(0, file.trk.length - 1, tracks);
-                                newFile.replaceWaypoints(
+                                newFile.replaceWaypoints(0, file.wpt.length - 1, closest.filter((c) => c.index.includes(index)).map((c) => file.wpt[c.wptIndex]));
-                                    0,
-                                    file.wpt.length - 1,
-                                    closest
-                                        .filter((c) => c.index.includes(index))
-                                        .map((c) => file.wpt[c.wptIndex])
-                                );
                                 newFile._data.id = fileIds[index];
-                                newFile.metadata.name =
+                                newFile.metadata.name = track.name ?? `${file.metadata.name} (${index + 1})`;
-                                    track.name ?? `${file.metadata.name} (${index + 1})`;
                                 draft.set(newFile._data.id, freeze(newFile));
                             });
                         } else if (file.trk.length === 1) {
@@ -955,16 +763,13 @@ export const dbUtils = {
                                 return {
                                     wptIndex: wptIndex,
                                     index: [0],
-                                    distance: Number.MAX_VALUE,
+                                    distance: Number.MAX_VALUE
                                 };
-                            });
+                            })
                             file.trk[0].trkseg.forEach((segment, index) => {
                                 segment.trkpt.forEach((point) => {
                                     file.wpt.forEach((wpt, wptIndex) => {
-                                        let dist = distance(
+                                        let dist = distance(point.getCoordinates(), wpt.getCoordinates());
-                                            point.getCoordinates(),
-                                            wpt.getCoordinates()
-                                        );
                                         if (dist < closest[wptIndex].distance) {
                                             closest[wptIndex].distance = dist;
                                             closest[wptIndex].index = [index];
@@ -977,16 +782,8 @@ export const dbUtils = {
 
                             file.trk[0].trkseg.forEach((segment, index) => {
                                 let newFile = file.clone();
-                                newFile.replaceTrackSegments(0, 0, file.trk[0].trkseg.length - 1, [
+                                newFile.replaceTrackSegments(0, 0, file.trk[0].trkseg.length - 1, [segment]);
-                                    segment,
+                                newFile.replaceWaypoints(0, file.wpt.length - 1, closest.filter((c) => c.index.includes(index)).map((c) => file.wpt[c.wptIndex]));
-                                ]);
-                                newFile.replaceWaypoints(
-                                    0,
-                                    file.wpt.length - 1,
-                                    closest
-                                        .filter((c) => c.index.includes(index))
-                                        .map((c) => file.wpt[c.wptIndex])
-                                );
                                 newFile._data.id = fileIds[index];
                                 newFile.metadata.name = `${file.trk[0].name ?? file.metadata.name} (${index + 1})`;
                                 draft.set(newFile._data.id, freeze(newFile));
@@ -1015,13 +812,7 @@ export const dbUtils = {
             });
         });
     },
-    split(
+    split(fileId: string, trackIndex: number, segmentIndex: number, coordinates: Coordinates, trkptIndex?: number) {
-        fileId: string,
-        trackIndex: number,
-        segmentIndex: number,
-        coordinates: Coordinates,
-        trkptIndex?: number
-    ) {
         let splitType = get(splitAs);
         return applyGlobal((draft) => {
             let file = getFile(fileId);
@@ -1039,10 +830,7 @@ export const dbUtils = {
 
                 let absoluteIndex = minIndex;
                 file.forEachSegment((seg, trkIndex, segIndex) => {
-                    if (
+                    if ((trkIndex < trackIndex && splitType === SplitType.FILES) || (trkIndex === trackIndex && segIndex < segmentIndex)) {
-                        (trkIndex < trackIndex && splitType === SplitType.FILES) ||
-                        (trkIndex === trackIndex && segIndex < segmentIndex)
-                    ) {
                         absoluteIndex += seg.trkpt.length;
                     }
                 });
@@ -1072,21 +860,13 @@ export const dbUtils = {
                         start.crop(0, minIndex);
                         let end = segment.clone();
                         end.crop(minIndex, segment.trkpt.length - 1);
-                        newFile.replaceTrackSegments(trackIndex, segmentIndex, segmentIndex, [
+                        newFile.replaceTrackSegments(trackIndex, segmentIndex, segmentIndex, [start, end]);
-                            start,
-                            end,
-                        ]);
                     }
                 }
             }
         });
     },
-    cleanSelection: (
+    cleanSelection: (bounds: [Coordinates, Coordinates], inside: boolean, deleteTrackPoints: boolean, deleteWaypoints: boolean) => {
-        bounds: [Coordinates, Coordinates],
-        inside: boolean,
-        deleteTrackPoints: boolean,
-        deleteWaypoints: boolean
-    ) => {
         if (get(selection).size === 0) {
             return;
         }
@@ -1097,35 +877,16 @@ export const dbUtils = {
                     if (level === ListLevel.FILE) {
                         file.clean(bounds, inside, deleteTrackPoints, deleteWaypoints);
                     } else if (level === ListLevel.TRACK) {
-                        let trackIndices = items.map((item) =>
+                        let trackIndices = items.map((item) => (item as ListTrackItem).getTrackIndex());
-                            (item as ListTrackItem).getTrackIndex()
+                        file.clean(bounds, inside, deleteTrackPoints, deleteWaypoints, trackIndices);
-                        );
-                        file.clean(
-                            bounds,
-                            inside,
-                            deleteTrackPoints,
-                            deleteWaypoints,
-                            trackIndices
-                        );
                     } else if (level === ListLevel.SEGMENT) {
                         let trackIndices = [(items[0] as ListTrackSegmentItem).getTrackIndex()];
-                        let segmentIndices = items.map((item) =>
+                        let segmentIndices = items.map((item) => (item as ListTrackSegmentItem).getSegmentIndex());
-                            (item as ListTrackSegmentItem).getSegmentIndex()
+                        file.clean(bounds, inside, deleteTrackPoints, deleteWaypoints, trackIndices, segmentIndices);
-                        );
-                        file.clean(
-                            bounds,
-                            inside,
-                            deleteTrackPoints,
-                            deleteWaypoints,
-                            trackIndices,
-                            segmentIndices
-                        );
                     } else if (level === ListLevel.WAYPOINTS) {
                         file.clean(bounds, inside, false, deleteWaypoints);
                     } else if (level === ListLevel.WAYPOINT) {
-                        let waypointIndices = items.map((item) =>
+                        let waypointIndices = items.map((item) => (item as ListWaypointItem).getWaypointIndex());
-                            (item as ListWaypointItem).getWaypointIndex()
-                        );
                         file.clean(bounds, inside, false, deleteWaypoints, [], [], waypointIndices);
                     }
                 }
@@ -1147,15 +908,7 @@ export const dbUtils = {
                             let segmentIndex = item.getSegmentIndex();
                             let points = itemsAndPoints.get(item);
                             if (points) {
-                                file.replaceTrackPoints(
+                                file.replaceTrackPoints(trackIndex, segmentIndex, 0, file.trk[trackIndex].trkseg[segmentIndex].getNumberOfTrackPoints() - 1, points);
-                                    trackIndex,
-                                    segmentIndex,
-                                    0,
-                                    file.trk[trackIndex].trkseg[
-                                        segmentIndex
-                                    ].getNumberOfTrackPoints() - 1,
-                                    points
-                                );
                             }
                         }
                     }
@@ -1182,9 +935,7 @@ export const dbUtils = {
                 });
             } else {
                 let fileIds = new Set<string>();
-                get(selection)
+                get(selection).getSelected().forEach((item) => {
-                    .getSelected()
-                    .forEach((item) => {
                     fileIds.add(item.getFileId());
                 });
                 let wpt = new Waypoint(waypoint);
@@ -1230,22 +981,16 @@ export const dbUtils = {
                     if (level === ListLevel.FILE) {
                         file.setHidden(hidden);
                     } else if (level === ListLevel.TRACK) {
-                        let trackIndices = items.map((item) =>
+                        let trackIndices = items.map((item) => (item as ListTrackItem).getTrackIndex());
-                            (item as ListTrackItem).getTrackIndex()
-                        );
                         file.setHidden(hidden, trackIndices);
                     } else if (level === ListLevel.SEGMENT) {
                         let trackIndices = [(items[0] as ListTrackSegmentItem).getTrackIndex()];
-                        let segmentIndices = items.map((item) =>
+                        let segmentIndices = items.map((item) => (item as ListTrackSegmentItem).getSegmentIndex());
-                            (item as ListTrackSegmentItem).getSegmentIndex()
-                        );
                         file.setHidden(hidden, trackIndices, segmentIndices);
                     } else if (level === ListLevel.WAYPOINTS) {
                         file.setHiddenWaypoints(hidden);
                     } else if (level === ListLevel.WAYPOINT) {
-                        let waypointIndices = items.map((item) =>
+                        let waypointIndices = items.map((item) => (item as ListWaypointItem).getWaypointIndex());
-                            (item as ListWaypointItem).getWaypointIndex()
-                        );
                         file.setHiddenWaypoints(hidden, waypointIndices);
                     }
                 }
@@ -1272,12 +1017,7 @@ export const dbUtils = {
                             for (let item of items) {
                                 let trackIndex = (item as ListTrackSegmentItem).getTrackIndex();
                                 let segmentIndex = (item as ListTrackSegmentItem).getSegmentIndex();
-                                file.replaceTrackSegments(
+                                file.replaceTrackSegments(trackIndex, segmentIndex, segmentIndex, []);
-                                    trackIndex,
-                                    segmentIndex,
-                                    segmentIndex,
-                                    []
-                                );
                             }
                         } else if (level === ListLevel.WAYPOINTS) {
                             file.replaceWaypoints(0, file.wpt.length - 1, []);
@@ -1310,18 +1050,14 @@ export const dbUtils = {
                     });
                 } else if (level === ListLevel.SEGMENT) {
                     let trackIndex = (items[0] as ListTrackSegmentItem).getTrackIndex();
-                    let segmentIndices = items.map((item) =>
+                    let segmentIndices = items.map((item) => (item as ListTrackSegmentItem).getSegmentIndex());
-                        (item as ListTrackSegmentItem).getSegmentIndex()
-                    );
                     segmentIndices.forEach((segmentIndex) => {
                         points.push(...file.trk[trackIndex].trkseg[segmentIndex].getTrackPoints());
                     });
                 } else if (level === ListLevel.WAYPOINTS) {
                     points.push(...file.wpt);
                 } else if (level === ListLevel.WAYPOINT) {
-                    let waypointIndices = items.map((item) =>
+                    let waypointIndices = items.map((item) => (item as ListWaypointItem).getWaypointIndex());
-                        (item as ListWaypointItem).getWaypointIndex()
-                    );
                     points.push(...waypointIndices.map((waypointIndex) => file.wpt[waypointIndex]));
                 }
             }
@@ -1339,22 +1075,16 @@ export const dbUtils = {
                         if (level === ListLevel.FILE) {
                             file.addElevation(elevations);
                         } else if (level === ListLevel.TRACK) {
-                            let trackIndices = items.map((item) =>
+                            let trackIndices = items.map((item) => (item as ListTrackItem).getTrackIndex());
-                                (item as ListTrackItem).getTrackIndex()
-                            );
                             file.addElevation(elevations, trackIndices, undefined, []);
                         } else if (level === ListLevel.SEGMENT) {
                             let trackIndices = [(items[0] as ListTrackSegmentItem).getTrackIndex()];
-                            let segmentIndices = items.map((item) =>
+                            let segmentIndices = items.map((item) => (item as ListTrackSegmentItem).getSegmentIndex());
-                                (item as ListTrackSegmentItem).getSegmentIndex()
-                            );
                             file.addElevation(elevations, trackIndices, segmentIndices, []);
                         } else if (level === ListLevel.WAYPOINTS) {
                             file.addElevation(elevations, [], [], undefined);
                         } else if (level === ListLevel.WAYPOINT) {
-                            let waypointIndices = items.map((item) =>
+                            let waypointIndices = items.map((item) => (item as ListWaypointItem).getWaypointIndex());
-                                (item as ListWaypointItem).getWaypointIndex()
-                            );
                             file.addElevation(elevations, [], [], waypointIndices);
                         }
                     }
@@ -1381,7 +1111,7 @@ export const dbUtils = {
     undo: () => {
         if (get(canUndo)) {
             let index = get(patchIndex);
-            db.patches.get(index).then((patch) => {
+            db.patches.get(index).then(patch => {
                 if (patch) {
                     applyPatch(patch.inversePatch);
                     db.settings.put(index - 1, 'patchIndex');
@@ -1392,12 +1122,12 @@ export const dbUtils = {
     redo: () => {
         if (get(canRedo)) {
             let index = get(patchIndex) + 1;
-            db.patches.get(index).then((patch) => {
+            db.patches.get(index).then(patch => {
                 if (patch) {
                     applyPatch(patch.patch);
                     db.settings.put(index, 'patchIndex');
                 }
             });
         }
-    },
+    }
-};
+}

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

@@ -2,18 +2,9 @@
 title: Files and statistics
 ---
 
-<script lang="ts">
+<script>
-    import { ChartNoAxesColumn } from 'lucide-svelte';
+    import { TriangleRight, BrickWall, Zap, HeartPulse, Orbit, Thermometer, SquareActivity } from 'lucide-svelte';
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
-    import ElevationProfile from '$lib/components/ElevationProfile.svelte';
-    import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleGPXFile } from '$lib/assets/example';
-    import { writable } from 'svelte/store';
-
-    let gpxStatistics = writable(exampleGPXFile.getStatistics());
-    let slicedGPXStatistics = writable(undefined);
-    let additionalDatasets = writable(['speed', 'atemp']);
-    let elevationFill = writable<'slope' | 'surface' | undefined>(undefined);
 </script>
 
 # { title }
@@ -46,11 +37,11 @@ You can also navigate through the files using the arrow keys on your keyboard, a
 
 By right-clicking on a file tab, you can access the same actions as in the [edit menu](./menu/edit).
 
-### Tree layout
+### Vertical layout
 
-As mentioned in the [view options section](./menu/view), you can switch to a tree layout for the files list.
+As mentioned in the [view options section](./menu/view), you can switch between a horizontal and a vertical layout for the file 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.
+The vertical file list is useful when you have many files open, or files with multiple [tracks, segments, or points of interest](./gpx).
-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.
+Indeed, this layout allows you to inspect the content of the files through collapsible sections.
 
 You can also apply [edit actions](./menu/edit) and [tools](./toolbar) to internal file items.
 Furthermore, you can drag and drop the inner items to reorder them, or move them in the hierarchy or even to another file.
@@ -80,31 +71,12 @@ Click on the profile to reset the selection.
 
 You can also use the mouse wheel to zoom in and out on the elevation profile, and move left and right by dragging the profile while holding the <kbd>Shift</kbd> key.
 
-<div class="h-48 w-full">
-    <ElevationProfile
-        {gpxStatistics}
-        {slicedGPXStatistics}
-        additionalDatasets={$additionalDatasets}
-        elevationFill={$elevationFill}
-    />
-</div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
-</div>
-
 ### Additional data
 
-Using the <kbd><ChartNoAxesColumn size="16" class="inline-block" style="margin-bottom: 2px"/></kbd> button at the bottom-right of the elevation profile, you can optionally color the elevation profile by:
+Using the buttons on the right of the elevation profile, you can optionally color the elevation profile by:
 
-- **slope** information computed from the elevation data, or
+- **slope** <TriangleRight size="16" class="inline-block" style="margin-bottom: 2px" /> 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.
+- **surface** <BrickWall size="16" class="inline-block" style="margin-bottom: 2px" /> 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> tags.
   This is only available for files created with **gpx.studio**.
 
-If your selection includes it, you can also visualize: **speed**, **heart rate**, **cadence**, **temperature** and **power** data on the elevation profile.
+If your selection includes it, you can also visualize: **speed** <Zap size="16" class="inline-block" style="margin-bottom: 2px" />, **heart rate** <HeartPulse size="16" class="inline-block" style="margin-bottom: 2px" />, **cadence** <Orbit size="16" class="inline-block" style="margin-bottom: 2px" />, **temperature** <Thermometer size="16" class="inline-block" style="margin-bottom: 2px" />, and **power** <SquareActivity size="16" class="inline-block" style="margin-bottom: 2px" /> data on the elevation profile.

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

@@ -25,7 +25,7 @@ This is where you can access common actions such as opening, closing, and export
 
 At the bottom of the interface, you will find the list of files currently open in the application.
 You can click on a file to select it and display its statistics below the list.
-In the [dedicated section](./files-and-stats), we will explain how to select multiple files and switch to a tree layout for advanced file management.
+In the [dedicated section](./files-and-stats), we will explain how to select multiple files and switch to a vertical layout for advanced file management.
 
 ## Toolbar
 

website/src/lib/docs/be/gpx.mdx

@@ -1,5 +1,5 @@
 ---
-title: Фармат файла GPX
+title: GPX file format
 ---
 
 <script>
@@ -8,27 +8,27 @@ title: Фармат файла GPX
 
 # { title }
 
-<a href="https://www.topografix.com/gpx.asp" target="_blank">Фармат файла GPX</a> - гэта адкрыты стандарт для абмену дадзенымі GPS паміж праграмамі і прыладамі GPS.
+The <a href="https://www.topografix.com/gpx.asp" target="_blank">GPX file format</a> is an open standard for exchanging GPS data between applications and GPS devices.
-Па сутнасці, ён складаецца з серыі кропак GPS, якія кадзіруюць адну або некалькі слядоў GPS, і, па жаданні, некаторыя кропкі цікавасці.
+It essentially consists of a series of GPS points encoding one or multiple GPS traces, and, optionally, some points of interest.
 
-Файлы GPX могуць таксама ўтрымліваць метададзеныя, з якіх палі **імя** і **апісанне** найбольш карысныя для карыстальнікаў.
+GPX files may also contain metadata, of which the **name** and **description** fields are the most useful for users.
 
-### <Waypoints size="16" class="inline-block" style="margin-bottom: 2px" /> Трэкі, сегменты і кропкі GPS
+### <Waypoints size="16" class="inline-block" style="margin-bottom: 2px" /> Tracks, segments, and GPS points
 
-Як згадвалася вышэй, файл GPX можа ўтрымліваць некалькі слядоў GPS.
+As mentioned above, a GPX file can contain multiple GPS traces.
-Яны арганізаваны ў іерархічнай структуры з трэкамі на верхнім узроўні.
+These are organized in a hierarchical structure, with tracks at the top level.
 
-- **Трэк** складаецца з паслядоўнасці раз'яднаных сегментаў.
+- A **track** is made of a sequence of disconnected segments.
-  Акрамя таго, ён можа ўтрымліваць метададзеныя, такія як **імя**, **апісанне** і **знешнія ўласцівасці**.
+  Furthermore, it can contain metadata such as a **name**, a **description**, and **appearance properties**.
-- **Сегмент** - гэта паслядоўнасць GPS кропак, якія ўтвараюць бесперапынны шлях.
+- A **segment** is a sequence of GPS points that form a continuous path.
-- **Кропка GPS** - гэта месцазнаходжанне з шыратой, даўгатой і, магчыма, пазнакай часу і вышыні.
+- A **GPS point** is a location with a latitude, a longitude, and optionally a timestamp and an altitude.
-  Некаторыя прылады таксама захоўваюць дадатковую інфармацыю, такую ​​як пульс, кадэнцыя, тэмпература і магутнасць.
+  Some devices also store additional information such as heart rate, cadence, temperature, and power.
 
-У большасці выпадкаў файлы GPX утрымліваюць адзін трэк з адным сегментам.
+In most cases, GPX files contain a single track with a single segment.
-Аднак іерархія, апісаная вышэй, дазваляе выкарыстоўваць больш складаныя выпадкі, напрыклад, планаваць шматдзённыя паездкі з некалькімі варыянтамі на кожны дзень.
+However, the hierarchy described above allows for more advanced use cases, such as planning multi-day trips with several variants for each day.
 
-### <MapPin size="16" class="inline-block" style="margin-bottom: 2px" /> Кропкі цікавасці
+### <MapPin size="16" class="inline-block" style="margin-bottom: 2px" /> Points of interest
 
-**Кропкі цікавасці** (тэхнічна званыя _маршрутнымі кропкамі_) уяўляюць цікавыя месцы, якія можна паказаць альбо на прыладзе GPS, альбо на лічбавай карце.
+**Points of interest** (technically called _waypoints_) represent locations of interest to show either on a GPS device or on a digital map.
 
-У дадатак да каардынатаў кропка цікавасці можа мець **імя** і **апісанне**.
+In addition to its coordinates, a point of interest can have a **name** and a **description**.

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

@@ -1,5 +1,5 @@
 ---
-title: Інтэграцыя
+title: Integration
 ---
 
 <script>
@@ -9,18 +9,18 @@ title: Інтэграцыя
 
 # { title }
 
-Вы можаце выкарыстоўваць **gpx.studio** для стварэння карт, якія паказваюць вашыя файлы GPX, і ўбудаваць іх у свой сайт.
+You can use **gpx.studio** to create maps showing your GPX files and embed them in your website.
 
-Усё, што вам трэба, гэта:
+All you need is:
 
-1. <a href="https://account.mapbox.com/auth/signup" target="_blank">Ключ доступу Mapbox</a> для загрузкі карты і
+1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. Файлы GPX, размешчаныя на вашым серверы або на Google Drive, або даступныя праз публічны URL.
+2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
 
-Затым вы можаце пагуляць з канфігуратарам ніжэй, каб наладзіць сваю карту і стварыць адпаведны HTML-код.
+You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
 <DocsNote type="warning">
 
-Вам трэба будзе наладзіць загалоўкі <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS" target="_blank">Cross-Origin Resource Sharing (CORS)</a> на вашым серверы, каб дазволіць <b>gpx.studio</b> загружаць вашы файлы GPX.
+You will need to set up <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS" target="_blank">Cross-Origin Resource Sharing (CORS)</a> headers on your server to allow <b>gpx.studio</b> to load your GPX files.
 
 </DocsNote>
 

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

@@ -10,61 +10,61 @@ 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.
 
-### <Diff size="16" class="inline-block" style="margin-bottom: 2px" /> Навігацыя па карце
+### <Diff size="16" class="inline-block" style="margin-bottom: 2px" /> Map navigation
 
-Элементы кіравання ўверсе дазваляюць павялічваць <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> і памяншаць <Minus size="16" class="inline-block" style="margin-bottom: 2px" />, а таксама змяняць арыентацыю і нахіл карты <Compass size="16" class="inline-block" style="margin-bottom: 2px" />.
+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" />.
 
 <DocsNote>
 
-Каб кіраваць арыентацыяй і нахілам карты, вы таксама можаце перацягнуць карту, утрымліваючы <kbd>Ctrl</kbd>.
+To control the orientation and tilt of the map, you can also drag the map while holding <kbd>Ctrl</kbd>.
 
 </DocsNote>
 
-### <Search size="16" class="inline-block" style="margin-bottom: 2px" /> Пошукавы радок
+### <Search size="16" class="inline-block" style="margin-bottom: 2px" /> Search bar
 
-Вы можаце выкарыстоўваць пошукавы радок, каб знайсці адрас і перайсці да яго на карце.
+You can use the search bar to look for an address and navigate to it on the map.
 
-### <LocateFixed size="16" class="inline-block" style="margin-bottom: 2px" /> Кнопка месцазнаходжання
+### <LocateFixed size="16" class="inline-block" style="margin-bottom: 2px" /> Locate button
 
-Кнопка цэнтруе карту на вашым бягучым месцазнаходжанні.
+The locate button centers the map on your current location.
 
 <DocsNote>
 
-Гэта працуе, толькі калі вы дазволілі вашаму браўзеру і <b>gpx.studio</b> доступ да вашага месцазнаходжання.
+This only works if you have allowed your browser and <b>gpx.studio</b> to access your location.
 
 </DocsNote>
 
-### <PersonStanding size="16" class="inline-block" style="margin-bottom: 2px" /> Прагляд вуліц
+### <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.
-У залежнасці ад крыніцы прагляду вуліц, абранай у [наладах](./menu/settings), да прагляду вуліц можна атрымаць доступ па-рознаму.
+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>: прагляд вуліц будзе адлюстроўвацца на карце ў выглядзе зялёных ліній. Пры дастатковым павелічэнні зялёныя кропкі будуць паказваць дакладныя месцы, дзе даступныя здымкі вуліц. Пры навядзенні курсора на зялёную кропку будзе паказаны здымак вуліцы ў гэтым месцы.
+- <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.
-- <a href="https://www.google.com/streetview/" target="_blank">Google Street View</a>: націсніце на карту, каб адкрыць новую ўкладку са здымкамі вуліц у гэтым месцы.
+- <a href="https://www.google.com/streetview/" target="_blank">Google Street View</a>: click on the map to open a new tab with the street view imagery at that location.
 
-### <Layers size="16" class="inline-block" style="margin-bottom: 2px" /> Слаі карты
+### <Layers size="16" class="inline-block" style="margin-bottom: 2px" /> Map layers
 
-Кнопка слаёў карты дазваляе вам пераключацца паміж рознымі базавымі картамі, а таксама пераключаць слаі карты і катэгорыі кропак цікавасці.
+The map layers button allows you to switch between different basemaps, and toggle map overlays and categories of points of interest.
 
-- **Базавыя карты** - гэта фонавыя карты, якія прадстаўляюць асноўныя геаграфічныя аб'екты свету.
+- **Basemaps** are background maps that present the main geographic features of the world.
-  У залежнасці ад прызначэння базавыя карты маюць розныя стылі і ўзроўні дэталізацыі.
+  Depending on their purpose, basemaps have different styles and levels of detail.
-  Адначасова можа быць адлюстравана толькі адна базавая карта.
+  Only one basemap can be displayed at a time.
-- **Накладкі** - гэта дадатковыя слаі, якія могуць адлюстроўвацца паверх базавай карты для атрымання дадатковай інфармацыі.
+- **Overlays** are additional layers that can be displayed on top of the basemap to provide complementary information.
-- **Кропкі цікавасці** можна дадаць на карту, каб паказаць розныя катэгорыі месцаў, такіх як крамы, рэстараны або жыллё.
+- **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
     <DocsLayers />
     <span class="text-sm text-center mt-2">
-        Навядзіце курсор мышы на карту, каб паказаць накладанне <a href="https://hiking.waymarkedtrails.org" target="_blank">Пешаходных Сцежак</a> на базавай карце <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a>.
+        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>
 
-Вялікая калекцыя глабальных і лакальных базавых карт і накладанняў даступная ў **gpx.studio**, а таксама выбар катэгорый кропак цікавасці.
+A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
-Іх можна ўключыць у [дыялогавым акне налад слаёў карты](./menu/settings).
+They can be enabled in the [map layer settings dialog](./menu/settings).
 
-У гэтых наладах вы таксама можаце кіраваць непразрыстасцю накладанняў.
+In these settings, you can also manage the opacity of the overlays.
 
-Для прасунутых карыстальнікаў можна дадаваць карыстальніцкія базавыя карты і накладкі, дадаўшы URL-адрасы <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> або <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">JSON у стылі Mapbox</a>.
+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/be/menu/edit.mdx

@@ -10,7 +10,7 @@ title: Edit actions
 # { title }
 
 Unlike the file actions, the edit actions can potentially modify the content of the currently selected files.
-Moreover, when the tree layout of the files list is enabled (see [Files and statistics](../files-and-stats)), they can also be applied to [tracks, segments, and points of interest](../gpx).
+Moreover, when the vertical layout of the files list is enabled (see [Files and statistics](../files-and-stats)), they can also be applied to [tracks, segments, and points of interest](../gpx).
 Therefore, we will refer to the elements that can be modified by these actions as _file items_.
 Note that except for the undo and redo actions, the edit actions are also accessible through the context menu (right-click) of the file items.
 
@@ -37,7 +37,7 @@ Create a new track in the selected file.
 
 <DocsNote>
 
-This action is only available when the tree layout of the files list is enabled.
+This action is only available when the vertical layout of the files list is enabled.
 Additionally, the selection must be a single file.
 
 </DocsNote>
@@ -48,7 +48,7 @@ Create a new segment in the selected track.
 
 <DocsNote>
 
-This action is only available when the tree layout of the files list is enabled.
+This action is only available when the vertical layout of the files list is enabled.
 Additionally, the selection must be a single track.
 
 </DocsNote>
@@ -67,7 +67,7 @@ Copy the selected file items to the clipboard.
 
 <DocsNote>
 
-This action is only available when the tree layout of the files list is enabled.
+This action is only available when the vertical layout of the files list is enabled.
 
 </DocsNote>
 
@@ -77,7 +77,7 @@ Cut the selected file items to the clipboard.
 
 <DocsNote>
 
-This action is only available when the tree layout of the files list is enabled.
+This action is only available when the vertical layout of the files list is enabled.
 
 </DocsNote>
 
@@ -87,7 +87,7 @@ Paste the file items from the clipboard to the current hierarchy level if they a
 
 <DocsNote>
 
-This action is only available when the tree layout of the files list is enabled.
+This action is only available when the vertical layout of the files list is enabled.
 
 </DocsNote>