Contour line labels

src/traces/carpet/defaults.js

@@ -21,6 +21,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, dfltColor, fullLayou
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
+    traceOut._clipPathId = 'clip' + traceOut.uid + 'carpet';
+
     var defaultColor = coerce('color', colorAttrs.defaultLine);
     Lib.coerceFont(coerce, 'font');
 
@@ -55,6 +57,5 @@ module.exports = function supplyDefaults(traceIn, traceOut, dfltColor, fullLayou
 
     if(!len) {
         traceOut.visible = false;
-        return;
     }
 };

src/traces/carpet/plot.js

@@ -73,9 +73,8 @@ function plotOne(gd, plotinfo, cd) {
 function drawClipPath(trace, t, layer, xaxis, yaxis) {
     var seg, xp, yp, i;
     // var clip = makeg(layer, 'g', 'carpetclip');
-    trace.clipPathId = 'clip' + trace.uid + 'carpet';
 
-    var clip = layer.select('#' + trace.clipPathId);
+    var clip = layer.select('#' + trace._clipPathId);
 
     if(!clip.size()) {
         clip = layer.append('clipPath')
@@ -96,9 +95,9 @@ function drawClipPath(trace, t, layer, xaxis, yaxis) {
     // This could be optimized ever so slightly to avoid no-op L segments
     // at the corners, but it's so negligible that I don't think it's worth
     // the extra complexity
-    trace.clipPathData = 'M' + segs.join('L') + 'Z';
-    clip.attr('id', trace.clipPathId);
-    path.attr('d', trace.clipPathData);
+    var clipPathData = 'M' + segs.join('L') + 'Z';
+    clip.attr('id', trace._clipPathId);
+    path.attr('d', clipPathData);
         // .style('stroke-width', 20)
         // .style('vector-effect', 'non-scaling-stroke')
         // .style('stroke', 'black')

src/traces/contourcarpet/plot.js

@@ -124,12 +124,8 @@ function plotOne(gd, plotinfo, cd) {
     // Draw contour lines:
     makeLines(plotGroup, pathinfo, contours);
 
-    // Clip the boundary of the plot:
-    clipBoundary(plotGroup, carpet);
-}
-
-function clipBoundary(plotGroup, carpet) {
-    plotGroup.attr('clip-path', 'url(#' + carpet.clipPathId + ')');
+    // Clip the boundary of the plot
+    Drawing.setClipUrl(plotGroup, carpet._clipPathId);
 }
 
 function makeLines(plotgroup, pathinfo, contours) {

src/traces/scattercarpet/plot.js

@@ -11,6 +11,7 @@
 
 var scatterPlot = require('../scatter/plot');
 var Axes = require('../../plots/cartesian/axes');
+var Drawing = require('../../components/drawing');
 
 module.exports = function plot(gd, plotinfoproxy, data) {
     var i, trace, node;
@@ -37,6 +38,6 @@ module.exports = function plot(gd, plotinfoproxy, data) {
         // separately to all scattercarpet traces, but that would require
         // lots of reorganization of scatter traces that is otherwise not
         // necessary. That makes this a potential optimization.
-        node.attr('clip-path', 'url(#clip' + carpet.uid + 'carpet)');
+        Drawing.setClipUrl(node, carpet._clipPathId);
     }
 };