From 890bcd765a78c3e7a69c046d5fd1ae329fa44170 Mon Sep 17 00:00:00 2001 From: vcoppe Date: Sun, 11 Oct 2026 11:18:36 +0200 Subject: [PATCH] refactoring --- website/src/hooks.server.js | 2 +- .../lib/{ => actions}/default-file-name.test.ts | 2 +- .../src/lib/{ => actions}/default-file-name.ts | 0 .../src/lib/{logic => actions}/file-actions.ts | 6 +++--- .../src/lib/components/AlgoliaDocSearch.svelte | 2 +- website/src/lib/components/Footer.svelte | 2 +- website/src/lib/components/GPXStatistics.svelte | 6 +++--- website/src/lib/components/Help.svelte | 2 +- website/src/lib/components/LanguageSelect.svelte | 4 ++-- website/src/lib/components/Menu.svelte | 16 ++++++++-------- website/src/lib/components/ModeSwitch.svelte | 2 +- website/src/lib/components/Nav.svelte | 2 +- website/src/lib/components/Shortcut.svelte | 2 +- website/src/lib/components/WithUnits.svelte | 6 +++--- website/src/lib/components/docs/guides.test.ts | 2 +- .../elevation-profile/ElevationProfile.svelte | 8 ++++---- .../elevation-profile/elevation-profile.ts | 14 +++++++------- .../lib/components/embedding/Embedding.svelte | 6 +++--- .../embedding/EmbeddingPlayground.svelte | 2 +- .../src/lib/components/embedding/OpenIn.svelte | 2 +- .../src/lib/components/embedding/embedding.ts | 2 +- website/src/lib/components/export/Export.svelte | 2 +- .../src/lib/components/file-list/FileList.svelte | 6 +++--- .../lib/components/file-list/FileListNode.svelte | 6 +++--- .../file-list/FileListNodeContent.svelte | 2 +- .../file-list/FileListNodeLabel.svelte | 14 +++++++------- .../file-list/metadata/MetadataDialog.svelte | 4 ++-- .../components/file-list/sortable-file-list.ts | 2 +- .../file-list/style/StyleDialog.svelte | 8 ++++---- website/src/lib/components/map/Map.svelte | 2 +- .../map/gpx-layer/CopyCoordinates.svelte | 2 +- .../map/gpx-layer/TrackpointPopup.svelte | 8 ++++++-- .../map/gpx-layer/WaypointPopup.svelte | 6 +++--- .../components/map/gpx-layer/distance-markers.ts | 6 +++--- .../lib/components/map/gpx-layer/gpx-layer.ts | 12 ++++++------ .../map/gpx-layer/start-end-markers.ts | 4 ++-- .../map/layer-control/CustomLayers.svelte | 6 +++--- .../map/layer-control/LayerControl.svelte | 2 +- .../layer-control/LayerControlSettings.svelte | 6 +++--- .../map/layer-control/LayerTree.svelte | 2 +- .../map/layer-control/LayerTreeNode.svelte | 6 +++--- .../map/layer-control/OverpassPopup.svelte | 4 ++-- .../map/layer-control/extension-api.test.ts | 4 ++-- .../map/layer-control/extension-api.ts | 4 ++-- .../map/layer-control/overpass-layer.ts | 6 +++--- .../components/map/layer-control/utils.test.ts | 2 +- .../lib/components/map/layer-control/utils.ts | 2 +- website/src/lib/components/map/map.ts | 2 +- .../street-view-control/StreetViewControl.svelte | 4 ++-- .../components/map/street-view-control/google.ts | 2 +- .../map/street-view-control/mapillary.ts | 2 +- website/src/lib/components/map/style.ts | 6 +++--- .../src/lib/components/toolbar/Toolbar.svelte | 2 +- .../components/toolbar/ToolbarItemMenu.svelte | 2 +- .../lib/components/toolbar/tools/Clean.svelte | 4 ++-- .../components/toolbar/tools/Elevation.svelte | 2 +- .../lib/components/toolbar/tools/Extract.svelte | 2 +- .../lib/components/toolbar/tools/Merge.svelte | 2 +- .../src/lib/components/toolbar/tools/Time.svelte | 6 +++--- .../toolbar/tools/reduce/Reduce.svelte | 2 +- .../toolbar/tools/routing/Routing.svelte | 8 ++++---- .../tools/routing/RoutingControlPopup.svelte | 2 +- .../toolbar/tools/routing/routing-controls.ts | 10 +++++----- .../toolbar/tools/routing/routing.test.ts | 2 +- .../components/toolbar/tools/routing/routing.ts | 4 ++-- .../toolbar/tools/scissors/Scissors.svelte | 4 ++-- .../toolbar/tools/scissors/scissors.ts | 2 +- .../toolbar/tools/scissors/split-controls.ts | 2 +- .../toolbar/tools/waypoint/Waypoint.svelte | 8 ++++---- .../toolbar/tools/waypoint/waypoint.ts | 2 +- website/src/lib/{assets => data}/colors.test.ts | 2 +- website/src/lib/{assets => data}/colors.ts | 0 .../custom/bikerouter-gravel.json | 0 .../lib/{assets => data}/custom/ign-fr-plan.json | 0 .../custom/ign-fr-satellite.json | 0 .../lib/{assets => data}/custom/ign-fr-topo.json | 0 .../lib/{assets => data/example}/example-data.ts | 0 .../src/lib/{assets => data/example}/example.gpx | 0 .../lib/{assets => data/example}/example.test.ts | 6 +++--- .../{assets/example.ts => data/example/index.ts} | 2 +- website/src/lib/{assets => data}/layers.test.ts | 2 +- website/src/lib/{assets => data}/layers.ts | 8 ++++---- website/src/lib/{assets => data}/symbols.ts | 0 website/src/lib/docs/be/files-and-stats.mdx | 2 +- website/src/lib/docs/ca/files-and-stats.mdx | 2 +- website/src/lib/docs/cs/files-and-stats.mdx | 2 +- website/src/lib/docs/da/files-and-stats.mdx | 2 +- website/src/lib/docs/de/files-and-stats.mdx | 2 +- website/src/lib/docs/el/files-and-stats.mdx | 2 +- website/src/lib/docs/en/files-and-stats.mdx | 2 +- website/src/lib/docs/es/files-and-stats.mdx | 2 +- website/src/lib/docs/eu/files-and-stats.mdx | 2 +- website/src/lib/docs/fi/files-and-stats.mdx | 2 +- website/src/lib/docs/fr/files-and-stats.mdx | 2 +- website/src/lib/docs/he/files-and-stats.mdx | 2 +- website/src/lib/docs/hu/files-and-stats.mdx | 2 +- website/src/lib/docs/id/files-and-stats.mdx | 2 +- website/src/lib/docs/it/files-and-stats.mdx | 2 +- website/src/lib/docs/ko/files-and-stats.mdx | 2 +- website/src/lib/docs/lt/files-and-stats.mdx | 2 +- website/src/lib/docs/lv/files-and-stats.mdx | 2 +- website/src/lib/docs/nl/files-and-stats.mdx | 2 +- website/src/lib/docs/no/files-and-stats.mdx | 2 +- website/src/lib/docs/pl/files-and-stats.mdx | 2 +- website/src/lib/docs/pt-BR/files-and-stats.mdx | 2 +- website/src/lib/docs/pt/files-and-stats.mdx | 2 +- website/src/lib/docs/ro/files-and-stats.mdx | 2 +- website/src/lib/docs/ru/files-and-stats.mdx | 2 +- website/src/lib/docs/sr/files-and-stats.mdx | 2 +- website/src/lib/docs/sv/files-and-stats.mdx | 2 +- website/src/lib/docs/th/files-and-stats.mdx | 2 +- website/src/lib/docs/tr/files-and-stats.mdx | 2 +- website/src/lib/docs/uk/files-and-stats.mdx | 2 +- website/src/lib/docs/vi/files-and-stats.mdx | 2 +- website/src/lib/docs/zh-HK/files-and-stats.mdx | 2 +- website/src/lib/docs/zh/files-and-stats.mdx | 2 +- website/src/lib/{ => engine}/all-hidden.ts | 2 +- website/src/lib/engine/engine.test.ts | 2 +- website/src/lib/engine/engine.ts | 8 ++++---- website/src/lib/{ => engine}/file-colors.test.ts | 2 +- website/src/lib/{ => engine}/file-colors.ts | 0 website/src/lib/engine/file-state.ts | 4 ++-- .../src/lib/{ => engine}/file-visibility.test.ts | 2 +- website/src/lib/{ => engine}/file-visibility.ts | 0 .../lib/{ => engine}/selection-helpers.test.ts | 4 ++-- .../src/lib/{ => engine}/selection-helpers.ts | 2 +- website/src/lib/engine/statistics.ts | 2 +- website/src/lib/engine/storage.ts | 4 ++-- .../{ => engine}/trackpoint-categories.test.ts | 6 +++++- .../lib/{ => engine}/trackpoint-categories.ts | 0 website/src/lib/engine/types.ts | 4 ++-- website/src/lib/{ => geo}/closest-point.test.ts | 2 +- website/src/lib/{ => geo}/closest-point.ts | 0 .../lib/{geo.test.ts => geo/coordinates.test.ts} | 2 +- website/src/lib/{geo.ts => geo/coordinates.ts} | 0 website/src/lib/{ => i18n}/i18n.svelte.ts | 0 .../lib/{i18n-keys.test.ts => i18n/keys.test.ts} | 4 ++-- website/src/lib/{ => i18n}/languages.ts | 0 website/src/lib/index.ts | 1 - website/src/lib/scripts/example-statistics.ts | 10 +++++----- website/src/lib/scripts/pwa-manifest.ts | 2 +- website/src/lib/scripts/sitemap.ts | 2 +- website/src/lib/{logic => state}/bounds.ts | 0 website/src/lib/{logic => state}/map-cursor.ts | 0 .../lib/{logic => state}/selection-statistics.ts | 2 +- website/src/lib/{logic => state}/setting.test.ts | 4 ++-- website/src/lib/{logic => state}/setting.ts | 2 +- .../src/lib/{logic => state}/settings.test.ts | 2 +- website/src/lib/{logic => state}/settings.ts | 6 +++--- .../src/lib/{ => storage}/cached-fetch.test.ts | 2 +- website/src/lib/{ => storage}/cached-fetch.ts | 0 .../src/lib/{ => storage}/legacy-import.test.ts | 2 +- website/src/lib/{ => storage}/legacy-import.ts | 0 .../conversions.test.ts} | 2 +- .../conversions.ts} | 0 website/src/lib/{ => units}/units.ts | 8 ++++---- website/src/lib/utils.ts | 4 ++-- website/src/routes/+layout.svelte | 4 ++-- website/src/routes/404/+page.svelte | 2 +- website/src/routes/[[language]]/+page.server.ts | 2 +- website/src/routes/[[language]]/+page.svelte | 4 ++-- .../src/routes/[[language]]/app/+page.server.ts | 2 +- website/src/routes/[[language]]/app/+page.svelte | 8 ++++---- .../routes/[[language]]/embed/+page.server.ts | 2 +- .../src/routes/[[language]]/help/+layout.svelte | 2 +- .../src/routes/[[language]]/help/+page.server.ts | 2 +- .../src/routes/[[language]]/help/+page.svelte | 2 +- .../[[language]]/help/[...guide]/+page.server.ts | 2 +- .../[[language]]/help/[...guide]/+page.svelte | 2 +- 169 files changed, 263 insertions(+), 256 deletions(-) rename website/src/lib/{ => actions}/default-file-name.test.ts (96%) rename website/src/lib/{ => actions}/default-file-name.ts (100%) rename website/src/lib/{logic => actions}/file-actions.ts (91%) rename website/src/lib/{assets => data}/colors.test.ts (98%) rename website/src/lib/{assets => data}/colors.ts (100%) rename website/src/lib/{assets => data}/custom/bikerouter-gravel.json (100%) rename website/src/lib/{assets => data}/custom/ign-fr-plan.json (100%) rename website/src/lib/{assets => data}/custom/ign-fr-satellite.json (100%) rename website/src/lib/{assets => data}/custom/ign-fr-topo.json (100%) rename website/src/lib/{assets => data/example}/example-data.ts (100%) rename website/src/lib/{assets => data/example}/example.gpx (100%) rename website/src/lib/{assets => data/example}/example.test.ts (88%) rename website/src/lib/{assets/example.ts => data/example/index.ts} (97%) rename website/src/lib/{assets => data}/layers.test.ts (99%) rename website/src/lib/{assets => data}/layers.ts (99%) rename website/src/lib/{assets => data}/symbols.ts (100%) rename website/src/lib/{ => engine}/all-hidden.ts (95%) rename website/src/lib/{ => engine}/file-colors.test.ts (97%) rename website/src/lib/{ => engine}/file-colors.ts (100%) rename website/src/lib/{ => engine}/file-visibility.test.ts (99%) rename website/src/lib/{ => engine}/file-visibility.ts (100%) rename website/src/lib/{ => engine}/selection-helpers.test.ts (98%) rename website/src/lib/{ => engine}/selection-helpers.ts (99%) rename website/src/lib/{ => engine}/trackpoint-categories.test.ts (95%) rename website/src/lib/{ => engine}/trackpoint-categories.ts (100%) rename website/src/lib/{ => geo}/closest-point.test.ts (96%) rename website/src/lib/{ => geo}/closest-point.ts (100%) rename website/src/lib/{geo.test.ts => geo/coordinates.test.ts} (96%) rename website/src/lib/{geo.ts => geo/coordinates.ts} (100%) rename website/src/lib/{ => i18n}/i18n.svelte.ts (100%) rename website/src/lib/{i18n-keys.test.ts => i18n/keys.test.ts} (96%) rename website/src/lib/{ => i18n}/languages.ts (100%) delete mode 100644 website/src/lib/index.ts rename website/src/lib/{logic => state}/bounds.ts (100%) rename website/src/lib/{logic => state}/map-cursor.ts (100%) rename website/src/lib/{logic => state}/selection-statistics.ts (93%) rename website/src/lib/{logic => state}/setting.test.ts (98%) rename website/src/lib/{logic => state}/setting.ts (98%) rename website/src/lib/{logic => state}/settings.test.ts (98%) rename website/src/lib/{logic => state}/settings.ts (98%) rename website/src/lib/{ => storage}/cached-fetch.test.ts (98%) rename website/src/lib/{ => storage}/cached-fetch.ts (100%) rename website/src/lib/{ => storage}/legacy-import.test.ts (98%) rename website/src/lib/{ => storage}/legacy-import.ts (100%) rename website/src/lib/{unit-conversions.test.ts => units/conversions.test.ts} (99%) rename website/src/lib/{unit-conversions.ts => units/conversions.ts} (100%) rename website/src/lib/{ => units}/units.ts (96%) diff --git a/website/src/hooks.server.js b/website/src/hooks.server.js index 165a41ee0..7441e52c7 100644 --- a/website/src/hooks.server.js +++ b/website/src/hooks.server.js @@ -1,5 +1,5 @@ import { base } from '$app/paths'; -import { languages } from '$lib/languages'; +import { languages } from '$lib/i18n/languages'; import { getURLForLanguage } from '$lib/utils'; export async function handle({ event, resolve }) { diff --git a/website/src/lib/default-file-name.test.ts b/website/src/lib/actions/default-file-name.test.ts similarity index 96% rename from website/src/lib/default-file-name.test.ts rename to website/src/lib/actions/default-file-name.test.ts index bae395d44..ad25a2137 100644 --- a/website/src/lib/default-file-name.test.ts +++ b/website/src/lib/actions/default-file-name.test.ts @@ -1,6 +1,6 @@ import { describe, it } from 'node:test'; import assert from 'node:assert/strict'; -import { defaultFileName } from './default-file-name'; +import { defaultFileName } from '$lib/actions/default-file-name'; describe('default file name', () => { it('is the default name when there is no other file with it', () => { diff --git a/website/src/lib/default-file-name.ts b/website/src/lib/actions/default-file-name.ts similarity index 100% rename from website/src/lib/default-file-name.ts rename to website/src/lib/actions/default-file-name.ts diff --git a/website/src/lib/logic/file-actions.ts b/website/src/lib/actions/file-actions.ts similarity index 91% rename from website/src/lib/logic/file-actions.ts rename to website/src/lib/actions/file-actions.ts index 1448b4cc2..1e2ab0773 100644 --- a/website/src/lib/logic/file-actions.ts +++ b/website/src/lib/actions/file-actions.ts @@ -1,9 +1,9 @@ import { currentTool, Tool } from '$lib/components/toolbar/tools'; -import { i18n } from '$lib/i18n.svelte'; +import { i18n } from '$lib/i18n/i18n.svelte'; import { get } from 'svelte/store'; -import { boundsManager } from './bounds'; +import { boundsManager } from '$lib/state/bounds'; import { engine } from '$lib/engine'; -import { defaultFileName } from '$lib/default-file-name'; +import { defaultFileName } from '$lib/actions/default-file-name'; /** The name of a new file: the translated default name, numbered if other files have it. */ export function newFileName() { diff --git a/website/src/lib/components/AlgoliaDocSearch.svelte b/website/src/lib/components/AlgoliaDocSearch.svelte index 03bc01fc3..032b15bc8 100644 --- a/website/src/lib/components/AlgoliaDocSearch.svelte +++ b/website/src/lib/components/AlgoliaDocSearch.svelte @@ -2,7 +2,7 @@ import docsearch from '@docsearch/js'; import '@docsearch/css'; import { onMount } from 'svelte'; - import { i18n } from '$lib/i18n.svelte'; + import { i18n } from '$lib/i18n/i18n.svelte'; let props: { class?: string; diff --git a/website/src/lib/components/Footer.svelte b/website/src/lib/components/Footer.svelte index 6fc62191b..36cb64e07 100644 --- a/website/src/lib/components/Footer.svelte +++ b/website/src/lib/components/Footer.svelte @@ -4,7 +4,7 @@ import ModeSwitch from '$lib/components/ModeSwitch.svelte'; import Logo from '$lib/components/Logo.svelte'; import { AtSign, BookOpenText, Heart, House, Map } from '@lucide/svelte'; - import { i18n } from '$lib/i18n.svelte'; + import { i18n } from '$lib/i18n/i18n.svelte'; import { getURLForLanguage } from '$lib/utils'; diff --git a/website/src/lib/components/GPXStatistics.svelte b/website/src/lib/components/GPXStatistics.svelte index d86d39230..c8a4e7d50 100644 --- a/website/src/lib/components/GPXStatistics.svelte +++ b/website/src/lib/components/GPXStatistics.svelte @@ -5,11 +5,11 @@ import { MoveDownRight, MoveUpRight, Ruler, Timer, Zap } from '@lucide/svelte'; - import { i18n } from '$lib/i18n.svelte'; + import { i18n } from '$lib/i18n/i18n.svelte'; import type { Readable } from 'svelte/store'; import type { SelectionStatistics } from '$lib/engine'; - import type { SlicedStatistics } from '$lib/logic/selection-statistics'; - import { settings } from '$lib/logic/settings'; + import type { SlicedStatistics } from '$lib/state/selection-statistics'; + import { settings } from '$lib/state/settings'; const { velocityUnits } = settings; diff --git a/website/src/lib/components/Help.svelte b/website/src/lib/components/Help.svelte index 80163d2f9..dc0390d1d 100644 --- a/website/src/lib/components/Help.svelte +++ b/website/src/lib/components/Help.svelte @@ -1,6 +1,6 @@ diff --git a/website/src/lib/components/Menu.svelte b/website/src/lib/components/Menu.svelte index afcfc2d53..0bcbb4f16 100644 --- a/website/src/lib/components/Menu.svelte +++ b/website/src/lib/components/Menu.svelte @@ -51,19 +51,19 @@ import { editStyle } from '$lib/components/file-list/style/utils.svelte'; import { exportState, ExportState } from '$lib/components/export/utils.svelte'; import { anySelectedLayer } from '$lib/components/map/layer-control/utils'; - import { defaultOverlays } from '$lib/assets/layers'; + import { defaultOverlays } from '$lib/data/layers'; import LayerControlSettings from '$lib/components/map/layer-control/LayerControlSettings.svelte'; import Export from '$lib/components/export/Export.svelte'; import { mode, setMode } from 'mode-watcher'; - import { i18n } from '$lib/i18n.svelte'; - import { languages } from '$lib/languages'; + import { i18n } from '$lib/i18n/i18n.svelte'; + import { languages } from '$lib/i18n/languages'; import { getURLForLanguage } from '$lib/utils'; - import { settings } from '$lib/logic/settings'; - import { createFile, loadFiles, triggerFileInput } from '$lib/logic/file-actions'; + import { settings } from '$lib/state/settings'; + import { createFile, loadFiles, triggerFileInput } from '$lib/actions/file-actions'; import { engine } from '$lib/engine'; - import { allHidden } from '$lib/all-hidden'; - import { selectionSize } from '$lib/selection-helpers'; - import { boundsManager } from '$lib/logic/bounds'; + import { allHidden } from '$lib/engine/all-hidden'; + import { selectionSize } from '$lib/engine/selection-helpers'; + import { boundsManager } from '$lib/state/bounds'; import { onMount } from 'svelte'; const { diff --git a/website/src/lib/components/ModeSwitch.svelte b/website/src/lib/components/ModeSwitch.svelte index 731477390..d6f94009a 100644 --- a/website/src/lib/components/ModeSwitch.svelte +++ b/website/src/lib/components/ModeSwitch.svelte @@ -2,7 +2,7 @@ import { Button } from '$lib/components/ui/button'; import { Moon, Sun } from '@lucide/svelte'; import { mode, setMode } from 'mode-watcher'; - import { i18n } from '$lib/i18n.svelte'; + import { i18n } from '$lib/i18n/i18n.svelte'; let { class: className = '', diff --git a/website/src/lib/components/Nav.svelte b/website/src/lib/components/Nav.svelte index a6b0cb772..58b29096b 100644 --- a/website/src/lib/components/Nav.svelte +++ b/website/src/lib/components/Nav.svelte @@ -2,7 +2,7 @@ import Logo from '$lib/components/Logo.svelte'; import { Button } from '$lib/components/ui/button'; import { BookOpenText, House, Map } from '@lucide/svelte'; - import { i18n } from '$lib/i18n.svelte'; + import { i18n } from '$lib/i18n/i18n.svelte'; import { getURLForLanguage } from '$lib/utils'; diff --git a/website/src/lib/components/Shortcut.svelte b/website/src/lib/components/Shortcut.svelte index ee1357f0d..1fdd5a0c9 100644 --- a/website/src/lib/components/Shortcut.svelte +++ b/website/src/lib/components/Shortcut.svelte @@ -1,7 +1,7 @@ diff --git a/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte b/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte index 1319fafab..015c5d016 100644 --- a/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte +++ b/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte @@ -6,13 +6,13 @@ import WithUnits from '$lib/components/WithUnits.svelte'; import { Dot, ExternalLink, Trash2 } from '@lucide/svelte'; import { currentTool, Tool } from '$lib/components/toolbar/tools'; - import { getSymbolKey, symbols } from '$lib/assets/symbols'; - import { i18n } from '$lib/i18n.svelte'; + import { getSymbolKey, symbols } from '$lib/data/symbols'; + import { i18n } from '$lib/i18n/i18n.svelte'; import sanitizeHtml from 'sanitize-html'; import { ScrollArea } from '$lib/components/ui/scroll-area/index.js'; import type { PopupItem } from '$lib/components/map/map-popup'; import { engine, type WaypointDetails } from '$lib/engine'; - import { hasSelectionWithin } from '$lib/selection-helpers'; + import { hasSelectionWithin } from '$lib/engine/selection-helpers'; let { waypoint, diff --git a/website/src/lib/components/map/gpx-layer/distance-markers.ts b/website/src/lib/components/map/gpx-layer/distance-markers.ts index 33b7eb838..75f72a32e 100644 --- a/website/src/lib/components/map/gpx-layer/distance-markers.ts +++ b/website/src/lib/components/map/gpx-layer/distance-markers.ts @@ -1,9 +1,9 @@ -import { settings } from '$lib/logic/settings'; +import { settings } from '$lib/state/settings'; import { engine } from '$lib/engine'; -import { getConvertedDistanceToKilometers } from '$lib/units'; +import { getConvertedDistanceToKilometers } from '$lib/units/units'; import { get } from 'svelte/store'; import { map } from '$lib/components/map/map'; -import { allHidden } from '$lib/all-hidden'; +import { allHidden } from '$lib/engine/all-hidden'; import type { GeoJSONSource } from 'maplibre-gl'; import { ANCHOR_LAYER_KEY } from '$lib/components/map/style'; diff --git a/website/src/lib/components/map/gpx-layer/gpx-layer.ts b/website/src/lib/components/map/gpx-layer/gpx-layer.ts index 5f4dd1ec6..9937c6909 100644 --- a/website/src/lib/components/map/gpx-layer/gpx-layer.ts +++ b/website/src/lib/components/map/gpx-layer/gpx-layer.ts @@ -7,18 +7,18 @@ import maplibregl, { } from 'maplibre-gl'; import { map } from '$lib/components/map/map'; import { waypointPopup, trackpointPopup } from './gpx-layer-popup'; -import { closestPointIndex } from '$lib/closest-point'; +import { closestPointIndex } from '$lib/geo/closest-point'; import { getElevation, loadSVGIcon } from '$lib/utils'; import { selectedWaypoint } from '$lib/components/toolbar/tools/waypoint/waypoint'; import { MapPin, Square } from 'lucide-static'; -import { getSymbolKey, symbols } from '$lib/assets/symbols'; +import { getSymbolKey, symbols } from '$lib/data/symbols'; import { engine, type FileState, type Selection } from '$lib/engine'; -import { isCovered, hasSelectionWithin, type FileTreeNode } from '$lib/selection-helpers'; -import { isSegmentHidden, isWaypointHidden } from '$lib/file-visibility'; -import { settings } from '$lib/logic/settings'; +import { isCovered, hasSelectionWithin, type FileTreeNode } from '$lib/engine/selection-helpers'; +import { isSegmentHidden, isWaypointHidden } from '$lib/engine/file-visibility'; +import { settings } from '$lib/state/settings'; import { currentTool, Tool } from '$lib/components/toolbar/tools'; import { splitAtPoint } from '$lib/components/toolbar/tools/scissors/scissors'; -import { mapCursor, MapCursorState } from '$lib/logic/map-cursor'; +import { mapCursor, MapCursorState } from '$lib/state/map-cursor'; import { ANCHOR_LAYER_KEY } from '$lib/components/map/style'; export function getSvgForSymbol(symbol?: string | undefined, layerColor?: string | undefined) { diff --git a/website/src/lib/components/map/gpx-layer/start-end-markers.ts b/website/src/lib/components/map/gpx-layer/start-end-markers.ts index b8db0d58c..7b16914ce 100644 --- a/website/src/lib/components/map/gpx-layer/start-end-markers.ts +++ b/website/src/lib/components/map/gpx-layer/start-end-markers.ts @@ -2,10 +2,10 @@ import { currentTool, Tool } from '$lib/components/toolbar/tools'; import type { GeoJSONSource } from 'maplibre-gl'; import { get } from 'svelte/store'; import { map } from '$lib/components/map/map'; -import { allHidden } from '$lib/all-hidden'; +import { allHidden } from '$lib/engine/all-hidden'; import { ANCHOR_LAYER_KEY } from '$lib/components/map/style'; import { loadSVGIcon } from '$lib/utils'; -import { hoveredPoint, slicedStatistics } from '$lib/logic/selection-statistics'; +import { hoveredPoint, slicedStatistics } from '$lib/state/selection-statistics'; import { engine } from '$lib/engine'; const startMarkerSVG = ` diff --git a/website/src/lib/components/map/layer-control/CustomLayers.svelte b/website/src/lib/components/map/layer-control/CustomLayers.svelte index 6f7a94f2b..5d557c6a9 100644 --- a/website/src/lib/components/map/layer-control/CustomLayers.svelte +++ b/website/src/lib/components/map/layer-control/CustomLayers.svelte @@ -17,11 +17,11 @@ Map, Layers2, } from '@lucide/svelte'; - import { i18n } from '$lib/i18n.svelte'; - import { defaultBasemap, type CustomLayer } from '$lib/assets/layers'; + import { i18n } from '$lib/i18n/i18n.svelte'; + import { defaultBasemap, type CustomLayer } from '$lib/data/layers'; import { onMount } from 'svelte'; import { remove } from './utils'; - import { settings } from '$lib/logic/settings'; + import { settings } from '$lib/state/settings'; import { dndzone } from 'svelte-dnd-action'; const { diff --git a/website/src/lib/components/map/layer-control/LayerControl.svelte b/website/src/lib/components/map/layer-control/LayerControl.svelte index e91dec96f..233389142 100644 --- a/website/src/lib/components/map/layer-control/LayerControl.svelte +++ b/website/src/lib/components/map/layer-control/LayerControl.svelte @@ -5,7 +5,7 @@ import { Separator } from '$lib/components/ui/separator'; import { ScrollArea } from '$lib/components/ui/scroll-area/index.js'; import { Layers } from '@lucide/svelte'; - import { settings } from '$lib/logic/settings'; + import { settings } from '$lib/state/settings'; import { map } from '$lib/components/map/map'; let container: HTMLDivElement; diff --git a/website/src/lib/components/map/layer-control/LayerControlSettings.svelte b/website/src/lib/components/map/layer-control/LayerControlSettings.svelte index 71d61a8be..f2584919b 100644 --- a/website/src/lib/components/map/layer-control/LayerControlSettings.svelte +++ b/website/src/lib/components/map/layer-control/LayerControlSettings.svelte @@ -14,12 +14,12 @@ overlayTree, overpassTree, terrainSources, - } from '$lib/assets/layers'; + } from '$lib/data/layers'; import { getLayers, isSelected, toggle } from '$lib/components/map/layer-control/utils'; - import { i18n } from '$lib/i18n.svelte'; + import { i18n } from '$lib/i18n/i18n.svelte'; import { map } from '$lib/components/map/map'; import CustomLayers from './CustomLayers.svelte'; - import { settings } from '$lib/logic/settings'; + import { settings } from '$lib/state/settings'; import { untrack } from 'svelte'; import { extensionAPI } from '$lib/components/map/layer-control/extension-api'; diff --git a/website/src/lib/components/map/layer-control/LayerTree.svelte b/website/src/lib/components/map/layer-control/LayerTree.svelte index f1f6f3ea7..8fb07b8c5 100644 --- a/website/src/lib/components/map/layer-control/LayerTree.svelte +++ b/website/src/lib/components/map/layer-control/LayerTree.svelte @@ -1,6 +1,6 @@
diff --git a/website/src/routes/[[language]]/+page.server.ts b/website/src/routes/[[language]]/+page.server.ts index 67fb17aed..6f4d75815 100644 --- a/website/src/routes/[[language]]/+page.server.ts +++ b/website/src/routes/[[language]]/+page.server.ts @@ -1,4 +1,4 @@ -import { languages } from '$lib/languages'; +import { languages } from '$lib/i18n/languages'; import type { EntryGenerator } from './$types'; export const entries: EntryGenerator = () => { diff --git a/website/src/routes/[[language]]/+page.svelte b/website/src/routes/[[language]]/+page.svelte index 45f8e07b9..af88b81ce 100644 --- a/website/src/routes/[[language]]/+page.svelte +++ b/website/src/routes/[[language]]/+page.svelte @@ -16,8 +16,8 @@ Languages, ExternalLink, } from '@lucide/svelte'; - import { i18n } from '$lib/i18n.svelte'; - import { exampleStatistics } from '$lib/assets/example'; + import { i18n } from '$lib/i18n/i18n.svelte'; + import { exampleStatistics } from '$lib/data/example'; import { getURLForLanguage } from '$lib/utils'; import { writable } from 'svelte/store'; import Scissors from '$lib/components/toolbar/tools/scissors/Scissors.svelte'; diff --git a/website/src/routes/[[language]]/app/+page.server.ts b/website/src/routes/[[language]]/app/+page.server.ts index 67fb17aed..6f4d75815 100644 --- a/website/src/routes/[[language]]/app/+page.server.ts +++ b/website/src/routes/[[language]]/app/+page.server.ts @@ -1,4 +1,4 @@ -import { languages } from '$lib/languages'; +import { languages } from '$lib/i18n/languages'; import type { EntryGenerator } from './$types'; export const entries: EntryGenerator = () => { diff --git a/website/src/routes/[[language]]/app/+page.svelte b/website/src/routes/[[language]]/app/+page.svelte index c8d897db7..ed9e5a4e4 100644 --- a/website/src/routes/[[language]]/app/+page.svelte +++ b/website/src/routes/[[language]]/app/+page.svelte @@ -12,12 +12,12 @@ import Resizer from '$lib/components/Resizer.svelte'; import { Toaster } from '$lib/components/ui/sonner'; import * as AlertDialog from '$lib/components/ui/alert-dialog'; - import { i18n } from '$lib/i18n.svelte'; - import { settings } from '$lib/logic/settings'; - import { loadFiles } from '$lib/logic/file-actions'; + import { i18n } from '$lib/i18n/i18n.svelte'; + import { settings } from '$lib/state/settings'; + import { loadFiles } from '$lib/actions/file-actions'; import { onMount } from 'svelte'; import { page } from '$app/state'; - import { hoveredPoint, slicedStatistics } from '$lib/logic/selection-statistics'; + import { hoveredPoint, slicedStatistics } from '$lib/state/selection-statistics'; import { engine } from '$lib/engine'; import { getURLForGoogleDriveFile } from '$lib/components/embedding/embedding'; diff --git a/website/src/routes/[[language]]/embed/+page.server.ts b/website/src/routes/[[language]]/embed/+page.server.ts index 67fb17aed..6f4d75815 100644 --- a/website/src/routes/[[language]]/embed/+page.server.ts +++ b/website/src/routes/[[language]]/embed/+page.server.ts @@ -1,4 +1,4 @@ -import { languages } from '$lib/languages'; +import { languages } from '$lib/i18n/languages'; import type { EntryGenerator } from './$types'; export const entries: EntryGenerator = () => { diff --git a/website/src/routes/[[language]]/help/+layout.svelte b/website/src/routes/[[language]]/help/+layout.svelte index bc012963e..5ab0f2602 100644 --- a/website/src/routes/[[language]]/help/+layout.svelte +++ b/website/src/routes/[[language]]/help/+layout.svelte @@ -2,7 +2,7 @@ import { Button } from '$lib/components/ui/button'; import AlgoliaDocSearch from '$lib/components/AlgoliaDocSearch.svelte'; import { getURLForLanguage } from '$lib/utils'; - import { i18n } from '$lib/i18n.svelte'; + import { i18n } from '$lib/i18n/i18n.svelte'; import { page } from '$app/state'; import { guides } from '$lib/components/docs/docs'; import type { Snippet } from 'svelte'; diff --git a/website/src/routes/[[language]]/help/+page.server.ts b/website/src/routes/[[language]]/help/+page.server.ts index 67fb17aed..6f4d75815 100644 --- a/website/src/routes/[[language]]/help/+page.server.ts +++ b/website/src/routes/[[language]]/help/+page.server.ts @@ -1,4 +1,4 @@ -import { languages } from '$lib/languages'; +import { languages } from '$lib/i18n/languages'; import type { EntryGenerator } from './$types'; export const entries: EntryGenerator = () => { diff --git a/website/src/routes/[[language]]/help/+page.svelte b/website/src/routes/[[language]]/help/+page.svelte index 5c977038d..f9b0537a5 100644 --- a/website/src/routes/[[language]]/help/+page.svelte +++ b/website/src/routes/[[language]]/help/+page.svelte @@ -1,7 +1,7 @@