scattergeo: refactor plot !!

- add support for 'connectgaps'
- add support for 'fill: 'toself'
- remove all traces of hover / click handlers

Author: etpinard

src/traces/scatter/fillcolor_defaults.js

@@ -12,7 +12,6 @@
 var Color = require('../../components/color');
 
 
-// common to 'scatter' and 'scattergl'
 module.exports = function fillColorDefaults(traceIn, traceOut, defaultColor, coerce) {
     var inheritColorFromMarker = false;
 

src/traces/scattergeo/attributes.js

@@ -27,6 +27,7 @@ module.exports = {
         valType: 'data_array',
         description: 'Sets the latitude coordinates (in degrees North).'
     },
+
     locations: {
         valType: 'data_array',
         description: [
@@ -45,7 +46,9 @@ module.exports = {
             'to regions on the map.'
         ].join(' ')
     },
+
     mode: extendFlat({}, scatterAttrs.mode, {dflt: 'markers'}),
+
     text: extendFlat({}, scatterAttrs.text, {
         description: [
             'Sets text elements associated with each (lon,lat) pair',
@@ -56,11 +59,16 @@ module.exports = {
             'this trace\'s (lon,lat) or `locations` coordinates.'
         ].join(' ')
     }),
+    textfont: scatterAttrs.textfont,
+    textposition: scatterAttrs.textposition,
+
     line: {
         color: scatterLineAttrs.color,
         width: scatterLineAttrs.width,
         dash: scatterLineAttrs.dash
     },
+    connectgaps: scatterAttrs.connectgaps,
+
     marker: extendFlat({}, {
         symbol: scatterMarkerAttrs.symbol,
         opacity: scatterMarkerAttrs.opacity,
@@ -76,11 +84,25 @@ module.exports = {
     },
         colorAttributes('marker')
     ),
-    textfont: scatterAttrs.textfont,
-    textposition: scatterAttrs.textposition,
+
+    fill: {
+        valType: 'enumerated',
+        values: ['none', 'toself'],
+        dflt: 'none',
+        role: 'style',
+        description: [
+            'Sets the area to fill with a solid color.',
+            'Use with `fillcolor` if not *none*.',
+            '*toself* connects the endpoints of the trace (or each segment',
+            'of the trace if it has gaps) into a closed shape.'
+        ].join(' ')
+    },
+    fillcolor: scatterAttrs.fillcolor,
+
     hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
         flags: ['lon', 'lat', 'location', 'text', 'name']
     }),
+
     _nestedModules: {
         'marker.colorbar': 'Colorbar'
     }

src/traces/scattergeo/defaults.js

@@ -15,6 +15,7 @@ var subTypes = require('../scatter/subtypes');
 var handleMarkerDefaults = require('../scatter/marker_defaults');
 var handleLineDefaults = require('../scatter/line_defaults');
 var handleTextDefaults = require('../scatter/text_defaults');
+var handleFillColorDefaults = require('../scatter/fillcolor_defaults');
 
 var attributes = require('./attributes');
 
@@ -35,6 +36,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     if(subTypes.hasLines(traceOut)) {
         handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce);
+        coerce('connectgaps');
     }
 
     if(subTypes.hasMarkers(traceOut)) {
@@ -45,6 +47,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         handleTextDefaults(traceIn, traceOut, layout, coerce);
     }
 
+    coerce('fill');
+    if(traceOut.fill !== 'none') {
+        handleFillColorDefaults(traceIn, traceOut, defaultColor, coerce);
+    }
+
     coerce('hoverinfo', (layout._dataLength === 1) ? 'lon+lat+location+text' : undefined);
 };
 

src/traces/scattergeo/index.js

@@ -15,7 +15,7 @@ ScatterGeo.attributes = require('./attributes');
 ScatterGeo.supplyDefaults = require('./defaults');
 ScatterGeo.colorbar = require('../scatter/colorbar');
 ScatterGeo.calc = require('./calc');
-ScatterGeo.plot = require('./plot').plot;
+ScatterGeo.plot = require('./plot');
 
 ScatterGeo.moduleType = 'trace';
 ScatterGeo.name = 'scattergeo';