Verify trip status

CLAUDE.md

@@ -220,9 +220,10 @@ dateStr, parsedTime, fieldErrors, ok := utils.ParseTimeParameter(timeParam, loca
 ### Vehicle Status (`internal/restapi/vehicles_helper.go`)
 
 ```go
-// Convert GTFS-RT status to OneBusAway format
+// Convert GTFS-RT schedule relationship to OneBusAway status and phase
 status, phase := GetVehicleStatusAndPhase(vehicle)
-// Returns: ("IN_TRANSIT_TO", "in_progress"), ("STOPPED_AT", "stopped"), etc.
+// Returns: ("SCHEDULED", "in_progress"), ("CANCELED", ""), ("ADDED", "in_progress"), ("DUPLICATED", "in_progress")
+// For nil vehicle: ("default", "scheduled")
 ```
 
 ## Database Management

go.mod

@@ -3,7 +3,7 @@ module maglev.onebusaway.org
 go 1.24.2
 
 require (
-	github.com/OneBusAway/go-gtfs v1.1.0
+	github.com/OneBusAway/go-gtfs v1.1.1
 	github.com/davecgh/go-spew v1.1.1
 	github.com/google/uuid v1.6.0
 	github.com/klauspost/compress v1.18.0

go.sum

@@ -3,8 +3,8 @@ cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OneBusAway/go-gtfs v1.1.0 h1:oeiuHObV5tkFB8NFwb0TDvnAe1g/o3XGgKUZvgtMs5E=
-github.com/OneBusAway/go-gtfs v1.1.0/go.mod h1:MJqNyFOJs+iE1R6uerTyfBY6g3/sxvTvVdRhDeN1bu8=
+github.com/OneBusAway/go-gtfs v1.1.1 h1:JWl0ndXHBED6PAh8v3w0UgSDYWBg2OmHvAJb5RXX3Ss=
+github.com/OneBusAway/go-gtfs v1.1.1/go.mod h1:MJqNyFOJs+iE1R6uerTyfBY6g3/sxvTvVdRhDeN1bu8=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

gtfsdb/query.sql

@@ -629,16 +629,16 @@ ORDER BY
     s.shape_pt_sequence ASC;
 
 -- name: GetStopsWithShapeContextByIDs :many
-SELECT 
-    st.stop_id, 
-    t.shape_id, 
-    s.lat, 
-    s.lon, 
+SELECT
+    st.stop_id,
+    t.shape_id,
+    s.lat,
+    s.lon,
     st.shape_dist_traveled
 FROM stop_times st
 JOIN trips t ON st.trip_id = t.id
 JOIN stops s ON st.stop_id = s.id
-WHERE st.stop_id IN (sqlc.slice('stop_ids'));    
+WHERE st.stop_id IN (sqlc.slice('stop_ids'));
 
 -- name: GetTripsByBlockIDOrdered :many
 SELECT
@@ -984,7 +984,6 @@ WHERE t.block_id IN (sqlc.slice('block_ids'))
   AND t.service_id IN (sqlc.slice('service_ids'))
 GROUP BY t.id
 ORDER BY t.block_id, MIN(st.departure_time), t.id;
-
 -- Problem Report Queries
 
 -- name: CreateProblemReportTrip :exec

internal/gtfs/gtfs_manager_mock.go

@@ -1,6 +1,8 @@
 package gtfs
 
 import (
+	"time"
+
 	"github.com/OneBusAway/go-gtfs"
 )
 
@@ -29,13 +31,18 @@ func (m *Manager) MockAddRoute(id, agencyID, name string) {
 	})
 }
 func (m *Manager) MockAddVehicle(vehicleID, tripID, routeID string) {
+	m.realTimeMutex.Lock()
+	defer m.realTimeMutex.Unlock()
+
 	for _, v := range m.realTimeVehicles {
 		if v.ID.ID == vehicleID {
 			return
 		}
 	}
+	now := time.Now()
 	m.realTimeVehicles = append(m.realTimeVehicles, gtfs.Vehicle{
-		ID: &gtfs.VehicleID{ID: vehicleID},
+		ID:        &gtfs.VehicleID{ID: vehicleID},
+		Timestamp: &now,
 		Trip: &gtfs.Trip{
 			ID: gtfs.TripID{
 				ID:      tripID,
@@ -44,7 +51,51 @@ func (m *Manager) MockAddVehicle(vehicleID, tripID, routeID string) {
 		},
 	})
 
-	m.realTimeVehicleLookupByVehicle[vehicleID] = len(m.realTimeVehicles) - 1
+	idx := len(m.realTimeVehicles) - 1
+	m.realTimeVehicleLookupByVehicle[vehicleID] = idx
+	if tripID != "" {
+		m.realTimeVehicleLookupByTrip[tripID] = idx
+	}
+}
+
+type MockVehicleOptions struct {
+	Position            *gtfs.Position
+	CurrentStopSequence *uint32
+	StopID              *string
+	CurrentStatus       *gtfs.CurrentStatus
+}
+
+func (m *Manager) MockAddVehicleWithOptions(vehicleID, tripID, routeID string, opts MockVehicleOptions) {
+	m.realTimeMutex.Lock()
+	defer m.realTimeMutex.Unlock()
+
+	for _, v := range m.realTimeVehicles {
+		if v.ID.ID == vehicleID {
+			return
+		}
+	}
+	now := time.Now()
+	v := gtfs.Vehicle{
+		ID:        &gtfs.VehicleID{ID: vehicleID},
+		Timestamp: &now,
+		Trip: &gtfs.Trip{
+			ID: gtfs.TripID{
+				ID:      tripID,
+				RouteID: routeID,
+			},
+		},
+		Position:            opts.Position,
+		CurrentStopSequence: opts.CurrentStopSequence,
+		StopID:              opts.StopID,
+		CurrentStatus:       opts.CurrentStatus,
+	}
+	m.realTimeVehicles = append(m.realTimeVehicles, v)
+
+	idx := len(m.realTimeVehicles) - 1
+	m.realTimeVehicleLookupByVehicle[vehicleID] = idx
+	if tripID != "" {
+		m.realTimeVehicleLookupByTrip[tripID] = idx
+	}
 }
 
 func (m *Manager) MockAddTrip(tripID, agencyID, routeID string) {
@@ -58,3 +109,31 @@ func (m *Manager) MockAddTrip(tripID, agencyID, routeID string) {
 		Route: &gtfs.Route{Id: routeID},
 	})
 }
+
+func (m *Manager) MockAddTripUpdate(tripID string, delay *time.Duration, stopTimeUpdates []gtfs.StopTimeUpdate) {
+	m.realTimeMutex.Lock()
+	defer m.realTimeMutex.Unlock()
+
+	trip := gtfs.Trip{
+		ID:              gtfs.TripID{ID: tripID},
+		Delay:           delay,
+		StopTimeUpdates: stopTimeUpdates,
+	}
+	m.realTimeTrips = append(m.realTimeTrips, trip)
+	if m.realTimeTripLookup == nil {
+		m.realTimeTripLookup = make(map[string]int)
+	}
+	m.realTimeTripLookup[tripID] = len(m.realTimeTrips) - 1
+}
+
+// MockResetRealTimeData clears all mock real-time vehicles and trip updates.
+func (m *Manager) MockResetRealTimeData() {
+	m.realTimeMutex.Lock()
+	defer m.realTimeMutex.Unlock()
+
+	m.realTimeVehicles = nil
+	m.realTimeVehicleLookupByVehicle = make(map[string]int)
+	m.realTimeVehicleLookupByTrip = make(map[string]int)
+	m.realTimeTrips = nil
+	m.realTimeTripLookup = make(map[string]int)
+}

internal/restapi/block_distance_helper.go

@@ -59,10 +59,7 @@ func (api *RestAPI) getBlockDistanceToStop(ctx context.Context, targetTripID, ta
 		shapeRows, _ := api.GtfsManager.GtfsDB.Queries.GetShapePointsByTripID(ctx, blockTrip.ID)
 		totalDist := 0.0
 		if len(shapeRows) > 1 {
-			shapePoints := make([]gtfs.ShapePoint, len(shapeRows))
-			for i, sp := range shapeRows {
-				shapePoints[i] = gtfs.ShapePoint{Latitude: sp.Lat, Longitude: sp.Lon}
-			}
+			shapePoints := shapeRowsToPoints(shapeRows)
 			totalDist = preCalculateCumulativeDistances(shapePoints)[len(shapePoints)-1]
 		}
 

internal/restapi/block_handler.go

@@ -129,8 +129,8 @@ func transformBlockToEntry(block []gtfsdb.GetBlockDetailsRow, blockID, agencyID
 					BlockSequence:      int(stop.StopSequence - 1),
 					DistanceAlongBlock: blockDistance,
 					StopTime: models.StopTime{
-						ArrivalTime:   int(stop.ArrivalTime / 1e9),
-						DepartureTime: int(stop.DepartureTime / 1e9),
+						ArrivalTime:   int(utils.NanosToSeconds(stop.ArrivalTime)),
+						DepartureTime: int(utils.NanosToSeconds(stop.DepartureTime)),
 						DropOffType:   int(stop.DropOffType.Int64),
 						PickupType:    int(stop.PickupType.Int64),
 						StopID:        utils.FormCombinedID(agencyID, stop.StopID),

internal/restapi/schedule_for_route_handler.go

@@ -149,8 +149,8 @@ func (api *RestAPI) scheduleForRouteHandler(w http.ResponseWriter, r *http.Reque
 			}
 			stopTimesList := make([]models.RouteStopTime, 0, len(stopTimes))
 			for _, st := range stopTimes {
-				arrivalSec := int(st.ArrivalTime / 1e9)
-				departureSec := int(st.DepartureTime / 1e9)
+				arrivalSec := int(utils.NanosToSeconds(st.ArrivalTime))
+				departureSec := int(utils.NanosToSeconds(st.DepartureTime))
 				stopTimesList = append(stopTimesList, models.RouteStopTime{
 					ArrivalEnabled:   true,
 					ArrivalTime:      arrivalSec,

internal/restapi/shape_distance_helpers.go

@@ -4,8 +4,20 @@ import (
 	"context"
 
 	"github.com/OneBusAway/go-gtfs"
+	"maglev.onebusaway.org/gtfsdb"
 )
 
+// shapeRowsToPoints converts database shape rows to gtfs.ShapePoint slice.
+// ShapeDistTraveled is intentionally dropped; cumulative distances are recomputed
+// from scratch via preCalculateCumulativeDistances to ensure consistency.
+func shapeRowsToPoints(rows []gtfsdb.Shape) []gtfs.ShapePoint {
+	pts := make([]gtfs.ShapePoint, len(rows))
+	for i, sp := range rows {
+		pts[i] = gtfs.ShapePoint{Latitude: sp.Lat, Longitude: sp.Lon}
+	}
+	return pts
+}
+
 // IMPORTANT: Caller must hold manager.RLock() before calling this method.
 func (api *RestAPI) getStopDistanceAlongShape(ctx context.Context, tripID, stopID string) float64 {
 	stopTimes, err := api.GtfsManager.GtfsDB.Queries.GetStopTimesForTrip(ctx, tripID)
@@ -27,10 +39,7 @@ func (api *RestAPI) getStopDistanceAlongShape(ctx context.Context, tripID, stopI
 		return 0
 	}
 
-	shapePoints := make([]gtfs.ShapePoint, len(shapeRows))
-	for i, sp := range shapeRows {
-		shapePoints[i] = gtfs.ShapePoint{Latitude: sp.Lat, Longitude: sp.Lon}
-	}
+	shapePoints := shapeRowsToPoints(shapeRows)
 
 	return getDistanceAlongShape(stop.Lat, stop.Lon, shapePoints)
 }
@@ -46,10 +55,7 @@ func (api *RestAPI) getVehicleDistanceAlongShapeContextual(ctx context.Context,
 		return 0
 	}
 
-	shapePoints := make([]gtfs.ShapePoint, len(shapeRows))
-	for i, sp := range shapeRows {
-		shapePoints[i] = gtfs.ShapePoint{Latitude: sp.Lat, Longitude: sp.Lon}
-	}
+	shapePoints := shapeRowsToPoints(shapeRows)
 
 	lat := float64(*vehicle.Position.Latitude)
 	lon := float64(*vehicle.Position.Longitude)