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

Compare commits

base: nemunaire:9238097b41d4005542d797f78e1e563eb6ad9b8a
Branches Tags
nemunaire:master
nemunaire:renovate/golang.org-x-text-0.x
nemunaire:renovate/go-1.x
..
compare: nemunaire:3e39c5e5c041c69de982df5b6f45e95f7f257e3a
Branches Tags
nemunaire:renovate/golang.org-x-text-0.x
nemunaire:renovate/go-1.x
nemunaire:master

No commits in common. "9238097b41d4005542d797f78e1e563eb6ad9b8a" and "3e39c5e5c041c69de982df5b6f45e95f7f257e3a" have entirely different histories.
9238097b41 ... 3e39c5e5c0

2 changed files with 6 additions and 20 deletions
Show Stats Expand all files Collapse all files

4
api/lines.go
View File

@ -97,10 +97,6 @@ func convertLineType(old string) string {
}
}
func convertLineCode(code string) string {
return strings.TrimPrefix(strings.TrimSuffix(code, ":"), "STIF:Line::")
}
func searchLine(t, code string) string {
if t == "rer" {
for _, line := range IDFMLines {

22
api/schedules.go
View File

@ -79,10 +79,13 @@ type IDFMRealTime struct {
type PGSchedule struct {
Destination string `json:"destination"`
Mission string `json:"mission,omitempty"`
Message string `json:"message"`
}
func convertLineCode(code string) string {
return strings.TrimSuffix(code, ":")
}
func getRealTime(code string, stations []string) ([]IDFMMonitoredStopVisit, error) {
rurl, err := url.JoinPath(IDFM_BASEURL, "stop-monitoring")
if err != nil {
@ -173,19 +176,9 @@ func declareSchedulesRoutes(router *gin.RouterGroup) {
pgs := []PGSchedule{}
for _, vehicule := range schedules {
var msg string
var mission string
msg := vehicule.MonitoredVehicleJourney.MonitoredCall.ExpectedDepartureTime.String()
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 t == "metro" || t == "bus" || t == "noctiliens" || t == "tramway" {
if vehicule.MonitoredVehicleJourney.MonitoredCall.VehicleAtStop {
if t == "metro" {
msg = "Train à quai"
@ -201,13 +194,10 @@ func declareSchedulesRoutes(router *gin.RouterGroup) {
} else {
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{
Destination: vehicule.MonitoredVehicleJourney.MonitoredCall.DestinationDisplay[0].Value,
Mission: mission,
Message: msg,
})
}