nemunaire/idfm-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Fix rer display and add missions
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
nemunaire 2024-07-27 10:37:24 +02:00
parent e648d083f8
commit 9238097b41
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/schedules.go
View File

@ -79,6 +79,7 @@ type IDFMRealTime struct {
type PGSchedule struct { type PGSchedule struct {
Destination string `json:"destination"` Destination string `json:"destination"`
Mission string `json:"mission,omitempty"`
Message string `json:"message"` Message string `json:"message"`
} }
@ -172,9 +173,19 @@ func declareSchedulesRoutes(router *gin.RouterGroup) {
pgs := []PGSchedule{} pgs := []PGSchedule{}
for _, vehicule := range schedules { for _, vehicule := range schedules {
msg := vehicule.MonitoredVehicleJourney.MonitoredCall.ExpectedDepartureTime.String() var msg string
var mission string
if t == "metro" || t == "bus" || t == "noctiliens" || t == "tramway" { if vehicule.MonitoredVehicleJourney.MonitoredCall.DepartureStatus != "onTime" {
log.Println("DepartureStatus =", vehicule.MonitoredVehicleJourney.MonitoredCall.DepartureStatus)
}
if t == "rail" {
msg = vehicule.MonitoredVehicleJourney.MonitoredCall.ExpectedDepartureTime.Format("15:04")
if len(vehicule.MonitoredVehicleJourney.JourneyNote) > 0 {
mission = vehicule.MonitoredVehicleJourney.JourneyNote[0].Value
}
} else if t == "metro" || t == "bus" || t == "noctiliens" || t == "tramway" {
if vehicule.MonitoredVehicleJourney.MonitoredCall.VehicleAtStop { if vehicule.MonitoredVehicleJourney.MonitoredCall.VehicleAtStop {
if t == "metro" { if t == "metro" {
msg = "Train à quai" msg = "Train à quai"
@ -190,10 +201,13 @@ func declareSchedulesRoutes(router *gin.RouterGroup) {
} else { } else {
msg = fmt.Sprintf("%d mn", int(math.Floor(time.Until(vehicule.MonitoredVehicleJourney.MonitoredCall.ExpectedDepartureTime).Minutes()))) msg = fmt.Sprintf("%d mn", int(math.Floor(time.Until(vehicule.MonitoredVehicleJourney.MonitoredCall.ExpectedDepartureTime).Minutes())))
} }
} else {
msg = vehicule.MonitoredVehicleJourney.MonitoredCall.ExpectedDepartureTime.String()
} }
pgs = append(pgs, PGSchedule{ pgs = append(pgs, PGSchedule{
Destination: vehicule.MonitoredVehicleJourney.MonitoredCall.DestinationDisplay[0].Value, Destination: vehicule.MonitoredVehicleJourney.MonitoredCall.DestinationDisplay[0].Value,
Mission: mission,
Message: msg, Message: msg,
}) })
} }