improve functions

Author: archmoj

src/traces/scattermapbox/plot.js

@@ -85,63 +85,70 @@ proto.update = function update(calcTrace) {
     var map = subplot.map;
     var optsAll = convert(subplot.gd, calcTrace);
     var below = subplot.belowLookup['trace-' + this.uid];
-    var i, k, opts;
     var hasCluster = !!(trace.cluster && trace.cluster.enabled);
     var hadCluster = !!this.clusterEnabled;
     var lThis = this;
 
     function addCluster() {
         lThis.addSource('circle', optsAll.circle, trace.cluster);
-        for(i = 0; i < ORDER.cluster.length; i++) {
-            k = ORDER.cluster[i];
-            opts = optsAll[k];
+        var order = ORDER.cluster;
+        for(var i = 0; i < order.length; i++) {
+            var k = order[i];
+            var opts = optsAll[k];
             lThis.addLayer(k, opts, below);
         }
     }
 
     function removeCluster() {
-        for(i = ORDER.cluster.length - 1; i >= 0; i--) {
-            k = ORDER.cluster[i];
+        var order = ORDER.cluster;
+        for(var i = order.length - 1; i >= 0; i--) {
+            var k = order[i];
             map.removeLayer(lThis.layerIds[k]);
         }
         map.removeSource(lThis.sourceIds.circle);
     }
 
     function addNonCluster() {
-        for(i = 0; i < ORDER.nonCluster.length; i++) {
-            k = ORDER.nonCluster[i];
-            opts = optsAll[k];
+        var order = ORDER.nonCluster;
+        for(var i = 0; i < order.length; i++) {
+            var k = order[i];
+            var opts = optsAll[k];
             lThis.addSource(k, opts, trace.cluster);
             lThis.addLayer(k, opts, below);
         }
     }
 
     function removeNonCluster() {
-        for(i = ORDER.nonCluster.length - 1; i >= 0; i--) {
-            k = ORDER.nonCluster[i];
+        var order = ORDER.nonCluster;
+        for(var i = order.length - 1; i >= 0; i--) {
+            var k = order[i];
             map.removeLayer(lThis.layerIds[k]);
             map.removeSource(lThis.sourceIds[k]);
         }
     }
 
-    if(hadCluster !== hasCluster || below !== this.below) {
-        if(hadCluster) removeCluster(); else removeNonCluster();
-        if(hasCluster) addCluster(); else addNonCluster();
-    } else {
+    function reset() {
         var order = hasCluster ? ORDER.cluster : ORDER.nonCluster;
-        for(i = 0; i < order.length; i++) {
-            k = order[i];
-            opts = optsAll[k];
+        for(var i = 0; i < order.length; i++) {
+            var k = order[i];
+            var opts = optsAll[k];
 
-            subplot.setOptions(this.layerIds[k], 'setLayoutProperty', opts.layout);
+            subplot.setOptions(lThis.layerIds[k], 'setLayoutProperty', opts.layout);
 
             if(opts.layout.visibility === 'visible') {
-                this.setSourceData(k, opts);
-                subplot.setOptions(this.layerIds[k], 'setPaintProperty', opts.paint);
+                lThis.setSourceData(k, opts);
+                subplot.setOptions(lThis.layerIds[k], 'setPaintProperty', opts.paint);
             }
         }
     }
 
+    if(hadCluster !== hasCluster || below !== this.below) {
+        if(hadCluster) removeCluster(); else removeNonCluster();
+        if(hasCluster) addCluster(); else addNonCluster();
+    } else {
+        reset();
+    }
+
     this.clusterEnabled = hasCluster;
     this.below = below;