fly/flightgear
1
0
Fork 0
Code Activity

Bugfix - don't exclude seaports or heliports when looking up by ICAO.

Browse source
This commit is contained in:
jmt 2009-10-28 08:27:19 +00:00 • committed by Tim Moore
parent 53b16caec0
commit 6593d6c065
2 changed files with 13 additions and 2 deletions

4
src/Airports/simple.cxx
View file

@ -290,7 +290,7 @@ bool FGAirport::HardSurfaceFilter::passAirport(FGAirport* aApt) const
FGAirport* FGAirport::findByIdent(const std::string& aIdent) FGAirport* FGAirport::findByIdent(const std::string& aIdent)
{ {
FGPositionedRef r; FGPositionedRef r;
AirportFilter filter; PortsFilter filter;
r = FGPositioned::findNextWithPartialId(r, aIdent, &filter); r = FGPositioned::findNextWithPartialId(r, aIdent, &filter);
if (!r) { if (!r) {
return NULL; // we don't warn here, let the caller do that return NULL; // we don't warn here, let the caller do that
@ -301,7 +301,7 @@ FGAirport* FGAirport::findByIdent(const std::string& aIdent)
FGAirport* FGAirport::getByIdent(const std::string& aIdent) FGAirport* FGAirport::getByIdent(const std::string& aIdent)
{ {
FGPositionedRef r; FGPositionedRef r;
AirportFilter filter; PortsFilter filter;
r = FGPositioned::findNextWithPartialId(r, aIdent, &filter); r = FGPositioned::findNextWithPartialId(r, aIdent, &filter);
if (!r) { if (!r) {
throw sg_range_exception("No such airport with ident: " + aIdent); throw sg_range_exception("No such airport with ident: " + aIdent);

11
src/Airports/simple.hxx
View file

@ -121,6 +121,17 @@ public:
} }
}; };
/**
* Filter which passes heliports and seaports in addition to airports
*/
class PortsFilter : public AirportFilter
{
public:
virtual Type maxType() const {
return SEAPORT;
}
};
class HardSurfaceFilter : public AirportFilter class HardSurfaceFilter : public AirportFilter
{ {
public: public: