adapt scattergeo to new geo layers and projection logic

- note that we now bind a calcdata item with a ref to geojson
  to the scattergeo line nodes,
  instead of stitching calcdata things onto geojson feature.

Author: etpinard

src/traces/scattergeo/hover.js

@@ -17,32 +17,24 @@ var getTraceColor = require('../scatter/get_trace_color');
 var attributes = require('./attributes');
 
 
-module.exports = function hoverPoints(pointData) {
+module.exports = function hoverPoints(pointData, xval, yval) {
     var cd = pointData.cd,
         trace = cd[0].trace,
         xa = pointData.xa,
         ya = pointData.ya,
-        geo = pointData.subplot;
-
-    function c2p(lonlat) {
-        return geo.projection(lonlat);
-    }
+        geo = pointData.subplot,
+        projection = geo.projection;
 
     function distFn(d) {
         var lonlat = d.lonlat;
 
         if(lonlat[0] === BADNUM) return Infinity;
+        if(projection.isLonLatOverEdges(lonlat)) return Infinity;
 
-        if(geo.isLonLatOverEdges(lonlat)) return Infinity;
-
-        var pos = c2p(lonlat);
-
-        var xPx = xa.c2p(),
-            yPx = ya.c2p();
+        var dx = Math.abs(xa.c2p(lonlat) - xa.c2p([xval, lonlat[1]]));
+        var dy = Math.abs(ya.c2p(lonlat) - ya.c2p([lonlat[0], yval]));
 
-        var dx = Math.abs(xPx - pos[0]),
-            dy = Math.abs(yPx - pos[1]),
-            rad = Math.max(3, d.mrc || 0);
+        var rad = Math.max(3, d.mrc || 0);
 
         // N.B. d.mrc is the calculated marker radius
         // which is only set for trace with 'markers' mode.
@@ -57,7 +49,7 @@ module.exports = function hoverPoints(pointData) {
 
     var di = cd[pointData.index],
         lonlat = di.lonlat,
-        pos = c2p(lonlat),
+        pos = [xa.c2p(lonlat), ya.c2p(lonlat)],
         rad = di.mrc || 1;
 
     pointData.x0 = pos[0] - rad;

src/traces/scattergeo/plot.js

@@ -23,6 +23,9 @@ var subTypes = require('../scatter/subtypes');
 
 
 module.exports = function plot(geo, calcData) {
+    for(var i = 0; i < calcData.length; i++) {
+        calcGeoJSON(calcData[i], geo.topojson);
+    }
 
     function keyFunc(d) { return d[0].trace.uid; }
 
@@ -32,11 +35,7 @@ module.exports = function plot(geo, calcData) {
         }
     }
 
-    for(var i = 0; i < calcData.length; i++) {
-        fillLocationLonLat(calcData[i], geo.topojson);
-    }
-
-    var gScatterGeoTraces = geo.framework.select('.scattergeolayer')
+    var gScatterGeoTraces = geo.layers.frontplot.select('.scatterlayer')
         .selectAll('g.trace.scattergeo')
         .data(calcData, keyFunc);
 
@@ -49,20 +48,20 @@ module.exports = function plot(geo, calcData) {
     gScatterGeoTraces.selectAll('*').remove();
 
     gScatterGeoTraces.each(function(calcTrace) {
-        var s = d3.select(this);
+        var s = calcTrace[0].node3 = d3.select(this);
         var trace = calcTrace[0].trace;
 
         if(subTypes.hasLines(trace) || trace.fill !== 'none') {
             var lineCoords = geoJsonUtils.calcTraceToLineCoords(calcTrace);
 
             var lineData = (trace.fill !== 'none') ?
-                geoJsonUtils.makePolygon(lineCoords, trace) :
-                geoJsonUtils.makeLine(lineCoords, trace);
+                geoJsonUtils.makePolygon(lineCoords) :
+                geoJsonUtils.makeLine(lineCoords);
 
             s.selectAll('path.js-line')
-                .data([lineData])
+                .data([{geojson: lineData, trace: trace}])
               .enter().append('path')
-                .classed('js-line', true);
+                .classed('js-line', true)
         }
 
         if(subTypes.hasMarkers(trace)) {
@@ -86,7 +85,7 @@ module.exports = function plot(geo, calcData) {
     style(geo);
 };
 
-function fillLocationLonLat(calcTrace, topojson) {
+function calcGeoJSON(calcTrace, topojson) {
     var trace = calcTrace[0].trace;
 
     if(!Array.isArray(trace.locations)) return;