From 8df4e50304d2864d3ac9c0d8e95d69d9919ad444 Mon Sep 17 00:00:00 2001 From: vcoppe Date: Tue, 30 Apr 2024 22:38:58 +0200 Subject: [PATCH] remove duplicate logic --- .../lib/components/toolbar/tools/routing/Routing.svelte | 4 ---- website/src/lib/filestore.ts | 9 --------- website/src/lib/stores.ts | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/website/src/lib/components/toolbar/tools/routing/Routing.svelte b/website/src/lib/components/toolbar/tools/routing/Routing.svelte index a59820c1..4824ceb0 100644 --- a/website/src/lib/components/toolbar/tools/routing/Routing.svelte +++ b/website/src/lib/components/toolbar/tools/routing/Routing.svelte @@ -26,7 +26,6 @@ // remove controls for deleted files routingControls.forEach((controls, fileId) => { if (!get(filestore).find((file) => file._data.id === fileId)) { - console.log('remove controls for deleted file', fileId); controls.remove(); routingControls.delete(fileId); @@ -38,7 +37,6 @@ } $: if ($map && $selectedFiles) { - console.log('selectedFiles', $selectedFiles); // update selected file if ($selectedFiles.size == 0 || $selectedFiles.size > 1 || !active) { if (selectedId) { @@ -54,14 +52,12 @@ selectedId = newSelectedId; } } - console.log('selectedId', selectedId); } $: if ($map && selectedId) { if (!routingControls.has(selectedId)) { let selectedFileStore = filestore.getFileStore(selectedId); if (selectedFileStore) { - console.log('add controls for selected file', selectedId); routingControls.set( selectedId, new RoutingControls(get(map), selectedFileStore, popup, popupElement) diff --git a/website/src/lib/filestore.ts b/website/src/lib/filestore.ts index fa694244..ac48d1f1 100644 --- a/website/src/lib/filestore.ts +++ b/website/src/lib/filestore.ts @@ -88,7 +88,6 @@ export function createGPXFileStore(): GPXFileStore { } } if (global) { - console.log("Global patch", patch); notify(); } updateUndoRedo(); @@ -181,19 +180,11 @@ export function createGPXFileStore(): GPXFileStore { draft.delete(fileId); }); }); - selectedFiles.update($selected => { - $selected.clear(); - return $selected; - }); }, deleteAllFiles: () => { applyToGlobalStore((draft) => { draft.clear(); }); - selectedFiles.update($selected => { - $selected.clear(); - return $selected; - }); }, getFileStore: (id: string) => { return filestores.get(id); diff --git a/website/src/lib/stores.ts b/website/src/lib/stores.ts index 68411d1e..490b89c3 100644 --- a/website/src/lib/stores.ts +++ b/website/src/lib/stores.ts @@ -14,7 +14,7 @@ export const fileOrder = writable([]); export const selectedFiles = writable>(new Set()); export const selectFiles = writable<{ [key: string]: (fileId?: string) => void }>({}); -filestore.subscribe((files) => { // Update selectedFiles if a file is deleted +filestore.subscribe((files) => { // Update selectedFiles automatically when files are deleted (either by action or by undo-redo) let deletedFileIds: string[] = []; get(selectedFiles).forEach((fileId) => { if (!files.find((f) => f._data.id === fileId)) {