From 8d0f83a9641b1dbaa011e3888fae5bce9b4ea864 Mon Sep 17 00:00:00 2001 From: Matthew Berryman Date: Sat, 21 Oct 2017 14:41:01 +1100 Subject: [PATCH] fix for removeLayer --- dist/leaflet.groupedlayercontrol.min.js | 4 ++-- dist/leaflet.groupedlayercontrol.min.js.map | 2 +- src/leaflet.groupedlayercontrol.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/leaflet.groupedlayercontrol.min.js b/dist/leaflet.groupedlayercontrol.min.js index a0a3bf8..f72a3bc 100644 --- a/dist/leaflet.groupedlayercontrol.min.js +++ b/dist/leaflet.groupedlayercontrol.min.js @@ -1,5 +1,5 @@ /*! Version: 0.6.0 -Date: 2017-02-20 */ +Date: 2017-10-21 */ -L.Control.GroupedLayers=L.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,exclusiveGroups:[],groupCheckboxes:!1},initialize:function(a,b,c){var d,e;L.Util.setOptions(this,c),this._layers=[],this._lastZIndex=0,this._handlingClick=!1,this._groupList=[],this._domGroups=[];for(d in a)this._addLayer(a[d],d);for(d in b)for(e in b[d])this._addLayer(b[d][e],e,d,!0)},onAdd:function(a){return this._initLayout(),this._update(),a.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(a){a.off("layeradd",this._onLayerChange).off("layerremove",this._onLayerChange)},addBaseLayer:function(a,b){return this._addLayer(a,b),this._update(),this},addOverlay:function(a,b,c){return this._addLayer(a,b,c,!0),this._update(),this},removeLayer:function(a){var b=L.Util.stamp(a),c=this._getLayer(b);return c&&delete this.layers[this.layers.indexOf(c)],this._update(),this},_getLayer:function(a){for(var b=0;ba;a++)b=e[a],b.groupID===this.groupID&&"leaflet-control-layers-selector"===b.className&&(b.checked=this.checked,c=d._getLayer(b.layerId),b.checked&&!d._map.hasLayer(c.layer)?d._map.addLayer(c.layer):!b.checked&&d._map.hasLayer(c.layer)&&d._map.removeLayer(c.layer));d._handlingClick=!1},_onInputClick:function(){var a,b,c,d=this._form.getElementsByTagName("input"),e=d.length;for(this._handlingClick=!0,a=0;e>a;a++)b=d[a],"leaflet-control-layers-selector"===b.className&&(c=this._getLayer(b.layerId),b.checked&&!this._map.hasLayer(c.layer)?this._map.addLayer(c.layer):!b.checked&&this._map.hasLayer(c.layer)&&this._map.removeLayer(c.layer));this._handlingClick=!1},_expand:function(){L.DomUtil.addClass(this._container,"leaflet-control-layers-expanded");var a=this._map._size.y-4*this._container.offsetTop;ac;c++)if(a[c]===b)return c;return-1}}),L.control.groupedLayers=function(a,b,c){return new L.Control.GroupedLayers(a,b,c)}; +L.Control.GroupedLayers=L.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,exclusiveGroups:[],groupCheckboxes:!1},initialize:function(a,b,c){var d,e;L.Util.setOptions(this,c),this._layers=[],this._lastZIndex=0,this._handlingClick=!1,this._groupList=[],this._domGroups=[];for(d in a)this._addLayer(a[d],d);for(d in b)for(e in b[d])this._addLayer(b[d][e],e,d,!0)},onAdd:function(a){return this._initLayout(),this._update(),a.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(a){a.off("layeradd",this._onLayerChange,this).off("layerremove",this._onLayerChange,this)},addBaseLayer:function(a,b){return this._addLayer(a,b),this._update(),this},addOverlay:function(a,b,c){return this._addLayer(a,b,c,!0),this._update(),this},removeLayer:function(a){var b=L.Util.stamp(a),c=this._getLayer(b);return c&&this._layers.splice(this._layers.indexOf(c),1),this._update(),this},_getLayer:function(a){for(var b=0;ba;a++)b=e[a],b.groupID===this.groupID&&"leaflet-control-layers-selector"===b.className&&(b.checked=this.checked,c=d._getLayer(b.layerId),b.checked&&!d._map.hasLayer(c.layer)?d._map.addLayer(c.layer):!b.checked&&d._map.hasLayer(c.layer)&&d._map.removeLayer(c.layer));d._handlingClick=!1},_onInputClick:function(){var a,b,c,d=this._form.getElementsByTagName("input"),e=d.length;for(this._handlingClick=!0,a=0;e>a;a++)b=d[a],"leaflet-control-layers-selector"===b.className&&(c=this._getLayer(b.layerId),b.checked&&!this._map.hasLayer(c.layer)?this._map.addLayer(c.layer):!b.checked&&this._map.hasLayer(c.layer)&&this._map.removeLayer(c.layer));this._handlingClick=!1},_expand:function(){L.DomUtil.addClass(this._container,"leaflet-control-layers-expanded");var a=this._map._size.y-4*this._container.offsetTop;ac;c++)if(a[c]===b)return c;return-1}}),L.control.groupedLayers=function(a,b,c){return new L.Control.GroupedLayers(a,b,c)}; //# sourceMappingURL=leaflet.groupedlayercontrol.min.js.map \ No newline at end of file diff --git a/dist/leaflet.groupedlayercontrol.min.js.map b/dist/leaflet.groupedlayercontrol.min.js.map index 4ba4942..c56405c 100644 --- a/dist/leaflet.groupedlayercontrol.min.js.map +++ b/dist/leaflet.groupedlayercontrol.min.js.map @@ -1 +1 @@ -{"version":3,"file":"leaflet.groupedlayercontrol.min.js","sources":["../src/leaflet.groupedlayercontrol.js"],"names":["L","Control","GroupedLayers","extend","options","collapsed","position","autoZIndex","exclusiveGroups","groupCheckboxes","initialize","baseLayers","groupedOverlays","i","j","Util","setOptions","this","_layers","_lastZIndex","_handlingClick","_groupList","_domGroups","_addLayer","onAdd","map","_initLayout","_update","on","_onLayerChange","_container","onRemove","off","addBaseLayer","layer","name","addOverlay","group","removeLayer","id","stamp","_layer","_getLayer","layers","indexOf","length","className","container","DomUtil","create","setAttribute","Browser","touch","DomEvent","stopPropagation","disableClickPropagation","form","_form","android","_expand","_collapse","link","_layersLink","href","title","stop","_map","_baseLayersList","_separator","_overlaysList","appendChild","overlay","push","groupId","_indexOf","exclusive","setZIndex","innerHTML","obj","baseLayersPresent","overlaysPresent","_addItem","style","display","e","type","fire","_createRadioElement","checked","radioHtml","radioFragment","document","createElement","firstChild","input","groupRadioName","label","hasLayer","defaultChecked","layerId","groupID","_onInputClick","groupContainer","groupLabel","groupInput","legend","_onGroupInputClick","groupName","this_legend","inputs","getElementsByTagName","inputsLen","addLayer","addClass","acceptableHeight","_size","y","offsetTop","clientHeight","height","replace","arr","control","groupedLayers"],"mappings":";;;AAIAA,EAAEC,QAAQC,cAAgBF,EAAEC,QAAQE,QAElCC,SACEC,WAAW,EACXC,SAAU,WACVC,YAAY,EACZC,mBACAC,iBAAiB,GAGnBC,WAAY,SAAUC,EAAYC,EAAiBR,GACjD,GAAIS,GAAGC,CACPd,GAAEe,KAAKC,WAAWC,KAAMb,GAExBa,KAAKC,WACLD,KAAKE,YAAc,EACnBF,KAAKG,gBAAiB,EACtBH,KAAKI,cACLJ,KAAKK,aAEL,KAAKT,IAAKF,GACRM,KAAKM,UAAUZ,EAAWE,GAAIA,EAGhC,KAAKA,IAAKD,GACR,IAAKE,IAAKF,GAAgBC,GACxBI,KAAKM,UAAUX,EAAgBC,GAAGC,GAAIA,EAAGD,GAAG,IAKlDW,MAAO,SAAUC,GAQf,MAPAR,MAAKS,cACLT,KAAKU,UAELF,EACKG,GAAG,WAAYX,KAAKY,eAAgBZ,MACpCW,GAAG,cAAeX,KAAKY,eAAgBZ,MAErCA,KAAKa,YAGdC,SAAU,SAAUN,GAClBA,EACKO,IAAI,WAAYf,KAAKY,gBACrBG,IAAI,cAAef,KAAKY,iBAG/BI,aAAc,SAAUC,EAAOC,GAG7B,MAFAlB,MAAKM,UAAUW,EAAOC,GACtBlB,KAAKU,UACEV,MAGTmB,WAAY,SAAUF,EAAOC,EAAME,GAGjC,MAFApB,MAAKM,UAAUW,EAAOC,EAAME,GAAO,GACnCpB,KAAKU,UACEV,MAGTqB,YAAa,SAAUJ,GACrB,GAAIK,GAAKvC,EAAEe,KAAKyB,MAAMN,GAClBO,EAASxB,KAAKyB,UAAUH,EAK5B,OAJIE,UACKxB,MAAK0B,OAAO1B,KAAK0B,OAAOC,QAAQH,IAEzCxB,KAAKU,UACEV,MAGTyB,UAAW,SAAUH,GACnB,IAAK,GAAI1B,GAAI,EAAGA,EAAII,KAAKC,QAAQ2B,OAAQhC,IACvC,GAAII,KAAKC,QAAQL,IAAMb,EAAEwC,MAAMvB,KAAKC,QAAQL,GAAGqB,SAAWK,EACxD,MAAOtB,MAAKC,QAAQL,IAK1Ba,YAAa,WACX,GAAIoB,GAAY,yBACdC,EAAY9B,KAAKa,WAAa9B,EAAEgD,QAAQC,OAAO,MAAOH,EAGxDC,GAAUG,aAAa,iBAAiB,GAEpClD,EAAEmD,QAAQC,MACZpD,EAAEqD,SAASzB,GAAGmB,EAAW,QAAS/C,EAAEqD,SAASC,kBAE7CtD,EAAEqD,SAASE,wBAAwBR,GACnC/C,EAAEqD,SAASzB,GAAGmB,EAAW,QAAS/C,EAAEqD,SAASC,iBAG/C,IAAIE,GAAOvC,KAAKwC,MAAQzD,EAAEgD,QAAQC,OAAO,OAAQH,EAAY,QAE7D,IAAI7B,KAAKb,QAAQC,UAAW,CACrBL,EAAEmD,QAAQO,SACb1D,EAAEqD,SACGzB,GAAGmB,EAAW,YAAa9B,KAAK0C,QAAS1C,MACzCW,GAAGmB,EAAW,WAAY9B,KAAK2C,UAAW3C,KAEjD,IAAI4C,GAAO5C,KAAK6C,YAAc9D,EAAEgD,QAAQC,OAAO,IAAKH,EAAY,UAAWC,EAC3Ec,GAAKE,KAAO,IACZF,EAAKG,MAAQ,SAEThE,EAAEmD,QAAQC,MACZpD,EAAEqD,SACGzB,GAAGiC,EAAM,QAAS7D,EAAEqD,SAASY,MAC7BrC,GAAGiC,EAAM,QAAS5C,KAAK0C,QAAS1C,MAErCjB,EAAEqD,SAASzB,GAAGiC,EAAM,QAAS5C,KAAK0C,QAAS1C,MAG7CA,KAAKiD,KAAKtC,GAAG,QAASX,KAAK2C,UAAW3C,UAGtCA,MAAK0C,SAGP1C,MAAKkD,gBAAkBnE,EAAEgD,QAAQC,OAAO,MAAOH,EAAY,QAASU,GACpEvC,KAAKmD,WAAapE,EAAEgD,QAAQC,OAAO,MAAOH,EAAY,aAAcU,GACpEvC,KAAKoD,cAAgBrE,EAAEgD,QAAQC,OAAO,MAAOH,EAAY,YAAaU,GAEtET,EAAUuB,YAAYd,IAGxBjC,UAAW,SAAUW,EAAOC,EAAME,EAAOkC,GACvC,GAEI9B,IAFKzC,EAAEe,KAAKyB,MAAMN,IAGpBA,MAAOA,EACPC,KAAMA,EACNoC,QAASA,GAEXtD,MAAKC,QAAQsD,KAAK/B,GAElBJ,EAAQA,GAAS,EACjB,IAAIoC,GAAUxD,KAAKyD,SAASzD,KAAKI,WAAYgB,EAE7B,MAAZoC,IACFA,EAAUxD,KAAKI,WAAWmD,KAAKnC,GAAS,EAG1C,IAAIsC,GAAoE,KAAvD1D,KAAKyD,SAASzD,KAAKb,QAAQI,gBAAiB6B,EAE7DI,GAAOJ,OACLF,KAAME,EACNE,GAAIkC,EACJE,UAAWA,GAGT1D,KAAKb,QAAQG,YAAc2B,EAAM0C,YACnC3D,KAAKE,cACLe,EAAM0C,UAAU3D,KAAKE,eAIzBQ,QAAS,WACP,GAAKV,KAAKa,WAAV,CAIAb,KAAKkD,gBAAgBU,UAAY,GACjC5D,KAAKoD,cAAcQ,UAAY,GAC/B5D,KAAKK,WAAWuB,OAAS,CAMzB,KAAK,GAFHhC,GAAGiE,EAFDC,GAAoB,EACtBC,GAAkB,EAGXnE,EAAI,EAAGA,EAAII,KAAKC,QAAQ2B,OAAQhC,IACvCiE,EAAM7D,KAAKC,QAAQL,GACnBI,KAAKgE,SAASH,GACdE,EAAkBA,GAAmBF,EAAIP,QACzCQ,EAAoBA,IAAsBD,EAAIP,OAGhDtD,MAAKmD,WAAWc,MAAMC,QAAUH,GAAmBD,EAAoB,GAAK,SAG9ElD,eAAgB,SAAUuD,GACxB,GACEC,GADEP,EAAM7D,KAAKyB,UAAU1C,EAAEe,KAAKyB,MAAM4C,EAAElD,OAGnC4C,KAIA7D,KAAKG,gBACRH,KAAKU,UAIL0D,EADEP,EAAIP,QACY,aAAXa,EAAEC,KAAsB,aAAe,gBAE5B,aAAXD,EAAEC,KAAsB,kBAAoB,KAGjDA,GACFpE,KAAKiD,KAAKoB,KAAKD,EAAMP,KAKzBS,oBAAqB,SAAUpD,EAAMqD,GACnC,GAAIC,GAAY,qEAAuEtD,EAAO,GAC1FqD,KACFC,GAAa,sBAEfA,GAAa,IAEb,IAAIC,GAAgBC,SAASC,cAAc,MAG3C,OAFAF,GAAcb,UAAYY,EAEnBC,EAAcG,YAGvBZ,SAAU,SAAUH,GAClB,GACEgB,GAEA/C,EACAgD,EAJEC,EAAQL,SAASC,cAAc,SAEjCJ,EAAUvE,KAAKiD,KAAK+B,SAASnB,EAAI5C,MAI/B4C,GAAIP,QACFO,EAAIzC,MAAMsC,WACZoB,EAAiB,iCAAmCjB,EAAIzC,MAAME,GAC9DuD,EAAQ7E,KAAKsE,oBAAoBQ,EAAgBP,KAEjDM,EAAQH,SAASC,cAAc,SAC/BE,EAAMT,KAAO,WACbS,EAAMhD,UAAY,kCAClBgD,EAAMI,eAAiBV,GAGzBM,EAAQ7E,KAAKsE,oBAAoB,sBAAuBC,GAG1DM,EAAMK,QAAUnG,EAAEe,KAAKyB,MAAMsC,EAAI5C,OACjC4D,EAAMM,QAAUtB,EAAIzC,MAAME,GAC1BvC,EAAEqD,SAASzB,GAAGkE,EAAO,QAAS7E,KAAKoF,cAAepF,KAElD,IAAIkB,GAAOwD,SAASC,cAAc,OAMlC,IALAzD,EAAK0C,UAAY,IAAMC,EAAI3C,KAE3B6D,EAAM1B,YAAYwB,GAClBE,EAAM1B,YAAYnC,GAEd2C,EAAIP,QAAS,CACfxB,EAAY9B,KAAKoD,aAEjB,IAAIiC,GAAiBrF,KAAKK,WAAWwD,EAAIzC,MAAME,GAG/C,KAAK+D,EAAgB,CACnBA,EAAiBX,SAASC,cAAc,OACxCU,EAAexD,UAAY,+BAC3BwD,EAAe/D,GAAK,gCAAkCuC,EAAIzC,MAAME,EAEhE,IAAIgE,GAAaZ,SAASC,cAAc,QAGxC,IAFAW,EAAWzD,UAAY,qCAEA,KAAnBgC,EAAIzC,MAAMF,OAAgB2C,EAAIzC,MAAMsC,WAElC1D,KAAKb,QAAQK,gBAAiB,CAChC,GAAI+F,GAAab,SAASC,cAAc,QACxCY,GAAWnB,KAAO,WAClBmB,EAAW1D,UAAY,wCACvB0D,EAAWJ,QAAUtB,EAAIzC,MAAME,GAC/BiE,EAAWC,OAASxF,KACpBjB,EAAEqD,SAASzB,GAAG4E,EAAY,QAASvF,KAAKyF,mBAAoBF,GAC5DD,EAAWjC,YAAYkC,GAI3B,GAAIG,GAAYhB,SAASC,cAAc,OACvCe,GAAU7D,UAAY,oCACtB6D,EAAU9B,UAAYC,EAAIzC,MAAMF,KAChCoE,EAAWjC,YAAYqC,GAEvBL,EAAehC,YAAYiC,GAC3BxD,EAAUuB,YAAYgC,GAEtBrF,KAAKK,WAAWwD,EAAIzC,MAAME,IAAM+D,EAGlCvD,EAAYuD,MAEZvD,GAAY9B,KAAKkD,eAKnB,OAFApB,GAAUuB,YAAY0B,GAEfA,GAGTU,mBAAoB,WAClB,GAAI7F,GAAGiF,EAAOhB,EAEV8B,EAAc3F,KAAKwF,MACvBG,GAAYxF,gBAAiB,CAE7B,IAAIyF,GAASD,EAAYnD,MAAMqD,qBAAqB,SAChDC,EAAYF,EAAOhE,MAEvB,KAAKhC,EAAI,EAAOkG,EAAJlG,EAAeA,IACzBiF,EAAQe,EAAOhG,GACXiF,EAAMM,UAAYnF,KAAKmF,SAA+B,oCAApBN,EAAMhD,YAC1CgD,EAAMN,QAAUvE,KAAKuE,QACrBV,EAAM8B,EAAYlE,UAAUoD,EAAMK,SAC9BL,EAAMN,UAAYoB,EAAY1C,KAAK+B,SAASnB,EAAI5C,OAClD0E,EAAY1C,KAAK8C,SAASlC,EAAI5C,QACpB4D,EAAMN,SAAWoB,EAAY1C,KAAK+B,SAASnB,EAAI5C,QACzD0E,EAAY1C,KAAK5B,YAAYwC,EAAI5C,OAKvC0E,GAAYxF,gBAAiB,GAG/BiF,cAAe,WACb,GAAIxF,GAAGiF,EAAOhB,EACZ+B,EAAS5F,KAAKwC,MAAMqD,qBAAqB,SACzCC,EAAYF,EAAOhE,MAIrB,KAFA5B,KAAKG,gBAAiB,EAEjBP,EAAI,EAAOkG,EAAJlG,EAAeA,IACzBiF,EAAQe,EAAOhG,GACS,oCAApBiF,EAAMhD,YACRgC,EAAM7D,KAAKyB,UAAUoD,EAAMK,SAEvBL,EAAMN,UAAYvE,KAAKiD,KAAK+B,SAASnB,EAAI5C,OAC3CjB,KAAKiD,KAAK8C,SAASlC,EAAI5C,QACb4D,EAAMN,SAAWvE,KAAKiD,KAAK+B,SAASnB,EAAI5C,QAClDjB,KAAKiD,KAAK5B,YAAYwC,EAAI5C,OAKhCjB,MAAKG,gBAAiB,GAGxBuC,QAAS,WACP3D,EAAEgD,QAAQiE,SAAShG,KAAKa,WAAY,kCAEpC,IAAIoF,GAAmBjG,KAAKiD,KAAKiD,MAAMC,EAAiC,EAA5BnG,KAAKa,WAAWuF,SACxDH,GAAmBjG,KAAKwC,MAAM6D,eAChCtH,EAAEgD,QAAQiE,SAAShG,KAAKwC,MAAO,oCAC/BxC,KAAKwC,MAAMyB,MAAMqC,OAASL,EAAmB,OAIjDtD,UAAW,WACT3C,KAAKa,WAAWgB,UAAY7B,KAAKa,WAAWgB,UAAU0E,QAAQ,mCAAoC,KAGpG9C,SAAU,SAAU+C,EAAK3C,GACvB,IAAK,GAAIjE,GAAI,EAAGC,EAAI2G,EAAI5E,OAAY/B,EAAJD,EAAOA,IACrC,GAAI4G,EAAI5G,KAAOiE,EACb,MAAOjE,EAGX,OAAO,MAIXb,EAAE0H,QAAQC,cAAgB,SAAUhH,EAAYC,EAAiBR,GAC/D,MAAO,IAAIJ,GAAEC,QAAQC,cAAcS,EAAYC,EAAiBR"} \ No newline at end of file +{"version":3,"file":"leaflet.groupedlayercontrol.min.js","sources":["../src/leaflet.groupedlayercontrol.js"],"names":["L","Control","GroupedLayers","extend","options","collapsed","position","autoZIndex","exclusiveGroups","groupCheckboxes","initialize","baseLayers","groupedOverlays","i","j","Util","setOptions","this","_layers","_lastZIndex","_handlingClick","_groupList","_domGroups","_addLayer","onAdd","map","_initLayout","_update","on","_onLayerChange","_container","onRemove","off","addBaseLayer","layer","name","addOverlay","group","removeLayer","id","stamp","_layer","_getLayer","splice","indexOf","length","className","container","DomUtil","create","setAttribute","Browser","touch","DomEvent","stopPropagation","disableClickPropagation","form","_form","android","_expand","_collapse","link","_layersLink","href","title","stop","_map","_baseLayersList","_separator","_overlaysList","appendChild","overlay","push","groupId","_indexOf","exclusive","setZIndex","innerHTML","obj","baseLayersPresent","overlaysPresent","_addItem","style","display","e","type","fire","_createRadioElement","checked","radioHtml","radioFragment","document","createElement","firstChild","input","groupRadioName","label","hasLayer","defaultChecked","layerId","groupID","_onInputClick","groupContainer","groupLabel","groupInput","legend","_onGroupInputClick","groupName","this_legend","inputs","getElementsByTagName","inputsLen","addLayer","addClass","acceptableHeight","_size","y","offsetTop","clientHeight","height","replace","arr","control","groupedLayers"],"mappings":"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"} \ No newline at end of file diff --git a/src/leaflet.groupedlayercontrol.js b/src/leaflet.groupedlayercontrol.js index 1da0a8b..6ca1639 100644 --- a/src/leaflet.groupedlayercontrol.js +++ b/src/leaflet.groupedlayercontrol.js @@ -66,7 +66,7 @@ L.Control.GroupedLayers = L.Control.extend({ var id = L.Util.stamp(layer); var _layer = this._getLayer(id); if (_layer) { - delete this.layers[this.layers.indexOf(_layer)]; + this._layers.splice(this._layers.indexOf(_layer), 1); } this._update(); return this;