JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 3 additions & 3 deletions b/‎d3.js‎
Lines changed: 3 additions & 3 deletions
@@ -3367,12 +3367,12 @@ d3 = function() {
     function resampleLineTo(x0, y0, λ0, a0, b0, c0, x1, y1, λ1, a1, b1, c1, depth, buffer) {
       var dx = x1 - x0, dy = y1 - y0, d2 = dx * dx + dy * dy;
       if (d2 > 4 * δ2 && depth--) {
-        var a = a0 + a1, b = b0 + b1, c = c0 + c1, m = Math.sqrt(a * a + b * b + c * c), φ2 = Math.asin(c /= m), λ2 = Math.abs(Math.abs(c) - 1) < ε ? (λ0 + λ1) / 2 : Math.atan2(b, a), p = project(λ2, φ2), x2 = p[0], y2 = p[1], dx2 = x2 - x0, dy2 = y2 - y0, dz = dy * dx2 - dx * dy2, tooFar;
-        if (dz * dz / d2 > δ2 || (tooFar = d2 > 16384 * δ2)) {
+        var a = a0 + a1, b = b0 + b1, c = c0 + c1, m = Math.sqrt(a * a + b * b + c * c), φ2 = Math.asin(c /= m), λ2 = Math.abs(Math.abs(c) - 1) < ε ? (λ0 + λ1) / 2 : Math.atan2(b, a), p = project(λ2, φ2), x2 = p[0], y2 = p[1], dx2 = x2 - x0, dy2 = y2 - y0, dz = dy * dx2 - dx * dy2, curve = dz * dz / d2 > δ2;
+        if (curve || d2 > 16384 * δ2) {
           var s0 = resampleLineTo(x0, y0, λ0, a0, b0, c0, x2, y2, λ2, a /= m, b /= m, c, depth, buffer);
           buffer.push(p);
           var s1 = resampleLineTo(x2, y2, λ2, a, b, c, x1, y1, λ1, a1, b1, c1, depth, buffer);
-          return !tooFar || s0 || s1 || (buffer.pop(), false);
+          return curve || s0 || s1 || (buffer.pop(), false);
         }
       }
     }
Original file line number	Diff line number	Diff line change
`@@ -3367,12 +3367,12 @@ d3 = function() {`
`3367`	`3367`	`function resampleLineTo(x0, y0, λ0, a0, b0, c0, x1, y1, λ1, a1, b1, c1, depth, buffer) {`
`3368`	`3368`	`var dx = x1 - x0, dy = y1 - y0, d2 = dx * dx + dy * dy;`
`3369`	`3369`	`if (d2 > 4 * δ2 && depth--) {`
`3370`		`- var a = a0 + a1, b = b0 + b1, c = c0 + c1, m = Math.sqrt(a * a + b * b + c * c), φ2 = Math.asin(c /= m), λ2 = Math.abs(Math.abs(c) - 1) < ε ? (λ0 + λ1) / 2 : Math.atan2(b, a), p = project(λ2, φ2), x2 = p[0], y2 = p[1], dx2 = x2 - x0, dy2 = y2 - y0, dz = dy * dx2 - dx * dy2, tooFar;`
`3371`		`- if (dz * dz / d2 > δ2 \|\| (tooFar = d2 > 16384 * δ2)) {`
	`3370`	`+ var a = a0 + a1, b = b0 + b1, c = c0 + c1, m = Math.sqrt(a * a + b * b + c * c), φ2 = Math.asin(c /= m), λ2 = Math.abs(Math.abs(c) - 1) < ε ? (λ0 + λ1) / 2 : Math.atan2(b, a), p = project(λ2, φ2), x2 = p[0], y2 = p[1], dx2 = x2 - x0, dy2 = y2 - y0, dz = dy * dx2 - dx * dy2, curve = dz * dz / d2 > δ2;`
	`3371`	`+ if (curve \|\| d2 > 16384 * δ2) {`
`3372`	`3372`	`var s0 = resampleLineTo(x0, y0, λ0, a0, b0, c0, x2, y2, λ2, a /= m, b /= m, c, depth, buffer);`
`3373`	`3373`	`buffer.push(p);`
`3374`	`3374`	`var s1 = resampleLineTo(x2, y2, λ2, a, b, c, x1, y1, λ1, a1, b1, c1, depth, buffer);`
`3375`		`- return !tooFar \|\| s0 \|\| s1 \|\| (buffer.pop(), false);`
	`3375`	`+ return curve \|\| s0 \|\| s1 \|\| (buffer.pop(), false);`
`3376`	`3376`	`}`
`3377`	`3377`	`}`
`3378`	`3378`	`}`