Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
bahn-api
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
bahn-api
Commits
86c6ad87
Commit
86c6ad87
authored
6 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Implement suggestions API
parent
6148fdea
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
client.go
+43
-9
43 additions, 9 deletions
client.go
external_suggestion.go
+81
-0
81 additions, 0 deletions
external_suggestion.go
model_suggestion.go
+16
-0
16 additions, 0 deletions
model_suggestion.go
with
140 additions
and
9 deletions
client.go
+
43
−
9
View file @
86c6ad87
...
...
@@ -4,11 +4,14 @@ import (
"fmt"
"net/http"
"time"
"net/url"
)
type
ApiClient
struct
{
IrisBaseUrl
string
CoachSequenceBaseUrl
string
HafasBaseUrl
string
HttpClient
*
http
.
Client
}
...
...
@@ -62,12 +65,12 @@ func (c *ApiClient) Timetable(evaId int64, date time.Time) (Timetable, error) {
func
(
c
*
ApiClient
)
RealtimeAll
(
evaId
int64
,
date
time
.
Time
)
(
Timetable
,
error
)
{
var
err
error
ur
l
:=
fmt
.
Sprintf
(
"%s/timetable/fchg/%d"
,
c
.
IrisBaseUrl
,
evaId
)
ur
i
:=
fmt
.
Sprintf
(
"%s/timetable/fchg/%d"
,
c
.
IrisBaseUrl
,
evaId
)
var
timetable
Timetable
var
response
*
http
.
Response
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
l
);
err
!=
nil
{
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
i
);
err
!=
nil
{
return
timetable
,
err
}
...
...
@@ -85,12 +88,12 @@ func (c *ApiClient) RealtimeAll(evaId int64, date time.Time) (Timetable, error)
func
(
c
*
ApiClient
)
RealtimeRecent
(
evaId
int64
,
date
time
.
Time
)
(
Timetable
,
error
)
{
var
err
error
ur
l
:=
fmt
.
Sprintf
(
"%s/timetable/rchg/%d"
,
c
.
IrisBaseUrl
,
evaId
)
ur
i
:=
fmt
.
Sprintf
(
"%s/timetable/rchg/%d"
,
c
.
IrisBaseUrl
,
evaId
)
var
timetable
Timetable
var
response
*
http
.
Response
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
l
);
err
!=
nil
{
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
i
);
err
!=
nil
{
return
timetable
,
err
}
...
...
@@ -108,12 +111,12 @@ func (c *ApiClient) RealtimeRecent(evaId int64, date time.Time) (Timetable, erro
func
(
c
*
ApiClient
)
WingDefinition
(
parent
string
,
wing
string
)
(
WingDefinition
,
error
)
{
var
err
error
ur
l
:=
fmt
.
Sprintf
(
"%s/timetable/wingdef/%s/%s"
,
c
.
IrisBaseUrl
,
parent
,
wing
)
ur
i
:=
fmt
.
Sprintf
(
"%s/timetable/wingdef/%s/%s"
,
c
.
IrisBaseUrl
,
parent
,
wing
)
var
wingDefinition
WingDefinition
var
response
*
http
.
Response
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
l
);
err
!=
nil
{
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
i
);
err
!=
nil
{
return
wingDefinition
,
err
}
...
...
@@ -131,12 +134,12 @@ func (c *ApiClient) WingDefinition(parent string, wing string) (WingDefinition,
func
(
c
*
ApiClient
)
CoachSequence
(
line
string
,
date
time
.
Time
)
(
CoachSequence
,
error
)
{
var
err
error
ur
l
:=
fmt
.
Sprintf
(
"%s/%s/%s"
,
c
.
CoachSequenceBaseUrl
,
line
,
date
.
Format
(
TimeLayoutShort
))
ur
i
:=
fmt
.
Sprintf
(
"%s/%s/%s"
,
c
.
CoachSequenceBaseUrl
,
line
,
date
.
Format
(
TimeLayoutShort
))
var
coachSequence
CoachSequence
var
response
*
http
.
Response
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
l
);
err
!=
nil
{
if
response
,
err
=
c
.
HttpClient
.
Get
(
ur
i
);
err
!=
nil
{
return
coachSequence
,
err
}
...
...
@@ -150,3 +153,34 @@ func (c *ApiClient) CoachSequence(line string, date time.Time) (CoachSequence, e
return
coachSequence
,
err
}
func
(
c
*
ApiClient
)
Suggestions
(
line
string
,
date
time
.
Time
)
([]
Suggestion
,
error
)
{
var
err
error
uri
:=
fmt
.
Sprintf
(
"%s/trainsearch.exe/dn"
,
c
.
HafasBaseUrl
)
var
suggestions
[]
Suggestion
DateFormat
:=
"02.01.2006"
body
:=
url
.
Values
{
"maxResults"
:
[]
string
{
"50"
},
"trainname"
:
[]
string
{
line
},
"date"
:
[]
string
{
date
.
Format
(
DateFormat
)},
"L"
:
[]
string
{
"vs_json.vs_hap"
},
}
var
response
*
http
.
Response
if
response
,
err
=
c
.
HttpClient
.
PostForm
(
uri
,
body
);
err
!=
nil
{
return
suggestions
,
err
}
if
suggestions
,
err
=
SuggestionsFromReader
(
response
.
Body
);
err
!=
nil
{
return
suggestions
,
err
}
if
err
=
response
.
Body
.
Close
();
err
!=
nil
{
return
suggestions
,
err
}
return
suggestions
,
err
}
This diff is collapsed.
Click to expand it.
external_suggestion.go
0 → 100644
+
81
−
0
View file @
86c6ad87
package
bahn
import
(
"encoding/json"
"io"
"time"
)
func
SuggestionsFromReader
(
source
io
.
Reader
)
([]
Suggestion
,
error
)
{
var
raw
rawSuggestions
if
err
:=
json
.
NewDecoder
(
source
)
.
Decode
(
&
raw
);
err
!=
nil
{
return
make
([]
Suggestion
,
0
),
err
}
return
parseSuggestions
(
raw
),
nil
}
func
SuggestionsFromBytes
(
source
[]
byte
)
([]
Suggestion
,
error
)
{
var
raw
rawSuggestions
if
err
:=
json
.
Unmarshal
(
source
,
&
raw
);
err
!=
nil
{
return
make
([]
Suggestion
,
0
),
err
}
return
parseSuggestions
(
raw
),
nil
}
type
rawSuggestions
struct
{
Suggestions
[]
rawSuggestion
}
func
parseSuggestions
(
data
rawSuggestions
)
[]
Suggestion
{
result
:=
make
([]
Suggestion
,
len
(
data
.
Suggestions
))
for
i
,
element
:=
range
data
.
Suggestions
{
result
[
i
]
=
parseSuggestion
(
element
)
}
return
result
}
type
rawSuggestion
struct
{
Value
string
`json:"value"`
Cycle
string
`json:"cycle"`
Pool
string
`json:"pool"`
Id
string
`json:"id"`
TrainLink
string
`json:"trainLink"`
JourneyParams
string
`json:"journParam"`
PublishedTime
string
`json:"pubTime"`
PublishedDate
string
`json:"pubDate"`
DepartureStation
string
`json:"dep"`
DepartureDate
string
`json:"depDate"`
DepartureTime
string
`json:"depTime"`
ArrivalStation
string
`json:"arr"`
ArrivalTime
string
`json:"arrTime"`
ArrivalDate
string
`json:"arrDate"`
}
func
parseTime
(
dateStr
string
,
timeStr
string
)
*
time
.
Time
{
DateFormat
:=
"02.01.2006"
DateTimeFormat
:=
"02.01.2006 15:04"
if
dateStr
==
""
{
dateStr
=
time
.
Now
()
.
Format
(
DateFormat
)
}
dateTime
,
err
:=
time
.
Parse
(
DateTimeFormat
,
dateStr
+
" "
+
timeStr
)
if
err
!=
nil
{
return
nil
}
return
&
dateTime
}
func
parseSuggestion
(
data
rawSuggestion
)
Suggestion
{
return
Suggestion
{
Value
:
data
.
Value
,
Cycle
:
data
.
Cycle
,
Pool
:
data
.
Pool
,
Id
:
data
.
Id
,
TrainLink
:
data
.
TrainLink
,
PublishedTime
:
parseTime
(
data
.
PublishedDate
,
data
.
PublishedTime
),
DepartureStation
:
data
.
DepartureStation
,
DepartureTime
:
parseTime
(
data
.
DepartureDate
,
data
.
DepartureTime
),
ArrivalStation
:
data
.
ArrivalStation
,
ArrivalTime
:
parseTime
(
data
.
ArrivalDate
,
data
.
ArrivalTime
),
}
}
This diff is collapsed.
Click to expand it.
model_suggestion.go
0 → 100644
+
16
−
0
View file @
86c6ad87
package
bahn
import
"time"
type
Suggestion
struct
{
Value
string
Cycle
string
Pool
string
Id
string
TrainLink
string
PublishedTime
*
time
.
Time
DepartureStation
string
DepartureTime
*
time
.
Time
ArrivalStation
string
ArrivalTime
*
time
.
Time
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment