fly/flightgear
1
0
Fork 0
Code Activity

Change Nasal navaid searching API to handle units

Browse source 
Add explicit findNDBByFrequencyKHz, and rename the generic one to
explicitly use MHz, but exclude searching for NDBs.
This commit is contained in:
James Turner 2017-10-29 12:24:05 +00:00
parent 86aaaf6de9
commit ea31cb30e3
2 changed files with 62 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Navaids/navlist.cxx
View file

@ -248,10 +248,12 @@ nav_list_type FGNavList::findAllByFreq( double freq, const SGGeod& position,
nav_list_type stations; nav_list_type stations;
flightgear::NavDataCache* cache = flightgear::NavDataCache::instance(); flightgear::NavDataCache* cache = flightgear::NavDataCache::instance();
int freqKhz = static_cast<int>(freq * 1000 + 0.5); // note this frequency is passed in 'database units', which depend on the
PositionedIDVec ids(cache->findNavaidsByFreq(freqKhz, position, filter)); // type of navaid being requested
int f = static_cast<int>(freq * 100 + 0.5);
PositionedIDVec ids(cache->findNavaidsByFreq(f, position, filter));
BOOST_FOREACH(PositionedID id, ids) { for (PositionedID id : ids) {
FGNavRecordRef station = FGPositioned::loadById<FGNavRecord>(id); FGNavRecordRef station = FGPositioned::loadById<FGNavRecord>(id);
if (!filter->pass(station)) { if (!filter->pass(station)) {
continue; continue;

64
src/Scripting/NasalPositioned.cxx
View file

@ -1686,6 +1686,50 @@ static naRef f_findNavaidsWithinRange(naContext c, naRef me, int argc, naRef* ar
return r; return r;
} }
static naRef f_findNDBByFrequency(naContext c, naRef me, int argc, naRef* args)
{
int argOffset = 0;
SGGeod pos = globals->get_aircraft_position();
argOffset += geodFromArgs(args, 0, argc, pos);
if (!naIsNum(args[argOffset])) {
naRuntimeError(c, "findNDBByFrquency expectes frequency (in kHz) as arg %d", argOffset);
}
double dbFreq = args[argOffset++].num;
FGNavList::TypeFilter filter(FGPositioned::NDB);
nav_list_type navs = FGNavList::findAllByFreq(dbFreq, pos, &filter);
if (navs.empty()) {
return naNil();
}
return ghostForNavaid(c, navs.front().ptr());
}
static naRef f_findNDBsByFrequency(naContext c, naRef me, int argc, naRef* args)
{
int argOffset = 0;
SGGeod pos = globals->get_aircraft_position();
argOffset += geodFromArgs(args, 0, argc, pos);
if (!naIsNum(args[argOffset])) {
naRuntimeError(c, "findNDBsByFrquency expectes frequency (in kHz) as arg %d", argOffset);
}
double dbFreq = args[argOffset++].num;
FGNavList::TypeFilter filter(FGPositioned::NDB);
nav_list_type navs = FGNavList::findAllByFreq(dbFreq, pos, &filter);
if (navs.empty()) {
return naNil();
}
naRef r = naNewVector(c);
for (nav_rec_ptr a : navs) {
naVec_append(r, ghostForNavaid(c, a.ptr()));
}
return r;
}
static naRef f_findNavaidByFrequency(naContext c, naRef me, int argc, naRef* args) static naRef f_findNavaidByFrequency(naContext c, naRef me, int argc, naRef* args)
{ {
int argOffset = 0; int argOffset = 0;
@ -1700,10 +1744,13 @@ static naRef f_findNavaidByFrequency(naContext c, naRef me, int argc, naRef* arg
double freqMhz = args[argOffset++].num; double freqMhz = args[argOffset++].num;
if (argOffset < argc) { if (argOffset < argc) {
type = FGPositioned::typeFromName(naStr_data(args[argOffset])); type = FGPositioned::typeFromName(naStr_data(args[argOffset]));
if (type == FGPositioned::NDB) {
naRuntimeError(c, "Use findNDBByFrquency to seach NDBs");
}
} }
FGNavList::TypeFilter filter(type); FGNavList::TypeFilter filter(type);
nav_list_type navs = FGNavList::findAllByFreq(freqMhz, pos, &filter); auto navs = FGNavList::findAllByFreq(freqMhz, pos, &filter);
if (navs.empty()) { if (navs.empty()) {
return naNil(); return naNil();
} }
@ -1725,14 +1772,15 @@ static naRef f_findNavaidsByFrequency(naContext c, naRef me, int argc, naRef* ar
double freqMhz = args[argOffset++].num; double freqMhz = args[argOffset++].num;
if (argOffset < argc) { if (argOffset < argc) {
type = FGPositioned::typeFromName(naStr_data(args[argOffset])); type = FGPositioned::typeFromName(naStr_data(args[argOffset]));
if (type == FGPositioned::NDB) {
naRuntimeError(c, "Use findNDBsByFrquency to seach NDBs");
}
} }
naRef r = naNewVector(c); naRef r = naNewVector(c);
FGNavList::TypeFilter filter(type); FGNavList::TypeFilter filter(type);
nav_list_type navs = FGNavList::findAllByFreq(freqMhz, pos, &filter); auto navs = FGNavList::findAllByFreq(freqMhz, pos, &filter);
for (nav_rec_ptr a : navs) {
BOOST_FOREACH(nav_rec_ptr a, navs) {
naVec_append(r, ghostForNavaid(c, a.ptr())); naVec_append(r, ghostForNavaid(c, a.ptr()));
} }
@ -2724,8 +2772,10 @@ static struct { const char* name; naCFunction func; } funcs[] = {
{ "findAirportsByICAO", f_findAirportsByICAO }, { "findAirportsByICAO", f_findAirportsByICAO },
{ "navinfo", f_navinfo }, { "navinfo", f_navinfo },
{ "findNavaidsWithinRange", f_findNavaidsWithinRange }, { "findNavaidsWithinRange", f_findNavaidsWithinRange },
{ "findNavaidByFrequency", f_findNavaidByFrequency }, { "findNDBByFrequencyKHz", f_findNDBByFrequency },
{ "findNavaidsByFrequency", f_findNavaidsByFrequency }, { "findNDBsByFrequencyKHz", f_findNDBsByFrequency },
{ "findNavaidByFrequencyMHz", f_findNavaidByFrequency },
{ "findNavaidsByFrequencyMHz", f_findNavaidsByFrequency },
{ "findNavaidsByID", f_findNavaidsByIdent }, { "findNavaidsByID", f_findNavaidsByIdent },
{ "findFixesByID", f_findFixesByIdent }, { "findFixesByID", f_findFixesByIdent },
{ "flightplan", f_flightplan }, { "flightplan", f_flightplan },