From 814e0716988222de506c58bc23b44aa307ddc015 Mon Sep 17 00:00:00 2001 From: "D. Berge" Date: Fri, 14 May 2021 01:22:16 +0200 Subject: [PATCH] Add Markdown support to map tooltips --- lib/www/client/source/src/views/Map.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/www/client/source/src/views/Map.vue b/lib/www/client/source/src/views/Map.vue index d59f296..8cc8ba7 100644 --- a/lib/www/client/source/src/views/Map.vue +++ b/lib/www/client/source/src/views/Map.vue @@ -31,6 +31,7 @@ import 'leaflet-arrowheads' import { mapActions, mapGetters, mapState } from 'vuex'; import ftstamp from '@/lib/FormatTimestamp' import zoomFitIcon from '@/assets/zoom-fit-best.svg' +import { markdown, markdownInline } from '@/lib/markdown'; var map; @@ -108,7 +109,7 @@ const layers = { const speed = (p.length / (new Date(p.ts1) - new Date(p.ts0))) * 3.6/1.852 * 1000; const remarks = p.remarks - ? "
"+p.remarks + ? "
"+markdownInline(p.remarks) : ""; const popup = `Planned sequence ${p.sequence}
@@ -146,7 +147,7 @@ const layers = { : ""; const remarks = p.remarks - ? "
"+p.remarks + ? "
"+markdown(p.remarks) : ""; const popup = feature.geometry.type == "Point" @@ -181,7 +182,7 @@ const layers = { const p = feature.properties; const remarks = p.remarks - ? "
"+p.remarks + ? "
"+markdown(p.remarks) : ""; const popup = feature.geometry.type == "Point" @@ -612,8 +613,8 @@ export default { onEachFeature (feature, layer) { const p = feature.properties; const popup = (p.sequence - ? `Event @ ${p.tstamp}
Sequence ${p.sequence}
Point ${p.line} / ${p.point}

${p.remarks}` - : `Event @ ${p.tstamp}

${p.remarks}`) + ? `Event @ ${p.tstamp}
Sequence ${p.sequence}
Point ${p.line} / ${p.point}

${markdownInline(p.remarks)}` + : `Event @ ${p.tstamp}

${markdownInline(p.remarks)}`) + (p.labels.length? `
[${p.labels.join(", ")}]` : ""); layer.bindTooltip(popup, {sticky: true}); }