Refactoring waypoint II.
Tweak for DST, enlarge size of x-time window.