From 192ae7ae0a48298c8794f593d2edb941889a5a93 Mon Sep 17 00:00:00 2001 From: vcoppe Date: Thu, 6 Jun 2024 11:44:53 +0200 Subject: [PATCH] progress --- .../src/lib/components/toolbar/Toolbar.svelte | 7 +++- .../components/toolbar/ToolbarItemMenu.svelte | 5 ++- .../components/toolbar/tools/Scissors.svelte | 1 + .../tools/{waypoint => }/Waypoint.svelte | 0 website/src/lib/stores.ts | 1 + website/src/locales/en.json | 35 ++++++++++--------- 6 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 website/src/lib/components/toolbar/tools/Scissors.svelte rename website/src/lib/components/toolbar/tools/{waypoint => }/Waypoint.svelte (100%) diff --git a/website/src/lib/components/toolbar/Toolbar.svelte b/website/src/lib/components/toolbar/Toolbar.svelte index bca0da0b..694f9848 100644 --- a/website/src/lib/components/toolbar/Toolbar.svelte +++ b/website/src/lib/components/toolbar/Toolbar.svelte @@ -9,7 +9,8 @@ Ungroup, MapPin, Palette, - Filter + Filter, + Scissors } from 'lucide-svelte'; import { _ } from 'svelte-i18n'; @@ -25,6 +26,10 @@ {$_('toolbar.routing.tooltip')} + + + {$_('toolbar.scissors.tooltip')} + {$_('toolbar.waypoint_tooltip')} diff --git a/website/src/lib/components/toolbar/ToolbarItemMenu.svelte b/website/src/lib/components/toolbar/ToolbarItemMenu.svelte index eb574b39..d4ecd687 100644 --- a/website/src/lib/components/toolbar/ToolbarItemMenu.svelte +++ b/website/src/lib/components/toolbar/ToolbarItemMenu.svelte @@ -3,7 +3,8 @@ import { flyAndScale } from '$lib/utils'; import * as Card from '$lib/components/ui/card'; import Routing from '$lib/components/toolbar/tools/routing/Routing.svelte'; - import Waypoint from '$lib/components/toolbar/tools/waypoint/Waypoint.svelte'; + import Scissors from '$lib/components/toolbar/tools/Scissors.svelte'; + import Waypoint from '$lib/components/toolbar/tools/Waypoint.svelte'; import RoutingControlPopup from '$lib/components/toolbar/tools/routing/RoutingControlPopup.svelte'; import { onMount } from 'svelte'; import mapboxgl from 'mapbox-gl'; @@ -31,6 +32,8 @@ {#if $currentTool === Tool.ROUTING} + {:else if $currentTool === Tool.SCISSORS} + {:else if $currentTool === Tool.WAYPOINT} {/if} diff --git a/website/src/lib/components/toolbar/tools/Scissors.svelte b/website/src/lib/components/toolbar/tools/Scissors.svelte new file mode 100644 index 00000000..a466fe77 --- /dev/null +++ b/website/src/lib/components/toolbar/tools/Scissors.svelte @@ -0,0 +1 @@ +
- Start/end sliders - Cut by clicking on a route
diff --git a/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte b/website/src/lib/components/toolbar/tools/Waypoint.svelte similarity index 100% rename from website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte rename to website/src/lib/components/toolbar/tools/Waypoint.svelte diff --git a/website/src/lib/stores.ts b/website/src/lib/stores.ts index 24de93b1..d15c155e 100644 --- a/website/src/lib/stores.ts +++ b/website/src/lib/stores.ts @@ -118,6 +118,7 @@ export const routingControls: Map = new Map(); export enum Tool { ROUTING, WAYPOINT, + SCISSORS, TIME, MERGE, EXTRACT, diff --git a/website/src/locales/en.json b/website/src/locales/en.json index 6a037559..59a24609 100644 --- a/website/src/locales/en.json +++ b/website/src/locales/en.json @@ -15,7 +15,7 @@ "delete_all": "Delete all", "select_all": "Select all", "view": "View", - "vertical_file_view": "Show vertical file list", + "vertical_file_view": "Vertical file list", "switch_basemap": "Switch to previous basemap", "toggle_overlays": "Toggle overlays", "toggle_3d": "Toggle 3D", @@ -32,8 +32,8 @@ "dark": "Dark", "system": "System", "layers": "Map layers...", - "distance_markers": "Show distance markers", - "direction_markers": "Show direction markers", + "distance_markers": "Distance markers", + "direction_markers": "Direction markers", "about": "About", "donate": "Donate", "ctrl": "Ctrl", @@ -100,12 +100,15 @@ "timeout": "The routing request took too long, try adding points closer" } }, - "time_tooltip": "Change the time and speed data", - "merge_tooltip": "Merge files together", + "scissors": { + "tooltip": "Trim or split routes" + }, + "time_tooltip": "Manage time and speed data", + "merge_tooltip": "Merge file elements together", "extract_tooltip": "Extract inner tracks or segments", - "waypoint_tooltip": "Create a new point of interest", - "reduce_tooltip": "Reduce the number of points", - "clean_tooltip": "Clean track points and points of interest with a rectangle selection", + "waypoint_tooltip": "Create and edit points of interest", + "reduce_tooltip": "Reduce the number of GPS points", + "clean_tooltip": "Clean GPS points and points of interest with a rectangle selection", "style_tooltip": "Change the style of the route" }, "layers": { @@ -165,14 +168,14 @@ } }, "chart": { - "show_slope": "Show slope", - "show_surface": "Show surface", - "show_speed": "Show speed", - "show_pace": "Show pace", - "show_heartrate": "Show heart rate", - "show_cadence": "Show cadence", - "show_temperature": "Show temperature", - "show_power": "Show power" + "show_slope": "Show slope data", + "show_surface": "Show surface data", + "show_speed": "Show speed data", + "show_pace": "Show pace data", + "show_heartrate": "Show heart rate data", + "show_cadence": "Show cadence data", + "show_temperature": "Show temperature data", + "show_power": "Show power data" }, "quantities": { "distance": "Distance",