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
3a1ab422
Commit
3a1ab422
authored
Nov 05, 2021
by
Volker Krause
Browse files
Slightly more clever navigation path merging
parent
dbb9c01e
Pipeline
#94379
passed with stage
in 2 minutes and 12 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/lib/datatypes/journey.cpp
View file @
3a1ab422
...
...
@@ -444,7 +444,7 @@ JourneySection JourneySection::merge(const JourneySection &lhs, const JourneySec
res
.
d
->
loadInformation
=
LoadUtil
::
merge
(
lhs
.
d
->
loadInformation
,
rhs
.
d
->
loadInformation
);
res
.
d
->
rentalVehicle
=
RentalVehicleUtil
::
merge
(
lhs
.
d
->
rentalVehicle
,
rhs
.
d
->
rentalVehicle
);
res
.
d
->
path
=
lhs
.
d
->
path
.
isEmpty
()
?
rhs
.
d
->
path
:
lhs
.
d
->
path
;
res
.
d
->
path
=
lhs
.
d
->
path
.
sections
().
size
()
<
rhs
.
d
->
path
.
sections
().
size
()
?
rhs
.
d
->
path
:
lhs
.
d
->
path
;
res
.
d
->
departureVehicleLayout
=
Vehicle
::
merge
(
lhs
.
d
->
departureVehicleLayout
,
rhs
.
d
->
departureVehicleLayout
);
res
.
d
->
departurePlatformLayout
=
Platform
::
merge
(
lhs
.
d
->
departurePlatformLayout
,
rhs
.
d
->
departurePlatformLayout
);
...
...
Write
Preview
Supports
Markdown
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