fix scattermapbox defaults for omitted options

I had to make a mock marker.line object in _fullData to keep legends happy,
but at least it doesn't respond to values in data.

Author: alexcjohnson

src/traces/scatter/line_defaults.js

@@ -13,7 +13,7 @@ var hasColorscale = require('../../components/colorscale/has_colorscale');
 var colorscaleDefaults = require('../../components/colorscale/defaults');
 
 
-module.exports = function lineDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
+module.exports = function lineDefaults(traceIn, traceOut, defaultColor, layout, coerce, opts) {
     var markerColor = (traceIn.marker || {}).color;
 
     coerce('line.color', defaultColor);
@@ -27,5 +27,5 @@ module.exports = function lineDefaults(traceIn, traceOut, defaultColor, layout,
     }
 
     coerce('line.width');
-    coerce('line.dash');
+    if(!(opts || {}).noDash) coerce('line.dash');
 };

src/traces/scatter/marker_defaults.js

@@ -16,7 +16,7 @@ var colorscaleDefaults = require('../../components/colorscale/defaults');
 var subTypes = require('./subtypes');
 
 
-module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
+module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout, coerce, opts) {
     var isBubble = subTypes.isBubble(traceIn),
         lineColor = (traceIn.line || {}).color,
         defaultMLC;
@@ -33,22 +33,24 @@ module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout
         colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
     }
 
-    // if there's a line with a different color than the marker, use
-    // that line color as the default marker line color
-    // (except when it's an array)
-    // mostly this is for transparent markers to behave nicely
-    if(lineColor && !Array.isArray(lineColor) && (traceOut.marker.color !== lineColor)) {
-        defaultMLC = lineColor;
+    if(!(opts || {}).noLine) {
+        // if there's a line with a different color than the marker, use
+        // that line color as the default marker line color
+        // (except when it's an array)
+        // mostly this is for transparent markers to behave nicely
+        if(lineColor && !Array.isArray(lineColor) && (traceOut.marker.color !== lineColor)) {
+            defaultMLC = lineColor;
+        }
+        else if(isBubble) defaultMLC = Color.background;
+        else defaultMLC = Color.defaultLine;
+
+        coerce('marker.line.color', defaultMLC);
+        if(hasColorscale(traceIn, 'marker.line')) {
+            colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.line.', cLetter: 'c'});
+        }
+
+        coerce('marker.line.width', isBubble ? 1 : 0);
     }
-    else if(isBubble) defaultMLC = Color.background;
-    else defaultMLC = Color.defaultLine;
-
-    coerce('marker.line.color', defaultMLC);
-    if(hasColorscale(traceIn, 'marker.line')) {
-        colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.line.', cLetter: 'c'});
-    }
-
-    coerce('marker.line.width', isBubble ? 1 : 0);
 
     if(isBubble) {
         coerce('marker.sizeref');

src/traces/scattermapbox/defaults.js

@@ -26,14 +26,14 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
-    function coerceMarker(attr, dflt) {
-        var attrs = (attr.indexOf('.line') === -1) ? attributes : scatterAttrs;
+    // function coerceMarker(attr, dflt) {
+    //     var attrs = (attr.indexOf('.line') === -1) ? attributes : scatterAttrs;
 
-        // use 'scatter' attributes for 'marker.line.' attr,
-        // so that we can reuse the scatter marker defaults
+    //     // use 'scatter' attributes for 'marker.line.' attr,
+    //     // so that we can reuse the scatter marker defaults
 
-        return Lib.coerce(traceIn, traceOut, attrs, attr, dflt);
-    }
+    //     return Lib.coerce(traceIn, traceOut, attrs, attr, dflt);
+    // }
 
     var len = handleLonLatDefaults(traceIn, traceOut, coerce);
     if(!len) {
@@ -46,16 +46,18 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('mode');
 
     if(subTypes.hasLines(traceOut)) {
-        handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce);
+        handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce, {noDash: true});
         coerce('connectgaps');
     }
 
     if(subTypes.hasMarkers(traceOut)) {
-        handleMarkerDefaults(traceIn, traceOut, defaultColor, layout, coerceMarker);
+        handleMarkerDefaults(traceIn, traceOut, defaultColor, layout, coerce, {noLine: true});
 
         // array marker.size and marker.color are only supported with circles
 
         var marker = traceOut.marker;
+        // we need  mock marker.line object to make legends happy
+        marker.line = {width: 0};
 
         if(marker.symbol !== 'circle') {
             if(Array.isArray(marker.size)) marker.size = marker.size[0];