Make get_journey return the waypoints too