fix and test a bunch more contour edge cases

these edge cases literally involve strange things at the edges

Author: alexcjohnson

src/traces/contour/find_all_paths.js

@@ -88,8 +88,6 @@ function makePath(pi, loc, edgeflag) {
                 (marchStep[1] && (loc[1] < 0 || loc[1] > m - 2)),
             closedLoop = (locStr === startLocStr) && (marchStep.join(',') === startStepStr);
 
-        if(atEdge) pi.foundedge = true;
-
         // have we completed a loop, or reached an edge?
         if((closedLoop) || (edgeflag && atEdge)) break;
 

src/traces/contour/plot.js

@@ -95,8 +95,6 @@ function emptyPathinfo(contours, plotinfo, cd0) {
             // all unclosed paths (may have less items than starts,
             // if a path is closed by rounding)
             edgepaths: [],
-            // we found some edges (even if they later got removed due to rounding)
-            foundedge: false,
             // all closed paths
             paths: [],
             // store axes so we can convert to px
@@ -167,7 +165,8 @@ function makeFills(plotgroup, pathinfo, perimeter, contours) {
 }
 
 function joinAllPaths(pi, perimeter) {
-    var fullpath = (pi.foundedge || pi.z[0][0] < pi.level) ?
+    var edgeVal2 = Math.min(pi.z[0][0], pi.z[0][1]),
+        fullpath = (pi.edgepaths.length || edgeVal2 <= pi.level) ?
             '' : ('M' + perimeter.join('L') + 'Z'),
         i = 0,
         startsleft = pi.edgepaths.map(function(v, i) { return i; }),

test/image/baselines/contour_edge_cases.png

@@ -1,31 +1,132 @@
 {
   "data": [
     {
+      "x": [0, 5],
+      "y": [0, 4],
       "z": [[4, 3], [2, 1]],
       "type": "contour",
       "contours": {
         "start": 1.1,
         "end": 4.09,
         "size": 1
       },
-      "colorbar": {"x": 0.4}
+      "colorbar": {"x": 0.4, "y": 0.9, "len": 0.2}
     },
     {
+      "x": [0, 5],
+      "y": [0, 4],
       "z": [[4, 3], [2, 1]],
       "type": "contour",
       "contours": {
         "start": 1,
         "end": 4,
         "size": 0.9999999
       },
-      "colorbar": {"x": 1},
+      "colorbar": {"x": 1, "y": 0.9, "len": 0.2},
       "xaxis": "x2"
+    },
+    {
+      "z": [[0, 0, 0, 0, 0, 0],
+            [0, 0, 9, 0, 0, 0],
+            [0, 0, 0, 0, 0, 0],
+            [0, 0, 0, -9, 0, 0],
+            [0, 0, 0, 0, 0, 0]],
+      "type": "contour",
+      "contours": {
+        "start": -0.000001,
+        "end": 0.000001,
+        "size": 0.000001
+      },
+      "colorbar": {"x": 0.4, "y": 0.65, "len": 0.2},
+      "yaxis": "y2"
+    },
+    {
+      "z": [[0, 0, 0, 0, 0, 0],
+            [0, 0, 9, -9, 0, 0],
+            [0, 0, 9, -9, 0, 0],
+            [0, 0, 9, -9, 0, 0],
+            [0, 0, 0, 0, 0, 0]],
+      "type": "contour",
+      "contours": {
+        "start": -0.000001,
+        "end": 0.000001,
+        "size": 0.000001
+      },
+      "colorbar": {"x": 1, "y": 0.65, "len": 0.2},
+      "xaxis": "x2",
+      "yaxis": "y2"
+    },
+    {
+      "z": [[0, 0, 0, 0, 0, 0],
+            [0, 9, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0, 0],
+            [0, 0, 0, 0, -9, 0],
+            [0, 0, 0, 0, 0, 0]],
+      "type": "contour",
+      "contours": {
+        "start": -0.000001,
+        "end": 0.000001,
+        "size": 0.000001
+      },
+      "colorbar": {"x": 0.4, "y": 0.4, "len": 0.2},
+      "yaxis": "y3"
+    },
+    {
+      "z": [[0, 0, 0, 0, 0, 0],
+            [0, 0, -9, 0, 0, 0],
+            [0, 0, 0, 0, 0, 0],
+            [0, 0, 0, 9, 0, 0],
+            [0, 0, 0, 0, 0, 0]],
+      "type": "contour",
+      "contours": {
+        "start": -0.0000005,
+        "end": 0.000001,
+        "size": 0.000001
+      },
+      "colorbar": {"x": 1, "y": 0.4, "len": 0.2},
+      "xaxis": "x2",
+      "yaxis": "y3"
+    },
+    {
+      "z": [[0, 0, 0, 0, 0, 0],
+            [0, 9, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0, 0],
+            [0, 0, 0, 0, -9, 0],
+            [0, 0, 0, 0, 0, 0]],
+      "type": "contour",
+      "contours": {
+        "start": -0.0000005,
+        "end": 0.000001,
+        "size": 0.000001
+      },
+      "colorbar": {"x": 0.4, "y": 0.15, "len": 0.2},
+      "yaxis": "y4"
+    },
+    {
+      "z": [[0, 0, 0, 0, 0, 0],
+            [0, 0, 9, 0, 0, 0],
+            [0, -9, -9, -9, -9, 0],
+            [0, 0, 0, 9, 0, 0],
+            [0, 0, 0, 0, 0, 0]],
+      "type": "contour",
+      "contours": {
+        "start": -0.0000005,
+        "end": 0.000001,
+        "size": 0.000001
+      },
+      "colorbar": {"x": 1, "y": 0.15, "len": 0.2},
+      "xaxis": "x2",
+      "yaxis": "y4"
     }
   ],
   "layout": {
     "xaxis": {"domain": [0, 0.4]},
     "xaxis2": {"domain": [0.6, 1]},
-    "width": 800,
-    "height": 400
+    "yaxis": {"domain": [0.8, 1]},
+    "yaxis2": {"domain": [0.55, 0.75]},
+    "yaxis3": {"domain": [0.3, 0.5]},
+    "yaxis4": {"domain": [0.05, 0.25]},
+    "width": 600,
+    "height": 800
   }
-}
+}