restore correct behavior for constraint-type contourcarpet

Author: alexcjohnson

src/traces/contour/style_defaults.js

@@ -14,15 +14,16 @@ var Lib = require('../../lib');
 
 
 module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, layout, opts) {
+    if(!opts) opts = {};
     var coloring = coerce('contours.coloring');
 
     var showLines;
     var lineColor = '';
     if(coloring === 'fill') showLines = coerce('contours.showlines');
 
     if(showLines !== false) {
-        if(coloring !== 'lines') lineColor = coerce('line.color', '#000');
-        coerce('line.width', 0.5);
+        if(coloring !== 'lines') lineColor = coerce('line.color', opts.defaultColor || '#000');
+        coerce('line.width', opts.defaultWidth === undefined ? 0.5 : opts.defaultWidth);
         coerce('line.dash');
     }
 
@@ -45,7 +46,7 @@ module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, layout,
         coerce('contours.labelformat');
     }
 
-    if(!opts || opts.hasHover !== false) {
+    if(opts.hasHover !== false) {
         coerce('zhoverformat');
         // Needed for formatting of hoverlabel if format is not explicitly specified
         traceOut._separators = layout.separators;

src/traces/contourcarpet/defaults.js

@@ -80,7 +80,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
             // If there's a fill color, use it at full opacity for the line color
             var lineDfltColor = traceOut.fillcolor ? addOpacity(traceOut.fillcolor, 1) : defaultColor;
 
-            handleStyleDefaults(traceIn, traceOut, coerce, layout, lineDfltColor, 2);
+            handleStyleDefaults(traceIn, traceOut, coerce, layout, {
+                hasHover: false,
+                defaultColor: lineDfltColor,
+                defaultWidth: 2
+            });
 
             if(contours.operation === '=') {
                 coerce('line.color', defaultColor);