Reimplement route waypoint reorder