gl2d: clean up update trace step

etpinard · etpinard · commit 5734107b86cc · 2016-08-23T10:18:39.000-04:00
diff --git a/src/plots/gl2d/scene2d.js b/src/plots/gl2d/scene2d.js
@@ -312,7 +312,6 @@ proto.cameraChanged = function() {
 };
 
 proto.destroy = function() {
-
     var traces = this.traces;
 
     if(traces) {
@@ -336,10 +335,11 @@ proto.plot = function(fullData, calcData, fullLayout) {
     var glplot = this.glplot,
         pixelRatio = this.pixelRatio;
 
-    var i, j, trace;
+    var i;
 
     this.fullLayout = fullLayout;
     this.updateAxes(fullLayout);
+    this.updateTraces(fullData, calcData);
 
     var width = fullLayout.width,
         height = fullLayout.height,
@@ -353,34 +353,6 @@ proto.plot = function(fullData, calcData, fullLayout) {
         canvas.height = pixelHeight;
     }
 
-    // update traces
-    for(i = 0; i < fullData.length; ++i) {
-        var fullTrace = fullData[i],
-            calcTrace = calcData[i];
-        trace = this.traces[fullTrace.uid];
-
-        if(trace) trace.update(fullTrace, calcTrace);
-        else {
-            trace = fullTrace._module.plot(this, fullTrace, calcTrace);
-        }
-
-        this.traces[fullTrace.uid] = trace;
-    }
-
-    // remove empty traces
-    var traceIds = Object.keys(this.traces);
-
-    trace_id_loop:
-    for(i = 0; i < traceIds.length; ++i) {
-        for(j = 0; j < calcData.length; ++j) {
-            if(calcData[j][0].trace.uid === traceIds[i]) continue trace_id_loop;
-        }
-
-        trace = this.traces[traceIds[i]];
-        trace.dispose();
-        delete this.traces[traceIds[i]];
-    }
-
     var options = this.glplotOptions;
     options.merge(fullLayout);
     options.screenBox = [0, 0, width, height];
@@ -406,12 +378,13 @@ proto.plot = function(fullData, calcData, fullLayout) {
     bounds[0] = bounds[1] = Infinity;
     bounds[2] = bounds[3] = -Infinity;
 
-    traceIds = Object.keys(this.traces);
+    var traceIds = Object.keys(this.traces);
     for(i = 0; i < traceIds.length; ++i) {
-        trace = this.traces[traceIds[i]];
+        var traceObj = this.traces[traceIds[i]];
+
         for(var k = 0; k < 2; ++k) {
-            bounds[k] = Math.min(bounds[k], trace.bounds[k]);
-            bounds[k + 2] = Math.max(bounds[k + 2], trace.bounds[k + 2]);
+            bounds[k] = Math.min(bounds[k], traceObj.bounds[k]);
+            bounds[k + 2] = Math.max(bounds[k + 2], traceObj.bounds[k + 2]);
         }
     }
 
@@ -441,6 +414,43 @@ proto.plot = function(fullData, calcData, fullLayout) {
     this.glplot.draw();
 };
 
+proto.updateTraces = function(fullData, calcData) {
+    var traceIds = Object.keys(this.traces);
+    var i, j, fullTrace;
+
+    // remove empty traces
+    trace_id_loop:
+    for(i = 0; i < traceIds.length; i++) {
+        var oldUid = traceIds[i],
+            oldTrace = this.traces[oldUid];
+
+        for(j = 0; j < fullData.length; j++) {
+            fullTrace = fullData[j];
+
+            if(fullTrace.uid === oldUid && fullTrace.type === oldTrace.type) {
+                continue trace_id_loop;
+            }
+        }
+
+        oldTrace.dispose();
+        delete this.traces[oldUid];
+    }
+
+    // update / create trace objects
+    for(i = 0; i < fullData.length; i++) {
+        fullTrace = fullData[i];
+
+        var calcTrace = calcData[i],
+            traceObj = this.traces[fullTrace.uid];
+
+        if(traceObj) traceObj.update(fullTrace, calcTrace);
+        else {
+            traceObj = fullTrace._module.plot(this, fullTrace, calcTrace);
+            this.traces[fullTrace.uid] = traceObj;
+        }
+    }
+};
+
 proto.draw = function() {
     if(this.stopped) return;
 
diff --git a/src/traces/contourgl/convert.js b/src/traces/contourgl/convert.js
@@ -20,6 +20,7 @@ var str2RGBArray = require('../../lib/str2rgbarray');
 function Contour(scene, uid) {
     this.scene = scene;
     this.uid = uid;
+    this.type = 'contourgl';
 
     this.name = '';
     this.hoverinfo = 'all';
diff --git a/src/traces/heatmapgl/convert.js b/src/traces/heatmapgl/convert.js
@@ -17,6 +17,7 @@ var str2RGBArray = require('../../lib/str2rgbarray');
 function Heatmap(scene, uid) {
     this.scene = scene;
     this.uid = uid;
+    this.type = 'heatmapgl';
 
     this.name = '';
     this.hoverinfo = 'all';
diff --git a/src/traces/scattergl/convert.js b/src/traces/scattergl/convert.js
@@ -32,6 +32,7 @@ var AXES = ['xaxis', 'yaxis'];
 function LineWithMarkers(scene, uid) {
     this.scene = scene;
     this.uid = uid;
+    this.type = 'scattergl';
 
     this.pickXData = [];
     this.pickYData = [];
