set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric

- to improve performance in check downstream
- add calc tests to scattergeo_test.js

Author: etpinard

src/traces/scattergeo/calc.js

@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
         if(hasLocationData) {
             var loc = trace.locations[i];
             calcPt.loc = typeof loc === 'string' ? loc : null;
-        }
-        else {
+        } else {
             var lon = trace.lon[i];
             var lat = trace.lat[i];
-            calcPt.lonlat = new Array(2);
 
-            calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
-            calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
+            if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
+            else calcPt.lonlat = [BADNUM, BADNUM];
         }
     }
 

test/jasmine/tests/scattergeo_test.js

@@ -1,3 +1,7 @@
+var Plots = require('@src/plots/plots');
+var Lib = require('@src/lib');
+var BADNUM = require('@src/constants/numerical').BADNUM;
+
 var ScatterGeo = require('@src/traces/scattergeo');
 
 
@@ -69,18 +73,151 @@ describe('Test scattergeo defaults', function() {
     });
 });
 
+describe('Test scattergeo calc', function() {
+
+    function _calc(opts) {
+        var base = { type: 'scattermapbox' };
+        var trace = Lib.extendFlat({}, base, opts);
+        var gd = { data: [trace] };
+
+        Plots.supplyDefaults(gd);
+
+        var fullTrace = gd._fullData[0];
+        return ScatterGeo.calc(gd, fullTrace);
+    }
+
+    it('should place lon/lat data in lonlat pairs', function() {
+        var calcTrace = _calc({
+            lon: [10, 20, 30],
+            lat: [20, 30, 10]
+        });
+
+        expect(calcTrace).toEqual([
+            { lonlat: [10, 20] },
+            { lonlat: [20, 30] },
+            { lonlat: [30, 10] }
+        ]);
+    });
+
+    it('should coerce numeric strings lon/lat data into numbers', function() {
+        var calcTrace = _calc({
+            lon: [10, 20, '30', '40'],
+            lat: [20, '30', 10, '50']
+        });
+
+        expect(calcTrace).toEqual([
+            { lonlat: [10, 20] },
+            { lonlat: [20, 30] },
+            { lonlat: [30, 10] },
+            { lonlat: [40, 50] }
+        ]);
+    });
+
+    it('should set non-numeric values lon/lat pairs to BADNUM', function() {
+        var calcTrace = _calc({
+            lon: [null, 10, null, null, 20, '30', null, '40', null, 10],
+            lat: [10, 20, '30', null, 10, '50', null, 60, null, null]
         });
 
+        expect(calcTrace).toEqual([
+            { lonlat: [BADNUM, BADNUM] },
+            { lonlat: [10, 20] },
+            { lonlat: [BADNUM, BADNUM] },
+            { lonlat: [BADNUM, BADNUM] },
+            { lonlat: [20, 10] },
+            { lonlat: [30, 50] },
+            { lonlat: [BADNUM, BADNUM] },
+            { lonlat: [40, 60] },
+            { lonlat: [BADNUM, BADNUM] },
+            { lonlat: [BADNUM, BADNUM] }
+        ]);
+    });
 
+    it('should fill array text (base case)', function() {
+        var calcTrace = _calc({
+            lon: [10, 20, 30, null, 40],
+            lat: [20, 30, 10, 'no-good', 50],
+            text: ['A', 'B', 'C', 'D', 'E']
         });
 
+        expect(calcTrace).toEqual([
+            { lonlat: [10, 20], tx: 'A' },
+            { lonlat: [20, 30], tx: 'B' },
+            { lonlat: [30, 10], tx: 'C' },
+            { lonlat: [BADNUM, BADNUM], tx: 'D' },
+            { lonlat: [40, 50], tx: 'E' }
+        ]);
+    });
 
+    it('should fill array text (invalid entry case)', function() {
+        var calcTrace = _calc({
+            lon: [10, 20, 30, null, 40],
+            lat: [20, 30, 10, 'no-good', 50],
+            text: ['A', null, 'C', 'D', {}]
         });
 
+        expect(calcTrace).toEqual([
+            { lonlat: [10, 20], tx: 'A' },
+            { lonlat: [20, 30], tx: null },
+            { lonlat: [30, 10], tx: 'C' },
+            { lonlat: [BADNUM, BADNUM], tx: 'D' },
+            { lonlat: [40, 50], tx: {} }
+        ]);
+    });
 
+    it('should fill array marker attributes (base case)', function() {
+        var calcTrace = _calc({
+            lon: [10, 20, null, 30],
+            lat: [20, 30, null, 10],
+            marker: {
+                color: ['red', 'blue', 'green', 'yellow'],
+                size: [10, 20, 8, 10]
+            }
+        });
 
+        expect(calcTrace).toEqual([
+            { lonlat: [10, 20], mc: 'red', ms: 10 },
+            { lonlat: [20, 30], mc: 'blue', ms: 20 },
+            { lonlat: [BADNUM, BADNUM], mc: 'green', ms: 8 },
+            { lonlat: [30, 10], mc: 'yellow', ms: 10 }
+        ]);
+    });
 
+    it('should fill array marker attributes (invalid scale case)', function() {
+        var calcTrace = _calc({
+            lon: [10, 20, null, 30],
+            lat: [20, 30, null, 10],
+            marker: {
+                color: [0, null, 5, 10],
+                size: [10, NaN, 8, 10],
+                colorscale: [
+                    [0, 'blue'], [0.5, 'red'], [1, 'green']
+                ]
+            }
         });
+
+        expect(calcTrace).toEqual([
+            { lonlat: [10, 20], mc: 0, ms: 10 },
+            { lonlat: [20, 30], mc: null, ms: NaN },
+            { lonlat: [BADNUM, BADNUM], mc: 5, ms: 8 },
+            { lonlat: [30, 10], mc: 10, ms: 10 }
+        ]);
     });
 
+    it('should fill marker attributes (symbol case)', function() {
+        var calcTrace = _calc({
+            lon: [10, 20, null, 30],
+            lat: [20, 30, null, 10],
+            marker: {
+                symbol: ['cross', 'square', 'diamond', null]
+            }
+        });
+
+        expect(calcTrace).toEqual([
+            { lonlat: [10, 20], mx: 'cross' },
+            { lonlat: [20, 30], mx: 'square' },
+            { lonlat: [BADNUM, BADNUM], mx: 'diamond' },
+            { lonlat: [30, 10], mx: null }
+        ]);
+    });
 });