#include <algorithm> // for std::sort
#include <plib/puAux.h>
-#include <simgear/sg_inlines.h>
-#include <simgear/route/waypoint.hxx>
#include <simgear/sg_inlines.h>
#include <simgear/misc/strutils.hxx>
#include <simgear/magvar/magvar.hxx>
{
_heliports = nd->getBoolValue("show-heliports", false);
_hardRunwaysOnly = nd->getBoolValue("hard-surfaced-airports", true);
- _minLengthFt = nd->getDoubleValue("min-runway-length-ft", 2000.0);
+ _minLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft", 2000);
}
virtual FGPositioned::Type maxType() const {
}
virtual FGPositioned::Type minType() const {
- return _fixes ? FGPositioned::FIX : FGPositioned::VOR;
+ return _fixes ? FGPositioned::FIX : FGPositioned::NDB;
}
virtual FGPositioned::Type maxType() const {
- return _navaids ? FGPositioned::NDB : FGPositioned::FIX;
+ return _navaids ? FGPositioned::VOR : FGPositioned::FIX;
}
private:
// identify the tuned station - unfortunately we don't get lat/lon directly,
// need to do the frequency search again
double mhz = radio->getDoubleValue("frequencies/selected-mhz", 0.0);
- FGNavRecord* nav = globals->get_navlist()->findByFreq(mhz, _aircraft);
+
+ FGNavRecord* nav = FGNavList::findByFreq(mhz, _aircraft,
+ FGNavList::navFilter());
if (!nav || (nav->ident() != radio->getStringValue("nav-id"))) {
// mismatch between navradio selection logic and ours!
return;
void MapWidget::drawTunedLocalizer(SGPropertyNode_ptr radio)
{
double mhz = radio->getDoubleValue("frequencies/selected-mhz", 0.0);
- FGNavRecord* loc = globals->get_loclist()->findByFreq(mhz, _aircraft);
+ FGNavRecord* loc = FGNavList::findByFreq(mhz, _aircraft, FGNavList::locFilter());
if (!loc || (loc->ident() != radio->getStringValue("nav-id"))) {
// mismatch between navradio selection logic and ours!
return;