JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 2 additions & 1 deletion b/‎d3.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎d3.min.js‎
Lines changed: 1 addition & 1 deletion b/‎d3.min.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/geo/circle.js‎
Lines changed: 2 additions & 1 deletion b/‎src/geo/circle.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎test/geo/path-test.js‎
Lines changed: 1 addition & 1 deletion b/‎test/geo/path-test.js‎
Lines changed: 1 addition & 1 deletion
@@ -5639,6 +5639,7 @@
       for (var i = 1; i < n; i++) {
         var point1 = rotate(coordinates[i]), v = visible(point1);
         if (v !== inside) {
+          keepWinding = false;
           if (inside = v) {
             point0 = intersect(point1, point0);
             context.moveTo(point0[0], point0[1]);
@@ -5693,7 +5694,7 @@
       }
       segments = segments.concat(ringSegments);
     });
-    if (winding > 0) {
+    if (segments.length ? winding > 0 : winding < 0) {
       segments.push(winding = []);
       x = {
         lineTo: function(x, y) {
 
@@ -170,6 +170,7 @@ function d3_geo_circleClip(degrees, rotate) {
       var point1 = rotate(coordinates[i]),
           v = visible(point1);
       if (v !== inside) {
+        keepWinding = false;
         if (inside = v) {
           // outside going in
           point0 = intersect(point1, point0);
@@ -265,7 +266,7 @@ function d3_geo_circleClipPolygon(coordinates, context, clipLine, interpolate, a
     }
     segments = segments.concat(ringSegments);
   });
-  if (winding > 0) {
+  if (segments.length ? winding > 0 : winding < 0) {
     segments.push(winding = []);
     x = {lineTo: function(x, y) { winding.push([x, y]); }};
     d3_geo_circleInterpolateCircle(interpolate, x);
 
@@ -265,7 +265,7 @@ suite.addBatch({
           assert.equal(buffer.filter(function(d) { return d.type === "moveTo"; }).length, 2);
         },
         "inserts exterior along clip edge if polygon exterior surrounds it": function(path) {
-          path({type: "Polygon", coordinates: [[[100, -80], [100, 80], [-100, 80], [-100, -80], [100, -80]]]});
+          path({type: "Polygon", coordinates: [[[100, -80], [-100, -80], [-100, 80], [100, 80], [100, -80]]]});
           var buffer = testContext.buffer();
           assert.equal(buffer.filter(function(d) { return d.type === "moveTo"; }).length, 1);
         }
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ suite.addBatch({`
`265`	`265`	`assert.equal(buffer.filter(function(d) { return d.type === "moveTo"; }).length, 2);`
`266`	`266`	`},`
`267`	`267`	`"inserts exterior along clip edge if polygon exterior surrounds it": function(path) {`
`268`		`- path({type: "Polygon", coordinates: [[[100, -80], [100, 80], [-100, 80], [-100, -80], [100, -80]]]});`
	`268`	`+ path({type: "Polygon", coordinates: [[[100, -80], [-100, -80], [-100, 80], [100, 80], [100, -80]]]});`
`269`	`269`	`var buffer = testContext.buffer();`
`270`	`270`	`assert.equal(buffer.filter(function(d) { return d.type === "moveTo"; }).length, 1);`
`271`	`271`	`}`