fixed layer's control

Estimap · Oct 27, 2016 · ebf21a6 · ebf21a6
1 parent c40e791
commit ebf21a6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 44 deletions.
diff --git a/dist/leaflet-spectrum-spatial.js b/dist/leaflet-spectrum-spatial.js
@@ -2959,10 +2959,8 @@ L.Control.include(L.Evented.prototype);
 
     hideLegendForLayer: function(layerId) {
         var lo = this._getLayer(layerId);
-        if(!this.options.legendContainer) {
-            if(lo.legendContainer.hasChildNodes()) {
-                L.DomUtil.empty(lo.legendContainer);
-            }
+        if ((!this.options.legendContainer) && (lo.legendContainer.hasChildNodes())) {
+            L.DomUtil.empty(lo.legendContainer);
         }
     },
 
@@ -3186,19 +3184,14 @@ L.Control.include(L.Evented.prototype);
         var layerId = e.currentTarget.layerId;
         var lo = this._getLayer(layerId);
         var legend;
-        if(!this.options.legendContainer) {
-            if(lo.legendContainer.hasChildNodes()) {
-                L.DomUtil.empty(lo.legendContainer);
-            }
-            else {
-                legend = new L.SpectrumSpatial.Controls.Legend(lo.layer._service, lo.layer._mapName, this.options.legendOptions);
-                legend.addTo(this._map, this.options.legendContainer ? this.options.legendContainer : lo.legendContainer);
-            }
-        }
-        else {
-            legend = new L.SpectrumSpatial.Controls.Legend(lo.layer._service, lo.layer._mapName, this.options.legendOptions);
-            legend.addTo(this._map, this.options.legendContainer ? this.options.legendContainer : lo.legendContainer);
+
+        if ((!this.options.legendContainer) && (lo.legendContainer.hasChildNodes())) {
+            L.DomUtil.empty(lo.legendContainer);
+            return;
         }
+
+        legend = new L.SpectrumSpatial.Controls.Legend(lo.layer._service, lo.layer._mapName, this.options.legendOptions);
+        legend.addTo(this._map, this.options.legendContainer ? this.options.legendContainer : lo.legendContainer);
     },
 
     _onDownClick: function(e) {
@@ -3269,11 +3262,13 @@ L.Control.include(L.Evented.prototype);
         }
 
         this._refocusOnMap();
-        this._fireVisibilityChangedEvent({
+
+        this.fire('visibilitychanged', {
             removedLayers: removedLayers,
             addedLayers: addedLayers,
             activeLayers: activeLayers
         });
+
         this._handlingClick = false;
     },
 
@@ -3295,10 +3290,6 @@ L.Control.include(L.Evented.prototype);
         this._handlingClick = false;
     },
 
-    _fireVisibilityChangedEvent: function(layers) {
-        this._map.fire('spectrum:visibility-changed', layers);
-    },
-
     _expand: function() {
         L.DomUtil.addClass(this._container, this.className + '-expanded');
     },