move getSubplotCalcdata method into Plots

Author: etpinard

src/plots/geo/index.js

@@ -45,7 +45,7 @@ exports.plot = function plotGeo(gd) {
 
     for(var i = 0; i < geoIds.length; i++) {
         var geoId = geoIds[i],
-            geoCalcData = getSubplotCalcData(calcData, geoId),
+            geoCalcData = Plots.getSubplotCalcData(calcData, 'geo', geoId),
             geo = fullLayout[geoId]._subplot;
 
         // If geo is not instantiated, create one!
@@ -102,16 +102,3 @@ exports.toSVG = function(gd) {
             .appendChild(geoFramework.node());
     }
 };
-
-function getSubplotCalcData(calcData, id) {
-    var subplotCalcData = [];
-
-    for(var i = 0; i < calcData.length; i++) {
-        var calcTrace = calcData[i],
-            trace = calcTrace[0].trace;
-
-        if(trace.geo === id) subplotCalcData.push(calcTrace);
-    }
-
-    return subplotCalcData;
-}

src/plots/mapbox/index.js

@@ -56,7 +56,7 @@ exports.plot = function plotMapbox(gd) {
 
     for(var i = 0; i < mapboxIds.length; i++) {
         var id = mapboxIds[i],
-            subplotCalcData = getSubplotCalcData(calcData, id),
+            subplotCalcData = Plots.getSubplotCalcData(calcData, 'mapbox', id),
             opts = fullLayout[id],
             mapbox = opts._subplot;
 
@@ -118,19 +118,6 @@ exports.toSVG = function(gd) {
     }
 };
 
-function getSubplotCalcData(calcData, id) {
-    var subplotCalcData = [];
-
-    for(var i = 0; i < calcData.length; i++) {
-        var calcTrace = calcData[i],
-            trace = calcTrace[0].trace;
-
-        if(trace.subplot === id) subplotCalcData.push(calcTrace);
-    }
-
-    return subplotCalcData;
-}
-
 function findAccessToken(gd, mapboxIds) {
     var fullLayout = gd._fullLayout,
         context = gd._context;

src/plots/plots.js

@@ -157,6 +157,31 @@ plots.getSubplotData = function getSubplotData(data, type, subplotId) {
     return subplotData;
 };
 
+/**
+ * Get calcdata traces(s) associated with a given subplot
+ *
+ * @param {array} calcData (as in gd.calcdata)
+ * @param {string} type subplot type
+ * @param {string} subplotId subplot id to look for
+ *
+ * @return {array} array of calcdata traces
+ */
+plots.getSubplotCalcData = function(calcData, type, subplotId) {
+    if(plots.subplotsRegistry[type] === undefined) return [];
+
+    var attr = plots.subplotsRegistry[type].attr;
+    var subplotCalcData = [];
+
+    for(var i = 0; i < calcData.length; i++) {
+        var calcTrace = calcData[i],
+            trace = calcTrace[0].trace;
+
+        if(trace[attr] === subplotId) subplotCalcData.push(calcTrace);
+    }
+
+    return subplotCalcData;
+};
+
 // in some cases the browser doesn't seem to know how big
 // the text is at first, so it needs to draw it,
 // then wait a little, then draw it again

test/jasmine/tests/plots_test.js

@@ -549,4 +549,37 @@ describe('Test Plots', function() {
             });
         });
     });
+
+    describe('Plots.getSubplotCalcData', function() {
+        var trace0 = { geo: 'geo2' };
+        var trace1 = { subplot: 'ternary10' };
+        var trace2 = { subplot: 'ternary10' };
+
+        var cd = [
+            [{ trace: trace0 }],
+            [{ trace: trace1 }],
+            [{ trace: trace2}]
+        ];
+
+        it('should extract calcdata traces associated with subplot (1)', function() {
+            var out = Plots.getSubplotCalcData(cd, 'geo', 'geo2');
+            expect(out).toEqual([[{ trace: trace0 }]]);
+        });
+
+        it('should extract calcdata traces associated with subplot (2)', function() {
+            var out = Plots.getSubplotCalcData(cd, 'ternary', 'ternary10');
+            expect(out).toEqual([[{ trace: trace1 }], [{ trace: trace2 }]]);
+        });
+
+        it('should return [] when no calcdata traces where found', function() {
+            var out = Plots.getSubplotCalcData(cd, 'geo', 'geo');
+            expect(out).toEqual([]);
+        });
+
+        it('should return [] when subplot type is invalid', function() {
+            var out = Plots.getSubplotCalcData(cd, 'non-sense', 'geo2');
+            expect(out).toEqual([]);
+        });
+    });
+
 });