Nest data by trip_id.

Note that this still has problems for trips that occur around midnight.