Skirda/LiveAtlas
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle popups for markers. Fixes #5

Browse Source
This commit is contained in:
James Lyne 2021-01-26 14:32:48 +00:00
parent 3591f15064
commit 869f733fb7
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/util/markers.ts
View File

@ -24,7 +24,7 @@ import {DynmapProjection} from "@/leaflet/projection/DynmapProjection";
import {GenericMarker} from "@/leaflet/marker/GenericMarker"; import {GenericMarker} from "@/leaflet/marker/GenericMarker";
export const createMarker = (options: DynmapMarker, projection: DynmapProjection): Marker => { export const createMarker = (options: DynmapMarker, projection: DynmapProjection): Marker => {
return new GenericMarker(projection.locationToLatLng(options.location), { const marker = new GenericMarker(projection.locationToLatLng(options.location), {
icon: new DynmapIcon({ icon: new DynmapIcon({
icon: options.icon, icon: options.icon,
label: options.label, label: options.label,
@ -34,6 +34,12 @@ export const createMarker = (options: DynmapMarker, projection: DynmapProjection
maxZoom: options.maxZoom, maxZoom: options.maxZoom,
minZoom: options.minZoom, minZoom: options.minZoom,
}); });
if(options.popupContent) {
marker.bindPopup(() => createPopup(options));
}
return marker;
}; };
export const updateMarker = (marker: Marker | undefined, options: DynmapMarker, projection: DynmapProjection): Marker => { export const updateMarker = (marker: Marker | undefined, options: DynmapMarker, projection: DynmapProjection): Marker => {
@ -61,5 +67,27 @@ export const updateMarker = (marker: Marker | undefined, options: DynmapMarker,
} }
} }
marker.unbindPopup();
if(options.popupContent) {
marker.bindPopup(() => createPopup(options));
}
return marker; return marker;
}; };
export const createPopup = (options: DynmapMarker) => {
const popup = document.createElement('span');
if (options.popupContent) {
popup.classList.add('MarkerPopup');
popup.insertAdjacentHTML('afterbegin', options.popupContent);
} else if (options.isHTML) {
popup.classList.add('MarkerPopup');
popup.insertAdjacentHTML('afterbegin', options.label);
} else {
popup.textContent = options.label;
}
return popup;
}