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
cb2e4a7a
Commit
cb2e4a7a
authored
Jul 23, 2021
by
Volker Krause
Browse files
Propagate merged line data to intermediate stops
parent
2d19050a
Pipeline
#71559
passed with stage
in 18 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/lib/datatypes/journey.cpp
View file @
cb2e4a7a
...
...
@@ -422,6 +422,7 @@ JourneySection JourneySection::merge(const JourneySection &lhs, const JourneySec
auto
stops
=
res
.
takeIntermediateStops
();
for
(
uint
i
=
0
;
i
<
stops
.
size
();
++
i
)
{
stops
[
i
]
=
Stopover
::
merge
(
stops
[
i
],
rhs
.
intermediateStops
()[
i
]);
stops
[
i
].
setRoute
(
res
.
route
());
}
res
.
setIntermediateStops
(
std
::
move
(
stops
));
}
...
...
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