diff --git a/src/leaflet/LiveAtlasLeafletMap.ts b/src/leaflet/LiveAtlasLeafletMap.ts index fa41ea3..b863a96 100644 --- a/src/leaflet/LiveAtlasLeafletMap.ts +++ b/src/leaflet/LiveAtlasLeafletMap.ts @@ -18,10 +18,11 @@ import {Map, DomUtil, MapOptions} from 'leaflet'; import LayerManager from "@/leaflet/layer/LayerManager"; export default class LiveAtlasLeafletMap extends Map { + declare _controlCorners: any; + declare _controlContainer?: HTMLElement; + declare _container?: HTMLElement; + private readonly _layerManager: LayerManager; - private _controlCorners: any; - private _controlContainer?: HTMLElement; - private _container?: HTMLElement; constructor(element: string | HTMLElement, options?: MapOptions) { super(element, options); diff --git a/src/leaflet/control/ChatControl.ts b/src/leaflet/control/ChatControl.ts index 9dfa09d..c1d0799 100644 --- a/src/leaflet/control/ChatControl.ts +++ b/src/leaflet/control/ChatControl.ts @@ -22,8 +22,7 @@ import {watch} from "@vue/runtime-core"; import "@/assets/icons/chat.svg"; export class ChatControl extends Control { - // @ts-ignore - options: ControlOptions + declare options: ControlOptions constructor(options: ControlOptions) { super(options); diff --git a/src/leaflet/control/ClockControl.ts b/src/leaflet/control/ClockControl.ts index 6003e0c..756c32e 100644 --- a/src/leaflet/control/ClockControl.ts +++ b/src/leaflet/control/ClockControl.ts @@ -38,10 +38,9 @@ export interface ClockControlOptions extends ControlOptions { } export class ClockControl extends Control { - // @ts-ignore - options: ClockControlOptions; + declare options: ClockControlOptions; + declare _container?: HTMLElement; - private _container?: HTMLElement; private _sun?: HTMLElement; private _moon?: HTMLElement; private _clock?: HTMLElement; diff --git a/src/leaflet/control/CoordinatesControl.ts b/src/leaflet/control/CoordinatesControl.ts index 081b493..5cf420c 100644 --- a/src/leaflet/control/CoordinatesControl.ts +++ b/src/leaflet/control/CoordinatesControl.ts @@ -31,10 +31,9 @@ export interface CoordinatesControlOptions extends ControlOptions { } export class CoordinatesControl extends Control { - // @ts-ignore - options: CoordinatesControlOptions; + declare options: CoordinatesControlOptions; + declare _map ?: Map; - private _map ?: Map; private _location?: Coordinate; private _locationChanged: boolean = false; private readonly _coordsContainer: HTMLSpanElement; diff --git a/src/leaflet/control/LinkControl.ts b/src/leaflet/control/LinkControl.ts index 25bc9e1..f73d0b7 100644 --- a/src/leaflet/control/LinkControl.ts +++ b/src/leaflet/control/LinkControl.ts @@ -25,8 +25,7 @@ import {notify} from "@kyvg/vue3-notification"; import {computed} from "@vue/runtime-core"; export class LinkControl extends Control { - // @ts-ignore - options: ControlOptions + declare options: ControlOptions constructor(options: ControlOptions) { super(options); diff --git a/src/leaflet/control/LiveAtlasLayerControl.ts b/src/leaflet/control/LiveAtlasLayerControl.ts index a79df59..f776e97 100644 --- a/src/leaflet/control/LiveAtlasLayerControl.ts +++ b/src/leaflet/control/LiveAtlasLayerControl.ts @@ -32,15 +32,16 @@ import Layers = Control.Layers; const store = useStore(); export class LiveAtlasLayerControl extends Control.Layers { + declare _map ?: LeafletMap; + declare _overlaysList?: HTMLElement; + declare _baseLayersList?: HTMLElement; + declare _layerControlInputs?: HTMLElement[]; + declare _container?: HTMLElement; + declare _section?: HTMLElement; + declare _separator?: HTMLElement; + private _layersButton?: HTMLElement; - private _map ?: LeafletMap; - private _overlaysList?: HTMLElement; - private _baseLayersList?: HTMLElement; - private _layerControlInputs?: HTMLElement[]; private _layerPositions: Map; - private _container?: HTMLElement; - private _section?: HTMLElement; - private _separator?: HTMLElement; private visible: boolean = false; constructor(baseLayers?: LayersObject, overlays?: LayersObject, options?: LayersOptions) { diff --git a/src/leaflet/control/LoadingControl.ts b/src/leaflet/control/LoadingControl.ts index 41be051..55c9d19 100644 --- a/src/leaflet/control/LoadingControl.ts +++ b/src/leaflet/control/LoadingControl.ts @@ -38,12 +38,11 @@ export interface LoadingControlOptions extends ControlOptions { } export class LoadingControl extends Control { - // @ts-ignore - options: LoadingControlOptions; + declare options: LoadingControlOptions; - _dataLoaders: Set = new Set(); - _loadingIndicator: HTMLDivElement; - _delayIndicatorTimeout?: number; + private _dataLoaders: Set = new Set(); + private readonly _loadingIndicator: HTMLDivElement; + private _delayIndicatorTimeout?: number; constructor(options: LoadingControlOptions) { super(options); diff --git a/src/leaflet/control/LogoControl.ts b/src/leaflet/control/LogoControl.ts index 7466684..9abc078 100644 --- a/src/leaflet/control/LogoControl.ts +++ b/src/leaflet/control/LogoControl.ts @@ -26,8 +26,7 @@ export interface LogoControlOptions extends ControlOptions { } export class LogoControl extends Control { - // @ts-ignore - options: LogoControlOptions; + declare options: LogoControlOptions; constructor(options: LogoControlOptions) { super(options); diff --git a/src/leaflet/icon/GenericIcon.ts b/src/leaflet/icon/GenericIcon.ts index 4603b35..3de9624 100644 --- a/src/leaflet/icon/GenericIcon.ts +++ b/src/leaflet/icon/GenericIcon.ts @@ -45,8 +45,7 @@ export class GenericIcon extends DivIcon { className: '', }; - // @ts-ignore - options: GenericIconOptions; + declare options: GenericIconOptions; private _image?: HTMLImageElement; private _label?: HTMLSpanElement; diff --git a/src/leaflet/icon/PlayerIcon.ts b/src/leaflet/icon/PlayerIcon.ts index 15c67aa..f5ac906 100644 --- a/src/leaflet/icon/PlayerIcon.ts +++ b/src/leaflet/icon/PlayerIcon.ts @@ -49,6 +49,8 @@ export interface PlayerIconOptions extends MarkerOptions { } export class PlayerIcon extends DivIcon { + declare options: PlayerIconOptions; + private readonly _player: LiveAtlasPlayer; private _container?: HTMLDivElement; private _playerImage?: HTMLImageElement; @@ -62,9 +64,6 @@ export class PlayerIcon extends DivIcon { private _playerArmor?: HTMLDivElement; private _playerArmorBar?: HTMLDivElement; - // @ts-ignore - options: PlayerIconOptions; - constructor(player: LiveAtlasPlayer, options: PlayerIconOptions) { super(options); this._player = player; diff --git a/src/leaflet/layer/LiveAtlasLayerGroup.ts b/src/leaflet/layer/LiveAtlasLayerGroup.ts index e1e6be7..4073dea 100644 --- a/src/leaflet/layer/LiveAtlasLayerGroup.ts +++ b/src/leaflet/layer/LiveAtlasLayerGroup.ts @@ -28,11 +28,11 @@ export interface LiveAtlasLayerGroupOptions extends LayerOptions { } export default class LiveAtlasLayerGroup extends LayerGroup { - // @ts-ignore - options: LiveAtlasLayerGroupOptions; + declare options: LiveAtlasLayerGroupOptions; + declare _layers: any; + private _zoomLimitedLayers: Set; //Layers which are zoom limited and should be checked on zoom - _layers: any; - _markerPane?: HTMLElement; + private _markerPane?: HTMLElement; private _zoomEndCallback = () => this._updateLayerVisibility(); diff --git a/src/leaflet/marker/PlayerMarker.ts b/src/leaflet/marker/PlayerMarker.ts index e91d621..eadc077 100644 --- a/src/leaflet/marker/PlayerMarker.ts +++ b/src/leaflet/marker/PlayerMarker.ts @@ -26,6 +26,8 @@ export interface PlayerMarkerOptions extends MarkerOptions { } export class PlayerMarker extends Marker { + declare options: PlayerMarkerOptions; + private _player: LiveAtlasPlayer; constructor(player: LiveAtlasPlayer, options: PlayerMarkerOptions) { diff --git a/src/leaflet/tileLayer/LiveAtlasTileLayer.ts b/src/leaflet/tileLayer/LiveAtlasTileLayer.ts index 6e6caa7..4c4ea3d 100644 --- a/src/leaflet/tileLayer/LiveAtlasTileLayer.ts +++ b/src/leaflet/tileLayer/LiveAtlasTileLayer.ts @@ -26,9 +26,9 @@ export interface LiveAtlasTileLayerOptions extends TileLayerOptions { // noinspection JSUnusedGlobalSymbols export abstract class LiveAtlasTileLayer extends TileLayer { - protected _mapSettings: LiveAtlasMapDefinition; declare options: LiveAtlasTileLayerOptions; + protected _mapSettings: LiveAtlasMapDefinition; private readonly tileTemplate: LiveAtlasTileElement; protected readonly loadQueue: LiveAtlasTileElement[] = []; private readonly loadingTiles: Set = Object.seal(new Set());