Skirda/LiveAtlas
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inactive maps stealing pending tile updates

Browse Source
This commit is contained in:
James Lyne 2021-12-16 00:33:41 +00:00
parent f0f98206a1
commit 421c72dba7
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/leaflet/tileLayer/DynmapTileLayer.ts
View File

@ -17,7 +17,7 @@
* limitations under the License. * limitations under the License.
*/ */
import {Coords, DoneCallback} from 'leaflet'; import {Map as LeafletMap, Coords, DoneCallback} from 'leaflet';
import {useStore} from "@/store"; import {useStore} from "@/store";
import {Coordinate} from "@/index"; import {Coordinate} from "@/index";
import {LiveAtlasTileLayer, LiveAtlasTileLayerOptions} from "@/leaflet/tileLayer/LiveAtlasTileLayer"; import {LiveAtlasTileLayer, LiveAtlasTileLayerOptions} from "@/leaflet/tileLayer/LiveAtlasTileLayer";
@ -31,13 +31,13 @@ const store = useStore();
// noinspection JSUnusedGlobalSymbols // noinspection JSUnusedGlobalSymbols
export class DynmapTileLayer extends LiveAtlasTileLayer { export class DynmapTileLayer extends LiveAtlasTileLayer {
private readonly _namedTiles: Map<any, any> = Object.seal(new Map()); private readonly _namedTiles: Map<any, any>;
private readonly _baseUrl: string; private readonly _baseUrl: string;
private readonly _night: ComputedRef<boolean>; private readonly _night: ComputedRef<boolean>;
private readonly _pendingUpdates: ComputedRef<boolean>; private readonly _pendingUpdates: ComputedRef<boolean>;
private readonly _nightUnwatch: WatchStopHandle; private _nightUnwatch: WatchStopHandle | null = null;
private readonly _updateUnwatch: WatchStopHandle; private _updateUnwatch: WatchStopHandle | null = null;
private _updateFrame: number = 0; private _updateFrame: number = 0;
constructor(options: LiveAtlasTileLayerOptions) { constructor(options: LiveAtlasTileLayerOptions) {
@ -45,20 +45,29 @@ export class DynmapTileLayer extends LiveAtlasTileLayer {
this._mapSettings = options.mapSettings; this._mapSettings = options.mapSettings;
this._baseUrl = store.state.currentMapProvider!.getTilesUrl(); this._baseUrl = store.state.currentMapProvider!.getTilesUrl();
this._namedTiles = Object.seal(new Map());
this._pendingUpdates = computed(() => !!store.state.pendingTileUpdates.length); this._pendingUpdates = computed(() => !!store.state.pendingTileUpdates.length);
this._night = computed(() => store.getters.night);
}
onAdd(map: LeafletMap) {
super.onAdd(map);
//Only watch updates when active map, to avoid stealing other map's tile updates
this._updateUnwatch = watch(this._pendingUpdates, (newValue, oldValue) => { this._updateUnwatch = watch(this._pendingUpdates, (newValue, oldValue) => {
if(newValue && !oldValue && !this._updateFrame) { if(newValue && !oldValue && !this._updateFrame) {
this.handlePendingUpdates(); this.handlePendingUpdates();
} }
}); });
this._night = computed(() => store.getters.night);
this._nightUnwatch = watch(this._night, () => { this._nightUnwatch = watch(this._night, () => {
if(this._mapSettings.nightAndDay) { if(this._mapSettings.nightAndDay) {
this.redraw(); this.redraw();
} }
}); });
return this;
} }
private getTileName(coords: Coordinate) { private getTileName(coords: Coordinate) {
@ -88,6 +97,7 @@ export class DynmapTileLayer extends LiveAtlasTileLayer {
const tile = this._namedTiles.get(name); const tile = this._namedTiles.get(name);
if (tile) { if (tile) {
tile.classList.remove('leaflet-tile-loaded');
tile.dataset.src = this.getTileUrlFromName(name, timestamp); tile.dataset.src = this.getTileUrlFromName(name, timestamp);
this.loadQueue.push(tile); this.loadQueue.push(tile);
this.tickLoadQueue(); this.tickLoadQueue();
@ -190,7 +200,9 @@ export class DynmapTileLayer extends LiveAtlasTileLayer {
remove() { remove() {
super.remove(); super.remove();
if(this._nightUnwatch) {
this._nightUnwatch(); this._nightUnwatch();
}
if(this._updateFrame) { if(this._updateFrame) {
cancelAnimationFrame(this._updateFrame); cancelAnimationFrame(this._updateFrame);