Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(geomap): draw everything a note puts on the map in the note's colour
Elian Doranc80e06f87899
diff --git a/apps/client/src/widgets/collections/geomap/GpxTrack.spec.tsx b/apps/client/src/widgets/collections/geomap/GpxTrack.spec.tsxindex fab068e3ec..a02079fa77 100644--- a/apps/client/src/widgets/collections/geomap/GpxTrack.spec.tsx+++ b/apps/client/src/widgets/collections/geomap/GpxTrack.spec.tsx@@ -114,12 +114,13 @@ const TWO_SEGMENT_GPX = `<?xml version="1.0" encoding="UTF-8"?>/** The note the track belongs to, which every one of its layers is named after. */const NOTE_ID = "gpxNoteId1";-/** What the marks are drawn with, under the ids the shared rasterizer files pins by (see Markers). */-const PIN_COLOR = "purple";+/** The note's colour: the line is drawn in it and the marks' pins are filled with it, under the ids+ * the shared rasterizer files pins by (see Markers). */+const NOTE_COLOR = "purple";const NOTE_ICON = "bx bx-cycling";-const START_IMAGE = markerImageId(PIN_COLOR, NOTE_ICON);-const END_IMAGE = markerImageId(PIN_COLOR, "bx bxs-flag-checkered");-const WAYPOINT_IMAGE = markerImageId(PIN_COLOR, "bx bx-pin");+const START_IMAGE = markerImageId(NOTE_COLOR, NOTE_ICON);+const END_IMAGE = markerImageId(NOTE_COLOR, "bx bxs-flag-checkered");+const WAYPOINT_IMAGE = markerImageId(NOTE_COLOR, "bx bx-pin");describe("GpxTrack", () => {let container: HTMLElement;@@ -160,8 +161,7 @@ describe("GpxTrack", () => {noteId={NOTE_ID}title="A Sunday ride"gpxXmlString={gpx}- trackColor="red"- pinColor={PIN_COLOR}+ color={NOTE_COLOR}iconClass={NOTE_ICON}hideLabels={hideLabels}isDarkTheme={isDarkTheme}@@ -217,7 +217,7 @@ describe("GpxTrack", () => {renderTrack({ styleLoaded: true });- expect(layer("layer")?.paint["line-color"]).toBe("red");+ expect(layer("layer")?.paint["line-color"]).toBe(NOTE_COLOR);expect(trackCoordinates()?.type).toBe("MultiLineString");});diff --git a/apps/client/src/widgets/collections/geomap/GpxTrack.tsx b/apps/client/src/widgets/collections/geomap/GpxTrack.tsxindex 56bd0e2511..f9d2125aad 100644--- a/apps/client/src/widgets/collections/geomap/GpxTrack.tsx+++ b/apps/client/src/widgets/collections/geomap/GpxTrack.tsx@@ -16,9 +16,12 @@ export interface GpxTrackProps {/** What the line is named along its length, and what the start mark wears under its pin. */title: string;gpxXmlString: string;- trackColor?: string;- /** What the marks' pins are filled with — the note's own colour, as its marker would wear it. */- pinColor: string;+ /**+ * The note's own colour, as its marker would wear it: the line is drawn in it and the marks'+ * pins are filled with it. One colour rather than one per layer, a note having one colour —+ * the line and its own start pin used to be given different ones and so disagreed.+ */+ color: string;/** The note's icon, which the start mark wears; the end and the waypoints have icons of their own. */iconClass: string;/** Whether the map is a dark one, which decides how the names are drawn over it (see Markers). */@@ -73,7 +76,7 @@ const MARKS_ONLY: FilterSpecification = [ "==", [ "geometry-type" ], "Point" ];* the note's own menu (see ContextMenus) — a line three pixels wide being nearly impossible to hit* otherwise.*/-export function GpxTrack({ noteId, title, gpxXmlString, trackColor, pinColor, iconClass, isDarkTheme, hideLabels }: GpxTrackProps) {+export function GpxTrack({ noteId, title, gpxXmlString, color, iconClass, isDarkTheme, hideLabels }: GpxTrackProps) {const parentMap = useContext(ParentMap);const styleLoaded = useContext(MapStyleLoaded);@@ -93,7 +96,7 @@ export function GpxTrack({ noteId, title, gpxXmlString, trackColor, pinColor, icconst gpxDoc = new DOMParser().parseFromString(gpxXmlString, "application/xml");const tracks = readTrackLines(gpxDoc);- const marks = readMarks(gpxDoc, tracks, { noteId, title, pinColor, iconClass });+ const marks = readMarks(gpxDoc, tracks, { noteId, title, color, iconClass });// The pins the marks stamp, rasterized off this path: the line must not wait on them, so// the layers go up in two halves — the line at once, the marks when their images arrive.@@ -159,7 +162,7 @@ export function GpxTrack({ noteId, title, gpxXmlString, trackColor, pinColor, ic"line-cap": "round"},paint: {- "line-color": trackColor ?? "blue",+ "line-color": color,"line-width": 3}});@@ -176,7 +179,7 @@ export function GpxTrack({ noteId, title, gpxXmlString, trackColor, pinColor, icsource: sourceId,filter: LINES_ONLY,paint: {- "line-color": trackColor ?? "blue",+ "line-color": color,"line-opacity": 0,"line-width": HIT_WIDTH}@@ -264,7 +267,7 @@ export function GpxTrack({ noteId, title, gpxXmlString, trackColor, pinColor, ic}}- buildMarkImages(pinColor, iconClass).then((built) => {+ buildMarkImages(color, iconClass).then((built) => {if (cancelled) return;images = built;if (styleLoaded) {@@ -295,7 +298,7 @@ export function GpxTrack({ noteId, title, gpxXmlString, trackColor, pinColor, ic// The map may already have been removed.}};- }, [ parentMap, styleLoaded, noteId, title, gpxXmlString, trackColor, pinColor, iconClass, isDarkTheme, hideLabels ]);+ }, [ parentMap, styleLoaded, noteId, title, gpxXmlString, color, iconClass, isDarkTheme, hideLabels ]);return <div />;}@@ -333,8 +336,8 @@ export function trackHitLayers(map: MapLibreGLMap) {* crossings, and a pin that will not say which one it is answers only to a click; the ends' pin* says the rest.*/-function readMarks(gpxDoc: Document, tracks: GpxTrackLines[], { noteId, title, pinColor, iconClass }: {- noteId: string; title: string; pinColor: string; iconClass: string;+function readMarks(gpxDoc: Document, tracks: GpxTrackLines[], { noteId, title, color, iconClass }: {+ noteId: string; title: string; color: string; iconClass: string;}) {const marks: GeoJSON.Feature[] = [];@@ -342,7 +345,7 @@ function readMarks(gpxDoc: Document, tracks: GpxTrackLines[], { noteId, title, pmarks.push({type: "Feature",geometry: { type: "Point", coordinates },- properties: { id: noteId, icon: markerImageId(pinColor, icon), name }+ properties: { id: noteId, icon: markerImageId(color, icon), name }});}@@ -374,13 +377,13 @@ function readMarks(gpxDoc: Document, tracks: GpxTrackLines[], { noteId, title, p* flags of their own in the note's colour. A pin that cannot be drawn is left out, and its mark* stamps nothing rather than keeping the rest from going up.*/-async function buildMarkImages(pinColor: string, iconClass: string) {+async function buildMarkImages(color: string, iconClass: string) {const images = new Map<string, HTMLImageElement>();await Promise.all([ iconClass, END_ICON, WAYPOINT_ICON ].map(async (icon) => {- const image = await buildMarkerImage(pinColor, icon);+ const image = await buildMarkerImage(color, icon);if (image) {- images.set(markerImageId(pinColor, icon), image);+ images.set(markerImageId(color, icon), image);}}));diff --git a/apps/client/src/widgets/collections/geomap/index.tsx b/apps/client/src/widgets/collections/geomap/index.tsxindex b3ea96a850..0fff2ba2e1 100644--- a/apps/client/src/widgets/collections/geomap/index.tsx+++ b/apps/client/src/widgets/collections/geomap/index.tsx@@ -591,11 +591,10 @@ function NoteGpxTrack({ note, hideLabels, isDarkTheme }: { note: FNote, hideLabenoteId={note.noteId}title={title}gpxXmlString={xmlString}- trackColor={color ?? "blue"}// The colour and icon rather than anything built from them: the marks are rasterized into// the track's own symbol layer through the shared pin rasterizer (see GpxTrack), so the// start of a track wears exactly the pin its note would wear as a marker.- pinColor={color ?? DEFAULT_MARKER_COLOR}+ color={color ?? DEFAULT_MARKER_COLOR}iconClass={note.getIcon()}isDarkTheme={isDarkTheme}hideLabels={hideLabels}@@ -620,7 +619,7 @@ function NoteShapeWrapper({ note }: { note: FNote }) {return <ShapeLayernoteId={note.noteId}shape={shape}- color={color ?? "blue"}+ color={color ?? DEFAULT_MARKER_COLOR}/>;}