add getUidsFromCalcData helper

src/plots/get_data.js

@@ -123,3 +123,20 @@ exports.getSubplotData = function getSubplotData(data, type, subplotId) {
 
     return subplotData;
 };
+
+/**
+ * Get a lookup object of trace uids corresponding in a given calcdata array.
+ *
+ * @param {array} calcdata: as in gd.calcdata (or a subset)
+ * @return {object} lookup object of uids (`uid: 1`)
+ */
+exports.getUidsFromCalcData = function(calcdata) {
+    var out = {};
+
+    for(var i = 0; i < calcdata.length; i++) {
+        var trace = calcdata[i][0].trace;
+        out[trace.uid] = 1;
+    }
+
+    return out;
+};

src/traces/carpet/plot.js

@@ -17,20 +17,21 @@ var orientText = require('./orient_text');
 var svgTextUtils = require('../../lib/svg_text_utils');
 var Lib = require('../../lib');
 var alignmentConstants = require('../../constants/alignment');
+var getUidsFromCalcData = require('../../plots/get_data').getUidsFromCalcData;
 
 module.exports = function plot(gd, plotinfo, cdcarpet, carpetLayer) {
-    var i;
+    var uidLookup = getUidsFromCalcData(cdcarpet);
 
     carpetLayer.selectAll('g.trace').each(function() {
         var classString = d3.select(this).attr('class');
         var oldUid = classString.split('carpet')[1].split(/\s/)[0];
-        for(i = 0; i < cdcarpet.length; i++) {
-            if(oldUid === cdcarpet[i][0].trace.uid) return;
+
+        if(!uidLookup[oldUid]) {
+            d3.select(this).remove();
         }
-        d3.select(this).remove();
     });
 
-    for(i = 0; i < cdcarpet.length; i++) {
+    for(var i = 0; i < cdcarpet.length; i++) {
         plotOne(gd, plotinfo, cdcarpet[i], carpetLayer);
     }
 };

src/traces/contour/plot.js

@@ -16,6 +16,7 @@ var Drawing = require('../../components/drawing');
 var svgTextUtils = require('../../lib/svg_text_utils');
 var Axes = require('../../plots/cartesian/axes');
 var setConvert = require('../../plots/cartesian/set_convert');
+var getUidsFromCalcData = require('../../plots/get_data').getUidsFromCalcData;
 
 var heatmapPlot = require('../heatmap/plot');
 var makeCrossings = require('./make_crossings');
@@ -26,18 +27,16 @@ var closeBoundaries = require('./close_boundaries');
 var constants = require('./constants');
 var costConstants = constants.LABELOPTIMIZER;
 
-
 exports.plot = function plot(gd, plotinfo, cdcontours, contourLayer) {
-    var i;
+    var uidLookup = getUidsFromCalcData(cdcontours);
 
     contourLayer.selectAll('g.contour').each(function(d) {
-        for(i = 0; i < cdcontours.length; i++) {
-            if(d.trace.uid === cdcontours[i][0].trace.uid) return;
+        if(!uidLookup[d.trace.uid]) {
+            d3.select(this).remove();
         }
-        d3.select(this).remove();
     });
 
-    for(i = 0; i < cdcontours.length; i++) {
+    for(var i = 0; i < cdcontours.length; i++) {
         plotOne(gd, plotinfo, cdcontours[i], contourLayer);
     }
 };

src/traces/contourcarpet/plot.js

@@ -13,6 +13,7 @@ var map1dArray = require('../carpet/map_1d_array');
 var makepath = require('../carpet/makepath');
 var Drawing = require('../../components/drawing');
 var Lib = require('../../lib');
+var getUidsFromCalcData = require('../../plots/get_data').getUidsFromCalcData;
 
 var makeCrossings = require('../contour/make_crossings');
 var findAllPaths = require('../contour/find_all_paths');
@@ -25,18 +26,16 @@ var mapPathinfo = require('./map_pathinfo');
 var lookupCarpet = require('../carpet/lookup_carpetid');
 var closeBoundaries = require('../contour/close_boundaries');
 
-
 module.exports = function plot(gd, plotinfo, cdcontours, contourcarpetLayer) {
-    var i;
+    var uidLookup = getUidsFromCalcData(cdcontours);
 
     contourcarpetLayer.selectAll('g.contour').each(function(d) {
-        for(i = 0; i < cdcontours.length; i++) {
-            if(d.trace.uid === cdcontours[i][0].trace.uid) return;
+        if(!uidLookup[d.trace.uid]) {
+            d3.select(this).remove();
         }
-        d3.select(this).remove();
     });
 
-    for(i = 0; i < cdcontours.length; i++) {
+    for(var i = 0; i < cdcontours.length; i++) {
         plotOne(gd, plotinfo, cdcontours[i], contourcarpetLayer);
     }
 };

src/traces/heatmap/plot.js

@@ -16,21 +16,22 @@ var Registry = require('../../registry');
 var Lib = require('../../lib');
 var Colorscale = require('../../components/colorscale');
 var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
+var getUidsFromCalcData = require('../../plots/get_data').getUidsFromCalcData;
 
 var maxRowLength = require('./max_row_length');
 
 module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
-    var i;
+    var uidLookup = getUidsFromCalcData(cdheatmaps);
 
     heatmapLayer.selectAll('.hm > image').each(function(d) {
         var oldTrace = d.trace || {};
-        for(i = 0; i < cdheatmaps.length; i++) {
-            if(oldTrace.uid === cdheatmaps[i][0].trace.uid) return;
+
+        if(!uidLookup[oldTrace.uid]) {
+            d3.select(this.parentNode).remove();
         }
-        d3.select(this.parentNode).remove();
     });
 
-    for(i = 0; i < cdheatmaps.length; i++) {
+    for(var i = 0; i < cdheatmaps.length; i++) {
         plotOne(gd, plotinfo, cdheatmaps[i], heatmapLayer);
     }
 };