Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Libraries
KPublicTransport
Commits
5a894a46
Commit
5a894a46
authored
Jun 10, 2021
by
Volker Krause
Browse files
Also set location types in vehicle layout parsers
parent
a8a65d0c
Pipeline
#65179
passed with stage
in 25 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
autotests/data/deutschebahn/double-deck-ic-departure.json
View file @
5a894a46
...
...
@@ -54,7 +54,8 @@
"identifier"
:
{
"ibnr"
:
"8010205"
},
"name"
:
"Leipzig Hbf"
"name"
:
"Leipzig Hbf"
,
"type"
:
"Stop"
},
"vehicleLayout"
:
{
"direction"
:
"Backward"
,
...
...
autotests/data/deutschebahn/double-segment-ice-departure.json
View file @
5a894a46
...
...
@@ -54,7 +54,8 @@
"identifier"
:
{
"ibnr"
:
"8010205"
},
"name"
:
"Leipzig Hbf"
"name"
:
"Leipzig Hbf"
,
"type"
:
"Stop"
},
"vehicleLayout"
:
{
"direction"
:
"Backward"
,
...
...
autotests/data/deutschebahn/no-position-departure.json
View file @
5a894a46
...
...
@@ -16,7 +16,8 @@
"identifier"
:
{
"ibnr"
:
"8500010"
},
"name"
:
"Basel SBB"
"name"
:
"Basel SBB"
,
"type"
:
"Stop"
},
"vehicleLayout"
:
{
"direction"
:
"Backward"
,
...
...
autotests/data/oebb/ec-no-platform-sectors-departure.json
View file @
5a894a46
...
...
@@ -16,7 +16,8 @@
"identifier"
:
{
"ibnr"
:
"8103000"
},
"name"
:
"Wien Hbf"
"name"
:
"Wien Hbf"
,
"type"
:
"Stop"
},
"vehicleLayout"
:
{
"direction"
:
"Backward"
,
...
...
autotests/data/oebb/ice-empty-departure.json
View file @
5a894a46
...
...
@@ -16,6 +16,7 @@
"identifier"
:
{
"ibnr"
:
"8000261"
},
"name"
:
"München Hbf"
"name"
:
"München Hbf"
,
"type"
:
"Stop"
}
}
autotests/data/oebb/rj-forward-departure.json
View file @
5a894a46
...
...
@@ -44,7 +44,8 @@
"identifier"
:
{
"ibnr"
:
"8103000"
},
"name"
:
"Wien Hbf"
"name"
:
"Wien Hbf"
,
"type"
:
"Stop"
},
"vehicleLayout"
:
{
"direction"
:
"Forward"
,
...
...
src/lib/backends/deutschebahnvehiclelayoutparser.cpp
View file @
5a894a46
...
...
@@ -58,6 +58,7 @@ bool DeutscheBahnVehicleLayoutParser::parse(const QByteArray &data)
Location
stop
;
stop
.
setName
(
halt
.
value
(
QLatin1String
(
"bahnhofsname"
)).
toString
());
stop
.
setIdentifier
(
QStringLiteral
(
"ibnr"
),
halt
.
value
(
QLatin1String
(
"evanummer"
)).
toString
());
stop
.
setType
(
Location
::
Stop
);
Line
line
;
line
.
setMode
(
Line
::
LongDistanceTrain
);
line
.
setName
(
vehicle
.
name
());
...
...
src/lib/backends/oebbvehiclelayoutparser.cpp
View file @
5a894a46
...
...
@@ -133,6 +133,7 @@ bool OebbVehicleLayoutParser::parse(const QByteArray &data)
const
auto
trainStationObj
=
obj
.
value
(
QLatin1String
(
"trainStation"
)).
toObject
();
stop
.
setName
(
trainStationObj
.
value
(
QLatin1String
(
"name"
)).
toString
());
stop
.
setIdentifier
(
QStringLiteral
(
"ibnr"
),
trainStationObj
.
value
(
QLatin1String
(
"evaCode"
)).
toString
());
stop
.
setType
(
Location
::
Stop
);
Line
line
;
line
.
setMode
(
Line
::
LongDistanceTrain
);
// TODO is this actually true for ÖBB?
line
.
setName
(
obj
.
value
(
QLatin1String
(
"trainName"
)).
toString
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment