add support for heatmap and contour traces on multicategoy axes

etpinard · etpinard · commit b792b8df24de · 2018-12-05T16:53:19.000-05:00
diff --git a/src/traces/heatmap/convert_column_xyz.js b/src/traces/heatmap/convert_column_xyz.js
@@ -14,44 +14,36 @@ var BADNUM = require('../../constants/numerical').BADNUM;
 
 module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name, arrayVarNames) {
     var colLen = trace._length;
-    var col1 = trace[var1Name].slice(0, colLen);
-    var col2 = trace[var2Name].slice(0, colLen);
+    var col1 = ax1.makeCalcdata(trace, var1Name);
+    var col2 = ax2.makeCalcdata(trace, var2Name);
     var textCol = trace.text;
     var hasColumnText = (textCol !== undefined && Lib.isArray1D(textCol));
-    var col1Calendar = trace[var1Name + 'calendar'];
-    var col2Calendar = trace[var2Name + 'calendar'];
+    var i, j;
 
-    var i, j, arrayVar, newArray, arrayVarName;
-
-    // TODO use makeCalcdata to make this work for multicategory?
-    for(i = 0; i < colLen; i++) {
-        col1[i] = ax1.d2c(col1[i], 0, col1Calendar);
-        col2[i] = ax2.d2c(col2[i], 0, col2Calendar);
-    }
-
-    var col1dv = Lib.distinctVals(col1),
-        col1vals = col1dv.vals,
-        col2dv = Lib.distinctVals(col2),
-        col2vals = col2dv.vals,
-        newArrays = [];
+    var col1dv = Lib.distinctVals(col1);
+    var col1vals = col1dv.vals;
+    var col2dv = Lib.distinctVals(col2);
+    var col2vals = col2dv.vals;
+    var newArrays = [];
+    var text;
 
     for(i = 0; i < arrayVarNames.length; i++) {
         newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
     }
 
-    var i1, i2, text;
-
-    if(hasColumnText) text = Lib.init2dArray(col2vals.length, col1vals.length);
+    if(hasColumnText) {
+        text = Lib.init2dArray(col2vals.length, col1vals.length);
+    }
 
     for(i = 0; i < colLen; i++) {
         if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
-            i1 = Lib.findBin(col1[i] + col1dv.minDiff / 2, col1vals);
-            i2 = Lib.findBin(col2[i] + col2dv.minDiff / 2, col2vals);
+            var i1 = Lib.findBin(col1[i] + col1dv.minDiff / 2, col1vals);
+            var i2 = Lib.findBin(col2[i] + col2dv.minDiff / 2, col2vals);
 
             for(j = 0; j < arrayVarNames.length; j++) {
-                arrayVarName = arrayVarNames[j];
-                arrayVar = trace[arrayVarName];
-                newArray = newArrays[j];
+                var arrayVarName = arrayVarNames[j];
+                var arrayVar = trace[arrayVarName];
+                var newArray = newArrays[j];
                 newArray[i2][i1] = arrayVar[i];
             }
 
diff --git a/src/traces/heatmap/xyz_defaults.js b/src/traces/heatmap/xyz_defaults.js
@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
@@ -26,10 +25,13 @@ module.exports = function handleXYZDefaults(traceIn, traceOut, coerce, layout, x
         x = coerce(xName);
         y = coerce(yName);
 
+        var xlen = Lib.minRowLength(x);
+        var ylen = Lib.minRowLength(y);
+
         // column z must be accompanied by xName and yName arrays
-        if(!(x && x.length && y && y.length)) return 0;
+        if(xlen === 0 || ylen === 0) return 0;
 
-        traceOut._length = Math.min(x.length, y.length, z.length);
+        traceOut._length = Math.min(xlen, ylen, z.length);
     }
     else {
         x = coordDefaults(xName, coerce);
@@ -50,10 +52,8 @@ module.exports = function handleXYZDefaults(traceIn, traceOut, coerce, layout, x
 };
 
 function coordDefaults(coordStr, coerce) {
-    var coord = coerce(coordStr),
-        coordType = coord ?
-            coerce(coordStr + 'type', 'array') :
-            'scaled';
+    var coord = coerce(coordStr);
+    var coordType = coord ? coerce(coordStr + 'type', 'array') : 'scaled';
 
     if(coordType === 'scaled') {
         coerce(coordStr + '0');
diff --git a/test/image/baselines/heatmap_multicategory.png b/test/image/baselines/heatmap_multicategory.png
diff --git a/test/image/mocks/heatmap_multicategory.json b/test/image/mocks/heatmap_multicategory.json
@@ -0,0 +1,100 @@
+{
+  "data": [{
+    "type": "heatmap",
+    "name": "w/ 2d z",
+    "x": [
+      ["2017", "2017", "2017", "2017", "2018", "2018", "2018"],
+      ["q1", "q2", "q3", "q4", "q1", "q2", "q3"]
+    ],
+    "y": [
+      ["Group 1", "Group 1", "Group 1", "Group 2", "Group 2", "Group 2", "Group 3", "Group 3", "Group 3"],
+      ["A", "B", "C", "A", "B", "C", "A", "B", "C"]
+    ],
+    "z": [
+      [ 0.304, 1.465, 2.474, 3.05, 4.38, 5.245, 6.12 ],
+      [ 0.3515, 1.326, 2.18, 3.26, 4.41, 5.25, 6.11 ],
+      [ 0.3994, 1.167, 2.09, 3.306, 4.305, 5.35, 6.00 ],
+      [ 0.297, 1.295, 2.49, 3.428, 4.13, 5.41, 6.38 ],
+      [ 0.4602, 1.2256, 2.3356, 3.0667, 4.498, 5.411, 6.29 ],
+      [ 0.0197, 1.274, 2.407, 3.22, 4.47, 5.44, 6.28 ],
+      [ 0.32, 1.44, 2.303, 3.115, 4.49, 5.25, 6.46 ],
+      [ 0.4446, 1.223, 2.367, 3.253, 4.385, 5.08, 6.19 ],
+      [ 0.1304, 1.046, 2.45, 3.226, 4.34, 5.40, 6.05 ]
+    ],
+    "colorbar": {
+      "x": -0.15,
+      "len": 0.3,
+      "y": 1,
+      "yanchor": "top"
+    }
+  }, {
+    "type": "contour",
+    "name": "w/ 2d z",
+    "x": [
+      ["2017", "2017", "2017", "2017", "2018", "2018", "2018"],
+      ["q1", "q2", "q3", "q4", "q1", "q2", "q3"]
+    ],
+    "y": [
+      ["Group 1", "Group 1", "Group 1", "Group 2", "Group 2", "Group 2", "Group 3", "Group 3", "Group 3"],
+      ["A", "B", "C", "A", "B", "C", "A", "B", "C"]
+    ],
+    "z": [
+      [ 0.1304, 1.046, 2.45, 3.226, 4.34, 5.40, 6.05 ],
+      [ 0.3515, 1.326, 2.18, 3.26, 4.41, 5.25, 6.11 ],
+      [ 0.3994, 1.167, 2.09, 3.306, 4.305, 5.35, 6.00 ],
+      [ 0.32, 1.44, 2.303, 3.115, 4.49, 5.25, 6.46 ],
+      [ 0.297, 1.295, 2.49, 3.428, 4.13, 5.41, 6.38 ],
+      [ 0.0197, 1.274, 2.407, 3.22, 4.47, 5.44, 6.28 ],
+      [ 0.4446, 1.223, 2.367, 3.253, 4.385, 5.08, 6.19 ],
+      [ 0.4602, 1.2256, 2.3356, 3.0667, 4.498, 5.411, 6.29 ],
+      [ 0.304, 1.465, 2.474, 3.05, 4.38, 5.245, 6.12 ]
+    ],
+    "contours": {
+      "coloring": "lines",
+      "showlabels": true
+    },
+    "reversescale": true,
+    "line": {
+      "width": 4
+    },
+    "colorbar": {
+      "x": -0.15,
+      "len": 0.3,
+      "y": 0.5
+    }
+  }, {
+    "type": "heatmap",
+    "name": "w/ 1d z",
+    "x": [
+      ["2017", "2017", "2017", "2017", "2018", "2018", "2018"],
+      ["q1", "q2", "q3", "q4", "q1", "q2", "q3"]
+    ],
+    "y": [
+      ["Group 1", "Group 1", "Group 1", "Group 2", "Group 2", "Group 2", "Group 3", "Group 3", "Group 3"],
+      ["A", "B", "C", "A", "B", "C", "A", "B", "C"]
+    ],
+    "z": [1, 2, 3, 6, 5, 4, 11, 12, 13],
+    "opacity": 0.4,
+    "colorscale": "Greens",
+    "colorbar": {
+      "x": -0.15,
+      "len": 0.3,
+      "y": 0,
+      "yanchor": "bottom"
+    }
+  }],
+  "layout": {
+    "title": {
+      "text": "Multi-category heatmap/contour",
+      "x": 0,
+      "xref": "paper"
+    },
+    "xaxis": {
+      "tickson": "boundaries"
+    },
+    "yaxis": {
+      "tickson": "boundaries",
+      "side": "right"
+    }
+  }
+}
diff --git a/test/jasmine/tests/heatmap_test.js b/test/jasmine/tests/heatmap_test.js
@@ -164,15 +164,10 @@ describe('heatmap convertColumnXYZ', function() {
     'use strict';
 
     var trace;
-
-    function makeMockAxis() {
-        return {
-            d2c: function(v) { return v; }
-        };
-    }
-
-    var xa = makeMockAxis();
-    var ya = makeMockAxis();
+    var xa = {type: 'linear'};
+    var ya = {type: 'linear'};
+    setConvert(xa);
+    setConvert(ya);
 
     function checkConverted(trace, x, y, z) {
         trace._length = Math.min(trace.x.length, trace.y.length, trace.z.length);
