Commit 3a1ab422 authored by Volker Krause's avatar Volker Krause
Browse files

Slightly more clever navigation path merging

parent dbb9c01e
Pipeline #94379 passed with stage
in 2 minutes and 12 seconds
......@@ -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);
......
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