ignore null, undefined and NaN in extent checking

mhkeller · Jun 17, 2020 · 8cb8f34 · 8cb8f34
1 parent 6c254a7
commit 8cb8f34
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/lib/calcExtents.js b/src/lib/calcExtents.js
@@ -1,3 +1,5 @@
+import canBeZero from '../utils/canBeZero.js';
+
 /* --------------------------------------------
  *
  * Calculate the extents of desired fields
@@ -20,7 +22,11 @@ export default function calcExtents (data, fields) {
 	if (fl) {
 		for (i = 0; i < fl; i += 1) {
 			const firstRow = fields[i].accessor(data[0]);
-			extents[fields[i].field] = Array.isArray(firstRow) ? firstRow : [firstRow, firstRow];
+			if (firstRow === undefined || firstRow === null || Number.isNaN(firstRow) === true) {
+				extents[fields[i].field] = [Infinity, -Infinity];
+			} else {
+				extents[fields[i].field] = Array.isArray(firstRow) ? firstRow : [firstRow, firstRow];
+			}
 		}
 		const dl = data.length;
 		for (i = 0; i < dl; i += 1) {
@@ -31,7 +37,7 @@ export default function calcExtents (data, fields) {
 				if (Array.isArray(val)) {
 					const vl = val.length;
 					for (let k = 0; k < vl; k += 1) {
-						if (val[k] !== undefined) {
+						if (val[k] !== undefined && val[k] !== null && Number.isNaN(val[k]) === false) {
 							if (val[k] < extents[s][0]) {
 								extents[s][0] = val[k];
 							}
@@ -40,7 +46,7 @@ export default function calcExtents (data, fields) {
 							}
 						}
 					}
-				} else if (val !== undefined) {
+				} else if (val !== undefined && val !== null && Number.isNaN(val) === false) {
 					if (val < extents[s][0]) {
 						extents[s][0] = val;
 					}

diff --git a/test/calcExtents.js b/test/calcExtents.js
@@ -14,6 +14,36 @@ const tests = [
 		], [{ field: 'x', accessor: d => d.x }]],
 		expected: { x: [0, 4] }
 	},
+	{
+		args: [[
+			{}, { x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }, { x: 3, y: 4 }, { x: 4, y: 5 }
+		], [{ field: 'x', accessor: d => d.x }]],
+		expected: { x: [0, 4] }
+	},
+	{
+		args: [[
+			{ x: null }, { x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }, { x: 3, y: 4 }, { x: 4, y: 5 }
+		], [{ field: 'x', accessor: d => d.x }]],
+		expected: { x: [0, 4] }
+	},
+	{
+		args: [[
+			{ x: 'd' / 1 }, { x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }, { x: 3, y: 4 }, { x: 4, y: 5 }
+		], [{ field: 'x', accessor: d => d.x }]],
+		expected: { x: [0, 4] }
+	},
+	{
+		args: [[
+			{ x: NaN }, { x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }, { x: 3, y: 4 }, { x: 4, y: 5 }
+		], [{ field: 'x', accessor: d => d.x }]],
+		expected: { x: [0, 4] }
+	},
+	{
+		args: [[
+			{ x: Number.NaN }, { x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }, { x: 3, y: 4 }, { x: 4, y: 5 }
+		], [{ field: 'x', accessor: d => d.x }]],
+		expected: { x: [0, 4] }
+	},
 	{
 		args: [[
 			{ x: '2010-01-04' }, { x: '2010-01-02' }, { x: '2010-01-04' }, { x: '2010-01-05' }, { x: '2010-01-06' }