Fix contourcarpet showlegend

Author: rreusser

src/plots/plots.js

@@ -837,7 +837,6 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde
         // gets overwritten in pie, geo and ternary modules
         coerce('hoverinfo', (layout._dataLength === 1) ? 'x+y+z+text' : undefined);
 
-        // gets overwritten by carpetcontour
         if(plots.traceIs(traceOut, 'showLegend')) {
             coerce('showlegend');
             coerce('legendgroup');
@@ -855,11 +854,6 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde
         coerceSubplotAttr('gl2d', 'xaxis');
         coerceSubplotAttr('gl2d', 'yaxis');
 
-        if(plots.traceIs(traceOut, 'showLegend')) {
-            coerce('showlegend');
-            coerce('legendgroup');
-        }
-
         if(plots.traceIs(traceOut, 'notLegendIsolatable')) {
             // This clears out the legendonly state for traces like carpet that
             // cannot be isolated in the legend

src/traces/contourcarpet/defaults.js

@@ -77,16 +77,13 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
                 // after the initial draw, we can just reuse the previous calculation
             contourSize = coerce('contours.size');
             coerce('contours.coloring');
-
-            traceOut.showlegend = false;
         }
 
         // Override the trace-level showlegend default with a default that takes
         // into account whether this is a constraint or level contours:
         Lib.coerce(traceIn, traceOut, plotAttributes, 'showlegend', traceOut.contours.type === 'constraint');
 
         missingEnd = (contourStart === false) || (contourEnd === false);
-        autoContour;
 
         if(missingEnd) {
             autoContour = traceOut.autocontour = true;

test/image/mocks/cheater_contour.json

@@ -35,7 +35,10 @@
         "width":2,
         "smoothing":0
       },
-      "colorscale":"Viridis",
+      "colorbar": {
+        "len": 0.4,
+        "y": 0.25
+      },
       "z":[1, 1.96, 2.56, 3.0625, 4, 5.0625, 1, 7.5625, 9, 12.25, 15.21, 14.0625],
       "a":[0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3],
       "b":[4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6],
@@ -76,7 +79,10 @@
       "line":{
         "width":2
       },
-      "colorscale":"Viridis",
+      "colorbar": {
+        "len": 0.4,
+        "y": 0.75
+      },
       "z":[1, 1.96, 2.56, 3.0625, 4, 5.0625, 1, 7.5625, 9, 12.25, 15.21, 14.0625],
       "a":[0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3],
       "b":[4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6],