fly/flightgear
1
0
Fork 0
Code Activity

Change default airport search to exclude seaports and heliports, for the moment.

Browse source
This commit is contained in:
jmt 2009-10-13 06:48:52 +00:00 • committed by Tim Moore
parent 110dd605a0
commit d4cc5f9c44
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Airports/simple.hxx
View file

@ -113,7 +113,7 @@ public:
} }
virtual Type maxType() const { virtual Type maxType() const {
return SEAPORT; return AIRPORT;
} }
virtual bool passAirport(FGAirport* aApt) const { virtual bool passAirport(FGAirport* aApt) const {
@ -128,9 +128,6 @@ public:
virtual bool passAirport(FGAirport* aApt) const; virtual bool passAirport(FGAirport* aApt) const;
virtual Type maxType() const {
return AIRPORT;
}
private: private:
double mMinLengthFt; double mMinLengthFt;
}; };
@ -138,7 +135,7 @@ public:
/** /**
* Syntactic wrapper around FGPositioned::findClosest - find the closest * Syntactic wrapper around FGPositioned::findClosest - find the closest
* match for filter, and return it cast to FGAirport. The default filter * match for filter, and return it cast to FGAirport. The default filter
* passes all airports, including seaports and heliports. * passes airports, but not seaports or heliports
*/ */
static FGAirport* findClosest(const SGGeod& aPos, double aCuttofNm, Filter* filter = NULL); static FGAirport* findClosest(const SGGeod& aPos, double aCuttofNm, Filter* filter = NULL);

4
src/Environment/environment_ctrl.cxx
View file

@ -44,6 +44,10 @@ public:
virtual bool passAirport(FGAirport* aApt) const { virtual bool passAirport(FGAirport* aApt) const {
return aApt->getMetar(); return aApt->getMetar();
} }
// permit heliports and seaports too
virtual FGPositioned::Type maxType() const
{ return FGPositioned::SEAPORT; }
}; };
static AirportWithMetar airportWithMetarFilter; static AirportWithMetar airportWithMetarFilter;

4
src/Instrumentation/mk_viii.hxx
View file

@ -1594,10 +1594,6 @@ private:
: mk(device) {} : mk(device) {}
virtual bool passAirport(FGAirport *a) const; virtual bool passAirport(FGAirport *a) const;
virtual FGPositioned::Type maxType() const {
return FGPositioned::AIRPORT;
}
private: private:
MK_VIII* mk; MK_VIII* mk;
}; };