filter module data wrt 'visible' before geo plot routine:

- geo plot routine use a classic d3 join/enter/exit pattern
- trace visibility is updated using exit selections
- to simplify the logic, send only visible trace to the geo plot
  routine so that visible traces and svg trace groups match
  one to one.

Author: etpinard

src/plots/geo/geo.js

@@ -15,8 +15,6 @@ var d3 = require('d3');
 
 var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
-
-var Plots = require('../../plots/plots');
 var Axes = require('../../plots/cartesian/axes');
 
 var addProjectionsToD3 = require('./projections');
@@ -139,6 +137,20 @@ proto.plot = function(geoData, fullLayout, promises) {
     // to avoid making multiple request while streaming
 };
 
+// filter out non-visible trace
+// geo plot routine use the classic join/enter/exit pattern to update traces
+function filterData(dataIn) {
+    var dataOut = [];
+
+    for(var i = 0; i < dataIn.length; i++) {
+        var trace = dataIn[i];
+
+        if(trace.visible === true) dataOut.push(trace);
+    }
+
+    return dataOut;
+}
+
 proto.onceTopojsonIsLoaded = function(geoData, geoLayout) {
     var traceData = {};
 
@@ -153,8 +165,10 @@ proto.onceTopojsonIsLoaded = function(geoData, geoLayout) {
 
     var traceKeys = Object.keys(traceData);
     for(var j = 0; j < traceKeys.length; j++){
-        var traceKey = traceKeys[j];
-        Plots.getModule(traceKey).plot(this, traceData[traceKey], geoLayout);
+        var moduleData = traceData[traceKeys[j]];
+        var _module = moduleData[0]._module;
+
+        _module.plot(this, filterData(moduleData), geoLayout);
     }
 
     this.render();

src/traces/choropleth/plot.js

@@ -68,7 +68,7 @@ plotChoropleth.plot = function(geo, choroplethData, geoLayout) {
 
     var gChoroplethTraces = gChoropleth
         .selectAll('g.trace.choropleth')
-        .data(choroplethData);
+        .data(choroplethData, function(trace) { return trace.uid; });
 
     gChoroplethTraces.enter().append('g')
         .attr('class', 'trace choropleth');

src/traces/scattergeo/plot.js

@@ -118,7 +118,7 @@ function makeLineGeoJSON(trace) {
 plotScatterGeo.plot = function(geo, scattergeoData) {
     var gScatterGeoTraces = geo.framework.select('.scattergeolayer')
         .selectAll('g.trace.scattergeo')
-        .data(scattergeoData);
+        .data(scattergeoData, function(trace) { return trace.uid; });
 
     gScatterGeoTraces.enter().append('g')
         .attr('class', 'trace scattergeo');