Corrected Waypoint ETA

Compute ETA along a waypoint track while allowing for current: the boat first cancels the cross-current component, and its remaining along-track speed is combined with the current's along-track component.