} else {
*out = stringToNasal(c, wpt->flag(WPT_OVERFLIGHT) ? "flyOver" : "flyBy");
}
+ } else if (!strcmp(fieldName, "heading_course")) {
+ *out = naNum(wpt->headingRadialDeg());
} else {
return NULL; // member not found
}
}
wpt->setFlag(f, true);
+ } else if (!strcmp(fieldName, "fly_type")) {
+ if (!naIsString(value)) naRuntimeError(c, "fly_type must be a string");
+ bool flyOver = (strcmp(naStr_data(value), "flyOver") == 0);
+ wpt->setFlag(WPT_OVERFLIGHT, flyOver);
}
}
else if (!strcmp(fieldName, "star_trans")) *out = ghostForProcedure(c, fp->starTransition());
else if (!strcmp(fieldName, "approach")) *out = ghostForProcedure(c, fp->approach());
else if (!strcmp(fieldName, "current")) *out = naNum(fp->currentIndex());
+ else if (!strcmp(fieldName, "aircraftCategory")) *out = stringToNasal(c, fp->icaoAircraftCategory());
+ else if (!strcmp(fieldName, "followLegTrackToFix")) *out = naNum(fp->followLegTrackToFixes());
else {
return 0;
}
}
naRuntimeError(c, "bad argument type setting approach");
+ } else if (!strcmp(fieldName, "aircraftCategory")) {
+ if (!naIsString(value)) naRuntimeError(c, "aircraftCategory must be a string");
+ fp->setIcaoAircraftCategory(naStr_data(value));
+ } else if (!strcmp(fieldName, "followLegTrackToFix")) {
+ int b = (int) value.num;
+ fp->setFollowLegTrackToFixes(b);
}
}
}
FGAirportDynamics* dynamics = apt->getDynamics();
- PositionedIDVec parkings = flightgear::NavDataCache::instance()->airportItemsOfType(apt->guid(),
- FGPositioned::PARKING);
-
- BOOST_FOREACH(PositionedID parking, parkings) {
- // filter out based on availability and type
- if (onlyAvailable && !dynamics->isParkingAvailable(parking)) {
- continue;
- }
-
- FGParking* park = dynamics->getParking(parking);
- if (!type.empty() && (park->getType() != type)) {
- continue;
- }
-
+ FGParkingList parkings = dynamics->getParkings(onlyAvailable, type);
+ FGParkingList::const_iterator it;
+ for (it = parkings.begin(); it != parkings.end(); ++it) {
+ FGParkingRef park = *it;
const SGGeod& parkLoc = park->geod();
naRef ph = naNewHash(c);
hashset(c, ph, "name", stringToNasal(c, park->getName()));
{
callDelegateMethod("endOfFlightPlan");
}
+
+ virtual void activated()
+ {
+ callDelegateMethod("activated");
+ }
private:
void callDelegateMethod(const char* method)
{
naRef f;
- if (naMember_cget(_nasal->context(), _instance, method, &f) == 0) {
- return; // no method on the delegate
+ naContext ctx = naNewContext();
+
+ if (naMember_cget(ctx, _instance, method, &f) != 0) {
+ naRef arg[1];
+ arg[0] = ghostForFlightPlan(ctx, _plan);
+ _nasal->callMethod(f, _instance, 1, arg, naNil());
}
- naRef arg[1];
- arg[0] = ghostForFlightPlan(_nasal->context(), _plan);
- _nasal->callMethod(f, _instance, 1, arg, naNil());
+ naFreeContext(ctx);
}
FGNasalSys* _nasal;
int _gcSaveKey;
};
+
class NasalFPDelegateFactory : public FlightPlan::DelegateFactory
{
public:
_gcSaveKey = _nasal->gcSave(_func);
}
- ~NasalFPDelegateFactory()
+ virtual ~NasalFPDelegateFactory()
{
_nasal->gcRelease(_gcSaveKey);
}
virtual FlightPlan::Delegate* createFlightPlanDelegate(FlightPlan* fp)
{
naRef args[1];
- args[0] = ghostForFlightPlan(_nasal->context(), fp);
+ naContext ctx = naNewContext();
+ args[0] = ghostForFlightPlan(ctx, fp);
naRef instance = _nasal->call(_func, 1, args, naNil());
- if (naIsNil(instance)) {
- return NULL;
- }
- return new NasalFPDelegate(fp, _nasal, instance);
+ FlightPlan::Delegate* result = NULL;
+ if (!naIsNil(instance)) {
+ // will GC-save instance
+ result = new NasalFPDelegate(fp, _nasal, instance);
+ }
+
+ naFreeContext(ctx);
+ return result;
}
private:
FGNasalSys* _nasal;
int _gcSaveKey;
};
+static std::vector<NasalFPDelegateFactory*> static_nasalDelegateFactories;
+
+void shutdownNasalPositioned()
+{
+ std::vector<NasalFPDelegateFactory*>::iterator it;
+ for (it = static_nasalDelegateFactories.begin();
+ it != static_nasalDelegateFactories.end(); ++it)
+ {
+ FlightPlan::unregisterDelegateFactory(*it);
+ delete (*it);
+ }
+ static_nasalDelegateFactories.clear();
+}
+
static naRef f_registerFPDelegate(naContext c, naRef me, int argc, naRef* args)
{
if ((argc < 1) || !naIsFunc(args[0])) {
NasalFPDelegateFactory* factory = new NasalFPDelegateFactory(args[0]);
FlightPlan::registerDelegateFactory(factory);
-
+ static_nasalDelegateFactories.push_back(factory);
return naNil();
}
return naNil();
}
+static naRef f_flightplan_indexOfWp(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan* fp = flightplanGhost(me);
+ if (!fp) {
+ naRuntimeError(c, "flightplan.indexOfWP called on non-flightplan object");
+ }
+
+ FGPositioned* positioned = positionedGhost(args[0]);
+ if (positioned) {
+ return naNum(fp->findWayptIndex(positioned));
+ }
+
+ SGGeod pos;
+ int argOffset = geodFromArgs(args, 0, argc, pos);
+ if (argOffset > 0) {
+ return naNum(fp->findWayptIndex(pos));
+ }
+
+ return naNum(-1);
+}
+
static naRef f_leg_setSpeed(naContext c, naRef me, int argc, naRef* args)
{
FlightPlan::Leg* leg = fpLegGhost(me);
SGGeod pos;
geodFromArgs(args, 0, argc, pos);
-
- double courseDeg;
- double distanceM;
- boost::tie(courseDeg, distanceM) = leg->waypoint()->courseAndDistanceFrom(pos);
-
+
+ RoutePath path(leg->owner());
+ SGGeod wpPos = path.positionForIndex(leg->index());
+ double courseDeg, az2, distanceM;
+ SGGeodesy::inverse(pos, wpPos, courseDeg, az2, distanceM);
+
naRef result = naNewVector(c);
naVec_append(result, naNum(courseDeg));
naVec_append(result, naNum(distanceM * SG_METER_TO_NM));
WayptVec r;
Approach* app = (Approach*) proc;
if (!app->route(iaf, r)) {
- SG_LOG(SG_NASAL, SG_WARN, "procedure.route failed for Approach somehow");
return naNil();
}
hashset(c, flightplanPrototype, "clone", naNewFunc(c, naNewCCode(c, f_flightplan_clone)));
hashset(c, flightplanPrototype, "pathGeod", naNewFunc(c, naNewCCode(c, f_flightplan_pathGeod)));
hashset(c, flightplanPrototype, "finish", naNewFunc(c, naNewCCode(c, f_flightplan_finish)));
+ hashset(c, flightplanPrototype, "indexOfWP", naNewFunc(c, naNewCCode(c, f_flightplan_indexOfWp)));
waypointPrototype = naNewHash(c);
naSave(c, waypointPrototype);