gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 23:29:02 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

feat(views/geomap): display geolocation in both context menus

Browse Source
This commit is contained in:
Elian Doran 2025-07-06 23:48:51 +03:00
parent a1341e6036
commit 8102172557
No known key found for this signature in database
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/client/src/widgets/view_widgets/geo_view/context_menu.ts
View File

@ -1,17 +1,17 @@
import type { LatLng, LeafletMouseEvent } from "leaflet"; import type { LatLng, LeafletMouseEvent } from "leaflet";
import appContext from "../../../components/app_context.js"; import appContext from "../../../components/app_context.js";
import type { ContextMenuEvent } from "../../../menus/context_menu.js";
import contextMenu from "../../../menus/context_menu.js"; import contextMenu from "../../../menus/context_menu.js";
import linkContextMenu from "../../../menus/link_context_menu.js"; import linkContextMenu from "../../../menus/link_context_menu.js";
import { t } from "../../../services/i18n.js"; import { t } from "../../../services/i18n.js";
import { createNewNote } from "./editing.js"; import { createNewNote } from "./editing.js";
import { copyTextWithToast } from "../../../services/clipboard_ext.js"; import { copyTextWithToast } from "../../../services/clipboard_ext.js";
export default function openContextMenu(noteId: string, e: ContextMenuEvent) { export default function openContextMenu(noteId: string, e: LeafletMouseEvent) {
contextMenu.show({ contextMenu.show({
x: e.pageX, x: e.originalEvent.pageX,
y: e.pageY, y: e.originalEvent.pageY,
items: [ items: [
...buildGeoLocationItem(e),
...linkContextMenu.getItems(), ...linkContextMenu.getItems(),
{ title: t("geo-map-context.open-location"), command: "openGeoLocation", uiIcon: "bx bx-map-alt" }, { title: t("geo-map-context.open-location"), command: "openGeoLocation", uiIcon: "bx bx-map-alt" },
{ title: "----" }, { title: "----" },
@ -39,10 +39,7 @@ export function openMapContextMenu(noteId: string, e: LeafletMouseEvent) {
x: e.originalEvent.pageX, x: e.originalEvent.pageX,
y: e.originalEvent.pageY, y: e.originalEvent.pageY,
items: [ items: [
{ ...buildGeoLocationItem(e),
title: formatGeoLocation(e.latlng),
handler: () => copyTextWithToast(formatGeoLocation(e.latlng, 15))
},
{ title: t("geo-map-context.add-note"), command: "addNoteToMap", uiIcon: "bx bx-plus" } { title: t("geo-map-context.add-note"), command: "addNoteToMap", uiIcon: "bx bx-plus" }
], ],
selectMenuItemHandler: ({ command }) => { selectMenuItemHandler: ({ command }) => {
@ -57,6 +54,18 @@ export function openMapContextMenu(noteId: string, e: LeafletMouseEvent) {
}); });
} }
function formatGeoLocation(latlng: LatLng, precision: number = 6) { function buildGeoLocationItem(e: LeafletMouseEvent) {
return `${latlng.lat.toFixed(precision)}, ${latlng.lng.toFixed(precision)}`; function formatGeoLocation(latlng: LatLng, precision: number = 6) {
return `${latlng.lat.toFixed(precision)}, ${latlng.lng.toFixed(precision)}`;
}
return [
{
title: formatGeoLocation(e.latlng),
handler: () => copyTextWithToast(formatGeoLocation(e.latlng, 15))
},
{
title: "----"
}
];
} }

2
apps/client/src/widgets/view_widgets/geo_view/markers.ts
View File

@ -33,7 +33,7 @@ export default function processNoteWithMarker(map: Map, note: FNote, location: s
} }
}); });
newMarker.on("contextmenu", (e) => { newMarker.on("contextmenu", (e) => {
openContextMenu(note.noteId, e.originalEvent); openContextMenu(note.noteId, e);
}); });
const el = newMarker.getElement(); const el = newMarker.getElement();