make scattergeo calcdata 1-1 with lon/lat items in fullData

- use BADNUM to normalize non-numeric lon/lat handling
- and instead remove BADNUM pts in plot step
- this is consistent with all other d3 plot type (!!)
- allows us to reuse scatter/arrays_to_calcdata
- and cleans up locations -> lonlat logic!

Author: etpinard

src/traces/scattergeo/calc.js

@@ -10,45 +10,34 @@
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
+var BADNUM = require('../../constants/numerical').BADNUM;
 
 var calcMarkerColorscale = require('../scatter/colorscale_calc');
-
+var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
 
 module.exports = function calc(gd, trace) {
-    var hasLocationData = Array.isArray(trace.locations),
-        len = hasLocationData ? trace.locations.length : trace.lon.length;
-
-    var calcTrace = [],
-        cnt = 0;
+    var hasLocationData = Array.isArray(trace.locations);
+    var len = hasLocationData ? trace.locations.length : trace.lon.length;
+    var calcTrace = new Array(len);
 
     for(var i = 0; i < len; i++) {
-        var calcPt = {},
-            skip;
+        var calcPt = calcTrace[i] = {};
 
         if(hasLocationData) {
             var loc = trace.locations[i];
-
-            calcPt.loc = loc;
-            skip = (typeof loc !== 'string');
+            calcPt.loc = typeof loc === 'string' ? loc : null;
         }
         else {
-            var lon = trace.lon[i],
-                lat = trace.lat[i];
+            var lon = trace.lon[i];
+            var lat = trace.lat[i];
+            calcPt.lonlat = new Array(2);
 
-            calcPt.lonlat = [+lon, +lat];
-            skip = (!isNumeric(lon) || !isNumeric(lat));
+            calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
+            calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
         }
-
-        if(skip) {
-            if(cnt > 0) calcTrace[cnt - 1].gapAfter = true;
-            continue;
-        }
-
-        cnt++;
-
-        calcTrace.push(calcPt);
     }
 
+    arraysToCalcdata(calcTrace, trace);
     calcMarkerColorscale(trace);
 
     return calcTrace;

src/traces/scattergeo/hover.js

@@ -11,6 +11,7 @@
 
 var Fx = require('../../plots/cartesian/graph_interact');
 var Axes = require('../../plots/cartesian/axes');
+var BADNUM = require('../../constants/numerical').BADNUM;
 
 var getTraceColor = require('../scatter/get_trace_color');
 var attributes = require('./attributes');
@@ -32,8 +33,7 @@ module.exports = function hoverPoints(pointData) {
     function distFn(d) {
         var lonlat = d.lonlat;
 
-        // this handles the not-found location feature case
-        if(lonlat[0] === null || lonlat[1] === null) return Infinity;
+        if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 
         if(geo.isLonLatOverEdges(lonlat)) return Infinity;
 

src/traces/scattergeo/plot.js

@@ -15,17 +15,28 @@ var Drawing = require('../../components/drawing');
 var Color = require('../../components/color');
 
 var Lib = require('../../lib');
+var BADNUM = require('../../constants/numerical').BADNUM;
 var getTopojsonFeatures = require('../../lib/topojson_utils').getTopojsonFeatures;
 var locationToFeature = require('../../lib/geo_location_utils').locationToFeature;
 var geoJsonUtils = require('../../lib/geojson_utils');
-var arrayToCalcItem = require('../../lib/array_to_calc_item');
 var subTypes = require('../scatter/subtypes');
 
 
 module.exports = function plot(geo, calcData) {
 
     function keyFunc(d) { return d[0].trace.uid; }
 
+    function removeBADNUM(d, node) {
+        var lonlat = d.lonlat;
+        if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
+            d3.select(node).remove();
+        }
+    }
+
+    for(var i = 0; i < calcData.length; i++) {
+        fillLocationLonLat(calcData[i], geo.topojson);
+    }
+
     var gScatterGeoTraces = geo.framework.select('.scattergeolayer')
         .selectAll('g.trace.scattergeo')
         .data(calcData, keyFunc);
@@ -39,27 +50,11 @@ module.exports = function plot(geo, calcData) {
     gScatterGeoTraces.selectAll('*').remove();
 
     gScatterGeoTraces.each(function(calcTrace) {
-        var s = d3.select(this),
-            trace = calcTrace[0].trace,
-            convertToLonLatFn = makeConvertToLonLatFn(trace, geo.topojson);
-
-        // skip over placeholder traces
-        if(calcTrace[0].placeholder) s.remove();
-
-        // just like calcTrace but w/o not-found location datum
-        var _calcTrace = [];
-
-        for(var i = 0; i < calcTrace.length; i++) {
-            var _calcPt = convertToLonLatFn(calcTrace[i]);
-
-            if(_calcPt) {
-                arrayItemToCalcdata(trace, calcTrace[i], i);
-                _calcTrace.push(_calcPt);
-            }
-        }
+        var s = d3.select(this);
+        var trace = calcTrace[0].trace;
 
         if(subTypes.hasLines(trace) || trace.fill !== 'none') {
-            var lineCoords = geoJsonUtils.calcTraceToLineCoords(_calcTrace);
+            var lineCoords = geoJsonUtils.calcTraceToLineCoords(calcTrace);
 
             var lineData = (trace.fill !== 'none') ?
                 geoJsonUtils.makePolygon(lineCoords, trace) :
@@ -72,66 +67,39 @@ module.exports = function plot(geo, calcData) {
         }
 
         if(subTypes.hasMarkers(trace)) {
-            s.selectAll('path.point').data(_calcTrace)
-              .enter().append('path')
-                .classed('point', true);
+            s.selectAll('path.point')
+                .data(Lib.identity)
+             .enter().append('path')
+                .classed('point', true)
+                .each(function(calcPt) { removeBADNUM(calcPt, this); });
         }
 
         if(subTypes.hasText(trace)) {
-            s.selectAll('g').data(_calcTrace)
+            s.selectAll('g')
+                .data(Lib.identity)
               .enter().append('g')
-              .append('text');
+                .append('text')
+                .each(function(calcPt) { removeBADNUM(calcPt, this); });
         }
     });
 
     // call style here within topojson request callback
     style(geo);
 };
 
-function makeConvertToLonLatFn(trace, topojson) {
-    if(!Array.isArray(trace.locations)) return Lib.identity;
-
-    var features = getTopojsonFeatures(trace, topojson),
-        locationmode = trace.locationmode;
+function fillLocationLonLat(calcTrace, topojson) {
+    var trace = calcTrace[0].trace;
 
-    return function(calcPt) {
-        var feature = locationToFeature(locationmode, calcPt.loc, features);
+    if(!Array.isArray(trace.locations)) return;
 
-        if(feature) {
-            calcPt.lonlat = feature.properties.ct;
-            return calcPt;
-        }
-        else {
-            // mutate gd.calcdata so that hoverPoints knows to skip this datum
-            calcPt.lonlat = [null, null];
-            return false;
-        }
-    };
-}
+    var features = getTopojsonFeatures(trace, topojson);
+    var locationmode = trace.locationmode;
 
-function arrayItemToCalcdata(trace, calcItem, i) {
-    var marker = trace.marker;
-
-    function merge(traceAttr, calcAttr) {
-        arrayToCalcItem(traceAttr, calcItem, calcAttr, i);
-    }
-
-    merge(trace.text, 'tx');
-    merge(trace.textposition, 'tp');
-    if(trace.textfont) {
-        merge(trace.textfont.size, 'ts');
-        merge(trace.textfont.color, 'tc');
-        merge(trace.textfont.family, 'tf');
-    }
+    for(var i = 0; i < calcTrace.length; i++) {
+        var calcPt = calcTrace[i];
+        var feature = locationToFeature(locationmode, calcPt.loc, features);
 
-    if(marker && marker.line) {
-        var markerLine = marker.line;
-        merge(marker.opacity, 'mo');
-        merge(marker.symbol, 'mx');
-        merge(marker.color, 'mc');
-        merge(marker.size, 'ms');
-        merge(markerLine.color, 'mlc');
-        merge(markerLine.width, 'mlw');
+        calcPt.lonlat = feature ? feature.properties.ct : [BADNUM, BADNUM];
     }
 }