fly/flightgear
1
0
Fork 0
Code Activity

Sorting parking candidates by size.

Browse source 
Ensures we only assign the smallest candidate parking, so tiny jets
don’t steal stands from A380s.
This commit is contained in:
James Turner 2017-11-02 17:21:21 +00:00
parent 117404979b
commit 20311c1956
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Airports/dynamics.cxx
View file

@ -241,6 +241,7 @@ FGParking* FGAirportDynamics::innerGetAvailableParking(double radius, const stri
{
NearbyAIObjectCache nearCache(parent());
const FGParkingList& parkings(parent()->groundNetwork()->allParkings());
FGParkingList candidates;
for (auto parking : parkings) {
if (!isParkingAvailable(parking)) {
continue;
@ -268,11 +269,22 @@ FGParking* FGAirportDynamics::innerGetAvailableParking(double radius, const stri
continue;
}
setParkingAvailable(parking, false);
return parking;
candidates.push_back(parking);
}
if (candidates.empty()) {
return nullptr;
}
return NULL;
// sort by increasing radius, so we return the smallest radius candidate
// this avoids large spaces (A380 sized) being given to Fokkers/ATR-72s
std::sort(candidates.begin(), candidates.end(),
[](const FGParkingRef& a, FGParkingRef& b) {
return a->getRadius() < b->getRadius();
});
setParkingAvailable(candidates.front(), false);
return candidates.front();
}
bool FGAirportDynamics::hasParkings() const