Simplify intervals.

d3 · Feb 4, 2019 · 3576d62 · 3576d62
1 parent d8b70e8
commit 3576d62
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/hour.js b/src/hour.js
@@ -1,10 +1,8 @@
 import interval from "./interval";
-import {durationHour, durationMinute} from "./duration";
+import {durationHour, durationMinute, durationSecond} from "./duration";
 
 var hour = interval(function(date) {
-  var offset = date.getTimezoneOffset() * durationMinute % durationHour;
-  if (offset < 0) offset += durationHour;
-  date.setTime(Math.floor((+date - offset) / durationHour) * durationHour + offset);
+  date.setTime(date - date.getMilliseconds() - date.getSeconds() * durationSecond - date.getMinutes() * durationMinute);
 }, function(date, step) {
   date.setTime(+date + step * durationHour);
 }, function(start, end) {

diff --git a/src/minute.js b/src/minute.js
@@ -1,8 +1,8 @@
 import interval from "./interval";
-import {durationMinute} from "./duration";
+import {durationMinute, durationSecond} from "./duration";
 
 var minute = interval(function(date) {
-  date.setTime(Math.floor(date / durationMinute) * durationMinute);
+  date.setTime(date - date.getMilliseconds() - date.getSeconds() * durationSecond);
 }, function(date, step) {
   date.setTime(+date + step * durationMinute);
 }, function(start, end) {

diff --git a/src/second.js b/src/second.js
@@ -2,7 +2,7 @@ import interval from "./interval";
 import {durationSecond} from "./duration";
 
 var second = interval(function(date) {
-  date.setTime(Math.floor(date / durationSecond) * durationSecond);
+  date.setTime(date - date.getMilliseconds());
 }, function(date, step) {
   date.setTime(+date + step * durationSecond);
 }, function(start, end) {