Rename GenericMarker dimensions to iconSize and make optional
This commit is contained in:
parent
2a47a99493
commit
87a1665d53
2
src/index.d.ts
vendored
2
src/index.d.ts
vendored
@ -217,8 +217,8 @@ interface LiveAtlasMarker {
|
||||
|
||||
interface LiveAtlasPointMarker extends LiveAtlasMarker {
|
||||
type: LiveAtlasMarkerType.POINT;
|
||||
dimensions: PointTuple;
|
||||
iconUrl: string;
|
||||
iconSize?: PointTuple;
|
||||
}
|
||||
|
||||
interface LiveAtlasPathMarker extends LiveAtlasMarker {
|
||||
|
@ -24,7 +24,7 @@ export interface GenericIconOptions extends BaseIconOptions {
|
||||
label: string;
|
||||
isHtml?: boolean;
|
||||
showLabel?: boolean;
|
||||
iconSize: PointTuple;
|
||||
iconSize?: PointTuple;
|
||||
className?: string;
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ markerLabel.className = 'marker__label';
|
||||
const defaultOptions: GenericIconOptions = {
|
||||
iconUrl: 'default',
|
||||
label: '',
|
||||
iconSize: [16, 16],
|
||||
iconSize: undefined,
|
||||
popupAnchor: [0, 0],
|
||||
iconAnchor: [0, 0],
|
||||
tooltipAnchor: [0, 0],
|
||||
|
@ -33,7 +33,7 @@ export class GenericMarker extends Marker {
|
||||
this.options.icon = new GenericIcon({
|
||||
iconUrl: options.iconUrl,
|
||||
label: options.tooltipHTML || options.tooltip,
|
||||
iconSize: options.dimensions,
|
||||
iconSize: options.iconSize,
|
||||
isHtml: !!options.tooltipHTML,
|
||||
});
|
||||
|
||||
|
@ -18,6 +18,7 @@
|
||||
*/
|
||||
|
||||
import {
|
||||
LiveAtlasAreaMarker,
|
||||
LiveAtlasComponentConfig,
|
||||
LiveAtlasDimension,
|
||||
LiveAtlasMarker,
|
||||
@ -279,7 +280,7 @@ export default class OverviewerMapProvider extends MapProvider {
|
||||
marker.iconUrl = this.config + (data.icon || markerSet.icon);
|
||||
}
|
||||
|
||||
return marker as LiveAtlasMarker;
|
||||
return marker as LiveAtlasMarker | LiveAtlasAreaMarker;
|
||||
}
|
||||
|
||||
async loadServerConfiguration(): Promise<void> {
|
||||
|
@ -325,7 +325,7 @@ export default class Pl3xmapMapProvider extends MapProvider {
|
||||
y: 0,
|
||||
z: marker.point?.z || 0,
|
||||
},
|
||||
dimensions: marker.size ? [marker.size.x || 16, marker.size.z || 16] : [16, 16],
|
||||
iconSize: marker.size ? [marker.size.x || 16, marker.size.z || 16] : [16, 16],
|
||||
iconUrl: `${this.config}images/icon/registered/${marker.icon || "default"}.png`,
|
||||
|
||||
tooltip: marker.tooltip ? stripHTML(marker.tooltip) : '',
|
||||
|
@ -349,8 +349,8 @@ function buildMarker(id: string, data: Marker, config: DynmapUrlConfig): LiveAtl
|
||||
y: !isNaN(data.y) ? Number.isInteger(data.y) ? data.y + 0.5 : data.y : 0,
|
||||
z: !isNaN(data.z) ? Number.isInteger(data.z) ? data.z + 0.5 : data.z : 0,
|
||||
},
|
||||
dimensions: (dimensions || [16, 16]) as PointTuple,
|
||||
iconUrl: `${config.markers}_markers_/${data.icon || "default"}.png`,
|
||||
iconSize: (dimensions || [16, 16]) as PointTuple,
|
||||
minZoom: typeof data.minzoom !== 'undefined' && data.minzoom > -1 ? data.minzoom : undefined,
|
||||
maxZoom: typeof data.maxzoom !== 'undefined' && data.maxzoom > -1 ? data.maxzoom : undefined,
|
||||
tooltip: data.markup ? stripHTML(data.label) : data.label,
|
||||
|
@ -54,7 +54,7 @@ export const updatePointLayer = (marker: Marker | undefined, options: LiveAtlasP
|
||||
icon.update({
|
||||
iconUrl: options.iconUrl,
|
||||
label: options.tooltipHTML || options.tooltip,
|
||||
iconSize: options.dimensions,
|
||||
iconSize: options.iconSize,
|
||||
isHtml: !!options.tooltipHTML,
|
||||
});
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user