ensure o, h, l, and c are all numeric - or drop the whole point

Author: alexcjohnson

src/traces/candlestick/transform.js

@@ -9,6 +9,8 @@
 
 'use strict';
 
+var isNumeric = require('fast-isnumeric');
+
 var Lib = require('../../lib');
 var helpers = require('../ohlc/helpers');
 
@@ -115,7 +117,7 @@ exports.calcTransform = function calcTransform(gd, trace, opts) {
     };
 
     for(var i = 0; i < len; i++) {
-        if(filterFn(open[i], close[i])) {
+        if(filterFn(open[i], close[i]) && isNumeric(high[i]) && isNumeric(low[i])) {
             appendX(i);
             appendY(open[i], high[i], low[i], close[i]);
         }

src/traces/ohlc/helpers.js

@@ -9,6 +9,8 @@
 
 'use strict';
 
+var isNumeric = require('fast-isnumeric');
+
 var Lib = require('../../lib');
 
 // This routine gets called during the trace supply-defaults step.
@@ -103,7 +105,7 @@ function _getFilterFn(direction) {
     var isPrevIncreasing = true;
     var cPrev = null;
 
-    function isIncreasing(o, c) {
+    function _isIncreasing(o, c) {
         if(o === c) {
             if(c > cPrev) {
                 isPrevIncreasing = true; // increasing
@@ -117,8 +119,12 @@ function _getFilterFn(direction) {
         return isPrevIncreasing;
     }
 
+    function isIncreasing(o, c) {
+        return isNumeric(o) && isNumeric(c) && _isIncreasing(+o, +c);
+    }
+
     function isDecreasing(o, c) {
-        return !isIncreasing(o, c);
+        return isNumeric(o) && isNumeric(c) && !_isIncreasing(+o, +c);
     }
 
     return direction === 'increasing' ? isIncreasing : isDecreasing;

src/traces/ohlc/transform.js

@@ -9,6 +9,8 @@
 
 'use strict';
 
+var isNumeric = require('fast-isnumeric');
+
 var Lib = require('../../lib');
 var helpers = require('./helpers');
 var Axes = require('../../plots/cartesian/axes');
@@ -195,7 +197,7 @@ exports.calcTransform = function calcTransform(gd, trace, opts) {
     };
 
     for(var i = 0; i < len; i++) {
-        if(filterFn(open[i], close[i])) {
+        if(filterFn(open[i], close[i]) && isNumeric(high[i]) && isNumeric(low[i])) {
             appendX(i);
             appendY(open[i], high[i], low[i], close[i]);
             appendText(i, open[i], high[i], low[i], close[i]);

test/jasmine/tests/finance_test.js

@@ -395,14 +395,28 @@ describe('finance charts calc transforms:', function() {
         return gd.calcdata.map(calcDatatoTrace);
     }
 
+    // add some points that shouldn't make it into calcdata because
+    // one of o, h, l, c is not numeric
+    function addJunk(trace) {
+        // x filtering happens in other ways
+        if(trace.x) trace.x.push(1, 1, 1, 1);
+
+        trace.open.push('', 1, 1, 1);
+        trace.high.push(1, null, 1, 1);
+        trace.low.push(1, 1, [1], 1);
+        trace.close.push(1, 1, 1, 'close');
+    }
+
     it('should fill when *x* is not present', function() {
         var trace0 = Lib.extendDeep({}, mock0, {
             type: 'ohlc',
         });
+        addJunk(trace0);
 
         var trace1 = Lib.extendDeep({}, mock0, {
             type: 'candlestick',
         });
+        addJunk(trace1);
 
         var out = _calc([trace0, trace1]);