mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2025-04-04 02:55:57 +02:00
Implement MarkerAPI
This commit is contained in:
Blue (Lukas Rieger)
parent
2cbff3ccdb
commit
d8e189528e
@ -1 +1 @@
|
||||
Subproject commit 1d7495dffd6d7c72e22a99888a277eb17de55d31
|
||||
Subproject commit 51ea1fe8d1e48eeeeb5e71af9e3d12c371214d89
|
||||
@ -24,6 +24,11 @@
|
||||
*/
|
||||
package de.bluecolored.bluemap.common.api;
|
||||
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.FileSystems;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
@ -31,19 +36,23 @@
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
import de.bluecolored.bluemap.api.BlueMapAPI;
|
||||
import de.bluecolored.bluemap.api.renderer.BlueMapMap;
|
||||
import de.bluecolored.bluemap.api.renderer.BlueMapWorld;
|
||||
import de.bluecolored.bluemap.api.renderer.Renderer;
|
||||
import de.bluecolored.bluemap.common.MapType;
|
||||
import de.bluecolored.bluemap.common.api.marker.MarkerAPIImpl;
|
||||
import de.bluecolored.bluemap.common.plugin.Plugin;
|
||||
import de.bluecolored.bluemap.core.BlueMap;
|
||||
import de.bluecolored.bluemap.core.world.World;
|
||||
|
||||
public class BlueMapAPIImpl extends BlueMapAPI {
|
||||
|
||||
private static final String IMAGE_ROOT_PATH = "images";
|
||||
|
||||
public Plugin blueMap;
|
||||
public RendererImpl renderer;
|
||||
public RenderAPIImpl renderer;
|
||||
|
||||
public Map<UUID, BlueMapWorldImpl> worlds;
|
||||
public Map<String, BlueMapMapImpl> maps;
|
||||
@ -51,7 +60,7 @@ public class BlueMapAPIImpl extends BlueMapAPI {
|
||||
public BlueMapAPIImpl(Plugin blueMap) {
|
||||
this.blueMap = blueMap;
|
||||
|
||||
this.renderer = new RendererImpl(this, blueMap.getRenderManager());
|
||||
this.renderer = new RenderAPIImpl(this, blueMap.getRenderManager());
|
||||
|
||||
worlds = new HashMap<>();
|
||||
for (World world : blueMap.getWorlds()) {
|
||||
@ -67,10 +76,15 @@ public BlueMapAPIImpl(Plugin blueMap) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Renderer getRenderer() {
|
||||
public RenderAPIImpl getRenderAPI() {
|
||||
return renderer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MarkerAPIImpl getMarkerAPI() throws IOException {
|
||||
return new MarkerAPIImpl(this, blueMap.getMainConfig().getWebDataPath().resolve("markers.json").toFile());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<BlueMapMap> getMaps() {
|
||||
return Collections.unmodifiableCollection(maps.values());
|
||||
@ -81,6 +95,27 @@ public Collection<BlueMapWorld> getWorlds() {
|
||||
return Collections.unmodifiableCollection(worlds.values());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String createImage(BufferedImage image, String path) throws IOException {
|
||||
path = path.replaceAll("[^a-zA-Z_\\.\\-\\/]", "_");
|
||||
String separator = FileSystems.getDefault().getSeparator();
|
||||
|
||||
Path webRoot = blueMap.getMainConfig().getWebRoot().toAbsolutePath();
|
||||
Path webDataRoot = blueMap.getMainConfig().getWebDataPath().toAbsolutePath();
|
||||
|
||||
Path imagePath;
|
||||
if (webDataRoot.startsWith(webRoot)) {
|
||||
imagePath = webDataRoot.resolve(Paths.get(IMAGE_ROOT_PATH, path.replace("/", separator))).toAbsolutePath();
|
||||
} else {
|
||||
imagePath = webRoot.resolve("assets").resolve(Paths.get(IMAGE_ROOT_PATH, path.replace("/", separator))).toAbsolutePath();
|
||||
}
|
||||
|
||||
if (!ImageIO.write(image, "png", imagePath.toFile()))
|
||||
throw new IOException("The format 'png' is not supported!");
|
||||
|
||||
return webRoot.relativize(imagePath).toString().replace(separator, "/");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBlueMapVersion() {
|
||||
return BlueMap.VERSION;
|
||||
|
||||
@ -30,15 +30,15 @@
|
||||
import com.flowpowered.math.vector.Vector3i;
|
||||
|
||||
import de.bluecolored.bluemap.api.renderer.BlueMapMap;
|
||||
import de.bluecolored.bluemap.api.renderer.Renderer;
|
||||
import de.bluecolored.bluemap.api.renderer.RenderAPI;
|
||||
import de.bluecolored.bluemap.common.RenderManager;
|
||||
|
||||
public class RendererImpl implements Renderer {
|
||||
public class RenderAPIImpl implements RenderAPI {
|
||||
|
||||
private BlueMapAPIImpl api;
|
||||
private RenderManager renderManager;
|
||||
|
||||
protected RendererImpl(BlueMapAPIImpl api, RenderManager renderManager) {
|
||||
protected RenderAPIImpl(BlueMapAPIImpl api, RenderManager renderManager) {
|
||||
this.api = api;
|
||||
this.renderManager = renderManager;
|
||||
}
|
||||
@ -0,0 +1,163 @@
|
||||
/*
|
||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||
* Copyright (c) contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package de.bluecolored.bluemap.common.api.marker;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
import de.bluecolored.bluemap.api.marker.MarkerAPI;
|
||||
import de.bluecolored.bluemap.api.marker.MarkerSet;
|
||||
import de.bluecolored.bluemap.common.api.BlueMapAPIImpl;
|
||||
import de.bluecolored.bluemap.core.logger.Logger;
|
||||
import ninja.leaping.configurate.ConfigurationNode;
|
||||
import ninja.leaping.configurate.gson.GsonConfigurationLoader;
|
||||
|
||||
public class MarkerAPIImpl implements MarkerAPI {
|
||||
|
||||
private BlueMapAPIImpl api;
|
||||
private File markerFile;
|
||||
private Map<String, MarkerSetImpl> markerSets;
|
||||
private Set<String> removedMarkerSets;
|
||||
|
||||
public MarkerAPIImpl(BlueMapAPIImpl api, File markerFile) throws IOException {
|
||||
this.api = api;
|
||||
this.markerFile = markerFile;
|
||||
|
||||
this.markerSets = new ConcurrentHashMap<>();
|
||||
this.removedMarkerSets = Sets.newConcurrentHashSet();
|
||||
|
||||
load();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<MarkerSet> getMarkerSets() {
|
||||
return Collections.unmodifiableCollection(this.markerSets.values());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<MarkerSet> getMarkerSet(String id) {
|
||||
return Optional.ofNullable(this.markerSets.get(id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized MarkerSet createMarkerSet(String id) {
|
||||
MarkerSetImpl set = this.markerSets.get(id);
|
||||
|
||||
if (set == null) {
|
||||
set = new MarkerSetImpl(id);
|
||||
this.markerSets.put(id, set);
|
||||
}
|
||||
|
||||
return set;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean removeMarkerSet(String id) {
|
||||
if (this.markerSets.remove(id) != null) {
|
||||
this.removedMarkerSets.add(id);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void load() throws IOException {
|
||||
this.removedMarkerSets.clear();
|
||||
|
||||
if (!markerFile.exists()) {
|
||||
markerFile.getParentFile().mkdirs();
|
||||
markerFile.createNewFile();
|
||||
}
|
||||
|
||||
GsonConfigurationLoader loader = GsonConfigurationLoader.builder().setFile(markerFile).build();
|
||||
ConfigurationNode node = loader.load();
|
||||
|
||||
Set<String> externallyRemovedSets = new HashSet<>(markerSets.keySet());
|
||||
for (ConfigurationNode markerSetNode : node.getNode("markerSets").getChildrenList()) {
|
||||
String setId = markerSetNode.getNode("id").getString();
|
||||
if (setId == null) continue;
|
||||
|
||||
externallyRemovedSets.remove(setId);
|
||||
MarkerSetImpl set = markerSets.get(setId);
|
||||
|
||||
if (set == null) {
|
||||
set = new MarkerSetImpl(setId);
|
||||
}
|
||||
|
||||
try {
|
||||
set.load(api, markerSetNode);
|
||||
markerSets.put(setId, set);
|
||||
} catch (MarkerFileFormatException ex) {
|
||||
Logger.global.logDebug("Marker-API: Failed to load marker-set '" + setId + ": " + ex);
|
||||
}
|
||||
}
|
||||
|
||||
for (String setId : externallyRemovedSets) {
|
||||
markerSets.remove(setId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void save() throws IOException {
|
||||
if (!markerFile.exists()) {
|
||||
markerFile.getParentFile().mkdirs();
|
||||
markerFile.createNewFile();
|
||||
}
|
||||
|
||||
GsonConfigurationLoader loader = GsonConfigurationLoader.builder().setFile(markerFile).build();
|
||||
ConfigurationNode node = loader.load();
|
||||
|
||||
List<? extends ConfigurationNode> markerList = node.getNode("markerSets").getChildrenList();
|
||||
node.removeChild("markerSets");
|
||||
|
||||
Set<String> newMarkers = new HashSet<>(markerSets.keySet());
|
||||
for (ConfigurationNode markerSetNode : markerList) {
|
||||
String setId = markerSetNode.getNode("id").getString();
|
||||
if (setId == null) continue;
|
||||
if (removedMarkerSets.contains(setId)) continue;
|
||||
|
||||
newMarkers.remove(setId);
|
||||
MarkerSetImpl set = markerSets.get(setId);
|
||||
|
||||
if (set != null) set.save(markerSetNode, false);
|
||||
|
||||
node.getNode("markerSets").getAppendedNode().mergeValuesFrom(markerSetNode);
|
||||
}
|
||||
|
||||
removedMarkerSets.clear();
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
/*
|
||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||
* Copyright (c) contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package de.bluecolored.bluemap.common.api.marker;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class MarkerFileFormatException extends IOException {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public MarkerFileFormatException() {
|
||||
super();
|
||||
}
|
||||
|
||||
public MarkerFileFormatException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
public MarkerFileFormatException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,210 @@
|
||||
/*
|
||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||
* Copyright (c) contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package de.bluecolored.bluemap.common.api.marker;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import com.flowpowered.math.vector.Vector3d;
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import de.bluecolored.bluemap.api.BlueMapAPI;
|
||||
import de.bluecolored.bluemap.api.marker.Marker;
|
||||
import de.bluecolored.bluemap.api.renderer.BlueMapMap;
|
||||
import ninja.leaping.configurate.ConfigurationNode;
|
||||
|
||||
public abstract class MarkerImpl implements Marker {
|
||||
|
||||
private final String id;
|
||||
private BlueMapMap map;
|
||||
private Vector3d postition;
|
||||
private double minDistance, maxDistance;
|
||||
private String label, link;
|
||||
private boolean newTab;
|
||||
|
||||
private boolean hasUnsavedChanges;
|
||||
|
||||
public MarkerImpl(String id, BlueMapMap map, Vector3d position) {
|
||||
Preconditions.checkNotNull(id);
|
||||
Preconditions.checkNotNull(map);
|
||||
Preconditions.checkNotNull(position);
|
||||
|
||||
this.id = id;
|
||||
this.map = map;
|
||||
this.postition = position;
|
||||
this.minDistance = 0;
|
||||
this.maxDistance = 100000;
|
||||
this.label = id;
|
||||
this.link = null;
|
||||
this.newTab = true;
|
||||
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public abstract String getType();
|
||||
|
||||
@Override
|
||||
public BlueMapMap getMap() {
|
||||
return this.map;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setMap(BlueMapMap map) {
|
||||
this.map = map;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Vector3d getPosition() {
|
||||
return this.postition;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setPosition(Vector3d position) {
|
||||
this.postition = position;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMinDistance() {
|
||||
return this.minDistance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setMinDistance(double minDistance) {
|
||||
this.minDistance = minDistance;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMaxDistance() {
|
||||
return this.maxDistance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setMaxDistance(double maxDistance) {
|
||||
this.maxDistance = maxDistance;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel() {
|
||||
return this.label;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setLabel(String label) {
|
||||
this.label = label;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<String> getLink() {
|
||||
return Optional.ofNullable(this.link);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isNewTab() {
|
||||
return this.newTab;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setLink(String link, boolean newTab) {
|
||||
this.link = link;
|
||||
this.newTab = newTab;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void removeLink() {
|
||||
this.link = null;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
public synchronized void load(BlueMapAPI api, ConfigurationNode markerNode) throws MarkerFileFormatException {
|
||||
this.hasUnsavedChanges = false;
|
||||
|
||||
//map
|
||||
String mapId = markerNode.getNode("map").getString();
|
||||
if (mapId == null) throw new MarkerFileFormatException("There is no map defined!");
|
||||
this.map = api.getMap(mapId).orElseThrow(() -> new MarkerFileFormatException("Could not resolve map with id: " + mapId));
|
||||
|
||||
//position
|
||||
this.postition = readPos(markerNode.getNode("position"));
|
||||
|
||||
//minmaxDistance
|
||||
this.minDistance = markerNode.getNode("minDistance").getDouble(0);
|
||||
this.maxDistance = markerNode.getNode("maxDistance").getDouble(100000);
|
||||
|
||||
//label
|
||||
this.label = markerNode.getNode("label").getString(this.id);
|
||||
|
||||
//link
|
||||
this.link = markerNode.getNode("link").getString();
|
||||
this.newTab = markerNode.getNode("newTab").getBoolean(true);
|
||||
}
|
||||
|
||||
public synchronized void save(ConfigurationNode markerNode, boolean force) {
|
||||
if (!force && !hasUnsavedChanges) return;
|
||||
|
||||
markerNode.getNode("id").setValue(this.id);
|
||||
markerNode.getNode("type").setValue(this.getType());
|
||||
markerNode.getNode("map").setValue(this.map.getId());
|
||||
writePos(markerNode.getNode("position"), this.postition);
|
||||
markerNode.getNode("minDistance").setValue(Math.round(this.minDistance * 1000d) / 1000d);
|
||||
markerNode.getNode("maxDistance").setValue(Math.round(this.maxDistance * 1000d) / 1000d);
|
||||
markerNode.getNode("label").setValue(this.label);
|
||||
markerNode.getNode("link").setValue(this.link);
|
||||
markerNode.getNode("newTab").setValue(this.newTab);
|
||||
|
||||
hasUnsavedChanges = false;
|
||||
}
|
||||
|
||||
private static Vector3d readPos(ConfigurationNode node) throws MarkerFileFormatException {
|
||||
ConfigurationNode nx, ny, nz;
|
||||
nx = node.getNode("x");
|
||||
ny = node.getNode("y");
|
||||
nz = node.getNode("z");
|
||||
|
||||
if (nx.isVirtual() || ny.isVirtual() || nz.isVirtual()) throw new MarkerFileFormatException("Failed to read position: One of the nodes x,y or z is missing!");
|
||||
|
||||
return new Vector3d(
|
||||
nx.getDouble(),
|
||||
ny.getDouble(),
|
||||
nz.getDouble()
|
||||
);
|
||||
}
|
||||
|
||||
private static void writePos(ConfigurationNode node, Vector3d pos) {
|
||||
node.getNode("x").setValue(Math.round(pos.getX() * 1000d) / 1000d);
|
||||
node.getNode("y").setValue(Math.round(pos.getY() * 1000d) / 1000d);
|
||||
node.getNode("z").setValue(Math.round(pos.getZ() * 1000d) / 1000d);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,232 @@
|
||||
/*
|
||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||
* Copyright (c) contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package de.bluecolored.bluemap.common.api.marker;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import com.flowpowered.math.vector.Vector3d;
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
import de.bluecolored.bluemap.api.BlueMapAPI;
|
||||
import de.bluecolored.bluemap.api.marker.Marker;
|
||||
import de.bluecolored.bluemap.api.marker.MarkerSet;
|
||||
import de.bluecolored.bluemap.api.marker.Shape;
|
||||
import de.bluecolored.bluemap.api.renderer.BlueMapMap;
|
||||
import de.bluecolored.bluemap.core.logger.Logger;
|
||||
import ninja.leaping.configurate.ConfigurationNode;
|
||||
|
||||
public class MarkerSetImpl implements MarkerSet {
|
||||
|
||||
private final String id;
|
||||
private String label;
|
||||
private boolean toggleable;
|
||||
private boolean isDefaultHidden;
|
||||
private Map<String, MarkerImpl> markers;
|
||||
|
||||
private Set<String> removedMarkers;
|
||||
|
||||
private boolean hasUnsavedChanges;
|
||||
|
||||
public MarkerSetImpl(String id) {
|
||||
this.id = id;
|
||||
this.label = id;
|
||||
this.toggleable = true;
|
||||
this.isDefaultHidden = false;
|
||||
this.markers = new ConcurrentHashMap<>();
|
||||
|
||||
this.removedMarkers = Sets.newConcurrentHashSet();
|
||||
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel() {
|
||||
return this.label;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setLabel(String label) {
|
||||
this.label = label;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isToggleable() {
|
||||
return this.toggleable;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setToggleable(boolean toggleable) {
|
||||
this.toggleable = toggleable;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDefautHidden() {
|
||||
return this.isDefaultHidden;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setDefaultHidden(boolean defaultHide) {
|
||||
this.isDefaultHidden = defaultHide;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Marker> getMarkers() {
|
||||
return Collections.unmodifiableCollection(markers.values());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<Marker> getMarker(String id) {
|
||||
return Optional.ofNullable(markers.get(id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized POIMarkerImpl createPOIMarker(String id, BlueMapMap map, Vector3d position) {
|
||||
removeMarker(id);
|
||||
|
||||
POIMarkerImpl marker = new POIMarkerImpl(id, map, position);
|
||||
markers.put(id, marker);
|
||||
|
||||
return marker;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized ShapeMarkerImpl createShapeMarker(String id, BlueMapMap map, Vector3d position, Shape shape, float height) {
|
||||
removeMarker(id);
|
||||
|
||||
ShapeMarkerImpl marker = new ShapeMarkerImpl(id, map, position, shape, height);
|
||||
markers.put(id, marker);
|
||||
|
||||
return marker;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean removeMarker(String id) {
|
||||
if (markers.remove(id) != null) {
|
||||
removedMarkers.add(id);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public synchronized void load(BlueMapAPI api, ConfigurationNode node) throws MarkerFileFormatException {
|
||||
this.hasUnsavedChanges = false;
|
||||
this.removedMarkers.clear();
|
||||
|
||||
this.label = node.getNode("label").getString(id);
|
||||
this.toggleable = node.getNode("toggleable").getBoolean(true);
|
||||
this.isDefaultHidden = node.getNode("defaultHide").getBoolean(false);
|
||||
|
||||
BlueMapMap dummyMap = api.getMaps().iterator().next();
|
||||
Shape dummyShape = Shape.createRect(0d, 0d, 1d, 1d);
|
||||
Set<String> externallyRemovedMarkers = new HashSet<>(this.markers.keySet());
|
||||
|
||||
for (ConfigurationNode markerNode : node.getNode("marker").getChildrenList()) {
|
||||
String id = markerNode.getNode("id").getString();
|
||||
String type = markerNode.getNode("type").getString();
|
||||
|
||||
if (id == null || type == null) {
|
||||
Logger.global.logDebug("Marker-API: Failed to load a marker in the set '" + this.id + "': No id or type defined!");
|
||||
}
|
||||
|
||||
MarkerImpl marker = markers.get(id);
|
||||
externallyRemovedMarkers.remove(id);
|
||||
|
||||
if (marker == null || !marker.getType().equals(type)) {
|
||||
switch (type) {
|
||||
case POIMarkerImpl.MARKER_TYPE:
|
||||
marker = new POIMarkerImpl(id, dummyMap, Vector3d.ZERO);
|
||||
break;
|
||||
case ShapeMarkerImpl.MARKER_TYPE:
|
||||
marker = new ShapeMarkerImpl(id, dummyMap, Vector3d.ZERO, dummyShape, 0f);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
marker.load(api, markerNode);
|
||||
markers.put(id, marker);
|
||||
} catch (MarkerFileFormatException ex) {
|
||||
Logger.global.logDebug("Marker-API: Failed to load marker '" + id + "' in the set '" + this.id + "': " + ex);
|
||||
}
|
||||
}
|
||||
|
||||
for (String id : externallyRemovedMarkers) {
|
||||
markers.remove(id);
|
||||
}
|
||||
}
|
||||
|
||||
public synchronized void save(ConfigurationNode node, boolean force) {
|
||||
List<? extends ConfigurationNode> markerList = node.getNode("marker").getChildrenList();
|
||||
node.removeChild("marker");
|
||||
|
||||
Set<String> newMarkers = new HashSet<>(markers.keySet());
|
||||
for (ConfigurationNode markerNode : markerList) {
|
||||
String id = markerNode.getNode("id").getString();
|
||||
if (id == null) continue;
|
||||
if (removedMarkers.contains(id)) continue;
|
||||
|
||||
newMarkers.remove(id);
|
||||
MarkerImpl marker = markers.get(id);
|
||||
|
||||
if (marker != null) marker.save(markerNode, false);
|
||||
|
||||
node.getNode("marker").getAppendedNode().mergeValuesFrom(markerNode);
|
||||
}
|
||||
|
||||
for (String markerId : newMarkers) {
|
||||
MarkerImpl marker = markers.get(markerId);
|
||||
if (marker == null) continue;
|
||||
|
||||
marker.save(node.getNode("marker").getAppendedNode(), true);
|
||||
}
|
||||
|
||||
removedMarkers.clear();
|
||||
|
||||
if (!force && !hasUnsavedChanges) return;
|
||||
|
||||
node.getNode("id").setValue(this.id);
|
||||
node.getNode("label").setValue(this.label);
|
||||
node.getNode("toggleable").setValue(this.toggleable);
|
||||
node.getNode("defaultHide").setValue(this.isDefaultHidden);
|
||||
|
||||
this.hasUnsavedChanges = false;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,108 @@
|
||||
/*
|
||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||
* Copyright (c) contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package de.bluecolored.bluemap.common.api.marker;
|
||||
|
||||
import com.flowpowered.math.vector.Vector2i;
|
||||
import com.flowpowered.math.vector.Vector3d;
|
||||
|
||||
import de.bluecolored.bluemap.api.BlueMapAPI;
|
||||
import de.bluecolored.bluemap.api.marker.POIMarker;
|
||||
import de.bluecolored.bluemap.api.renderer.BlueMapMap;
|
||||
import ninja.leaping.configurate.ConfigurationNode;
|
||||
|
||||
public class POIMarkerImpl extends MarkerImpl implements POIMarker {
|
||||
public static final String MARKER_TYPE = "poi";
|
||||
|
||||
private String iconAddress;
|
||||
private Vector2i anchor;
|
||||
|
||||
private boolean hasUnsavedChanges;
|
||||
|
||||
public POIMarkerImpl(String id, BlueMapMap map, Vector3d position) {
|
||||
super(id, map, position);
|
||||
|
||||
this.iconAddress = "assets/poi.svg";
|
||||
this.anchor = new Vector2i(25, 45);
|
||||
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
return MARKER_TYPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getIconAddress() {
|
||||
return iconAddress;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Vector2i getIconAnchor() {
|
||||
return anchor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setIcon(String iconAddress, Vector2i anchor) {
|
||||
this.iconAddress = iconAddress;
|
||||
this.anchor = anchor;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void load(BlueMapAPI api, ConfigurationNode markerNode) throws MarkerFileFormatException {
|
||||
super.load(api, markerNode);
|
||||
|
||||
this.hasUnsavedChanges = false;
|
||||
|
||||
this.iconAddress = markerNode.getNode("icon").getString("assets/poi.svg");
|
||||
this.anchor = readAnchor(markerNode.getNode("iconAnchor"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void save(ConfigurationNode markerNode, boolean force) {
|
||||
super.save(markerNode, force);
|
||||
|
||||
if (!force && !hasUnsavedChanges) return;
|
||||
|
||||
markerNode.getNode("icon").setValue(this.iconAddress);
|
||||
writeAnchor(markerNode.getNode("iconAnchor"), this.anchor);
|
||||
|
||||
hasUnsavedChanges = false;
|
||||
}
|
||||
|
||||
private static Vector2i readAnchor(ConfigurationNode node) {
|
||||
return new Vector2i(
|
||||
node.getNode("x").getInt(0),
|
||||
node.getNode("y").getInt(0)
|
||||
);
|
||||
}
|
||||
|
||||
private static void writeAnchor(ConfigurationNode node, Vector2i anchor) {
|
||||
node.getNode("x").setValue(anchor.getX());
|
||||
node.getNode("y").setValue(anchor.getY());
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,200 @@
|
||||
/*
|
||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||
* Copyright (c) contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package de.bluecolored.bluemap.common.api.marker;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.util.List;
|
||||
|
||||
import com.flowpowered.math.vector.Vector2d;
|
||||
import com.flowpowered.math.vector.Vector3d;
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import de.bluecolored.bluemap.api.BlueMapAPI;
|
||||
import de.bluecolored.bluemap.api.marker.Shape;
|
||||
import de.bluecolored.bluemap.api.marker.ShapeMarker;
|
||||
import de.bluecolored.bluemap.api.renderer.BlueMapMap;
|
||||
import ninja.leaping.configurate.ConfigurationNode;
|
||||
|
||||
public class ShapeMarkerImpl extends MarkerImpl implements ShapeMarker {
|
||||
public static final String MARKER_TYPE = "shape";
|
||||
|
||||
private Shape shape;
|
||||
private float height;
|
||||
private Color borderColor, fillColor;
|
||||
|
||||
private boolean hasUnsavedChanges;
|
||||
|
||||
public ShapeMarkerImpl(String id, BlueMapMap map, Vector3d position, Shape shape, float height) {
|
||||
super(id, map, position);
|
||||
|
||||
Preconditions.checkNotNull(shape);
|
||||
|
||||
this.shape = shape;
|
||||
this.height = height;
|
||||
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
return MARKER_TYPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Shape getShape() {
|
||||
return this.shape;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getHeight() {
|
||||
return this.height;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setShape(Shape shape, float height) {
|
||||
Preconditions.checkNotNull(shape);
|
||||
|
||||
this.shape = shape;
|
||||
this.height = height;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Color getBorderColor() {
|
||||
return this.borderColor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setBorderColor(Color color) {
|
||||
Preconditions.checkNotNull(color);
|
||||
|
||||
this.borderColor = color;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Color getFillColor() {
|
||||
return this.fillColor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void setFillColor(Color color) {
|
||||
Preconditions.checkNotNull(color);
|
||||
|
||||
this.fillColor = color;
|
||||
this.hasUnsavedChanges = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void load(BlueMapAPI api, ConfigurationNode markerNode) throws MarkerFileFormatException {
|
||||
super.load(api, markerNode);
|
||||
|
||||
this.shape = readShape(markerNode.getNode("icon"));
|
||||
this.height = markerNode.getNode("height").getFloat(64);
|
||||
this.borderColor = readColor(markerNode.getNode("borderColor"));
|
||||
this.fillColor = readColor(markerNode.getNode("fillColor"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save(ConfigurationNode markerNode, boolean force) {
|
||||
super.save(markerNode, force);
|
||||
|
||||
if (!force && !hasUnsavedChanges) return;
|
||||
|
||||
writeShape(markerNode.getNode("shape"), this.shape);
|
||||
markerNode.getNode("height").setValue(Math.round(height * 1000f) / 1000f);
|
||||
writeColor(markerNode.getNode("borderColor"), this.borderColor);
|
||||
writeColor(markerNode.getNode("fillColor"), this.fillColor);
|
||||
|
||||
hasUnsavedChanges = false;
|
||||
}
|
||||
|
||||
private Shape readShape(ConfigurationNode node) throws MarkerFileFormatException {
|
||||
List<? extends ConfigurationNode> posNodes = node.getChildrenList();
|
||||
|
||||
if (posNodes.size() < 3) throw new MarkerFileFormatException("Failed to read shape: point-list has fewer than 3 entries!");
|
||||
|
||||
Vector2d[] positions = new Vector2d[posNodes.size()];
|
||||
for (int i = 0; i < positions.length; i++) {
|
||||
positions[i] = readShapePos(posNodes.get(i));
|
||||
}
|
||||
|
||||
return new Shape(positions);
|
||||
}
|
||||
|
||||
private static Vector2d readShapePos(ConfigurationNode node) throws MarkerFileFormatException {
|
||||
ConfigurationNode nx, nz;
|
||||
nx = node.getNode("x");
|
||||
nz = node.getNode("z");
|
||||
|
||||
if (nx.isVirtual() || nz.isVirtual()) throw new MarkerFileFormatException("Failed to read shape position: Node x or z is not set!");
|
||||
|
||||
return new Vector2d(
|
||||
nx.getDouble(),
|
||||
nz.getDouble()
|
||||
);
|
||||
}
|
||||
|
||||
private static Color readColor(ConfigurationNode node) throws MarkerFileFormatException {
|
||||
ConfigurationNode nr, ng, nb, na;
|
||||
nr = node.getNode("r");
|
||||
ng = node.getNode("g");
|
||||
nb = node.getNode("b");
|
||||
na = node.getNode("a");
|
||||
|
||||
if (nr.isVirtual() || ng.isVirtual() || nb.isVirtual()) throw new MarkerFileFormatException("Failed to read color: Node r,g or b is not set!");
|
||||
|
||||
float alpha = na.getFloat(1);
|
||||
if (alpha < 0 || alpha > 1) throw new MarkerFileFormatException("Failed to read color: alpha value out of range (0-1)!");
|
||||
|
||||
try {
|
||||
return new Color(nr.getInt(), ng.getInt(), nb.getInt(), (int)(alpha * 255));
|
||||
} catch (IllegalArgumentException ex) {
|
||||
throw new MarkerFileFormatException("Failed to read color: " + ex.getMessage(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
private static void writeShape(ConfigurationNode node, Shape shape) {
|
||||
for (int i = 0; i < shape.getPointCount(); i++) {
|
||||
ConfigurationNode pointNode = node.getAppendedNode();
|
||||
Vector2d point = shape.getPoint(i);
|
||||
pointNode.getNode("x").setValue(Math.round(point.getX() * 1000d) / 1000d);
|
||||
pointNode.getNode("z").setValue(Math.round(point.getY() * 1000d) / 1000d);
|
||||
}
|
||||
}
|
||||
|
||||
private static void writeColor(ConfigurationNode node, Color color) {
|
||||
int r = color.getRed();
|
||||
int g = color.getGreen();
|
||||
int b = color.getBlue();
|
||||
float a = color.getAlpha() / 255f;
|
||||
|
||||
node.getNode("r").setValue(r);
|
||||
node.getNode("g").setValue(g);
|
||||
node.getNode("b").setValue(b);
|
||||
node.getNode("a").setValue(a);
|
||||
}
|
||||
|
||||
}
|
||||
@ -199,6 +199,11 @@ public synchronized void load() throws IOException, ParseResourceException {
|
||||
MapType mapType = new MapType(id, name, world, tileRenderer);
|
||||
maps.put(id, mapType);
|
||||
}
|
||||
if (maps.isEmpty()) {
|
||||
Logger.global.logWarning("There are no valid maps configured, please check your config! Disabling BlueMap...");
|
||||
unload();
|
||||
return;
|
||||
}
|
||||
|
||||
//initialize render manager
|
||||
renderManager = new RenderManager(config.getRenderThreadCount());
|
||||
@ -293,6 +298,7 @@ public synchronized void unload() {
|
||||
|
||||
//disable api
|
||||
if (api != null) api.unregister();
|
||||
api = null;
|
||||
|
||||
//unregister listeners
|
||||
serverInterface.unregisterAllListeners();
|
||||
|
||||
@ -6,7 +6,7 @@ export default class MarkerSet {
|
||||
constructor(blueMap, setData) {
|
||||
this.blueMap = blueMap;
|
||||
this.id = setData.id;
|
||||
this.label = setData.label ? setData.label : this.id;
|
||||
this.label = setData.label ? this.escapeHTML(setData.label) : this.id;
|
||||
this.toggleable = setData.toggleable !== undefined ? !!setData.toggleable : true;
|
||||
this.defaultHide = !!setData.defaultHide;
|
||||
this.marker = [];
|
||||
@ -33,4 +33,8 @@ export default class MarkerSet {
|
||||
});
|
||||
}
|
||||
|
||||
escapeHTML(text) {
|
||||
return text.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user