From e5cab354ea60d34a95d0ca94e8da51a05530c240 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Fri, 28 Jan 2022 19:06:28 -0600 Subject: [PATCH] Mark label as markup:true for UI (for alternate UIs) --- .../main/java/org/dynmap/markers/impl/MarkerAPIImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java b/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java index 65de8208..c51bd304 100644 --- a/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java +++ b/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java @@ -108,7 +108,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { this.z = m.getZ(); this.set = m.getMarkerSet().getMarkerSetID(); this.icon = m.getMarkerIcon().getMarkerIconID(); - this.markup = m.isLabelMarkup(); + this.markup = true; // We are markup format all the time now this.desc = Client.sanitizeHTML(m.getDescription()); this.dim = m.getMarkerIcon().getMarkerIconSize().getSize(); this.minzoom = m.getMinZoom(); @@ -171,7 +171,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { desc = Client.sanitizeHTML(m.getDescription()); this.minzoom = m.getMinZoom(); this.maxzoom = m.getMaxZoom(); - this.markup = m.isLabelMarkup(); + this.markup = true; // We are markup format all the time now this.set = m.getMarkerSet().getMarkerSetID(); if(deleted) @@ -207,10 +207,12 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { public String desc; public int minzoom; public int maxzoom; + public boolean markup; public PolyLineMarkerUpdated(PolyLineMarker m, boolean deleted) { this.id = m.getMarkerID(); this.label = Client.sanitizeHTML(m.getLabel()); + this.markup = true; // We are markup format all the time now int cnt = m.getCornerCount(); x = new double[cnt]; y = new double[cnt]; @@ -265,6 +267,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { public String desc; public int minzoom; public int maxzoom; + public boolean markup; public CircleMarkerUpdated(CircleMarker m, boolean deleted) { this.id = m.getMarkerID(); @@ -274,6 +277,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { this.z = m.getCenterZ(); this.xr = m.getRadiusX(); this.zr = m.getRadiusZ(); + this.markup = true; // We are markup format all the time now color = String.format("#%06X", m.getLineColor()); weight = m.getLineWeight(); opacity = m.getLineOpacity();