Use overviewer hovertext as marker tooltip

This commit is contained in:
James Lyne 2022-02-23 23:22:51 +00:00
parent cde0c327a0
commit 3e1122d34d

View File

@ -247,7 +247,7 @@ export default class OverviewerMapProvider extends MapProvider {
(markers[set.groupName]?.raw || []).forEach((marker: any, index: number) => { (markers[set.groupName]?.raw || []).forEach((marker: any, index: number) => {
const id = `marker_${index}`; const id = `marker_${index}`;
setContents.set(id, OverviewerMapProvider.buildMarker(id, marker, set.icon)); setContents.set(id, OverviewerMapProvider.buildMarker(id, marker, set));
}); });
this.mapMarkers.get(map)!.set(set.groupName, setContents); this.mapMarkers.get(map)!.set(set.groupName, setContents);
@ -255,11 +255,12 @@ export default class OverviewerMapProvider extends MapProvider {
} }
} }
private static buildMarker(id: string, data: any, defaultIcon: string): LiveAtlasMarker { private static buildMarker(id: string, data: any, markerSet: any): LiveAtlasMarker {
const marker: any = { const marker: any = {
id, id,
title: stripHTML(data.hovertext.trim()), tooltip: stripHTML(data.hovertext.trim()),
popup: data.text, tooltipHTML: data.hovertext.trim(),
popup: markerSet.createInfoWindow ? data.text : undefined,
isPopupHTML: true, isPopupHTML: true,
} }
@ -275,7 +276,7 @@ export default class OverviewerMapProvider extends MapProvider {
} else { } else {
marker.type = LiveAtlasMarkerType.POINT; marker.type = LiveAtlasMarkerType.POINT;
marker.location = {x: data.x, y: data.y, z: data.z}; marker.location = {x: data.x, y: data.y, z: data.z};
marker.icon = data.icon || defaultIcon; marker.icon = data.icon || markerSet.icon;
} }
return marker as LiveAtlasMarker; return marker as LiveAtlasMarker;