Waypoints instead of Track

https://www.openstreetmap.org/user/efes/diary/2452