GTFS Route Planner
-
-
-
-
-
-
-
-
-
- {(error || stopsError || routesError) &&
{error || (stopsError ? "Failed to load stops: " + stopsError.message : "Failed to find route: " + routesError)}
}
- {routes.length > 0 && (
-
-
- Routes from {from.name} to {to.name}
-
- {/* {routes.length > 1 && (
-
- {routes.map((_, index) => (
-
- ))}
-
- )} */}
-
- {/* {routes[selectedRouteIndex]?.legs &&
- routes[selectedRouteIndex].legs.length > 0 && (
-
- {routes[selectedRouteIndex].legs.map((leg, index) => {
- const trip = leg.trip;
- return (
-
-
- Leg {index + 1}:{" "}
- {trip?.trip_short_name ?? trip.route_id} by{" "}
- {leg.agency?.agency_name}
-
-
- From: {leg.from?.stop_name} To: {leg.to?.stop_name}
-
-
- Departure:{" "}
- {new Date(leg.departure_time).toLocaleString()}
-
-
- Arrival: {new Date(leg.arrival_time).toLocaleString()}
-
-
- {leg.stops?.map((stopId) => {
- const stop = stops.find(
- (s) => s.stop_id === stopId,
- );
- return (
- -
- {stop?.stop_name || stopId}
-
- );
- })}
-
- {/* {index < routes[selectedRouteIndex].legs.length - 1 && (
-
- Transfer at{" "}
- {stops.find((s) => s.stop_id === leg.to)?.stop_name ||
- leg.to}
-
- )} }
-
- );
- })}
-
- )}*/}
-
- )}
+
+
+
+ {mode === "plan" && (
+
+
+
+
+
+
+
+
+
+ {(error || stopsError || routesError) &&
{error || (stopsError ? "Failed to load stops: " + stopsError.message : "Failed to find route: " + routesError)}
}
+ {routes.length > 0 && (
+
+
+ Routes from {from.name} to {to.name}
+
+ {routes.length > 1 && (
+
+ {routes.map((_, index) => (
+
+ ))}
+
+ )}
+
+ {routes[selectedRouteIndex]?.legs &&
+ routes[selectedRouteIndex].legs.length > 0 && (
+
+ {routes[selectedRouteIndex].legs.map((leg, index) => {
+
+ const trip = leg.trip;
+ console.log(leg)
+ return (
+
+
+ Leg {index + 1}:{" "}
+ {trip?.trip_short_name ?? trip.route_id} by{" "}
+ {trip.agency_name}
+
+
+ From: {leg.start?.stop.stop_name} To: {leg.end?.stop?.stop_name}
+
+
+ Departure:{" "}
+ {asTimeString(leg.start.departure_time)}
+
+
+ Arrival: {asTimeString(leg.end.arrival_time)}
+
+
+ {trip.stops?.map((stopId, idx) => {
+ const stop = stops.find(
+ (s) => s.stop_id === stopId,
+ );
+ const isStart = index === 0 && idx === 0;
+ const isEnd = index === routes[selectedRouteIndex].legs.length - 1 && idx === trip.stops.length - 1;
+ const isCurrent = isStart || isEnd;
+ return (
+ -
+ {stop?.stop_name || stopId}
+
+ );
+ })}
+
+ {index < routes[selectedRouteIndex].legs.length - 1 && (
+
+ Transfer at{" "}
+ {stops.find((s) => s.stop_id === leg.to)?.stop_name ||
+ leg.to}
+
+ )}
+
+ );
+ })}
+
+
+ )}
+
+ )}
+
+ )}
+ {mode === "explore" && (
+
+
+
+
+
+ {(tripsError || stopsError) &&
{tripsError ? "Failed to load trips: " + tripsError : "Failed to load stops: " + stopsError}
}
+ {tripsLoading &&
Loading trips...
}
+ {trips.length > 0 && (
+
+
Trips from {exploreStop.name}
+ {trips.slice(0, 10).map((trip, index) => {
+ const tripStops = trip.stops.map(s => stops.find(st => st.stop_id === s.stop_id)).filter(Boolean);
+ return (
+
+
{trip.headsign || trip.short_name} ({trip.route_id}) by {trip.agency_name}
+
+ {trip.stops.map((stop, idx) => (
+ - {
+ setExploreStop({ id: stop.stop_id, name: stop.stop_name });
+ setExploreTime(secondsToDateTime(stop.departure_time));
+ }}>
+ {asTimeString(stop.arrival_time)} - {stop.stop_name}
+
+ ))}
+
+
+
+ );
+ })}
+
+ )}
+
+ )}
);
}
diff --git a/pkg/reader/loader.go b/pkg/reader/loader.go
index 0ccd749..0cf3fa8 100644
--- a/pkg/reader/loader.go
+++ b/pkg/reader/loader.go
@@ -41,8 +41,8 @@ func LoadTripData(path string) (*TripData, error) {
err = ParseRoutes(f, func(r types.Route) {
tp.Routes[r.RouteID] = &r
if ag, ok := tp.Agencies[r.AgencyID]; ok {
- r.Agency = ag
- ag.AddRoute(&r)
+ r.SetAgency(ag)
+ // ag.AddRoute(&r)
}
})
case "stops":
@@ -88,7 +88,7 @@ func LoadTripData(path string) (*TripData, error) {
//transfers = append(transfers, tr)
stop, ok := tp.Stops[tr.FromStopId]
if ok {
- stop.AddTransfer(&tr)
+ stop.AddTransfer(&tr, tp.Stops[tr.ToStopId])
} else {
log.Printf("stop %s not found for transfer", tr.FromStopId)
}
diff --git a/pkg/types/agency.go b/pkg/types/agency.go
index 3ba64f3..994b386 100644
--- a/pkg/types/agency.go
+++ b/pkg/types/agency.go
@@ -6,12 +6,12 @@ type Agency struct {
AgencyURL string `json:"agency_url" csv:"agency_url"`
AgencyTimezone string `json:"agency_timezone" csv:"agency_timezone"`
AgencyLang string `json:"agency_lang" csv:"agency_lang"`
- Routes map[string]*Route
+ //Routes map[string]*Route
}
-func (a *Agency) AddRoute(route *Route) {
- if a.Routes == nil {
- a.Routes = make(map[string]*Route)
- }
- a.Routes[route.RouteID] = route
-}
+// func (a *Agency) AddRoute(route *Route) {
+// if a.Routes == nil {
+// a.Routes = make(map[string]*Route)
+// }
+// a.Routes[route.RouteID] = route
+// }
diff --git a/pkg/types/route.go b/pkg/types/route.go
index 3183e53..e1af08f 100644
--- a/pkg/types/route.go
+++ b/pkg/types/route.go
@@ -1,10 +1,10 @@
package types
type Route struct {
- Agency *Agency `json:"agency" csv:"agency"`
+ Agency *Agency `json:"agency" csv:"-"`
Trips []*Trip `json:"trips" csv:"trips"`
- RouteID string `json:"route_id" csv:"route_id"`
- AgencyID string `json:"agency_id" csv:"agency_id"`
+ RouteId string `json:"route_id" csv:"route_id"`
+ AgencyId string `json:"agency_id" csv:"agency_id"`
RouteShortName string `json:"route_short_name" csv:"route_short_name"`
RouteLongName string `json:"route_long_name" csv:"route_long_name"`
RouteType int `json:"route_type" csv:"route_type"`
diff --git a/pkg/types/stop.go b/pkg/types/stop.go
index bcfd5d7..acef80e 100644
--- a/pkg/types/stop.go
+++ b/pkg/types/stop.go
@@ -16,7 +16,8 @@ type Stop struct {
Transfers []*Transfer `json:"-" csv:"transfers"`
}
-func (s *Stop) AddTransfer(transfer *Transfer) {
+func (s *Stop) AddTransfer(transfer *Transfer, toStop *Stop) {
+ transfer.ToStop = toStop
if s.Transfers == nil {
s.Transfers = make([]*Transfer, 0)
}
@@ -24,7 +25,6 @@ func (s *Stop) AddTransfer(transfer *Transfer) {
}
func (s *Stop) AddTrip(trip *Trip) {
-
s.Trips[trip.TripId] = trip
}
@@ -39,7 +39,7 @@ func (s *Stop) GetTripsAfter(when time.Time) iter.Seq[*TripWithDepartureTime] {
for _, trip := range s.Trips {
for _, stop := range trip.Stops {
- if stop.StopId == s.StopId && stop.ArrivalTime >= startAfterMidnight {
+ if stop.StopId == s.StopId && stop.ArrivalTime >= startAfterMidnight && stop.PickupType == 0 {
if !yield(&TripWithDepartureTime{Trip: trip, DepartureTime: stop.DepartureTime}) {
return
@@ -86,21 +86,44 @@ func (s *Stop) GetUpcomingStops(start *StopTime) iter.Seq[*StopTime] {
func (s *Stop) GetStopsAfter(when time.Time) iter.Seq2[*StopTime, *StopTime] {
startAfterMidnight := AsSecondsAfterMidnight(when)
+ var first *StopTime
return func(yield func(start, stop *StopTime) bool) {
for _, trip := range s.Trips {
- found := false
+ found := -1
var start *StopTime
for _, stop := range trip.Stops {
if stop.StopId == s.StopId && stop.ArrivalTime >= startAfterMidnight {
- found = true
+ found = stop.StopSequence
start = stop
+ if first == nil || start.ArrivalTime < first.ArrivalTime {
+ first = start
+ }
}
- if found {
+ if found != -1 && stop.StopSequence > found && stop.PickupType == 0 {
if !yield(start, stop) {
return
}
}
}
+
+ }
+ if first == nil {
+ return
+ }
+ for _, transfer := range s.Transfers {
+ if transfer.FromStopId == s.StopId {
+
+ if !yield(first, &StopTime{
+ Stop: transfer.ToStop,
+ TripId: "transfer",
+ ArrivalTime: startAfterMidnight + SecondsAfterMidnight(transfer.MinTransferTime),
+ DepartureTime: startAfterMidnight + SecondsAfterMidnight(transfer.MinTransferTime),
+ StopId: transfer.ToStopId,
+ }) {
+ return
+ }
+
+ }
}
}
diff --git a/pkg/types/transfer.go b/pkg/types/transfer.go
index 6f600b2..d60ca74 100644
--- a/pkg/types/transfer.go
+++ b/pkg/types/transfer.go
@@ -1,6 +1,7 @@
package types
type Transfer struct {
+ ToStop *Stop `json:"-" csv:"-"`
FromStopId string `json:"from_stop_id" csv:"from_stop_id"`
ToStopId string `json:"to_stop_id" csv:"to_stop_id"`
TransferType int `json:"transfer_type" csv:"transfer_type"`
diff --git a/pkg/types/trip.go b/pkg/types/trip.go
index 6648174..1d4b6e7 100644
--- a/pkg/types/trip.go
+++ b/pkg/types/trip.go
@@ -42,7 +42,28 @@ func (t *Trip) AddStopTime(stopTime *StopTime) {
if t.Stops == nil {
t.Stops = make([]*StopTime, 0)
}
- t.Stops = append(t.Stops, stopTime)
+ // Find the index to insert based on StopSequence
+ idx := 0
+ for i, st := range t.Stops {
+ if stopTime.StopSequence < st.StopSequence {
+ idx = i
+ break
+ }
+ idx = i + 1
+ }
+ // Insert at the correct position
+ t.Stops = append(t.Stops[:idx], append([]*StopTime{stopTime}, t.Stops[idx:]...)...)
+ // Adjust times if necessary for next-day continuation
+ for i := idx; i < len(t.Stops)-1; i++ {
+ curr := t.Stops[i]
+ next := t.Stops[i+1]
+ if next.ArrivalTime < curr.ArrivalTime {
+ next.ArrivalTime += 86400
+ }
+ if next.DepartureTime < curr.DepartureTime {
+ next.DepartureTime += 86400
+ }
+ }
}
func (t *Trip) Has(stop *Stop) (*StopTime, bool) {