move is-numeric and arrayOk logic to calc step

etpinard · etpinard · commit 22af60ced75e · 2016-06-07T17:23:19.000-04:00
diff --git a/src/traces/scattermapbox/calc.js b/src/traces/scattermapbox/calc.js
@@ -9,8 +9,9 @@
 
 'use strict';
 
+var isNumeric = require('fast-isnumeric');
+
 var Lib = require('../../lib');
-var arrayToCalcItem = require('../../lib/array_to_calc_item');
 var hasColorscale = require('../../components/colorscale/has_colorscale');
 var makeColorScaleFn = require('../../components/colorscale/make_scale_function');
 var subtypes = require('../scatter/subtypes');
@@ -20,8 +21,13 @@ var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 
 module.exports = function calc(gd, trace) {
     var len = trace.lon.length,
-        marker = trace.marker,
-        hasMarkers = subtypes.hasMarkers(trace);
+        marker = trace.marker;
+
+    var hasMarkers = subtypes.hasMarkers(trace),
+        hasColorArray = (hasMarkers && Array.isArray(marker.color)),
+        hasSizeArray = (hasMarkers && Array.isArray(marker.size)),
+        hasSymbolArray = (hasMarkers && Array.isArray(marker.symbol)),
+        hasTextArray = Array.isArray(trace.text);
 
     calcMarkerColorscale(trace);
 
@@ -33,26 +39,57 @@ module.exports = function calc(gd, trace) {
             makeBubbleSizeFn(trace) :
             Lib.identity;
 
-    var cd = new Array(len);
+    var calcTrace = [],
+        cnt = 0;
+
+    // Different than cartesian calc step
+    // as skip over non-numeric lon, lat pairs.
+    // This makes the hover and convert calculations simpler.
 
     for(var i = 0; i < len; i++) {
-        var cdi = cd[i] = {};
+        var lon = trace.lon[i],
+            lat = trace.lat[i];
 
-        // the isNumeric check is done in the convert step
+        if(!isNumeric(lon) || !isNumeric(lat)) {
+            if(cnt > 0) calcTrace[cnt - 1].gapAfter = true;
+            continue;
+        }
+
+        var calcPt = {};
+        cnt++;
 
-        cdi.lonlat = [trace.lon[i], trace.lat[i]];
+        // coerce numeric strings into numbers
+        calcPt.lonlat = [+lon, +lat];
 
         if(hasMarkers) {
-            arrayToCalcItem(marker.color, cdi, 'mc', i);
-            arrayToCalcItem(marker.size, cdi, 'ms', i);
-            arrayToCalcItem(marker.symbol, cdi, 'mx', i);
 
-            if(cdi.mc !== undefined) cdi.mcc = colorFn(cdi.mc);
-            if(cdi.ms !== undefined) cdi.mrc = sizeFn(cdi.ms);
+            if(hasColorArray) {
+                var mc = marker.color[i];
+
+                calcPt.mc = mc;
+                calcPt.mcc = colorFn(mc);
+            }
+
+            if(hasSizeArray) {
+                var ms = marker.size[i];
+
+                calcPt.ms = ms;
+                calcPt.mrc = sizeFn(ms);
+            }
+
+            if(hasSymbolArray) {
+                var mx = marker.symbol[i];
+                calcPt.mx = (typeof mx === 'string') ? mx : 'circle';
+            }
+        }
+
+        if(hasTextArray) {
+            var tx = trace.text[i];
+            calcPt.tx = (typeof tx === 'string') ? tx : '';
         }
 
-        arrayToCalcItem(trace.text, cdi, 'tx', i);
+        calcTrace.push(calcPt);
     }
 
-    return cd;
+    return calcTrace;
 };
diff --git a/src/traces/scattermapbox/convert.js b/src/traces/scattermapbox/convert.js
@@ -9,8 +9,6 @@
 
 'use strict';
 
-var isNumeric = require('fast-isnumeric');
-
 var Lib = require('../../lib');
 var subTypes = require('../scatter/subtypes');
 
@@ -176,23 +174,20 @@ function makeCircleGeoJSON(calcTrace, hash) {
     var features = [];
 
     for(var i = 0; i < calcTrace.length; i++) {
-        var calcPt = calcTrace[i],
-            lonlat = calcPt.lonlat;
+        var calcPt = calcTrace[i];
 
         var props = {};
         if(hasColorArray) translate(props, COLOR_PROP, calcPt.mcc, i);
         if(hasSizeArray) translate(props, SIZE_PROP, calcPt.mrc, i);
 
-        if(checkLonLat(lonlat)) {
-            features.push({
-                type: 'Feature',
-                geometry: {
-                    type: 'Point',
-                    coordinates: coerceLonLat(lonlat)
-                },
-                properties: props
-            });
-        }
+        features.push({
+            type: 'Feature',
+            geometry: {
+                type: 'Point',
+                coordinates: calcPt.lonlat
+            },
+            properties: props
+        });
     }
 
     return {
@@ -219,22 +214,19 @@ function makeSymbolGeoJSON(calcTrace) {
     var features = [];
 
     for(var i = 0; i < calcTrace.length; i++) {
-        var calcPt = calcTrace[i],
-            lonlat = calcPt.lonlat;
-
-        if(checkLonLat(lonlat)) {
-            features.push({
-                type: 'Feature',
-                geometry: {
-                    type: 'Point',
-                    coordinates: coerceLonLat(lonlat)
-                },
-                properties: {
-                    symbol: fillSymbol(calcPt.mx),
-                    text: fillText(calcPt.tx)
-                }
-            });
-        }
+        var calcPt = calcTrace[i];
+
+        features.push({
+            type: 'Feature',
+            geometry: {
+                type: 'Point',
+                coordinates: calcPt.lonlat
+            },
+            properties: {
+                symbol: fillSymbol(calcPt.mx),
+                text: fillText(calcPt.tx)
+            }
+        });
     }
 
     return {
@@ -258,7 +250,7 @@ function calcCircleColor(trace, hash) {
         }
 
         out = {
-            property: SIZE_PROP,
+            property: COLOR_PROP,
             stops: stops
         };
 
@@ -350,14 +342,6 @@ function calcTextOpts(trace) {
     return { anchor: anchor, offset: offset };
 }
 
-function checkLonLat(lonlat) {
-    return isNumeric(lonlat[0]) && isNumeric(lonlat[1]);
-}
-
-function coerceLonLat(lonlat) {
-    return [+lonlat[0], +lonlat[1]];
-}
-
 function getCoords(calcTrace) {
     var trace = calcTrace[0].trace,
         connectgaps = trace.connectgaps;
@@ -366,13 +350,11 @@ function getCoords(calcTrace) {
         lineString = [];
 
     for(var i = 0; i < calcTrace.length; i++) {
-        var calcPt = calcTrace[i],
-            lonlat = calcPt.lonlat;
+        var calcPt = calcTrace[i];
 
-        if(checkLonLat(lonlat)) {
-            lineString.push(coerceLonLat(lonlat));
-        }
-        else if(!connectgaps && lineString.length > 0) {
+        lineString.push(calcPt.lonlat);
+
+        if(!connectgaps && calcPt.gapAfter && lineString.length > 0) {
             coords.push(lineString);
             lineString = [];
         }
diff --git a/test/jasmine/tests/scattermapbox_test.js b/test/jasmine/tests/scattermapbox_test.js
