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

Move tileUpdateInterval handling to LiveAtlasTileLayer

Browse Source
This commit is contained in:
James Lyne 2022-02-25 14:50:17 +00:00
parent e09fbe1e06
commit 06ac12ba29
2 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/map/layer/MapLayer.vue
View File

@ -41,47 +41,23 @@ export default defineComponent({
const store = useStore(),
active = computed(() => props.map === store.state.currentMap);
let refreshTimeout: null | ReturnType<typeof setTimeout> = null,
layer: LiveAtlasTileLayer;
const refresh = () => {
if(active.value) {
layer.refresh();
}
refreshTimeout = setTimeout(refresh, props.map.tileUpdateInterval);
};
let layer: LiveAtlasTileLayer;
layer = store.state.currentMapProvider!.createTileLayer({
errorTileUrl: 'images/blank.png',
mapSettings: Object.freeze(JSON.parse(JSON.stringify(props.map))),
});
const enableLayer = () => {
props.leaflet.addLayer(layer);
},
const enableLayer = () => props.leaflet.addLayer(layer),
disableLayer = () => layer.remove();
disableLayer = () => {
layer.remove();
};
watch(active, (newValue) => newValue ? enableLayer() : disableLayer());
watch(active, newValue => newValue ? enableLayer() : disableLayer());
if(active.value) {
enableLayer();
}
if(props.map.tileUpdateInterval) {
refreshTimeout = setTimeout(refresh, props.map.tileUpdateInterval);
}
onUnmounted(() => {
disableLayer();
if(refreshTimeout) {
clearTimeout(refreshTimeout);
}
});
onUnmounted(() => disableLayer());
},
render() {

31
src/leaflet/tileLayer/LiveAtlasTileLayer.ts
View File

@ -15,7 +15,7 @@
*/
import LiveAtlasMapDefinition from "@/model/LiveAtlasMapDefinition";
import {Coords, DomUtil, DoneCallback, TileLayer, TileLayerOptions, Util} from "leaflet";
import {Map as LeafletMap, Coords, DomUtil, DoneCallback, TileLayer, TileLayerOptions, Util} from "leaflet";
import {LiveAtlasInternalTiles, LiveAtlasTileElement} from "@/index";
import falseFn = Util.falseFn;
@ -33,6 +33,7 @@ export abstract class LiveAtlasTileLayer extends TileLayer {
private readonly tileTemplate: LiveAtlasTileElement;
protected readonly loadQueue: LiveAtlasTileElement[] = [];
private readonly loadingTiles: Set<LiveAtlasTileElement> = Object.seal(new Set());
private refreshTimeout?: ReturnType<typeof setTimeout>;
private static genericLoadError = new Error('Tile failed to load');
@ -60,10 +61,6 @@ export abstract class LiveAtlasTileLayer extends TileLayer {
options.minZoom = 0;
Util.setOptions(this, options);
if (options.mapSettings === null) {
throw new TypeError("mapSettings missing");
}
}
// @method createTile(coords: Object, done?: Function): HTMLElement
@ -210,4 +207,28 @@ export abstract class LiveAtlasTileLayer extends TileLayer {
// @ts-ignore
super._removeTile(key);
}
onAdd(map: LeafletMap): this {
if(this._mapSettings.tileUpdateInterval) {
this.refreshTimeout = setTimeout(() => this.handlePeriodicRefresh(), this._mapSettings.tileUpdateInterval);
}
return super.onAdd(map);
}
remove() {
if(this.refreshTimeout) {
clearTimeout(this.refreshTimeout);
}
return super.remove();
}
private handlePeriodicRefresh() {
if(this._map) {
this.refresh();
}
this.refreshTimeout = setTimeout(() => this.handlePeriodicRefresh(), this._mapSettings.tileUpdateInterval);
}
}