Moved waypoint methods to NavScene class from NavView class.