mv maxRowLength to lib/array.js, use it it in xy defaults

etpinard · etpinard · commit 2a9ef876e07d · 2018-11-30T12:15:10.000-05:00
diff --git a/src/lib/array.js b/src/lib/array.js
@@ -132,3 +132,13 @@ exports.concat = function() {
     }
     return out;
 };
+
+exports.maxRowLength = function(z) {
+    var len = 0;
+
+    for(var i = 0; i < z.length; i++) {
+        len = Math.max(len, z[i].length);
+    }
+
+    return len;
+};
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -31,6 +31,7 @@ lib.isArrayOrTypedArray = arrayModule.isArrayOrTypedArray;
 lib.isArray1D = arrayModule.isArray1D;
 lib.ensureArray = arrayModule.ensureArray;
 lib.concat = arrayModule.concat;
+lib.maxRowLength = arrayModule.maxRowLength;
 
 var modModule = require('./mod');
 lib.mod = modModule.mod;
diff --git a/src/traces/contourcarpet/calc.js b/src/traces/contourcarpet/calc.js
@@ -9,11 +9,10 @@
 'use strict';
 
 var colorscaleCalc = require('../../components/colorscale/calc');
-var isArray1D = require('../../lib').isArray1D;
+var Lib = require('../../lib');
 
 var convertColumnData = require('../heatmap/convert_column_xyz');
 var clean2dArray = require('../heatmap/clean_2d_array');
-var maxRowLength = require('../heatmap/max_row_length');
 var interp2d = require('../heatmap/interp2d');
 var findEmpties = require('../heatmap/find_empties');
 var makeBoundArray = require('../heatmap/make_bound_array');
@@ -70,7 +69,7 @@ function heatmappishCalc(gd, trace) {
     aax._minDtick = 0;
     bax._minDtick = 0;
 
-    if(isArray1D(trace.z)) convertColumnData(trace, aax, bax, 'a', 'b', ['z']);
+    if(Lib.isArray1D(trace.z)) convertColumnData(trace, aax, bax, 'a', 'b', ['z']);
     a = trace._a = trace._a || trace.a;
     b = trace._b = trace._b || trace.b;
 
@@ -87,7 +86,7 @@ function heatmappishCalc(gd, trace) {
     interp2d(z, trace._emptypoints);
 
     // create arrays of brick boundaries, to be used by autorange and heatmap.plot
-    var xlen = maxRowLength(z),
+    var xlen = Lib.maxRowLength(z),
         xIn = trace.xtype === 'scaled' ? '' : a,
         xArray = makeBoundArray(trace, xIn, a0, da, xlen, aax),
         yIn = trace.ytype === 'scaled' ? '' : b,
diff --git a/src/traces/heatmap/calc.js b/src/traces/heatmap/calc.js
@@ -16,7 +16,6 @@ var Axes = require('../../plots/cartesian/axes');
 var histogram2dCalc = require('../histogram2d/calc');
 var colorscaleCalc = require('../../components/colorscale/calc');
 var convertColumnData = require('./convert_column_xyz');
-var maxRowLength = require('./max_row_length');
 var clean2dArray = require('./clean_2d_array');
 var interp2d = require('./interp2d');
 var findEmpties = require('./find_empties');
@@ -116,7 +115,7 @@ module.exports = function calc(gd, trace) {
     }
 
     // create arrays of brick boundaries, to be used by autorange and heatmap.plot
-    var xlen = maxRowLength(z);
+    var xlen = Lib.maxRowLength(z);
     var xIn = trace.xtype === 'scaled' ? '' : x;
     var xArray = makeBoundArray(trace, xIn, x0, dx, xlen, xa);
     var yIn = trace.ytype === 'scaled' ? '' : y;
diff --git a/src/traces/heatmap/find_empties.js b/src/traces/heatmap/find_empties.js
@@ -8,7 +8,7 @@
 
 'use strict';
 
-var maxRowLength = require('./max_row_length');
+var maxRowLength = require('../../lib').maxRowLength;
 
 /* Return a list of empty points in 2D array z
  * each empty point z[i][j] gives an array [i, j, neighborCount]
diff --git a/src/traces/heatmap/max_row_length.js b/src/traces/heatmap/max_row_length.js
diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
@@ -17,8 +17,6 @@ var Lib = require('../../lib');
 var Colorscale = require('../../components/colorscale');
 var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
 
-var maxRowLength = require('./max_row_length');
-
 module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
     var xa = plotinfo.xaxis;
     var ya = plotinfo.yaxis;
@@ -38,7 +36,7 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
 
         // get z dims
         var m = z.length;
-        var n = maxRowLength(z);
+        var n = Lib.maxRowLength(z);
         var xrev = false;
         var yrev = false;
 
diff --git a/src/traces/scatter/xy_defaults.js b/src/traces/scatter/xy_defaults.js
@@ -9,9 +9,9 @@
 
 'use strict';
 
+var Lib = require('../../lib');
 var Registry = require('../../registry');
 
-
 module.exports = function handleXYDefaults(traceIn, traceOut, layout, coerce) {
     var x = coerce('x');
     var y = coerce('y');
@@ -21,10 +21,7 @@ module.exports = function handleXYDefaults(traceIn, traceOut, layout, coerce) {
     handleCalendarDefaults(traceIn, traceOut, ['x', 'y'], layout);
 
     if(x) {
-        xlen = Array.isArray(x[0]) ?
-            x.map(function(c) { return c.length; })
-             .sort(function(a, b) { return a - b; })[0] :
-            x.length;
+        xlen = Array.isArray(x[0]) ? Lib.maxRowLength(x) : x.length;
         if(y) {
             len = Math.min(xlen, y.length);
         }
