From 46fc602a96bff22757c97f81196d354eec2cbe33 Mon Sep 17 00:00:00 2001 From: James Lyne Date: Fri, 14 Jan 2022 19:52:23 +0000 Subject: [PATCH] Fix incorrect argument type for DynmapTileLayer.getTileInfo --- src/index.d.ts | 5 +++++ src/leaflet/tileLayer/DynmapTileLayer.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/index.d.ts b/src/index.d.ts index c922e60..b5d5b19 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -57,6 +57,11 @@ interface Coordinate { z: number; } +interface Coordinate2D { + x: number; + y: number; +} + interface LiveAtlasLocation { x: number; y: number; diff --git a/src/leaflet/tileLayer/DynmapTileLayer.ts b/src/leaflet/tileLayer/DynmapTileLayer.ts index b0e5413..57f24f9 100644 --- a/src/leaflet/tileLayer/DynmapTileLayer.ts +++ b/src/leaflet/tileLayer/DynmapTileLayer.ts @@ -19,7 +19,7 @@ import {Map as LeafletMap, Coords, DoneCallback} from 'leaflet'; import {useStore} from "@/store"; -import {Coordinate} from "@/index"; +import {Coordinate, Coordinate2D} from "@/index"; import {LiveAtlasTileLayer, LiveAtlasTileLayerOptions} from "@/leaflet/tileLayer/LiveAtlasTileLayer"; import {computed, watch} from "@vue/runtime-core"; import {ComputedRef} from "@vue/reactivity"; @@ -159,7 +159,7 @@ export class DynmapTileLayer extends LiveAtlasTileLayer { return 'z'.repeat(amount) + (amount === 0 ? '' : '_'); } - private getTileInfo(coords: Coordinate): TileInformation { + private getTileInfo(coords: Coordinate2D): TileInformation { // zoom: max zoomed in = this.options.maxZoom, max zoomed out = 0 // izoom: max zoomed in = 0, max zoomed out = this.options.maxZoom // zoomoutlevel: izoom < mapzoomin -> 0, else -> izoom - mapzoomin (which ranges from 0 till mapzoomout)