Fix a centroid bug with CCW polygons.

d3 · Oct 7, 2011 · 0e0ba08 · 0e0ba08
1 parent 9edd4bc
commit 0e0ba08
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/d3.geo.js b/d3.geo.js
@@ -542,18 +542,20 @@ d3.geo.path = function() {
 
   function polygonCentroid(coordinates) {
     var polygon = d3.geom.polygon(coordinates[0].map(projection)), // exterior ring
-        centroid = polygon.centroid(1),
+        area = polygon.area(),
+        centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1),
         x = centroid[0],
         y = centroid[1],
-        z = Math.abs(polygon.area()),
+        z = area,
         i = 0, // coordinates index
         n = coordinates.length;
     while (++i < n) {
       polygon = d3.geom.polygon(coordinates[i].map(projection)); // holes
-      centroid = polygon.centroid(1);
+      area = polygon.area();
+      centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1);
       x -= centroid[0];
       y -= centroid[1];
-      z -= Math.abs(polygon.area());
+      z -= area;
     }
     return [x, y, 6 * z]; // weighted centroid
   }

diff --git a/d3.geo.min.js b/d3.geo.min.js
diff --git a/d3.js b/d3.js
@@ -10,7 +10,7 @@ try {
     d3_style_setProperty.call(this, name, value + "", priority);
   };
 }
-d3 = {version: "2.3.3"}; // semver
+d3 = {version: "2.3.4"}; // semver
 var d3_array = d3_arraySlice; // conversion for NodeLists
 
 function d3_arrayCopy(pseudoarray) {

diff --git a/d3.min.js b/d3.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",

diff --git a/src/core/core.js b/src/core/core.js
@@ -1 +1 @@
-d3 = {version: "2.3.3"}; // semver
+d3 = {version: "2.3.4"}; // semver
diff --git a/src/geo/path.js b/src/geo/path.js
@@ -186,18 +186,20 @@ d3.geo.path = function() {
 
   function polygonCentroid(coordinates) {
     var polygon = d3.geom.polygon(coordinates[0].map(projection)), // exterior ring
-        centroid = polygon.centroid(1),
+        area = polygon.area(),
+        centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1),
         x = centroid[0],
         y = centroid[1],
-        z = Math.abs(polygon.area()),
+        z = area,
         i = 0, // coordinates index
         n = coordinates.length;
     while (++i < n) {
       polygon = d3.geom.polygon(coordinates[i].map(projection)); // holes
-      centroid = polygon.centroid(1);
+      area = polygon.area();
+      centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1);
       x -= centroid[0];
       y -= centroid[1];
-      z -= Math.abs(polygon.area());
+      z -= area;
     }
     return [x, y, 6 * z]; // weighted centroid
   }