Improve passenger pickup/drop handling

handler/search.go

@@ -7,11 +7,14 @@ import (
 	"git.coopgo.io/coopgo-platform/carpool-service/internal"
 	"git.coopgo.io/coopgo-platform/routing-service/encoding/polylines"
 	"github.com/paulmach/orb"
+	"github.com/paulmach/orb/geojson"
 	"github.com/rs/zerolog/log"
 )
 
 // GetDriverJourneys searches for matching punctual planned driver journeys.
-func (h *CarpoolServiceHandler) GetDriverJourneys(departure orb.Point, arrival orb.Point, departureRadius *float64, arrivalRadius *float64, minDate time.Time, maxDate time.Time, count *int64) ([]internal.PlannedRouteSchedule, error) {
+func (h *CarpoolServiceHandler) GetDriverJourneys(departureFeature *geojson.Feature, arrivalFeature *geojson.Feature, departureRadius *float64, arrivalRadius *float64, minDate time.Time, maxDate time.Time, count *int64) ([]internal.PlannedRouteSchedule, error) {
+	departure := departureFeature.Point()
+	arrival := arrivalFeature.Point()
 	log.Debug().
 		Any("departure", departure).
 		Any("arrival", arrival).
@@ -69,11 +72,14 @@ func (h *CarpoolServiceHandler) GetDriverJourneys(departure orb.Point, arrival o
 				log.Error().Err(err).Msg("error getting route with viapoints")
 				continue
 			}
+
 			journeys = append(journeys, internal.PlannedRouteSchedule{
-				ID:            r.ID,
-				Route:         r.Route,
-				DepartureDate: r.DepartureDate,
-				Itinerary:     itinerary,
+				ID:              r.ID,
+				Route:           r.Route,
+				DepartureDate:   r.DepartureDate,
+				Itinerary:       itinerary,
+				PassengerPickup: departureFeature,
+				PassengerDrop:   arrivalFeature,
 			})
 			counted = counted + 1
 			if counted == *count {