Merge branch 'SebastianHanfland:main' into main

SternfahrtMuc · Apr 5, 2024 · 13cc920 · 13cc920
2 parents 8123065 + f773df0
commit 13cc920
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/website/src/common/map/addTrackToMap.ts b/website/src/common/map/addTrackToMap.ts
@@ -2,7 +2,7 @@ import { Point, Track } from 'gpxparser';
 import L, { LayerGroup } from 'leaflet';
 import { getColorFromUuid } from '../../utils/colorUtil.ts';
 import { breakIcon, endIcon, startIcon } from '../MapIcons.ts';
-import { getTimeDifferenceInSeconds } from '../../utils/dateUtil.ts';
+import { formatTimeOnly, getTimeDifferenceInSeconds } from '../../utils/dateUtil.ts';
 import { CalculatedTrack, GpxSegment, isZipTrack, ZipTrack } from '../types.ts';
 import { getGpx } from './gpxCache.ts';
 
@@ -63,7 +63,9 @@ function addStartAndBreakMarker(
                 if (timeDifferenceInSeconds > 4 * 60) {
                     const endMarker = L.marker(toLatLng(point), {
                         icon: breakIcon,
-                        title: `${gpxSegment.filename} - ${(timeDifferenceInSeconds / 60).toFixed(0)} min Pause`,
+                        title: `${gpxSegment.filename} - ${(timeDifferenceInSeconds / 60).toFixed(
+                            0
+                        )} min Pause\n um ${formatTimeOnly(lastTimeStamp, true)}`,
                     });
                     endMarker.addTo(routeLayer);
                 }

diff --git a/website/src/utils/dateUtil.ts b/website/src/utils/dateUtil.ts
@@ -18,8 +18,8 @@ export function formatDate(dateString: string): string {
     return date.format(new Date(dateString), DATE_FORMAT);
 }
 
-export function formatTimeOnly(dateString: string): string {
-    const TIME_FORMAT = 'HH:mm:ss';
+export function formatTimeOnly(dateString: string, noSecond = false): string {
+    const TIME_FORMAT = noSecond ? 'HH:mm' : 'HH:mm:ss';
     return date.format(new Date(dateString), TIME_FORMAT);
 }