Fix d3.geo.albersUsa tests.

d3.js

@@ -3359,6 +3359,9 @@ d3 = function() {
   (d3.geo.conicEqualArea = function() {
     return d3_geo_conic(d3_geo_conicEqualArea);
   }).raw = d3_geo_conicEqualArea;
+  d3.geo.albers = function() {
+    return d3.geo.conicEqualArea().rotate([ 96, 0 ]).center([ -.6, 38.7 ]).parallels([ 29.5, 45.5 ]).scale(1070);
+  };
   d3.geo.albersUsa = function() {
     var lower48 = d3.geo.albers();
     var alaska = d3.geo.conicEqualArea().rotate([ 154, 0 ]).center([ -2, 58.5 ]).parallels([ 55, 65 ]);
@@ -3688,9 +3691,6 @@ d3 = function() {
       };
     };
   }
-  d3.geo.albers = function() {
-    return d3.geo.conicEqualArea().rotate([ 96, 0 ]).center([ -.6, 38.7 ]).parallels([ 29.5, 45.5 ]).scale(1070);
-  };
   function d3_geo_azimuthal(scale, angle) {
     function azimuthal(λ, φ) {
       var cosλ = Math.cos(λ), cosφ = Math.cos(φ), k = scale(cosλ * cosφ);

src/geo/albers-usa.js

@@ -1,4 +1,4 @@
-import "conic-equal-area";
+import "albers";
 import "geo";
 
 // A composite projection for the United States, configured by default for

test/geo/albers-usa-test.js

@@ -10,24 +10,24 @@ suite.addBatch({
     topic: load("geo/albers-usa").expression("d3.geo.albersUsa"),
     "default": projectionTestSuite({
       topic: function(projection) { return projection(); },
-      "has the scale 1000": function(p) {
-        assert.inDelta(p.scale(), 1000, 1e-6);
+      "has the scale 1070": function(p) {
+        assert.inDelta(p.scale(), 1070, 1e-6);
       }
     }, {
-      "Washington, DC":    [[-120.50000000,   47.50000000], [ 215.47899724,   51.97649392]],
-      "San Francisco, CA": [[-122.42000000,   37.78000000], [ 150.07267740,  211.25782936]],
-      "Juneau, AK":        [[-134.22000000,   58.43000000], [ 217.36659042,  409.49851773]],
-      "Honolulu, HI":      [[-157.82000000,   21.30000000], [ 325.69600300,  427.27882479]],
-      "San Juan, PR":      [[ -66.07000000,   18.45000000], [ 909.15925090,  456.39482719]]
+      "Washington, DC":    [[-120.50000000,   47.50000000], [ 181.00023857,   45.12748866]],
+      "San Francisco, CA": [[-122.42000000,   37.78000000], [ 107.44485839,  214.04820561]],
+      "Juneau, AK":        [[-134.22000000,   58.43000000], [ 224.79015007,  455.65860760]],
+      "Honolulu, HI":      [[-157.82000000,   21.30000000], [ 299.14918225,  451.11762634]],
+      "San Juan, PR":      [[ -66.07000000,   18.45000000], [1030.00551581,  540.01932405]]
     }),
     "translated to 0,0 and at scale 1": projectionTestSuite({
       topic: function(projection) { return projection().translate([0, 0]).scale(1); }
     }, {
-      "Washington, DC":    [[-120.50000000,   47.50000000], [  -0.26452100,   -0.19802351]],
-      "San Francisco, CA": [[-122.42000000,   37.78000000], [  -0.32992732,   -0.03874217]],
-      "Juneau, AK":        [[-134.22000000,   58.43000000], [  -0.26263341,    0.15949852]],
-      "Honolulu, HI":      [[-157.82000000,   21.30000000], [  -0.15430400,    0.17727882]],
-      "San Juan, PR":      [[ -66.07000000,   18.45000000], [   0.42915925,    0.20639483]]
+      "Washington, DC":    [[-120.50000000,   47.50000000], [  -0.27943903,   -0.19146964]],
+      "San Francisco, CA": [[-122.42000000,   37.78000000], [  -0.34818238,   -0.03359981]],
+      "Juneau, AK":        [[-134.22000000,   58.43000000], [  -0.23851388,    0.19220431]],
+      "Honolulu, HI":      [[-157.82000000,   21.30000000], [  -0.16901946,    0.18796040]],
+      "San Juan, PR":      [[ -66.07000000,   18.45000000], [   0.51402385,    0.27104610]]
     })
   }
 });