fly/flightgear
1
0
Fork 0
Code Activity

Nasal: expose additional members on fixes/navaids

Browse source 
Add a ‘colocated_dme’ member to identify VOR/ILS pairings with DME. 
Also exposed the navaid unique ID for easy disambiguation.
This commit is contained in:
James Turner 2019-01-09 00:04:03 +00:00
parent 5affa13348
commit 4df6cb0558
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Scripting/NasalPositioned.cxx
View file

@ -1075,6 +1075,13 @@ static const char* navaidGhostGetMember(naContext c, void* g, naRef field, naRef
} else {
*out = naNil();
}
} else if (!strcmp(fieldName, "colocated_dme")) {
FGNavRecordRef dme = FGPositioned::loadById<FGNavRecord>(nav->colocatedDME());
if (dme) {
*out = ghostForNavaid(c, dme);
} else {
*out = naNil();
}
} else if (!strcmp(fieldName, "dme")) {
*out = naNum(nav->hasDME());
} else if (!strcmp(fieldName, "vortac")) {
@ -1087,6 +1094,8 @@ static const char* navaidGhostGetMember(naContext c, void* g, naRef field, naRef
} else {
*out = naNil();
}
} else if (!strcmp(fieldName, "guid")) {
*out = naNum(nav->guid());
} else {
return 0;
}
@ -1102,6 +1111,9 @@ static const char* fixGhostGetMember(naContext c, void* g, naRef field, naRef* o
if (!strcmp(fieldName, "id")) *out = stringToNasal(c, fix->ident());
else if (!strcmp(fieldName, "lat")) *out = naNum(fix->get_lat());
else if (!strcmp(fieldName, "lon")) *out = naNum(fix->get_lon());
// for homogenity with other values returned by navinfo()
else if (!strcmp(fieldName, "type")) *out = stringToNasal(c, "fix");
else if (!strcmp(fieldName, "name")) *out = stringToNasal(c, fix->ident());
else {
return 0;
}