Fix albersUsa, again.

d3 · Aug 25, 2011 · fb7e69f · fb7e69f
1 parent 3f6fefb
commit fb7e69f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/d3.geo.js b/d3.geo.js
@@ -141,9 +141,10 @@ d3.geo.albersUsa = function() {
   function albersUsa(coordinates) {
     var lon = coordinates[0],
         lat = coordinates[1];
-    return (lat < 21
-        ? (lon < -100 ? hawaii : puertoRico)
-        : (lat > 50 ? alaska : lower48))(coordinates);
+    return (lat > 50 ? alaska
+        : lon < -140 ? hawaii
+        : lat < 21 ? puertoRico
+        : lower48)(coordinates);
   }
 
   albersUsa.scale = function(x) {

diff --git a/d3.geo.min.js b/d3.geo.min.js
diff --git a/d3.js b/d3.js
@@ -1,4 +1,4 @@
-(function(){d3 = {version: "2.0.2"}; // semver
+(function(){d3 = {version: "2.0.3"}; // semver
 if (!Date.now) Date.now = function() {
   return +new Date;
 };

diff --git a/d3.min.js b/d3.min.js
diff --git a/src/core/core.js b/src/core/core.js
@@ -1 +1 @@
-d3 = {version: "2.0.2"}; // semver
+d3 = {version: "2.0.3"}; // semver
diff --git a/src/geo/albers.js b/src/geo/albers.js
@@ -83,9 +83,10 @@ d3.geo.albersUsa = function() {
   function albersUsa(coordinates) {
     var lon = coordinates[0],
         lat = coordinates[1];
-    return (lat < 21
-        ? (lon < -100 ? hawaii : puertoRico)
-        : (lat > 50 ? alaska : lower48))(coordinates);
+    return (lat > 50 ? alaska
+        : lon < -140 ? hawaii
+        : lat < 21 ? puertoRico
+        : lower48)(coordinates);
   }
 
   albersUsa.scale = function(x) {