Commit 83b44639 authored by Volker Krause's avatar Volker Krause
Browse files

Consider vehicle section platform section names during merging

parent 8365064f
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment