clean up carpet pushing stuff back to _fullTrace late

except zmin/zmaxz, just ignore for now, we need to add these.

Author: alexcjohnson

src/plot_api/plot_api.js

@@ -2440,8 +2440,13 @@ function getDiffFlags(oldContainer, newContainer, outerparts, opts) {
         // FIXME: ax.tick0 and dtick get filled in during plotting, and unlike other auto values
         // they don't make it back into the input, so newContainer won't have them.
         // similar for axis ranges for 3D
-        if((key === 'tick0' || key === 'dtick') && newContainer.tickmode === 'auto') continue;
+        // contourcarpet doesn't HAVE zmin/zmax, they're just auto-added. It needs them.
+        if(key === 'tick0' || key === 'dtick') {
+            var tickMode = newContainer.tickmode;
+            if(tickMode === 'auto' || tickMode === 'array' || !tickMode) continue;
+        }
         if(key === 'range' && newContainer.autorange) continue;
+        if((key === 'zmin' || key === 'zmax') && newContainer.type === 'contourcarpet') continue;
 
         var parts = outerparts.concat(key);
         valObject = getValObject(parts);

src/traces/carpet/calc.js

@@ -33,13 +33,13 @@ module.exports = function calc(gd, trace) {
     if(trace._cheater) {
         var avals = aax.cheatertype === 'index' ? a.length : a;
         var bvals = bax.cheatertype === 'index' ? b.length : b;
-        trace.x = x = cheaterBasis(avals, bvals, trace.cheaterslope);
+        x = cheaterBasis(avals, bvals, trace.cheaterslope);
     } else {
         x = trace.x;
     }
 
-    trace._x = trace.x = x = clean2dArray(x);
-    trace._y = trace.y = y = clean2dArray(y);
+    trace._x = x = clean2dArray(x);
+    trace._y = y = clean2dArray(y);
 
     // Fill in any undefined values with elliptic smoothing. This doesn't take
     // into account the spacing of the values. That is, the derivatives should

src/traces/carpet/calc_gridlines.js

@@ -27,10 +27,7 @@ module.exports = function calcGridlines(trace, cd, axisLetter, crossAxisLetter)
     var crossAxis = trace[crossAxisLetter + 'axis'];
 
     if(axis.tickmode === 'array') {
-        axis.tickvals = [];
-        for(i = 0; i < data.length; i++) {
-            axis.tickvals.push(data[i]);
-        }
+        axis.tickvals = data.slice();
     }
 
     var xcp = trace.xctrl;
@@ -42,6 +39,9 @@ module.exports = function calcGridlines(trace, cd, axisLetter, crossAxisLetter)
 
     Axes.calcTicks(axis);
 
+    // don't leave tickvals in axis looking like an attribute
+    if(axis.tickmode === 'array') delete axis.tickvals;
+
     // The default is an empty array that will cause the join to remove the gridline if
     // it's just disappeared:
     // axis._startline = axis._endline = [];

src/traces/carpet/set_convert.js

@@ -65,8 +65,8 @@ module.exports = function setConvert(trace) {
     bax.c2p = function(v) { return v; };
 
     trace.setScale = function() {
-        var x = trace.x;
-        var y = trace.y;
+        var x = trace._x;
+        var y = trace._y;
 
         // This is potentially a very expensive step! It does the bulk of the work of constructing
         // an expanded basis of control points. Note in particular that it overwrites the existing