From c4acab6568b8b2f04d27566c1a18b01bab41b2ce Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Fri, 29 Mar 2024 15:19:31 +0100
Subject: [PATCH] fixes tcx and kml file conversion upload

---
 docker-compose.yml                                       | 4 ++--
 web/src/lib/components/base/button.svelte                | 3 +++
 .../lib/components/summit_log/summit_log_modal.svelte    | 1 -
 web/src/lib/i18n/locales/de.json                         | 1 +
 web/src/lib/i18n/locales/en.json                         | 1 +
 web/src/lib/i18n/locales/fr.json                         | 1 +
 web/src/lib/i18n/locales/nl.json                         | 1 +
 web/src/lib/i18n/locales/pl.json                         | 1 +
 web/src/lib/i18n/locales/pt.json                         | 1 +
 web/src/lib/stores/trail_store.ts                        | 9 +--------
 web/src/routes/trail/edit/[id]/+page.svelte              | 7 +++++--
 11 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7bcad73e..215c8ab4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,8 +54,8 @@ services:
       PUBLIC_POCKETBASE_URL: http://db:8090
       PUBLIC_DISABLE_SIGNUP: false
       UPLOAD_FOLDER: /app/uploads
-      UPLOAD_USER:
-      UPLOAD_PASSWORD:
+      UPLOAD_USER: Flomp
+      UPLOAD_PASSWORD: 12345678
     volumes:
       - ./data/uploads:/app/uploads
     ports:
diff --git a/web/src/lib/components/base/button.svelte b/web/src/lib/components/base/button.svelte
index 120f5373..c0455723 100644
--- a/web/src/lib/components/base/button.svelte
+++ b/web/src/lib/components/base/button.svelte
@@ -8,6 +8,7 @@
     export let large: boolean = false;
     export let loading: boolean = false;
     export let disabled: boolean = false;
+    export let tooltip: string = "";
 </script>
 
 <button
@@ -17,6 +18,8 @@
     class:btn-large={large}
     class:btn-disabled={disabled || loading}
     disabled={disabled || loading}
+    class:tooltip={tooltip.length > 0}
+    data-title={tooltip}
     on:click
     {type}
 >
diff --git a/web/src/lib/components/summit_log/summit_log_modal.svelte b/web/src/lib/components/summit_log/summit_log_modal.svelte
index ea51e84a..b24a26a2 100644
--- a/web/src/lib/components/summit_log/summit_log_modal.svelte
+++ b/web/src/lib/components/summit_log/summit_log_modal.svelte
@@ -30,7 +30,6 @@
         },
     });
     $: form.set(util.cloneDeep($summitLog));
-    $: console.log($summitLog);
 </script>
 
 <Modal
diff --git a/web/src/lib/i18n/locales/de.json b/web/src/lib/i18n/locales/de.json
index 5e08036f..0aa31d83 100644
--- a/web/src/lib/i18n/locales/de.json
+++ b/web/src/lib/i18n/locales/de.json
@@ -103,6 +103,7 @@
   "required": "Pflichtfeld",
   "save": "Speichern",
   "save-trail": "Route speichern",
+  "save-your-trail-first": "Route zuerst speichern",
   "search-cities": "Städte suchen",
   "search-for-trails-places": "Suche nach Routen, Orten",
   "search-trails": "Route suchen",
diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json
index 64c6e61f..0ae2d5f7 100644
--- a/web/src/lib/i18n/locales/en.json
+++ b/web/src/lib/i18n/locales/en.json
@@ -103,6 +103,7 @@
   "required": "Required",
   "save": "Save",
   "save-trail": "Save Trail",
+  "save-your-trail-first": "Save your trail first",
   "search-cities": "Search cities",
   "search-for-trails-places": "Search for trails, places",
   "search-trails": "Search trails",
diff --git a/web/src/lib/i18n/locales/fr.json b/web/src/lib/i18n/locales/fr.json
index f8d5c14d..dd7d318d 100644
--- a/web/src/lib/i18n/locales/fr.json
+++ b/web/src/lib/i18n/locales/fr.json
@@ -103,6 +103,7 @@
   "required": "Requis",
   "save": "Sauvegarder",
   "save-trail": "Sauvegarder l'itinéraire",
+  "save-your-trail-first": "Enregistrez d'abord votre trace",
   "search-cities": "Recherche une ville",
   "search-for-trails-places": "Chercher un itinéraire ou un endroit",
   "search-trails": "Chercher un itinéraire",
