don't show wrong way around departures in planner

pkg/dataaggregator/source/journeyplanner/journeyplan.go

@@ -4,6 +4,7 @@ import (
 	"sort"
 	"time"
 
+	"github.com/kr/pretty"
 	"github.com/travigo/travigo/pkg/ctdf"
 	"github.com/travigo/travigo/pkg/dataaggregator"
 	"github.com/travigo/travigo/pkg/dataaggregator/query"
@@ -20,7 +21,7 @@ func (s Source) JourneyPlanQuery(q query.JourneyPlan) (*ctdf.JourneyPlanResults,
 
 	departureBoard, err := dataaggregator.Lookup[[]*ctdf.DepartureBoard](query.DepartureBoard{
 		Stop:          q.OriginStop,
-		Count:         q.Count,
+		Count:         q.Count * 4,
 		StartDateTime: q.StartDateTime,
 		Filter:        &bson.M{"path.destinationstopref": q.DestinationStop.PrimaryIdentifier},
 	})
@@ -34,23 +35,32 @@ func (s Source) JourneyPlanQuery(q query.JourneyPlan) (*ctdf.JourneyPlanResults,
 		return departureBoard[i].Time.Before(departureBoard[j].Time)
 	})
 
-	// Once sorted cut off any records higher than our max count
-	if len(departureBoard) > q.Count {
-		departureBoard = departureBoard[:q.Count]
-	}
-
 	// Turn the departure board into a journey plan
 	journeyPlanResults := &ctdf.JourneyPlanResults{
 		JourneyPlans:    []ctdf.JourneyPlan{},
 		OriginStop:      *q.OriginStop,
 		DestinationStop: *q.DestinationStop,
 	}
 
+	currentFound := 0
+
 	for _, departure := range departureBoard {
+		if currentFound >= q.Count {
+			break
+		}
+
 		startTime := departure.Time
 		var arrivalTime time.Time
 
+		seenOrigin := false
+
 		for _, item := range departure.Journey.Path {
+			pretty.Println(item.OriginStopRef, q.OriginStop.PrimaryIdentifier, q.OriginStop.OtherIdentifiers)
+			if item.OriginStopRef == q.OriginStop.PrimaryIdentifier || slices.Contains[[]string](q.OriginStop.OtherIdentifiers, item.OriginStopRef) {
+				pretty.Println("cum")
+				seenOrigin = true
+			}
+
 			if item.DestinationStopRef == q.DestinationStop.PrimaryIdentifier || slices.Contains[[]string](q.DestinationStop.OtherIdentifiers, item.DestinationStopRef) {
 				refTime := item.DestinationArrivalTime
 				dateTime := q.StartDateTime
@@ -65,6 +75,11 @@ func (s Source) JourneyPlanQuery(q query.JourneyPlan) (*ctdf.JourneyPlanResults,
 			}
 		}
 
+		// If we've not seen origin by the time we've seen destination then this journey is running in the wrong direction
+		if !seenOrigin {
+			continue
+		}
+
 		journeyPlan := ctdf.JourneyPlan{
 			RouteItems: []ctdf.JourneyPlanRouteItem{
 				{
@@ -82,6 +97,7 @@ func (s Source) JourneyPlanQuery(q query.JourneyPlan) (*ctdf.JourneyPlanResults,
 		}
 
 		journeyPlanResults.JourneyPlans = append(journeyPlanResults.JourneyPlans, journeyPlan)
+		currentFound += 1
 	}
 
 	return journeyPlanResults, nil