Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-11 11:02:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1229 from McSido/feature/colorful-marker-icons

Browse Source 
Enhance geomap marker icons with color
This commit is contained in:
Elian Doran 2025-02-20 21:43:42 +02:00 committed by GitHub
commit 2cefdf8b9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/app/widgets/type_widgets/geo_map.ts
View File

@ -222,7 +222,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el)); const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el));
const L = this.L; const L = this.L;
const icon = this.#buildIcon(note.getIcon(), note.title); const icon = this.#buildIcon(note.getIcon(), note.getColorClass(), note.title);
const marker = L.marker(L.latLng(lat, lng), { const marker = L.marker(L.latLng(lat, lng), {
icon, icon,
@ -257,12 +257,12 @@ export default class GeoMapTypeWidget extends TypeWidget {
this.currentMarkerData[note.noteId] = marker; this.currentMarkerData[note.noteId] = marker;
} }
#buildIcon(bxIconClass: string, title: string) { #buildIcon(bxIconClass: string, colorClass: string, title: string) {
return this.L.divIcon({ return this.L.divIcon({
html: `\ html: `\
<img class="icon" src="${asset_path}/node_modules/leaflet/dist/images/marker-icon.png" /> <img class="icon" src="${asset_path}/node_modules/leaflet/dist/images/marker-icon.png" />
<img class="icon-shadow" src="${asset_path}/node_modules/leaflet/dist/images/marker-shadow.png" /> <img class="icon-shadow" src="${asset_path}/node_modules/leaflet/dist/images/marker-shadow.png" />
<span class="bx ${bxIconClass}"></span> <span class="bx ${bxIconClass} ${colorClass}"></span>
<span class="title-label">${title}</span>`, <span class="title-label">${title}</span>`,
iconSize: [ 25, 41 ], iconSize: [ 25, 41 ],
iconAnchor: [ 12, 41 ] iconAnchor: [ 12, 41 ]
@ -361,7 +361,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
// If any of note has its location attribute changed. // If any of note has its location attribute changed.
// TODO: Should probably filter by parent here as well. // TODO: Should probably filter by parent here as well.
const attributeRows = loadResults.getAttributeRows(); const attributeRows = loadResults.getAttributeRows();
if (attributeRows.find((at) => at.name === LOCATION_ATTRIBUTE)) { if (attributeRows.find((at) => [ LOCATION_ATTRIBUTE, "color" ].includes(at.name ?? ""))) {
this.#reloadMarkers(); this.#reloadMarkers();
} }
} }