diff --git a/web/src/lib/i18n/locales/nl.json b/web/src/lib/i18n/locales/nl.json
index b1ce1035..c2f0d994 100644
--- a/web/src/lib/i18n/locales/nl.json
+++ b/web/src/lib/i18n/locales/nl.json
@@ -103,6 +103,7 @@
   "required": "Verplicht",
   "save": "Opslaan",
   "save-trail": "Route opslaan",
+  "save-your-trail-first": "Sla eerst uw route op",
   "search-cities": "Zoek steden",
   "search-for-trails-places": "Zoek routes, plaatsen",
   "search-trails": "Zoek routes",
diff --git a/web/src/lib/i18n/locales/pl.json b/web/src/lib/i18n/locales/pl.json
index df522fc0..6129bde3 100644
--- a/web/src/lib/i18n/locales/pl.json
+++ b/web/src/lib/i18n/locales/pl.json
@@ -103,6 +103,7 @@
   "required": "Wymagane",
   "save": "Zapisz",
   "save-trail": "Zapisz ścieżkę",
+  "save-your-trail-first": "Najpierw zapisz swój ślad",
   "search-cities": "Szukaj miasta",
   "search-for-trails-places": "Szukaj ścieżek lub miejsc",
   "search-trails": "Szukaj ścieżek",
diff --git a/web/src/lib/i18n/locales/pt.json b/web/src/lib/i18n/locales/pt.json
index 01606996..0df1dbc0 100644
--- a/web/src/lib/i18n/locales/pt.json
+++ b/web/src/lib/i18n/locales/pt.json
@@ -103,6 +103,7 @@
   "required": "Obrigatório",
   "save": "Guardar",
   "save-trail": "Guardar trilho",
+  "save-your-trail-first": "Salve sua trilha primeiro",
   "search-cities": "Procurar cidades",
   "search-for-trails-places": "Procurar trilhos, locais",
   "search-trails": "Procurar trilhos",
diff --git a/web/src/lib/stores/trail_store.ts b/web/src/lib/stores/trail_store.ts
index 9de5df7e..8e2f282c 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -245,7 +245,7 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
     }
 }
 
-export async function trails_update(oldTrail: Trail, newTrail: Trail, photos: File[], gpx: File | null) {
+export async function trails_update(oldTrail: Trail, newTrail: Trail, photos: File[], gpx: File | Blob | null) {
 
     const waypointUpdates = compareObjectArrays<Waypoint>(oldTrail.expand.waypoints ?? [], newTrail.expand.waypoints ?? []);
 
@@ -360,13 +360,6 @@ export async function fetchGPX(trail: Trail, f: (url: RequestInfo | URL, config?
     return gpxData
 }
 
-function setFileURLs(trail: Trail) {
-    for (let i = 0; i < trail.photos.length; i++) {
-        const photo = trail.photos[i];
-        trail.photos[i] = getFileURL(trail, photo)
-    }
-}
-
 function compareObjectArrays<T extends { id?: string }>(oldArray: T[], newArray: T[]) {
     const newObjects = [];
     const updatedObjects = [];
diff --git a/web/src/routes/trail/edit/[id]/+page.svelte b/web/src/routes/trail/edit/[id]/+page.svelte
index 3f7a36a0..ae0f71ac 100644
--- a/web/src/routes/trail/edit/[id]/+page.svelte
+++ b/web/src/routes/trail/edit/[id]/+page.svelte
@@ -64,7 +64,7 @@
 
     let photoFiles: File[] = [];
 
-    let gpxFile: File | null = null;
+    let gpxFile: File | Blob | null = null;
 
     const trailSchema = object<Trail>({
         id: string().optional(),
@@ -282,7 +282,6 @@
             return;
         }
 
-        gpxFile = selectedFile;
         $form.expand.waypoints = [];
         $form.waypoints = [];
 
@@ -295,10 +294,13 @@
             const fileContent = e.target?.result as string;
             if (fileContent.includes("http://www.opengis.net/kml")) {
                 gpxData = fromKML(e.target?.result as string);
+                gpxFile = new Blob([gpxData], { type: "application/gpx+xml" });
             } else if (fileContent.includes("TrainingCenterDatabase")) {
                 gpxData = fromTCX(e.target?.result as string);
+                gpxFile = new Blob([gpxData], { type: "application/gpx+xml" });
             } else {
                 gpxData = fileContent;
+                gpxFile = selectedFile;
             }
             try {
                 await addGPXLayer(gpxData);
@@ -644,6 +646,7 @@
             </div>
             <Button
                 secondary={true}
+                tooltip={$_("save-your-trail-first")}
                 disabled={!$form.id}
                 type="button"
                 on:click={openListSelectModal}