geo: make geo trace module use calcData instead of fullData

Author: etpinard

src/plots/geo/geo.js

@@ -17,8 +17,6 @@ var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
 var Axes = require('../../plots/cartesian/axes');
 
-var filterVisible = require('../../lib/filter_visible');
-
 var addProjectionsToD3 = require('./projections');
 var createGeoScale = require('./set_scale');
 var createGeoZoom = require('./zoom');
@@ -29,6 +27,9 @@ var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
 var topojsonUtils = require('../../lib/topojson_utils');
 var topojsonFeature = require('topojson').feature;
 
+// add a few projection types to d3.geo
+addProjectionsToD3(d3);
+
 
 function Geo(options, fullLayout) {
 
@@ -37,9 +38,6 @@ function Geo(options, fullLayout) {
     this.container = options.container;
     this.topojsonURL = options.topojsonURL;
 
-    // add a few projection types to d3.geo
-    addProjectionsToD3(d3);
-
     this.hoverContainer = null;
 
     this.topojsonName = null;
@@ -65,7 +63,7 @@ module.exports = Geo;
 
 var proto = Geo.prototype;
 
-proto.plot = function(geoData, fullLayout, promises) {
+proto.plot = function(geoCalcData, fullLayout, promises) {
     var _this = this,
         geoLayout = fullLayout[_this.id],
         graphSize = fullLayout._size;
@@ -97,7 +95,7 @@ proto.plot = function(geoData, fullLayout, promises) {
 
         if(PlotlyGeoAssets.topojson[_this.topojsonName] !== undefined) {
             _this.topojson = PlotlyGeoAssets.topojson[_this.topojsonName];
-            _this.onceTopojsonIsLoaded(geoData, geoLayout);
+            _this.onceTopojsonIsLoaded(geoCalcData, geoLayout);
         }
         else {
             topojsonPath = topojsonUtils.getTopojsonPath(
@@ -128,31 +126,32 @@ proto.plot = function(geoData, fullLayout, promises) {
                     _this.topojson = topojson;
                     PlotlyGeoAssets.topojson[_this.topojsonName] = topojson;
 
-                    _this.onceTopojsonIsLoaded(geoData, geoLayout);
+                    _this.onceTopojsonIsLoaded(geoCalcData, geoLayout);
                     resolve();
                 });
             }));
         }
     }
-    else _this.onceTopojsonIsLoaded(geoData, geoLayout);
+    else _this.onceTopojsonIsLoaded(geoCalcData, geoLayout);
 
     // TODO handle topojson-is-loading case
     // to avoid making multiple request while streaming
 };
 
