Merge branch 'dev'

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

@@ -45,6 +45,26 @@
     settings.initialize();
 
     function applyOptions() {
+        let downloads: Promise<GPXFile | null>[] = getFilesFromEmbeddingOptions(options).map(
+            (url) => {
+                return fetch(url)
+                    .then((response) => response.blob())
+                    .then((blob) => new File([blob], url.split('/').pop() ?? url))
+                    .then(loadFile);
+            }
+        );
+        Promise.all(downloads).then((answers) => {
+            const files = answers.filter((file) => file !== null) as GPXFile[];
+            let ids: string[] = [];
+            files.forEach((file, index) => {
+                let id = `gpx-${index}-embed`;
+                file._data.id = id;
+                ids.push(id);
+            });
+            fileStateCollection.setEmbeddedFiles(files);
+            $fileOrder = ids;
+            selection.selectAll();
+        });
         if (allowedEmbeddingBasemaps.includes(options.basemap)) {
             $currentBasemap = options.basemap;
         }
@@ -70,27 +90,6 @@
             ].filter((dataset) => dataset !== null)
         );
         elevationFill.set(options.elevation.fill == 'none' ? undefined : options.elevation.fill);
-
-        let downloads: Promise<GPXFile | null>[] = getFilesFromEmbeddingOptions(options).map(
-            (url) => {
-                return fetch(url)
-                    .then((response) => response.blob())
-                    .then((blob) => new File([blob], url.split('/').pop() ?? url))
-                    .then(loadFile);
-            }
-        );
-        Promise.all(downloads).then((answers) => {
-            const files = answers.filter((file) => file !== null) as GPXFile[];
-            let ids: string[] = [];
-            files.forEach((file, index) => {
-                let id = `gpx-${index}-embed`;
-                file._data.id = id;
-                ids.push(id);
-            });
-            fileStateCollection.setEmbeddedFiles(files);
-            $fileOrder = ids;
-            selection.selectAll();
-        });
     }
 
     $effect(() => {

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

@@ -88,14 +88,6 @@
                         <span class="font-mono">{key}</span>
                         {#if key === 'website' || key.startsWith('website:') || key.endsWith(':website') || key === 'contact:facebook' || key === 'contact:instagram' || key === 'contact:twitter'}
                             <a href={value} target="_blank" class="text-link underline">{value}</a>
-                        {:else if key === 'wikipedia' || key.startsWith('wikipedia:') || key.endsWith(':wikipedia')}
-                            <a
-                                href="https://wikipedia.org/wiki/{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>
                         {:else if key === 'email' || key === 'contact:email'}

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

@@ -24,7 +24,7 @@ liveQuery(() => db.overpassdata.toArray()).subscribe((pois) => {
 });
 
 export class OverpassLayer {
-    overpassUrl = 'https://overpass.gpx.studio/api/interpreter';
+    overpassUrl = 'https://overpass.private.coffee/api/interpreter';
     minZoom = 12;
     queryZoom = 12;
     expirationTime = 7 * 24 * 3600 * 1000;

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

@@ -59,7 +59,7 @@ Met de kaartlagen knop kun je wisselen tussen verschillende basiskaarten, en kaa
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Beweeg over de kaart om de <a href="https://hiking.waymarkedtrails.org" target="_blank">Gemarkeerde sporen wandelen</a> overlay te tonen bovenop de topografische basiskaart.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>

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

@@ -18,7 +18,7 @@ Met dit gereedschap kun je hoogtegegevens toevoegen aan sporen en [interessante
 
 <DocsNote>
 
-Hoogtegegevens worden verstrekt door <a href="https://maptiler.com" target="_blank">Mapterhorn</a>.
-Je kunt meer leren over de oorsprong en nauwkeurigheid in de <a href="https://mapterhorn.com/attribution/" target="_blank">documentatie</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>

website/src/lib/logic/bounds.ts

@@ -75,7 +75,7 @@ export class BoundsManager {
         this._unsubscribes.push(
             map.subscribe((map_) => {
                 if (!map_) return;
-                map_.fitBounds(this._bounds, { padding: 80, linear: true, animate: false });
+                map_.fitBounds(this._bounds, { padding: 80, linear: true, easing: () => 1 });
                 this.reset();
             })
         );

website/src/locales/nl.json

@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Hoogtegegevens opvragen",
-            "help": "Het opvragen van hoogtegegevens verwijdert de bestaande hoogtegegevens, indien aanwezig, en vervangt deze door gegevens van Mapterhorn.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Selecteer een bestand om hoogte gegevens op te vragen."
         },
         "waypoint": {
@@ -305,7 +305,7 @@
             "united_kingdom": "Verenigd Koninkrijk",
             "united_states": "Verenigde Staten",
             "libertyTopo": "Liberty Topo",
-            "libertySatellite": "Liberty Satelliet",
+            "libertySatellite": "Liberty Satellite",
             "osm": "OpenMapTiles OSM",
             "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",