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
83b44639
Commit
83b44639
authored
Mar 03, 2021
by
Volker Krause
Browse files
Consider vehicle section platform section names during merging
parent
8365064f
Changes
1
Show whitespace changes
Inline
Side-by-side
src/lib/datatypes/vehicle.cpp
View file @
83b44639
...
...
@@ -71,6 +71,7 @@ VehicleSection VehicleSection::merge(const VehicleSection &lhs, const VehicleSec
res
.
setFeatures
(
lhs
.
features
()
|
rhs
.
features
());
res
.
setDeckCount
(
std
::
max
(
lhs
.
deckCount
(),
rhs
.
deckCount
()));
res
.
setConnectedSides
(
lhs
.
connectedSides
()
&
rhs
.
connectedSides
());
res
.
setPlatformSectionName
(
MergeUtil
::
mergeString
(
lhs
.
platformSectionName
(),
rhs
.
platformSectionName
()));
return
res
;
}
...
...
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