adds settings collection

web/src/routes/map/+page.svelte

@@ -8,7 +8,12 @@
     import EmptyStateSearch from "$lib/components/empty_states/empty_state_search.svelte";
     import TrailCard from "$lib/components/trail/trail_card.svelte";
     import TrailFilterPanel from "$lib/components/trail/trail_filter_panel.svelte";
-    import type { Trail, TrailFilter } from "$lib/models/trail";
+    import type { Settings } from "$lib/models/settings";
+    import type {
+        Trail,
+        TrailBoundingBox,
+        TrailFilter,
+    } from "$lib/models/trail";
     import { categories } from "$lib/stores/category_store";
     import {
         trails,
@@ -48,6 +53,8 @@
     let showMap: boolean = true;
 
     const filter: TrailFilter = $page.data.filter;
+    const maxBoundingBox: TrailBoundingBox = $page.data.boundingBox;
+    const settings: Settings = $page.data.settings;
 
     onMount(async () => {
         L = (await import("leaflet")).default;
@@ -90,11 +97,18 @@
             ];
 
             map.fitBounds(boundingBox);
-        } else if ($currentUser && $currentUser.location) {
-            map.setView(
-                [$currentUser.location.lat, $currentUser.location.lon],
-                12,
-            );
+        } else if (settings && settings.mapFocus == "trails") {
+            const boundingBox: LatLngBoundsExpression = [
+                [maxBoundingBox.max_lat, maxBoundingBox.min_lon],
+                [maxBoundingBox.min_lat, maxBoundingBox.max_lon],
+            ];
+            map.fitBounds(boundingBox);
+        } else if (
+            settings &&
+            settings.mapFocus == "location" &&
+            settings.location
+        ) {
+            map.setView([settings.location.lat, settings.location.lon], 12);
         } else {
             navigator.geolocation.getCurrentPosition(
                 (position) => {

web/src/routes/map/+page.ts

@@ -1,9 +1,10 @@
 import type { TrailFilter } from "$lib/models/trail";
 import { categories_index } from "$lib/stores/category_store";
-import { trails, trails_get_filter_values } from "$lib/stores/trail_store";
+import { trails, trails_get_bounding_box, trails_get_filter_values } from "$lib/stores/trail_store";
 import type { ServerLoad } from "@sveltejs/kit";
 
 export const load: ServerLoad = async ({ params, locals, fetch }) => {
+    const boundingBox = await trails_get_bounding_box(fetch);
     const filterValues = await trails_get_filter_values(fetch);
 
     const filter: TrailFilter = {
@@ -27,5 +28,5 @@ export const load: ServerLoad = async ({ params, locals, fetch }) => {
 
     trails.set([])
 
-    return { filter: filter }
+    return { filter: filter, boundingBox: boundingBox }
 };

web/src/routes/map/trail/[id]/print/+page.svelte

@@ -4,13 +4,12 @@
     import "$lib/assets/fonts/IBMPlexSans-SemiBold-bold";
     import "$lib/assets/fonts/fa-solid-900-normal";
     import Button from "$lib/components/base/button.svelte";
-    import Select, {
-        type SelectItem,
-    } from "$lib/components/base/select.svelte";
+    import Select from "$lib/components/base/select.svelte";
     import LogoText from "$lib/components/logo/logo_text.svelte";
     import MapWithElevation from "$lib/components/trail/map_with_elevation.svelte";
+    import type { Settings } from "$lib/models/settings";
+    import { show_toast } from "$lib/stores/toast_store";
     import { trail } from "$lib/stores/trail_store";
-    import { currentUser } from "$lib/stores/user_store";
     import {
         formatDistance,
         formatElevation,
@@ -22,21 +21,22 @@
     } from "$lib/util/leaflet_util";
     import { createRect, createText } from "$lib/util/svg_util";
     import "$lib/vendor/leaflet-elevation/src/index.css";
+    import type AutoGraticule from "$lib/vendor/leaflet-graticule/leaflet-auto-graticule";
     import leafletImage from "$lib/vendor/leaflet-image/leaflet-image.js";
+    import { Canvg } from "canvg";
     import { jsPDF } from "jspdf";
     import type { Map } from "leaflet";
     import "leaflet.awesome-markers/dist/leaflet.awesome-markers.css";
     import "leaflet/dist/leaflet.css";
-    import QrCodeWithLogo from "qrcode-with-logos";
+    import QrCodeWithLogo from "$lib/vendor/qr-code-with-logos/index";
     import { onMount, tick } from "svelte";
     import { _ } from "svelte-i18n";
-    import { Canvg } from "canvg";
-    import type AutoGraticule from "$lib/vendor/leaflet-graticule/leaflet-auto-graticule";
-    import { show_toast } from "$lib/stores/toast_store";
 
     let map: Map;
     let graticule: AutoGraticule;
 
+    const settings: Settings = $page.data.settings;
+
     const paperSizes: { text: string; value: keyof typeof paperDimensions }[] =
         [
             { text: "A4", value: "a4" },
@@ -375,7 +375,7 @@
 
         let oneUnitInPixels = calculatePixelPerMeter(
             map,
-            $currentUser && $currentUser.unit == "imperial" ? 1609.34 : 1000,
+            settings && settings.unit == "imperial" ? 1609.34 : 1000,
         );
         let unitsInRuler = width / oneUnitInPixels;
 
@@ -430,7 +430,7 @@
 
         svg.appendChild(
             createText(
-                $currentUser && $currentUser.unit == "imperial" ? "MI" : "KM",
+                settings && settings.unit == "imperial" ? "MI" : "KM",
                 segmentCount * multiplier * oneUnitInPixels - 20,
                 height / 2 - 7,
             ),
@@ -535,7 +535,9 @@
                         >
                             <span
                                 ><i class="fa fa-left-right mr-2"
-                                ></i>{formatDistance($trail.distance)}</span
+                                ></i>{formatDistance(
+                                    $trail.distance,
+                                )}</span
                             >
                             <span
                                 ><i class="fa fa-up-down mr-2"