fix #2088 - with tests!

Author: alexcjohnson

src/traces/contour/find_all_paths.js

@@ -216,6 +216,7 @@ function makePath(pi, loc, edgeflag, xtol, ytol) {
                             pi.paths.push(pts.concat(edgepath2));
                         }
                         else {
+                            if(edgei2 > edgei) edgei2--;
                             pi.edgepaths[edgei2] =
                                 pi.edgepaths[edgei2].concat(pts, edgepath2);
                         }

test/jasmine/tests/contour_test.js

@@ -345,6 +345,83 @@ describe('contour calc', function() {
     });
 });
 
+describe('contour edge cases', function() {
+    var gd;
+
+    beforeEach(function() {
+        gd = createGraphDiv();
+    });
+    afterEach(destroyGraphDiv);
+
+    it('handles all sorts of merged edge paths', function() {
+        var z = [
+            [2.38, 2.34, 2.36, 2.37, 2.36, 2.37, 2.36, 2.36, 2.34, 2.35, 2.34, 2.36, 2.38, 2.37, 2.35, 2.34, 2.35, 2.36, 2.36, 2.34, 2.33, 2.34, 2.33, 2.37],
+            [2.38, 2.35, 2.37, 2.38, 2.35, 2.35, 2.36, 2.38, 2.34, 2.35, 2.35, 2.35, 2.38, 2.36, 2.35, 2.35, 2.34, 2.35, 2.35, 2.33, 2.34, 2.34, 2.33, 2.36],
+            [2.36, 2.33, 2.32, 2.33, 2.34, 2.34, 2.35, 2.31, 2.31, 2.32, 2.30, 2.33, 2.35, 2.33, 2.32, 2.31, 2.35, 2.33, 2.33, 2.31, 2.32, 2.30, 2.31, 2.34],
+            [2.36, 2.34, 2.32, 2.31, 2.32, 2.34, 2.35, 2.33, 2.31, 2.34, 2.33, 2.33, 2.35, 2.33, 2.32, 2.32, 2.35, 2.33, 2.33, 2.33, 2.33, 2.30, 2.32, 2.34],
+            [2.35, 2.35, 2.32, 2.31, 2.30, 2.31, 2.32, 2.32, 2.31, 2.31, 2.32, 2.33, 2.32, 2.32, 2.32, 2.29, 2.32, 2.31, 2.31, 2.31, 2.30, 2.31, 2.30, 2.32],
+            [2.34, 2.33, 2.31, 2.35, 2.31, 2.33, 2.34, 2.34, 2.32, 2.31, 2.32, 2.33, 2.33, 2.32, 2.33, 2.33, 2.33, 2.33, 2.32, 2.32, 2.32, 2.33, 2.33, 2.32],
+            [2.33, 2.32, 2.32, 2.31, 2.31, 2.32, 2.33, 2.31, 2.32, 2.31, 2.30, 2.31, 2.34, 2.32, 2.32, 2.31, 2.32, 2.32, 2.32, 2.31, 2.31, 2.31, 2.30, 2.34],
+            [2.34, 2.32, 2.33, 2.33, 2.32, 2.32, 2.32, 2.31, 2.32, 2.30, 2.32, 2.33, 2.33, 2.32, 2.32, 2.32, 2.32, 2.32, 2.33, 2.32, 2.32, 2.31, 2.32, 2.32],
+            [2.32, 2.32, 2.31, 2.30, 2.31, 2.31, 2.31, 2.29, 2.31, 2.32, 2.30, 2.33, 2.33, 2.29, 2.31, 2.32, 2.31, 2.33, 2.32, 2.31, 2.31, 2.31, 2.30, 2.32],
+            [2.33, 2.33, 2.32, 2.33, 2.33, 2.33, 2.32, 2.32, 2.32, 2.32, 2.30, 2.32, 2.31, 2.33, 2.32, 2.33, 2.32, 2.33, 2.34, 2.31, 2.32, 2.31, 2.31, 2.32],
+            [2.33, 2.31, 2.31, 2.30, 2.30, 2.31, 2.32, 2.33, 2.29, 2.29, 2.30, 2.31, 2.32, 2.32, 2.32, 2.31, 2.32, 2.30, 2.32, 2.30, 2.31, 2.29, 2.29, 2.30],
+            [2.32, 2.31, 2.32, 2.32, 2.31, 2.32, 2.33, 2.33, 2.31, 2.31, 2.32, 2.33, 2.33, 2.32, 2.33, 2.33, 2.30, 2.32, 2.31, 2.30, 2.30, 2.31, 2.31, 2.31],
+            [2.33, 2.32, 2.32, 2.30, 2.30, 2.30, 2.30, 2.31, 2.30, 2.31, 2.31, 2.30, 2.32, 2.31, 2.29, 2.31, 2.31, 2.31, 2.31, 2.31, 2.31, 2.30, 2.30, 2.32],
+            [2.33, 2.33, 2.32, 2.32, 2.30, 2.33, 2.31, 2.31, 2.32, 2.32, 2.32, 2.32, 2.34, 2.31, 2.32, 2.32, 2.32, 2.33, 2.32, 2.31, 2.31, 2.31, 2.31, 2.32],
+            [2.33, 2.33, 2.30, 2.33, 2.31, 2.32, 2.31, 2.31, 2.30, 2.31, 2.30, 2.32, 2.33, 2.32, 2.31, 2.30, 2.31, 2.33, 2.31, 2.32, 2.30, 2.31, 2.31, 2.32],
+            [2.33, 2.33, 2.31, 2.32, 2.32, 2.33, 2.33, 2.32, 2.32, 2.34, 2.33, 2.33, 2.33, 2.34, 2.32, 2.31, 2.31, 2.32, 2.32, 2.32, 2.30, 2.32, 2.32, 2.32],
+            [2.32, 2.31, 2.32, 2.33, 2.31, 2.33, 2.32, 2.32, 2.32, 2.31, 2.31, 2.37, 2.32, 2.31, 2.31, 2.30, 2.31, 2.32, 2.31, 2.31, 2.30, 2.31, 2.31, 2.35],
+            [2.33, 2.32, 2.32, 2.31, 2.34, 2.35, 2.32, 2.33, 2.33, 2.32, 2.33, 2.34, 2.33, 2.33, 2.32, 2.32, 2.33, 2.34, 2.32, 2.32, 2.31, 2.31, 2.32, 2.33],
+            [2.32, 2.34, 2.30, 2.33, 2.30, 2.32, 2.33, 2.33, 2.32, 2.31, 2.30, 2.31, 2.32, 2.30, 2.31, 2.29, 2.31, 2.31, 2.31, 2.31, 2.30, 2.32, 2.30, 2.31],
+            [2.32, 2.32, 2.32, 2.32, 2.32, 2.33, 2.34, 2.34, 2.32, 2.32, 2.32, 2.32, 2.34, 2.30, 2.31, 2.34, 2.32, 2.33, 2.32, 2.30, 2.31, 2.34, 2.31, 2.32],
+            [2.31, 2.30, 2.33, 2.30, 2.29, 2.30, 2.31, 2.32, 2.30, 2.30, 2.32, 2.31, 2.32, 2.32, 2.31, 2.31, 2.30, 2.32, 2.31, 2.31, 2.31, 2.31, 2.30, 2.29],
+            [2.32, 2.32, 2.31, 2.31, 2.31, 2.34, 2.32, 2.32, 2.33, 2.30, 2.32, 2.33, 2.32, 2.32, 2.31, 2.31, 2.31, 2.32, 2.29, 2.32, 2.31, 2.31, 2.31, 2.32],
+            [2.32, 2.30, 2.31, 2.31, 2.29, 2.32, 2.32, 2.33, 2.30, 2.31, 2.30, 2.30, 2.31, 2.32, 2.30, 2.30, 2.31, 2.31, 2.32, 2.31, 2.30, 2.31, 2.32, 2.31],
+            [2.32, 2.31, 2.32, 2.34, 2.32, 2.32, 2.32, 2.32, 2.32, 2.32, 2.32, 2.34, 2.34, 2.32, 2.32, 2.34, 2.31, 2.30, 2.33, 2.31, 2.34, 2.31, 2.33, 2.31],
+            [2.33, 2.31, 2.29, 2.31, 2.32, 2.30, 2.34, 2.31, 2.31, 2.32, 2.32, 2.31, 2.31, 2.30, 2.31, 2.29, 2.31, 2.31, 2.31, 2.29, 2.31, 2.31, 2.33, 2.30],
+            [2.33, 2.30, 2.31, 2.31, 2.31, 2.32, 2.35, 2.33, 2.32, 2.31, 2.31, 2.31, 2.32, 2.32, 2.31, 2.32, 2.31, 2.33, 2.31, 2.33, 2.33, 2.33, 2.32, 2.33],
+            [2.30, 2.30, 2.31, 2.33, 2.30, 2.31, 2.31, 2.31, 2.29, 2.32, 2.29, 2.31, 2.31, 2.31, 2.31, 2.30, 2.29, 2.32, 2.31, 2.31, 2.31, 2.32, 2.32, 2.30],
+            [2.32, 2.31, 2.31, 2.31, 2.32, 2.33, 2.32, 2.34, 2.30, 2.32, 2.33, 2.31, 2.33, 2.32, 2.31, 2.32, 2.32, 2.32, 2.32, 2.30, 2.32, 2.32, 2.32, 2.32],
+            [2.34, 2.33, 2.30, 2.30, 2.33, 2.30, 2.31, 2.31, 2.31, 2.30, 2.31, 2.31, 2.35, 2.31, 2.32, 2.32, 2.30, 2.31, 2.32, 2.32, 2.31, 2.31, 2.31, 2.31],
+            [2.35, 2.32, 2.30, 2.32, 2.31, 2.32, 2.33, 2.34, 2.34, 2.31, 2.33, 2.32, 2.35, 2.36, 2.31, 2.34, 2.33, 2.33, 2.32, 2.33, 2.32, 2.32, 2.33, 2.34],
+            [2.34, 2.31, 2.30, 2.31, 2.32, 2.34, 2.34, 2.29, 2.29, 2.30, 2.30, 2.32, 2.31, 2.32, 2.32, 2.31, 2.30, 2.31, 2.33, 2.32, 2.33, 2.32, 2.29, 2.32],
+            [2.33, 2.34, 2.33, 2.33, 2.32, 2.34, 2.34, 2.33, 2.32, 2.33, 2.33, 2.33, 2.33, 2.32, 2.33, 2.33, 2.31, 2.33, 2.33, 2.32, 2.33, 2.34, 2.32, 2.31],
+            [2.33, 2.32, 2.31, 2.30, 2.32, 2.31, 2.31, 2.32, 2.31, 2.30, 2.29, 2.32, 2.33, 2.31, 2.33, 2.30, 2.30, 2.31, 2.31, 2.31, 2.32, 2.32, 2.34, 2.32],
+            [2.32, 2.32, 2.31, 2.32, 2.32, 2.32, 2.35, 2.33, 2.33, 2.31, 2.32, 2.34, 2.32, 2.32, 2.36, 2.33, 2.33, 2.33, 2.32, 2.34, 2.36, 2.32, 2.34, 2.32],
+            [2.32, 2.30, 2.30, 2.32, 2.32, 2.32, 2.31, 2.31, 2.31, 2.29, 2.30, 2.34, 2.32, 2.32, 2.30, 2.31, 2.34, 2.32, 2.32, 2.32, 2.32, 2.30, 2.30, 2.30],
+            [2.32, 2.30, 2.33, 2.33, 2.34, 2.32, 2.32, 2.31, 2.32, 2.31, 2.33, 2.32, 2.34, 2.33, 2.31, 2.33, 2.33, 2.32, 2.32, 2.31, 2.33, 2.31, 2.31, 2.32],
+            [2.30, 2.33, 2.30, 2.31, 2.32, 2.30, 2.31, 2.31, 2.31, 2.30, 2.31, 2.33, 2.32, 2.30, 2.30, 2.32, 2.30, 2.31, 2.31, 2.31, 2.30, 2.30, 2.30, 2.31],
+            [2.34, 2.32, 2.33, 2.34, 2.33, 2.33, 2.33, 2.32, 2.32, 2.32, 2.33, 2.34, 2.32, 2.32, 2.32, 2.31, 2.34, 2.32, 2.31, 2.31, 2.32, 2.31, 2.31, 2.33],
+            [2.32, 2.32, 2.31, 2.30, 2.31, 2.30, 2.31, 2.30, 2.31, 2.31, 2.30, 2.32, 2.33, 2.31, 2.31, 2.30, 2.31, 2.32, 2.31, 2.31, 2.31, 2.30, 2.31, 2.32],
+            [2.33, 2.32, 2.33, 2.32, 2.32, 2.33, 2.32, 2.32, 2.33, 2.31, 2.33, 2.32, 2.32, 2.32, 2.33, 2.31, 2.32, 2.34, 2.33, 2.31, 2.33, 2.31, 2.34, 2.34],
+            [2.34, 2.31, 2.31, 2.32, 2.30, 2.34, 2.32, 2.31, 2.30, 2.30, 2.31, 2.32, 2.33, 2.31, 2.30, 2.32, 2.30, 2.32, 2.32, 2.32, 2.29, 2.32, 2.31, 2.31],
+            [2.33, 2.33, 2.32, 2.34, 2.34, 2.33, 2.32, 2.31, 2.32, 2.33, 2.33, 2.31, 2.33, 2.32, 2.32, 2.36, 2.31, 2.33, 2.31, 2.32, 2.31, 2.32, 2.33, 2.31],
+            [2.33, 2.31, 2.30, 2.31, 2.31, 2.31, 2.31, 2.31, 2.31, 2.29, 2.30, 2.31, 2.31, 2.30, 2.29, 2.30, 2.31, 2.31, 2.31, 2.30, 2.31, 2.30, 2.30, 2.33],
+            [2.32, 2.31, 2.33, 2.29, 2.30, 2.32, 2.31, 2.32, 2.31, 2.30, 2.32, 2.33, 2.32, 2.32, 2.32, 2.33, 2.31, 2.32, 2.32, 2.32, 2.32, 2.32, 2.30, 2.32],
+            [2.33, 2.32, 2.32, 2.32, 2.30, 2.33, 2.31, 2.32, 2.31, 2.30, 2.31, 2.33, 2.33, 2.32, 2.32, 2.31, 2.31, 2.31, 2.31, 2.31, 2.29, 2.31, 2.31, 2.31],
+            [2.33, 2.33, 2.33, 2.32, 2.31, 2.33, 2.33, 2.32, 2.34, 2.33, 2.34, 2.34, 2.33, 2.33, 2.31, 2.32, 2.31, 2.33, 2.34, 2.31, 2.32, 2.32, 2.32, 2.33],
+            [2.35, 2.33, 2.31, 2.32, 2.32, 2.34, 2.35, 2.31, 2.32, 2.30, 2.31, 2.33, 2.33, 2.32, 2.32, 2.32, 2.32, 2.40, 2.33, 2.32, 2.34, 2.31, 2.31, 2.34],
+            [2.35, 2.33, 2.33, 2.32, 2.33, 2.34, 2.34, 2.32, 2.33, 2.32, 2.33, 2.34, 2.36, 2.33, 2.33, 2.34, 2.34, 2.34, 2.34, 2.34, 2.34, 2.32, 2.34, 2.35]
+        ];
+
+        var data = [{
+            z: z,
+            type: 'contour',
+            showscale: true,
+            contours: {
+                start: 2.2,
+                end: 2.4,
+                size: 0.02
+            }
+        }];
+        Plotly.newPlot(gd, data);
+
+        expect(document.querySelectorAll('.contour .openline').length).toBe(22);
+        expect(document.querySelectorAll('.contour .closedline').length).toBe(122);
+    });
+});
+
 describe('contour edits', function() {
     var gd;