From 4019d5c23b5b061b2d09cc68046703231844c0e6 Mon Sep 17 00:00:00 2001
From: vcoppe <vianney.coppe@gmail.com>
Date: Tue, 18 Jun 2024 15:00:57 +0200
Subject: [PATCH] use same data for desc and cmt field of waypoints

---
 .../lib/components/gpx-layer/WaypointPopup.svelte |  2 +-
 .../lib/components/toolbar/tools/Waypoint.svelte  | 15 ++++++++-------
 website/src/locales/en.json                       |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/website/src/lib/components/gpx-layer/WaypointPopup.svelte b/website/src/lib/components/gpx-layer/WaypointPopup.svelte
index e837dd93..29ac9e1e 100644
--- a/website/src/lib/components/gpx-layer/WaypointPopup.svelte
+++ b/website/src/lib/components/gpx-layer/WaypointPopup.svelte
@@ -36,7 +36,7 @@
 				{#if $currentPopupWaypoint[0].desc}
 					<span>{$currentPopupWaypoint[0].desc}</span>
 				{/if}
-				{#if $currentPopupWaypoint[0].cmt}
+				{#if $currentPopupWaypoint[0].cmt && $currentPopupWaypoint[0].cmt !== $currentPopupWaypoint[0].desc}
 					<span>{$currentPopupWaypoint[0].cmt}</span>
 				{/if}
 				{#if $currentTool === Tool.WAYPOINT}
diff --git a/website/src/lib/components/toolbar/tools/Waypoint.svelte b/website/src/lib/components/toolbar/tools/Waypoint.svelte
index 6bf190cb..bf19a87f 100644
--- a/website/src/lib/components/toolbar/tools/Waypoint.svelte
+++ b/website/src/lib/components/toolbar/tools/Waypoint.svelte
@@ -23,7 +23,6 @@
 
 	let name: string;
 	let description: string;
-	let comment: string;
 	let longitude: number;
 	let latitude: number;
 
@@ -55,7 +54,12 @@
 					$selectedWaypoint[0] = fileStore.file.wpt[$selectedWaypoint[0]._data.index];
 					name = $selectedWaypoint[0].name ?? '';
 					description = $selectedWaypoint[0].desc ?? '';
-					comment = $selectedWaypoint[0].cmt ?? '';
+					if (
+						$selectedWaypoint[0].cmt !== undefined &&
+						$selectedWaypoint[0].cmt !== $selectedWaypoint[0].desc
+					) {
+						description += '\n\n' + $selectedWaypoint[0].cmt;
+					}
 					longitude = $selectedWaypoint[0].getLongitude();
 					latitude = $selectedWaypoint[0].getLatitude();
 				} else {
@@ -70,7 +74,6 @@
 	function resetWaypointData() {
 		name = '';
 		description = '';
-		comment = '';
 		longitude = 0;
 		latitude = 0;
 	}
@@ -104,7 +107,7 @@
 				let waypoint = $selectedWaypoint[0].clone();
 				waypoint.name = name;
 				waypoint.desc = description;
-				waypoint.cmt = comment;
+				waypoint.cmt = description;
 				waypoint.setCoordinates({
 					lat: latitude,
 					lon: longitude
@@ -123,7 +126,7 @@
 			let waypoint = new Waypoint({
 				name,
 				desc: description,
-				cmt: comment,
+				cmt: description,
 				attributes: {
 					lat: latitude,
 					lon: longitude
@@ -169,8 +172,6 @@
 		<Input bind:value={name} id="name" class="font-semibold h-8" />
 		<Label for="description">{$_('toolbar.waypoint.description')}</Label>
 		<Textarea bind:value={description} id="description" />
-		<Label for="comment">{$_('toolbar.waypoint.comment')}</Label>
-		<Textarea bind:value={comment} id="comment" />
 		<div class="flex flex-row gap-2">
 			<div>
 				<Label for="latitude">{$_('toolbar.waypoint.latitude')}</Label>
diff --git a/website/src/locales/en.json b/website/src/locales/en.json
index a7329bb4..1f8ac04d 100644
--- a/website/src/locales/en.json
+++ b/website/src/locales/en.json
@@ -151,7 +151,6 @@
             "tooltip": "Create and edit points of interest",
             "name": "Name",
             "description": "Description",
-            "comment": "Comment",
             "longitude": "Longitude",
             "latitude": "Latitude",
             "create": "Create point of interest",