heatmap&carpet/has_columns -> Lib.is1D

heatmap and carpet used opposite meanings here...

Author: alexcjohnson

src/lib/index.js

@@ -30,6 +30,7 @@ lib.ensureArray = require('./ensure_array');
 var isArrayModule = require('./is_array');
 lib.isTypedArray = isArrayModule.isTypedArray;
 lib.isArrayOrTypedArray = isArrayModule.isArrayOrTypedArray;
+lib.is1D = isArrayModule.is1D;
 
 var coerceModule = require('./coerce');
 lib.valObjectMeta = coerceModule.valObjectMeta;

src/lib/is_array.js

@@ -18,10 +18,20 @@ var dv = (typeof DataView === 'undefined') ?
     function() {} :
     DataView;
 
-exports.isTypedArray = function(a) {
+function isTypedArray(a) {
     return ab.isView(a) && !(a instanceof dv);
-};
+}
+
+function isArrayOrTypedArray(a) {
+    return Array.isArray(a) || isTypedArray(a);
+}
+
+function is1D(a) {
+    return !isArrayOrTypedArray(a[0]);
+}
 
-exports.isArrayOrTypedArray = function(a) {
-    return Array.isArray(a) || exports.isTypedArray(a);
+module.exports = {
+    isTypedArray: isTypedArray,
+    isArrayOrTypedArray: isArrayOrTypedArray,
+    is1D: is1D
 };

src/traces/carpet/ab_defaults.js

@@ -26,8 +26,6 @@ module.exports = function handleABDefaults(traceIn, traceOut, fullLayout, coerce
     }
 
     mimickAxisDefaults(traceIn, traceOut, fullLayout, dfltColor);
-
-    return;
 };
 
 function mimickAxisDefaults(traceIn, traceOut, fullLayout, dfltColor) {

src/traces/carpet/calc.js

@@ -9,14 +9,14 @@
 'use strict';
 
 var Axes = require('../../plots/cartesian/axes');
+var is1D = require('../../lib').is1D;
 var cheaterBasis = require('./cheater_basis');
 var arrayMinmax = require('./array_minmax');
 var calcGridlines = require('./calc_gridlines');
 var calcLabels = require('./calc_labels');
 var calcClipPath = require('./calc_clippath');
 var clean2dArray = require('../heatmap/clean_2d_array');
 var smoothFill2dArray = require('./smooth_fill_2d_array');
-var hasColumns = require('./has_columns');
 var convertColumnData = require('../heatmap/convert_column_xyz');
 var setConvert = require('./set_convert');
 
@@ -29,8 +29,8 @@ module.exports = function calc(gd, trace) {
     var x = trace.x;
     var y = trace.y;
     var cols = [];
-    if(x && !hasColumns(x)) cols.push('x');
-    if(y && !hasColumns(y)) cols.push('y');
+    if(x && is1D(x)) cols.push('x');
+    if(y && is1D(y)) cols.push('y');
 
     if(cols.length) {
         convertColumnData(trace, aax, bax, 'a', 'b', cols);

src/traces/carpet/has_columns.js

@@ -11,7 +11,6 @@
 
 var Lib = require('../../lib');
 
-var hasColumns = require('../heatmap/has_columns');
 var handleXYZDefaults = require('../heatmap/xyz_defaults');
 var handleConstraintDefaults = require('./constraint_defaults');
 var handleContoursDefaults = require('./contours_defaults');
@@ -36,7 +35,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     coerce('text');
     var isConstraint = (coerce('contours.type') === 'constraint');
-    coerce('connectgaps', hasColumns(traceOut));
+    coerce('connectgaps', Lib.is1D(traceOut.z));
 
     // trace-level showlegend has already been set, but is only allowed if this is a constraint
     if(!isConstraint) delete traceOut.showlegend;

src/traces/contour/defaults.js

@@ -9,7 +9,8 @@
 'use strict';
 
 var colorscaleCalc = require('../../components/colorscale/calc');
-var hasColumns = require('../heatmap/has_columns');
+var is1D = require('../../lib').is1D;
+
 var convertColumnData = require('../heatmap/convert_column_xyz');
 var clean2dArray = require('../heatmap/clean_2d_array');
 var maxRowLength = require('../heatmap/max_row_length');
@@ -69,7 +70,7 @@ function heatmappishCalc(gd, trace) {
     aax._minDtick = 0;
     bax._minDtick = 0;
 
-    if(hasColumns(trace)) convertColumnData(trace, aax, bax, 'a', 'b', ['z']);
+    if(is1D(trace.z)) convertColumnData(trace, aax, bax, 'a', 'b', ['z']);
     a = trace._a = trace._a || trace.a;
     b = trace._b = trace._b || trace.b;
 

src/traces/contourcarpet/calc.js

@@ -56,7 +56,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         var isConstraint = (coerce('contours.type') === 'constraint');
 
         // Unimplemented:
-        // coerce('connectgaps', hasColumns(traceOut));
+        // coerce('connectgaps', Lib.is1D(traceOut.z));
 
         // trace-level showlegend has already been set, but is only allowed if this is a constraint
         if(!isConstraint) delete traceOut.showlegend;

src/traces/contourcarpet/defaults.js

@@ -15,7 +15,6 @@ var Axes = require('../../plots/cartesian/axes');
 
 var histogram2dCalc = require('../histogram2d/calc');
 var colorscaleCalc = require('../../components/colorscale/calc');
-var hasColumns = require('./has_columns');
 var convertColumnData = require('./convert_column_xyz');
 var maxRowLength = require('./max_row_length');
 var clean2dArray = require('./clean_2d_array');
@@ -59,7 +58,7 @@ module.exports = function calc(gd, trace) {
     }
     else {
         var zIn = trace.z;
-        if(hasColumns(trace)) {
+        if(Lib.is1D(zIn)) {
             convertColumnData(trace, xa, ya, 'x', 'y', ['z']);
             x = trace._x;
             y = trace._y;

src/traces/heatmap/calc.js

@@ -11,7 +11,6 @@
 
 var Lib = require('../../lib');
 
-var hasColumns = require('./has_columns');
 var handleXYZDefaults = require('./xyz_defaults');
 var handleStyleDefaults = require('./style_defaults');
 var colorscaleDefaults = require('../../components/colorscale/defaults');
@@ -23,8 +22,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
-    var len = handleXYZDefaults(traceIn, traceOut, coerce, layout);
-    if(!len) {
+    var validData = handleXYZDefaults(traceIn, traceOut, coerce, layout);
+    if(!validData) {
         traceOut.visible = false;
         return;
     }
@@ -33,7 +32,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     handleStyleDefaults(traceIn, traceOut, coerce, layout);
 
-    coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));
+    coerce('connectgaps', Lib.is1D(traceOut.z) && (traceOut.zsmooth !== false));
 
     colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});
 };

src/traces/heatmap/defaults.js

@@ -10,10 +10,9 @@
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
-var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
+var Lib = require('../../lib');
 
 var Registry = require('../../registry');
-var hasColumns = require('./has_columns');
 
 module.exports = function handleXYZDefaults(traceIn, traceOut, coerce, layout, xName, yName) {
     var z = coerce('z');
@@ -23,7 +22,7 @@ module.exports = function handleXYZDefaults(traceIn, traceOut, coerce, layout, x
 
     if(z === undefined || !z.length) return 0;
 
-    if(hasColumns(traceIn)) {
+    if(Lib.is1D(traceIn.z)) {
         x = coerce(xName);
         y = coerce(yName);
 
@@ -76,7 +75,7 @@ function isValidZ(z) {
 
     for(var i = 0; i < z.length; i++) {
         zi = z[i];
-        if(!isArrayOrTypedArray(zi)) {
+        if(!Lib.isArrayOrTypedArray(zi)) {
             allRowsAreArrays = false;
             break;
         }