#undef HASHSET
}
-
-class airport_filter : public FGAirportSearchFilter {
- virtual bool pass(FGAirport *a) { return a->isAirport(); }
-} airport;
-class seaport_filter : public FGAirportSearchFilter {
- virtual bool pass(FGAirport *a) { return a->isSeaport(); }
-} seaport;
-class heliport_filter : public FGAirportSearchFilter {
- virtual bool pass(FGAirport *a) { return a->isHeliport(); }
-} heliport;
+class AirportInfoFilter : public FGAirport::AirportFilter
+{
+public:
+ AirportInfoFilter() :
+ type(FGPositioned::AIRPORT)
+ { }
+
+ virtual FGPositioned::Type minType() const {
+ return type;
+ }
+
+ virtual FGPositioned::Type maxType() const {
+ return type;
+ }
+
+ FGPositioned::Type type;
+};
// Returns data hash for particular or nearest airport of a <type>, or nil
-// on error. Only one side of each runway is contained.
+// on error.
//
// airportinfo(<id>); e.g. "KSFO"
// airportinfo(<type>); type := ("airport"|"seaport"|"heliport")
{
static SGConstPropertyNode_ptr latn = fgGetNode("/position/latitude-deg", true);
static SGConstPropertyNode_ptr lonn = fgGetNode("/position/longitude-deg", true);
- double lat, lon;
-
- FGAirportList *aptlst = globals->get_airports();
- FGAirport *apt;
+ SGGeod pos;
+ FGAirport* apt = NULL;
+
if(argc >= 2 && naIsNum(args[0]) && naIsNum(args[1])) {
- lat = args[0].num;
- lon = args[1].num;
+ pos = SGGeod::fromDeg(args[1].num, args[0].num);
args += 2;
argc -= 2;
} else {
- lat = latn->getDoubleValue();
- lon = lonn->getDoubleValue();
+ pos = SGGeod::fromDeg(lonn->getDoubleValue(), latn->getDoubleValue());
}
- double maxRange = 360.0; // expose this? or pick a smaller value?
+ double maxRange = 10000.0; // expose this? or pick a smaller value?
+
+ AirportInfoFilter filter; // defaults to airports only
if(argc == 0) {
- apt = aptlst->search(lon, lat, maxRange, airport);
+ // fine, just fall through and use AIRPORT
} else if(argc == 1 && naIsString(args[0])) {
const char *s = naStr_data(args[0]);
- if(!strcmp(s, "airport")) apt = aptlst->search(lon, lat, maxRange, airport);
- else if(!strcmp(s, "seaport")) apt = aptlst->search(lon, lat, maxRange, seaport);
- else if(!strcmp(s, "heliport")) apt = aptlst->search(lon, lat, maxRange, heliport);
- else apt = aptlst->search(s);
+ if (!strcmp(s, "airport")) filter.type = FGPositioned::AIRPORT;
+ else if(!strcmp(s, "seaport")) filter.type = FGPositioned::SEAPORT;
+ else if(!strcmp(s, "heliport")) filter.type = FGPositioned::HELIPORT;
+ else {
+ // user provided an <id>, hopefully
+ apt = FGAirport::findByIdent(s);
+ if (!apt) {
+ naRuntimeError(c, "airportinfo() couldn't find airport:%s", s);
+ return naNil();
+ }
+ }
} else {
naRuntimeError(c, "airportinfo() with invalid function arguments");
return naNil();
}
- if(!apt) return naNil();
-
- string id = apt->getId();
- string name = apt->getName();
+
+ if (!apt) {
+ apt = FGAirport::findClosest(pos, maxRange, &filter);
+ if(!apt) return naNil();
+ }
+
+ string id = apt->ident();
+ string name = apt->name();
// set runway hash
naRef rwys = naNewHash(c);
HASHSET("heading", 7, naNum(rwy->headingDeg()));
HASHSET("length", 6, naNum(rwy->lengthM()));
HASHSET("width", 5, naNum(rwy->widthM()));
- HASHSET("threshold", 9, naNum(rwy->_displ_thresh * SG_FEET_TO_METER));
- HASHSET("stopway", 7, naNum(rwy->_stopway * SG_FEET_TO_METER));
+ HASHSET("threshold", 9, naNum(rwy->displacedThresholdM()));
+ HASHSET("stopway", 7, naNum(rwy->stopwayM()));
#undef HASHSET
naHash_set(rwys, rwyid, rwydata);
}
// used to pass an associated property node to the module, which can then
// be accessed via cmdarg(). (This is, for example, used by XML dialogs.)
void FGNasalSys::createModule(const char* moduleName, const char* fileName,
- const char* src, int len, const SGPropertyNode* arg)
+ const char* src, int len,
+ const SGPropertyNode* cmdarg,
+ int argc, naRef* args)
{
naRef code = parse(fileName, src, len);
if(naIsNil(code))
if(!naHash_get(_globals, modname, &locals))
locals = naNewHash(_context);
- _cmdArg = (SGPropertyNode*)arg;
+ _cmdArg = (SGPropertyNode*)cmdarg;
- call(code, 0, 0, locals);
+ call(code, argc, args, locals);
hashset(_globals, moduleName, locals);
}
arg[1] = _nas->propNodeGhost(_node);
arg[2] = mode; // value changed, child added/removed
arg[3] = naNum(_node != which); // child event?
- _nas->_cmdArg = _node;
_nas->call(_code, 4, arg, naNil());
_active--;
}
{
if(!prop)
return;
+ SGPropertyNode *nasal = prop->getNode("nasal");
+ if(!nasal)
+ return;
- SGPropertyNode *load = prop->getNode("load");
- _unload = prop->getNode("unload");
+ SGPropertyNode *load = nasal->getNode("load");
+ _unload = nasal->getNode("unload");
if(!load && !_unload)
return;
if(_props)
_module += ':' + _props->getPath();
const char *s = load ? load->getStringValue() : "";
- nasalSys->createModule(_module.c_str(), _module.c_str(), s, strlen(s), _props);
+
+ naRef arg[2];
+ arg[0] = nasalSys->propNodeGhost(_root);
+ arg[1] = nasalSys->propNodeGhost(prop);
+ nasalSys->createModule(_module.c_str(), _module.c_str(), s, strlen(s),
+ _root, 2, arg);
+ _props = 0;
}
FGNasalModelData::~FGNasalModelData()
if(_unload) {
const char *s = _unload->getStringValue();
- nasalSys->createModule(_module.c_str(), _module.c_str(), s, strlen(s), _props);
+ nasalSys->createModule(_module.c_str(), _module.c_str(), s, strlen(s), _root);
}
nasalSys->deleteModule(_module.c_str());
}
projects / flightgear.git / blobdiff