skip dims with conflicting axis types

Author: etpinard

src/traces/splom/index.js

@@ -59,16 +59,17 @@ function calc(gd, trace) {
             xa = AxisIDs.getFromId(gd, trace._diag[i][0]);
             ya = AxisIDs.getFromId(gd, trace._diag[i][1]);
 
+            // if corresponding x & y axes don't have matching types, skip dim
+            if(xa && ya && xa.type !== ya.type) continue;
+
             if(xa) {
                 makeCalcdata(xa, dim);
                 if(ya && ya.type === 'category') {
                     ya._categories = xa._categories.slice();
                 }
-            } else if(ya) {
+            } else {
+                // should not make it here, if both xa and ya undefined
                 makeCalcdata(ya, dim);
-                if(xa && xa.type === 'category') {
-                    xa._categories = ya._categories.slice();
-                }
             }
         }
     }

test/jasmine/tests/splom_test.js

@@ -359,6 +359,36 @@ describe('Test splom trace defaults:', function() {
     });
 });
 
+describe('Test splom trace calc step:', function() {
+    var gd;
+
+    function _calc(opts, layout) {
+        gd = {};
+
+        gd.data = [Lib.extendFlat({type: 'splom'}, opts || {})];
+        gd.layout = layout || {};
+        supplyAllDefaults(gd);
+        Plots.doCalcdata(gd);
+    }
+
+    it('should skip dimensions with conflicting axis types', function() {
+        _calc({
+            dimensions: [{
+                values: [1, 2, 3]
+            }, {
+                values: [2, 1, 2]
+            }]
+        }, {
+            xaxis: {type: 'category'},
+            yaxis: {type: 'linear'}
+        });
+
+        var cd = gd.calcdata[0][0];
+
+        expect(cd.t._scene.matrixOptions.data).toBeCloseTo2DArray([[2, 1, 2]]);
+    });
+});
+
 describe('@gl Test splom interactions:', function() {
     var gd;