From 316012cfe4fb24715aee15859d259a5770b19386 Mon Sep 17 00:00:00 2001
From: vcoppe <vianney.coppe@gmail.com>
Date: Wed, 5 Jun 2024 23:37:55 +0200
Subject: [PATCH] fix bugs

---
 gpx/src/gpx.ts                                |  4 ++--
 .../CollapsibleTreeNode.svelte                | 13 +++++++------
 .../file-list/FileListNodeContent.svelte      | 19 +++++++++++--------
 .../src/lib/components/gpx-layer/GPXLayer.ts  |  2 +-
 .../toolbar/tools/routing/Routing.ts          |  2 +-
 .../toolbar/tools/routing/RoutingControls.ts  |  2 +-
 website/src/lib/stores.ts                     |  4 ++--
 7 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/gpx/src/gpx.ts b/gpx/src/gpx.ts
index d5fc971f..bc083ee5 100644
--- a/gpx/src/gpx.ts
+++ b/gpx/src/gpx.ts
@@ -221,7 +221,7 @@ export class GPXFile extends GPXTreeNode<Track>{
     }
 
     reverse() {
-        return this._reverse();
+        return this._reverse(this.getEndTimestamp(), this.getStartTimestamp());
     }
 
     reverseTrack(trackIndex: number) {
@@ -349,7 +349,7 @@ export class Track extends GPXTreeNode<TrackSegment> {
         return produce(this, (draft) => {
             let og = getOriginal(draft); // Read as much as possible from the original object because it is faster
             let trkseg = og.trkseg.slice();
-            trkseg[segmentIndex] = trkseg[segmentIndex]._reverse();
+            trkseg[segmentIndex] = trkseg[segmentIndex]._reverse(trkseg[segmentIndex].getEndTimestamp(), trkseg[segmentIndex].getStartTimestamp());
             draft.trkseg = freeze(trkseg); // Pre-freeze the array, faster as well
         });
     }
diff --git a/website/src/lib/components/collapsible-tree/CollapsibleTreeNode.svelte b/website/src/lib/components/collapsible-tree/CollapsibleTreeNode.svelte
index 60951e24..7284fd94 100644
--- a/website/src/lib/components/collapsible-tree/CollapsibleTreeNode.svelte
+++ b/website/src/lib/components/collapsible-tree/CollapsibleTreeNode.svelte
@@ -2,7 +2,7 @@
 	import * as Collapsible from '$lib/components/ui/collapsible';
 	import { Button } from '$lib/components/ui/button';
 	import { ChevronDown, ChevronLeft, ChevronRight } from 'lucide-svelte';
-	import { getContext, setContext } from 'svelte';
+	import { getContext, onMount, setContext } from 'svelte';
 	import { get, type Writable } from 'svelte/store';
 
 	export let id: string | number;
@@ -18,15 +18,16 @@
 	let fullId = `${parentId}.${id}`;
 	setContext('collapsible-tree-parent-id', fullId);
 
-	open.update((value) => {
-		if (!value.hasOwnProperty(fullId)) {
-			value[fullId] = defaultState === 'open';
+	onMount(() => {
+		if (!get(open).hasOwnProperty(fullId)) {
+			open.update((value) => {
+				value[fullId] = defaultState === 'open';
+				return value;
+			});
 		}
-		return value;
 	});
 
 	export function openNode() {
-		if (get(open)[fullId]) return;
 		open.update((value) => {
 			value[fullId] = true;
 			return value;
diff --git a/website/src/lib/components/file-list/FileListNodeContent.svelte b/website/src/lib/components/file-list/FileListNodeContent.svelte
index 0e2bdaa9..f731ed63 100644
--- a/website/src/lib/components/file-list/FileListNodeContent.svelte
+++ b/website/src/lib/components/file-list/FileListNodeContent.svelte
@@ -9,13 +9,15 @@
 	};
 
 	let dragging: Writable<ListLevel | null> = writable(null);
+
+	let updating = false;
 </script>
 
 <script lang="ts">
 	import { GPXFile, Track, Waypoint, type AnyGPXTreeElement, type GPXTreeElement } from 'gpx';
 	import { afterUpdate, getContext, onMount } from 'svelte';
 	import Sortable from 'sortablejs/Sortable';
-	import { fileObservers, getFileIds, settings, type GPXFileWithStatistics } from '$lib/db';
+	import { 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';
@@ -46,6 +48,8 @@
 	let orientation = getContext<'vertical' | 'horizontal'>('orientation');
 
 	function updateToSelection() {
+		if (updating) return;
+		updating = true;
 		// Sortable updates selection
 		let changed = getChangedIds();
 		if (changed.length > 0) {
@@ -60,9 +64,12 @@
 				return $selection;
 			});
 		}
+		updating = false;
 	}
 
-	async function updateFromSelection() {
+	function updateFromSelection() {
+		if (updating) return;
+		updating = true;
 		// Selection updates sortable
 		let changed = getChangedIds();
 		for (let id of changed) {
@@ -79,6 +86,7 @@
 				}
 			}
 		}
+		updating = false;
 	}
 
 	$: if ($selection) {
@@ -198,10 +206,8 @@
 		});
 	}
 
-	let firstUpdateAfterMount = false;
 	onMount(() => {
 		createSortable();
-		firstUpdateAfterMount = true;
 	});
 
 	afterUpdate(() => {
@@ -220,10 +226,7 @@
 		});
 
 		syncFileOrder();
-		if (firstUpdateAfterMount) {
-			firstUpdateAfterMount = false;
-			updateFromSelection();
-		}
+		updateFromSelection();
 	});
 
 	function getChangedIds() {
diff --git a/website/src/lib/components/gpx-layer/GPXLayer.ts b/website/src/lib/components/gpx-layer/GPXLayer.ts
index b6e58a52..c7e1996d 100644
--- a/website/src/lib/components/gpx-layer/GPXLayer.ts
+++ b/website/src/lib/components/gpx-layer/GPXLayer.ts
@@ -272,7 +272,7 @@ export class GPXLayer {
         }
 
         let item = undefined;
-        if (get(verticalFileView) && file.children.length > 1) { // Select inner item
+        if (get(verticalFileView) && file.getSegments().length > 1) { // Select inner item
             let trackIndex = e.features[0].properties.trackIndex;
             let segmentIndex = e.features[0].properties.segmentIndex;
             item = file.children[trackIndex].children.length > 1 ? new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex) : new ListTrackItem(this.fileId, trackIndex);
diff --git a/website/src/lib/components/toolbar/tools/routing/Routing.ts b/website/src/lib/components/toolbar/tools/routing/Routing.ts
index d9a2f3cc..1a0584c7 100644
--- a/website/src/lib/components/toolbar/tools/routing/Routing.ts
+++ b/website/src/lib/components/toolbar/tools/routing/Routing.ts
@@ -63,7 +63,7 @@ async function getRoute(points: Coordinates[], brouterProfile: string, privateRo
     const latIdx = messages[0].indexOf("Latitude");
     const tagIdx = messages[0].indexOf("WayTags");
     let messageIdx = 1;
-    let surface = getSurface(messages[messageIdx][tagIdx]);
+    let surface = messageIdx < messages.length ? getSurface(messages[messageIdx][tagIdx]) : "unknown";
 
     for (let i = 0; i < coordinates.length; i++) {
         let coord = coordinates[i];
diff --git a/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts b/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts
index ad780a9a..364f1396 100644
--- a/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts
+++ b/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts
@@ -402,7 +402,7 @@ export class RoutingControls {
         dbUtils.applyToFile(this.fileId, (file) => {
             let segment = original(file).getSegment(lastAnchor.trackIndex, lastAnchor.segmentIndex);
             let newSegment = segment.clone();
-            newSegment = newSegment.reverse(segment.getEndTimestamp(), segment.getEndTimestamp());
+            newSegment = newSegment._reverse(segment.getEndTimestamp(), segment.getEndTimestamp());
             return file.replaceTrackPoints(lastAnchor.trackIndex, lastAnchor.segmentIndex, segment.trkpt.length, segment.trkpt.length, newSegment.trkpt.map((point) => point));
         });
     }
diff --git a/website/src/lib/stores.ts b/website/src/lib/stores.ts
index b3ae4e16..24de93b1 100644
--- a/website/src/lib/stores.ts
+++ b/website/src/lib/stores.ts
@@ -7,7 +7,7 @@ import { _ } from 'svelte-i18n';
 import type { GPXLayer } from '$lib/components/gpx-layer/GPXLayer';
 import { dbUtils, fileObservers } from './db';
 import { applyToOrderedSelectedItemsFromFile, selectFile, selection } from '$lib/components/file-list/Selection';
-import { ListFileItem, ListWaypointItem } from '$lib/components/file-list/FileList';
+import { ListFileItem, ListWaypointItem, ListWaypointsItem } from '$lib/components/file-list/FileList';
 import type { RoutingControls } from '$lib/components/toolbar/tools/routing/RoutingControls';
 
 export const map = writable<mapboxgl.Map | null>(null);
@@ -24,7 +24,7 @@ function updateGPXData() {
             if (stats) {
                 let first = true;
                 items.forEach((item) => {
-                    if (!(item instanceof ListWaypointItem) || first) {
+                    if (!(item instanceof ListWaypointItem || item instanceof ListWaypointsItem) || first) {
                         statistics.mergeWith(stats.getStatisticsFor(item));
                         first = false;
                     }