-proto.onceTopojsonIsLoaded = function(geoData, geoLayout) {
+proto.onceTopojsonIsLoaded = function(geoCalcData, geoLayout) {
     var i;
 
     this.drawLayout(geoLayout);
 
     var traceHashOld = this.traceHash;
     var traceHash = {};
 
-    for(i = 0; i < geoData.length; i++) {
-        var trace = geoData[i];
+    for(i = 0; i < geoCalcData.length; i++) {
+        var calcData = geoCalcData[i],
+            trace = calcData[0].trace;
 
         traceHash[trace.type] = traceHash[trace.type] || [];
-        traceHash[trace.type].push(trace);
+        traceHash[trace.type].push(calcData);
     }
 
     var moduleNamesOld = Object.keys(traceHashOld);
@@ -165,26 +164,41 @@ proto.onceTopojsonIsLoaded = function(geoData, geoLayout) {
         var moduleName = moduleNamesOld[i];
 
         if(moduleNames.indexOf(moduleName) === -1) {
-            var fakeModule = traceHashOld[moduleName][0];
-            fakeModule.visible = false;
-            traceHash[moduleName] = [fakeModule];
+            var fakeCalcTrace = traceHashOld[moduleName][0],
+                fakeTrace = fakeCalcTrace[0].trace;
+
+            fakeTrace.visible = false;
+            traceHash[moduleName] = [fakeCalcTrace];
         }
     }
 
     moduleNames = Object.keys(traceHash);
 
     for(i = 0; i < moduleNames.length; i++) {
-        var moduleData = traceHash[moduleNames[i]];
-        var _module = moduleData[0]._module;
+        var moduleCalcData = traceHash[moduleNames[i]],
+            _module = moduleCalcData[0][0].trace._module;
 
-        _module.plot(this, filterVisible(moduleData), geoLayout);
+        _module.plot(this, filterVisible(moduleCalcData), geoLayout);
     }
 
     this.traceHash = traceHash;
 
     this.render();
 };
 
+function filterVisible(calcDataIn) {
+    var calcDataOut = [];
+
+    for(var i = 0; i < calcDataIn.length; i++) {
+        var calcTrace = calcDataIn[i],
+            trace = calcTrace[0].trace;
+
+        if(trace.visible === true) calcDataOut.push(calcTrace);
+    }
+
+    return calcDataOut;
+}
+
 proto.updateFx = function(hovermode) {
     this.showHover = (hovermode !== false);
 

src/plots/geo/index.js

@@ -32,7 +32,7 @@ exports.supplyLayoutDefaults = require('./layout/defaults');
 
 exports.plot = function plotGeo(gd) {
     var fullLayout = gd._fullLayout,
-        fullData = gd._fullData,
+        calcData = gd.calcdata,
         geoIds = Plots.getSubplotIds(fullLayout, 'geo');
 
     /**
@@ -45,7 +45,7 @@ exports.plot = function plotGeo(gd) {
 
     for(var i = 0; i < geoIds.length; i++) {
         var geoId = geoIds[i],
-            fullGeoData = Plots.getSubplotData(fullData, 'geo', geoId),
+            geoCalcData = getSubplotCalcData(calcData, geoId),
             geo = fullLayout[geoId]._geo;
 
         // If geo is not instantiated, create one!
@@ -62,7 +62,7 @@ exports.plot = function plotGeo(gd) {
             fullLayout[geoId]._geo = geo;
         }
 
-        geo.plot(fullGeoData, fullLayout, gd._promises);
+        geo.plot(geoCalcData, fullLayout, gd._promises);
     }
 };
 
@@ -102,3 +102,16 @@ exports.toSVG = function(gd) {
             .appendChild(geoFramework.node());
     }
 };
+
+function getSubplotCalcData(calcData, id) {
+    var subplotCalcData = [];
+
+    for(var i = 0; i < calcData.length; i++) {
+        var calcTrace = calcData[i],
+            trace = calcTrace[0].trace;
+
+        if(trace.geo === id) subplotCalcData.push(calcTrace);
+    }
+
+    return subplotCalcData;
+}

src/traces/choropleth/plot.js

@@ -58,7 +58,11 @@ plotChoropleth.calcGeoJSON = function(trace, topojson) {
     return cdi;
 };
 
-plotChoropleth.plot = function(geo, choroplethData, geoLayout) {
+plotChoropleth.plot = function(geo, calcData, geoLayout) {
+    function keyFunc(d) {
+        return d[0].trace.uid;
+    }
+
     var framework = geo.framework,
         gChoropleth = framework.select('g.choroplethlayer'),
         gBaseLayer = framework.select('g.baselayer'),
@@ -68,15 +72,16 @@ plotChoropleth.plot = function(geo, choroplethData, geoLayout) {
 
     var gChoroplethTraces = gChoropleth
         .selectAll('g.trace.choropleth')
-        .data(choroplethData, function(trace) { return trace.uid; });
+        .data(calcData, keyFunc);
 
     gChoroplethTraces.enter().append('g')
         .attr('class', 'trace choropleth');
 
     gChoroplethTraces.exit().remove();
 
-    gChoroplethTraces.each(function(trace) {
-        var cdi = plotChoropleth.calcGeoJSON(trace, geo.topojson),
+    gChoroplethTraces.each(function(calcTrace) {
+        var trace = calcTrace[0].trace,
+            cdi = plotChoropleth.calcGeoJSON(trace, geo.topojson),
             cleanHoverLabelsFunc = makeCleanHoverLabelsFunc(geo, trace),
             eventDataFunc = makeEventDataFunc(trace);
 
@@ -143,8 +148,9 @@ plotChoropleth.plot = function(geo, choroplethData, geoLayout) {
 
 plotChoropleth.style = function(geo) {
     geo.framework.selectAll('g.trace.choropleth')
-        .each(function(trace) {
-            var s = d3.select(this),
+        .each(function(calcTrace) {
+            var trace = calcTrace[0].trace,
+                s = d3.select(this),
                 marker = trace.marker || {},
                 markerLine = marker.line || {},
                 zmin = trace.zmin,

src/traces/scattergeo/plot.js

@@ -115,10 +115,14 @@ function makeLineGeoJSON(trace) {
     };
 }
 
-plotScatterGeo.plot = function(geo, scattergeoData) {
+plotScatterGeo.plot = function(geo, calcData) {
+    function keyFunc(d) {
+        return d[0].trace.uid;
+    }
+
     var gScatterGeoTraces = geo.framework.select('.scattergeolayer')
         .selectAll('g.trace.scattergeo')
-        .data(scattergeoData, function(trace) { return trace.uid; });
+        .data(calcData, keyFunc);
 
     gScatterGeoTraces.enter().append('g')
         .attr('class', 'trace scattergeo');
@@ -128,8 +132,9 @@ plotScatterGeo.plot = function(geo, scattergeoData) {
     // TODO find a way to order the inner nodes on update
     gScatterGeoTraces.selectAll('*').remove();
 
-    gScatterGeoTraces.each(function(trace) {
-        var s = d3.select(this);
+    gScatterGeoTraces.each(function(calcTrace) {
+        var s = d3.select(this),
+            trace = calcTrace[0].trace;
 
         if(!subTypes.hasLines(trace)) return;
 
@@ -141,8 +146,9 @@ plotScatterGeo.plot = function(geo, scattergeoData) {
         // TODO add hover - how?
     });
 
-    gScatterGeoTraces.each(function(trace) {
+    gScatterGeoTraces.each(function(calcTrace) {
         var s = d3.select(this),
+            trace = calcTrace[0].trace,
             showMarkers = subTypes.hasMarkers(trace),
             showText = subTypes.hasText(trace);
 
@@ -221,7 +227,9 @@ plotScatterGeo.style = function(geo) {
         return trace.opacity;
     });
 
-    selection.each(function(trace) {
+    selection.each(function(calcTrace) {
+        var trace = calcTrace[0].trace;
+
         d3.select(this).selectAll('path.point')
             .call(Drawing.pointStyle, trace);
         d3.select(this).selectAll('text')