Small modifications and cleanup to heatmap reorg

rreusser · rreusser · commit 016090a38271 · 2016-12-07T17:32:53.000-05:00
diff --git a/src/traces/heatmap/calc.js b/src/traces/heatmap/calc.js
@@ -18,7 +18,7 @@ var colorscaleCalc = require('../../components/colorscale/calc');
 var hasColumns = require('./has_columns');
 var convertColumnXYZ = require('./convert_column_xyz');
 var maxRowLength = require('./max_row_length');
-var cleanData = require('./clean_data');
+var clean2dArray = require('./clean_2d_array');
 var interp2d = require('./interp2d');
 var findEmpties = require('./find_empties');
 var makeBoundArray = require('./make_bound_array');
@@ -66,7 +66,7 @@ module.exports = function calc(gd, trace) {
         y0 = trace.y0 || 0;
         dy = trace.dy || 1;
 
-        z = cleanData(trace.z, trace.transpose);
+        z = clean2dArray(trace.z, trace.transpose);
 
         if(isContour || trace.connectgaps) {
             trace._emptypoints = findEmpties(z);
diff --git a/src/traces/heatmap/clean_2d_array.js b/src/traces/heatmap/clean_2d_array.js
@@ -10,7 +10,7 @@
 
 var isNumeric = require('fast-isnumeric');
 
-module.exports = function cleanData(zOld, transpose) {
+module.exports = function clean2dArray(zOld, transpose) {
     var rowlen, collen, getCollen, old2new, i, j;
 
     function cleanZvalue(v) {
diff --git a/src/traces/heatmap/find_empties.js b/src/traces/heatmap/find_empties.js
@@ -10,13 +10,14 @@
 
 var maxRowLength = require('./max_row_length');
 
+/* Return a list of empty points in 2D array z
+ * each empty point z[i][j] gives an array [i, j, neighborCount]
+ * neighborCount is the count of 4 nearest neighbors that DO exist
+ * this is to give us an order of points to evaluate for interpolation.
+ * if no neighbors exist, we iteratively look for neighbors that HAVE
+ * neighbors, and add a fractional neighborCount
+ */
 module.exports = function findEmpties(z) {
-    // return a list of empty points in 2D array z
-    // each empty point z[i][j] gives an array [i, j, neighborCount]
-    // neighborCount is the count of 4 nearest neighbors that DO exist
-    // this is to give us an order of points to evaluate for interpolation.
-    // if no neighbors exist, we iteratively look for neighbors that HAVE
-    // neighbors, and add a fractional neighborCount
     var empties = [],
         neighborHash = {},
         noNeighborList = [],
