[BUG #8607] fixed waypoint calculation (used by picker)