cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closes #2318: getMaxZoom returns prev layer on baselayerchange

Browse Source 
Remove all old layers before adding new ones to avoid
the old properties being returned in the baselayerchange handler.
This commit is contained in:
CloudNiner 2014-11-21 13:49:10 -05:00
parent e0a75093dc
commit 703f9a47d9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/control/Control.Layers.js
View File

@ -202,6 +202,8 @@ L.Control.Layers = L.Control.extend({
_onInputClick: function () { _onInputClick: function () {
var inputs = this._form.getElementsByTagName('input'), var inputs = this._form.getElementsByTagName('input'),
input, layer, hasLayer; input, layer, hasLayer;
var addedLayers = [],
removedLayers = [];
this._handlingClick = true; this._handlingClick = true;
@ -211,13 +213,21 @@ L.Control.Layers = L.Control.extend({
hasLayer = this._map.hasLayer(layer); hasLayer = this._map.hasLayer(layer);
if (input.checked && !hasLayer) { if (input.checked && !hasLayer) {
this._map.addLayer(layer); addedLayers.push(layer);
} else if (!input.checked && hasLayer) { } else if (!input.checked && hasLayer) {
this._map.removeLayer(layer); removedLayers.push(layer);
} }
} }
// Bugfix issue 2318: Should remove all old layers before readding new ones
for (i = 0; i < removedLayers.length; i++) {
this._map.removeLayer(removedLayers[i]);
}
for (i = 0; i < addedLayers.length; i++) {
this._map.addLayer(addedLayers[i]);
}
this._handlingClick = false; this._handlingClick = false;
this._refocusOnMap(); this._refocusOnMap();