changeset 113:03b95c2693ec

livemap: Fix date formatting
author Lewin Bormann <lbo@spheniscida.de>
date Wed, 30 Dec 2020 08:40:31 +0100
parents 1983da548b88
children 4060bc56cab7
files assets/livemap.html assets/shared.js
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/assets/livemap.html	Wed Dec 30 08:29:22 2020 +0100
+++ b/assets/livemap.html	Wed Dec 30 08:40:31 2020 +0100
@@ -67,7 +67,7 @@
         current_circle.remove();
 
         current_circle = L.circle([lat, lng], currentCircleProps).addTo(mymap);
-        current_circle.bindTooltip((new Date(props.time)).toString());
+        current_circle.bindTooltip(shortTimestamp(new Date(props.time)));
         current_circle.openTooltip();
         current_props = props;
     }
@@ -80,7 +80,7 @@
             radius: accuracy ? accuracy : 3,
         };
         var circle = L.circle([lat, lng], circleProps).addTo(mymap);
-        circle.bindTooltip((new Date(props.time)).toString());
+        circle.bindTooltip(shortTimestamp(new Date(props.time)));
         allMarkers.push(circle);
     }
 
--- a/assets/shared.js	Wed Dec 30 08:29:22 2020 +0100
+++ b/assets/shared.js	Wed Dec 30 08:40:31 2020 +0100
@@ -53,3 +53,13 @@
 
     window.history.pushState({}, "", url);
 }
+
+function shortTimestamp(date) {
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    month = month < 10 ? `0${month}` : month;
+    var day = date.getDate();
+    day = day < 10 ? `0${day}` : day;
+    var dateStr = `${year}-${month}-${day}`;
+    return date.toLocaleTimeString('de-DE') + ', ' + dateStr;
+}