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

Revert deprecation fix as it breaks the loading control

Browse Source
This commit is contained in:
James Lyne 2021-05-29 02:35:39 +01:00
parent 147ea5b154
commit 66477288d5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/leaflet/control/LoadingControl.ts
View File

@ -132,8 +132,8 @@ export class LoadingControl extends Control {
// Check for a target 'layer' that contains multiple layers, such as // Check for a target 'layer' that contains multiple layers, such as
// L.LayerGroup. This will happen if you have an L.LayerGroup in an // L.LayerGroup. This will happen if you have an L.LayerGroup in an
// L.Control.Layers. // L.Control.Layers.
if (e.propagatedFrom && e.propagatedFrom.eachLayer && typeof e.propagatedFrom.eachLayer === 'function') { if (e.layer && e.layer.eachLayer && typeof e.layer.eachLayer === 'function') {
e.propagatedFrom.eachLayer((layer: Layer) => { e.layer.eachLayer((layer: Layer) => {
this._handleBaseLayerChange({ layer: layer } as LeafletEvent); this._handleBaseLayerChange({ layer: layer } as LeafletEvent);
}); });
} }
@ -153,35 +153,35 @@ export class LoadingControl extends Control {
} }
_layerAdd(e: LeafletEvent) { _layerAdd(e: LeafletEvent) {
if(!(e.propagatedFrom instanceof TileLayer)) { if(!(e.layer instanceof TileLayer)) {
return; return;
} }
try { try {
if(e.propagatedFrom.isLoading()) { if(e.layer.isLoading()) {
this.addLoader((e.propagatedFrom as any)._leaflet_id); this.addLoader((e.layer as any)._leaflet_id);
} }
e.propagatedFrom.on('loading', this._handleLoading, this); e.layer.on('loading', this._handleLoading, this);
e.propagatedFrom.on('load', this._handleLoad, this); e.layer.on('load', this._handleLoad, this);
} catch (exception) { } catch (exception) {
console.warn('L.Control.Loading: Tried and failed to add ' + console.warn('L.Control.Loading: Tried and failed to add ' +
' event handlers to layer', e.propagatedFrom); ' event handlers to layer', e.layer);
console.warn('L.Control.Loading: Full details', exception); console.warn('L.Control.Loading: Full details', exception);
} }
} }
_layerRemove(e: LeafletEvent) { _layerRemove(e: LeafletEvent) {
if(!(e.propagatedFrom instanceof TileLayer)) { if(!(e.layer instanceof TileLayer)) {
return; return;
} }
try { try {
e.propagatedFrom.off('loading', this._handleLoading, this); e.layer.off('loading', this._handleLoading, this);
e.propagatedFrom.off('load', this._handleLoad, this); e.layer.off('load', this._handleLoad, this);
} catch (exception) { } catch (exception) {
console.warn('L.Control.Loading: Tried and failed to remove ' + console.warn('L.Control.Loading: Tried and failed to remove ' +
'event handlers from layer', e.propagatedFrom); 'event handlers from layer', e.layer);
console.warn('L.Control.Loading: Full details', exception); console.warn('L.Control.Loading: Full details', exception);
} }
} }