improve selection queries

etpinard · etpinard · commit 71c535541bb4 · 2017-09-25T13:45:31.000-04:00
- using stashed geo layers
diff --git a/src/traces/choropleth/plot.js b/src/traces/choropleth/plot.js
@@ -92,11 +92,12 @@ function calcGeoJSON(calcTrace, topojson) {
 }
 
 function style(geo) {
-    geo.framework.selectAll('g.trace.choropleth').each(function(calcTrace) {
-        var trace = calcTrace[0].trace,
-            s = d3.select(this),
-            marker = trace.marker || {},
-            markerLine = marker.line || {};
+    var gTraces = geo.layers.backplot.selectAll('.trace.choropleth');
+
+    gTraces.each(function(calcTrace) {
+        var trace = calcTrace[0].trace;
+        var marker = trace.marker || {};
+        var markerLine = marker.line || {};
 
         var sclFunc = Colorscale.makeColorScaleFunc(
             Colorscale.extractScale(
@@ -106,13 +107,11 @@ function style(geo) {
             )
         );
 
-        s.selectAll('path.choroplethlocation').each(function(_, i) {
-            var pt = calcTrace[i];
-
+        d3.select(this).selectAll('.choroplethlocation').each(function(d) {
             d3.select(this)
-                .attr('fill', sclFunc(pt.z))
-                .call(Color.stroke, pt.mlc || markerLine.color)
-                .call(Drawing.dashLine, '', pt.mlw || markerLine.width || 0);
+                .attr('fill', sclFunc(d.z))
+                .call(Color.stroke, d.mlc || markerLine.color)
+                .call(Drawing.dashLine, '', d.mlw || markerLine.width || 0);
         });
     });
 }
diff --git a/src/traces/scattergeo/plot.js b/src/traces/scattergeo/plot.js
@@ -21,7 +21,6 @@ var locationToFeature = require('../../lib/geo_location_utils').locationToFeatur
 var geoJsonUtils = require('../../lib/geojson_utils');
 var subTypes = require('../scatter/subtypes');
 
-
 module.exports = function plot(geo, calcData) {
     for(var i = 0; i < calcData.length; i++) {
         calcGeoJSON(calcData[i], geo.topojson);
@@ -35,19 +34,19 @@ module.exports = function plot(geo, calcData) {
         }
     }
 
-    var gScatterGeoTraces = geo.layers.frontplot.select('.scatterlayer')
+    var gTraces = geo.layers.frontplot.select('.scatterlayer')
         .selectAll('g.trace.scattergeo')
         .data(calcData, keyFunc);
 
-    gScatterGeoTraces.enter().append('g')
+    gTraces.enter().append('g')
         .attr('class', 'trace scattergeo');
 
-    gScatterGeoTraces.exit().remove();
+    gTraces.exit().remove();
 
     // TODO find a way to order the inner nodes on update
-    gScatterGeoTraces.selectAll('*').remove();
+    gTraces.selectAll('*').remove();
 
-    gScatterGeoTraces.each(function(calcTrace) {
+    gTraces.each(function(calcTrace) {
         var s = calcTrace[0].node3 = d3.select(this);
         var trace = calcTrace[0].trace;
 
@@ -103,15 +102,15 @@ function calcGeoJSON(calcTrace, topojson) {
 }
 
 function style(geo) {
-    var selection = geo.framework.selectAll('g.trace.scattergeo');
+    var gTraces = geo.layers.frontplot.selectAll('.trace.scattergeo');
 
-    selection.style('opacity', function(calcTrace) {
+    gTraces.style('opacity', function(calcTrace) {
         return calcTrace[0].trace.opacity;
     });
 
-    selection.each(function(calcTrace) {
-        var trace = calcTrace[0].trace,
-            group = d3.select(this);
+    gTraces.each(function(calcTrace) {
+        var trace = calcTrace[0].trace;
+        var group = d3.select(this);
 
         group.selectAll('path.point')
             .call(Drawing.pointStyle, trace, geo.graphDiv);
@@ -120,12 +119,12 @@ function style(geo) {
     });
 
     // this part is incompatible with Drawing.lineGroupStyle
-    selection.selectAll('path.js-line')
+    gTraces.selectAll('path.js-line')
         .style('fill', 'none')
         .each(function(d) {
-            var path = d3.select(this),
-                trace = d.trace,
-                line = trace.line || {};
+            var path = d3.select(this);
+            var trace = d.trace;
+            var line = trace.line || {};
 
             path.call(Color.stroke, line.color)
                 .call(Drawing.dashLine, line.dash || '', line.width || 0);
