Merge branch 'fix-time-dayOfYear' of git://github.com/jasondavies/d3 …

…into 2.9.7
furtherLee · Jul 31, 2012 · 151d5fe · 151d5fe
2 parents d449be9 + e8f5d86
commit 151d5fe
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/d3.v2.js b/d3.v2.js
@@ -9193,7 +9193,7 @@ d3.time.days.utc = d3.time.day.utc.range;
 
 d3.time.dayOfYear = function(date) {
   var year = d3.time.year(date);
-  return Math.floor((date - year) / 864e5 - (date.getTimezoneOffset() - year.getTimezoneOffset()) / 1440);
+  return Math.floor((date - year - (date.getTimezoneOffset() - year.getTimezoneOffset()) * 6e4) / 864e5);
 };
 d3_time_weekdays.forEach(function(day, i) {
   day = day.toLowerCase();

diff --git a/d3.v2.min.js b/d3.v2.min.js
diff --git a/src/time/day.js b/src/time/day.js
@@ -11,5 +11,5 @@ d3.time.days.utc = d3.time.day.utc.range;
 
 d3.time.dayOfYear = function(date) {
   var year = d3.time.year(date);
-  return Math.floor((date - year) / 864e5 - (date.getTimezoneOffset() - year.getTimezoneOffset()) / 1440);
+  return Math.floor((date - year - (date.getTimezoneOffset() - year.getTimezoneOffset()) * 6e4) / 864e5);
 };
diff --git a/test/time/dayOfYear-test.js b/test/time/dayOfYear-test.js
@@ -0,0 +1,22 @@
+require("../env");
+
+var vows = require("vows"),
+    assert = require("assert"),
+    time = require("./time"),
+    local = time.local,
+    utc = time.utc;
+
+var suite = vows.describe("d3.time.dayOfYear");
+
+suite.addBatch({
+  "dayOfYear": {
+    topic: function() {
+      return d3.time.dayOfYear;
+    },
+    "no floating-point rounding error": time.zone("America/Santiago", function(dayOfYear) {
+      assert.equal(dayOfYear(new Date(2011, 4, 9)), 128);
+    })
+  }
+});
+
+suite.export(module);