Merge branch 'fix-polylinear' into v2.8.0

d3 · Feb 18, 2012 · 4949310 · 4949310
2 parents 4345a0c + 744aa96
commit 4949310
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/d3.js b/d3.js
@@ -2430,7 +2430,7 @@ function d3_scale_linear(domain, range, interpolate, clamp) {
       input;
 
   function rescale() {
-    var linear = domain.length == 2 ? d3_scale_bilinear : d3_scale_polylinear,
+    var linear = Math.min(domain.length, range.length) > 2 ? d3_scale_polylinear : d3_scale_bilinear,
         uninterpolate = clamp ? d3_uninterpolateClamp : d3_uninterpolateNumber;
     output = linear(domain, range, uninterpolate, interpolate);
     input = linear(range, domain, uninterpolate, d3.interpolate);
@@ -2542,7 +2542,7 @@ function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
   var u = [],
       i = [],
       j = 0,
-      k = domain.length - 1;
+      k = Math.min(domain.length, range.length) - 1;
 
   // Handle descending domains.
   if (domain[k] < domain[0]) {

diff --git a/d3.min.js b/d3.min.js
diff --git a/src/scale/linear.js b/src/scale/linear.js
@@ -7,7 +7,7 @@ function d3_scale_linear(domain, range, interpolate, clamp) {
       input;
 
   function rescale() {
-    var linear = domain.length == 2 ? d3_scale_bilinear : d3_scale_polylinear,
+    var linear = Math.min(domain.length, range.length) > 2 ? d3_scale_polylinear : d3_scale_bilinear,
         uninterpolate = clamp ? d3_uninterpolateClamp : d3_uninterpolateNumber;
     output = linear(domain, range, uninterpolate, interpolate);
     input = linear(range, domain, uninterpolate, d3.interpolate);

diff --git a/src/scale/polylinear.js b/src/scale/polylinear.js
@@ -2,7 +2,7 @@ function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
   var u = [],
       i = [],
       j = 0,
-      k = domain.length - 1;
+      k = Math.min(domain.length, range.length) - 1;
 
   // Handle descending domains.
   if (domain[k] < domain[0]) {

diff --git a/test/scale/linear-test.js b/test/scale/linear-test.js
@@ -43,6 +43,14 @@ suite.addBatch({
         assert.equal(x(50), "#80c080");
         assert.equal(x(75), "#40a040");
       },
+      "the smaller of the domain or range is observed": function(linear) {
+        var x = linear().domain([-10, 0]).range(["red", "white", "green"]).clamp(true);
+        assert.equal(x(-5), "#ff8080");
+        assert.equal(x(50), "#ffffff");
+        var x = linear().domain([-10, 0, 100]).range(["red", "white"]).clamp(true);
+        assert.equal(x(-5), "#ff8080");
+        assert.equal(x(50), "#ffffff");
+      },
       "an empty domain maps to the range start": function(linear) {
         var x = linear().domain([0, 0]).range(["red", "green"]);
         assert.equal(x(0), "#ff0000");