#include <boost/foreach.hpp>
#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/tuple/tuple.hpp> // for boost::tie
#include <simgear/sg_inlines.h>
#include <simgear/scene/material/mat.hxx>
#include <simgear/bucket/newbucket.hxx>
#include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
#include <Airports/dynamics.hxx>
#include <Airports/parking.hxx>
+#include <Scripting/NasalSys.hxx>
#include <Navaids/navlist.hxx>
#include <Navaids/procedure.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include <Scenery/scenery.hxx>
#include <ATC/CommStation.hxx>
-#include <Navaids/route.hxx>
+#include <Navaids/FlightPlan.hxx>
+#include <Navaids/waypoint.hxx>
+#include <Navaids/fix.hxx>
#include <Autopilot/route_mgr.hxx>
+#include <Navaids/routePath.hxx>
#include <Navaids/procedure.hxx>
+#include <Navaids/airways.hxx>
+#include <Navaids/NavDataCache.hxx>
using namespace flightgear;
static const char* runwayGhostGetMember(naContext c, void* g, naRef field, naRef* out);
naGhostType RunwayGhostType = { positionedGhostDestroy, "runway", runwayGhostGetMember, 0 };
+naGhostType HelipadGhostType = { positionedGhostDestroy, "helipad", runwayGhostGetMember, 0 };
+naGhostType TaxiwayGhostType = { positionedGhostDestroy, "taxiway", runwayGhostGetMember, 0 };
+
+static const char* fixGhostGetMember(naContext c, void* g, naRef field, naRef* out);
+naGhostType FixGhostType = { positionedGhostDestroy, "fix", fixGhostGetMember, 0 };
static const char* wayptGhostGetMember(naContext c, void* g, naRef field, naRef* out);
+static void waypointGhostSetMember(naContext c, void* g, naRef field, naRef value);
+
naGhostType WayptGhostType = { wayptGhostDestroy,
"waypoint",
wayptGhostGetMember,
- 0};
+ waypointGhostSetMember};
static const char* legGhostGetMember(naContext c, void* g, naRef field, naRef* out);
+static void legGhostSetMember(naContext c, void* g, naRef field, naRef value);
+
naGhostType FPLegGhostType = { legGhostDestroy,
"flightplan-leg",
legGhostGetMember,
- 0};
+ legGhostSetMember};
static const char* flightplanGhostGetMember(naContext c, void* g, naRef field, naRef* out);
static void flightplanGhostSetMember(naContext c, void* g, naRef field, naRef value);
s.length());
}
+static bool convertToNum(naRef v, double& result)
+{
+ naRef n = naNumValue(v);
+ if (naIsNil(n)) {
+ return false; // couldn't convert
+ }
+
+ result = n.num;
+ return true;
+}
+
+static WayptFlag wayptFlagFromString(const char* s)
+{
+ if (!strcmp(s, "sid")) return WPT_DEPARTURE;
+ if (!strcmp(s, "star")) return WPT_ARRIVAL;
+ if (!strcmp(s, "approach")) return WPT_APPROACH;
+ if (!strcmp(s, "missed")) return WPT_MISS;
+ if (!strcmp(s, "pseudo")) return WPT_PSEUDO;
+
+ return (WayptFlag) 0;
+}
+
+static naRef wayptFlagToNasal(naContext c, unsigned int flags)
+{
+ if (flags & WPT_PSEUDO) return stringToNasal(c, "pseudo");
+ if (flags & WPT_DEPARTURE) return stringToNasal(c, "sid");
+ if (flags & WPT_ARRIVAL) return stringToNasal(c, "star");
+ if (flags & WPT_MISS) return stringToNasal(c, "missed");
+ if (flags & WPT_APPROACH) return stringToNasal(c, "approach");
+ return naNil();
+}
+
static FGPositioned* positionedGhost(naRef r)
{
- if (naGhost_type(r) == &PositionedGhostType)
+ if ((naGhost_type(r) == &AirportGhostType) ||
+ (naGhost_type(r) == &NavaidGhostType) ||
+ (naGhost_type(r) == &RunwayGhostType) ||
+ (naGhost_type(r) == &FixGhostType))
+ {
return (FGPositioned*) naGhost_ptr(r);
+ }
+
return 0;
}
return 0;
}
+static FGTaxiway* taxiwayGhost(naRef r)
+{
+ if (naGhost_type(r) == &TaxiwayGhostType)
+ return (FGTaxiway*) naGhost_ptr(r);
+ return 0;
+}
+
+static FGFix* fixGhost(naRef r)
+{
+ if (naGhost_type(r) == &FixGhostType)
+ return (FGFix*) naGhost_ptr(r);
+ return 0;
+}
+
+
static void positionedGhostDestroy(void* g)
{
FGPositioned* pos = (FGPositioned*)g;
{
if (naGhost_type(r) == &WayptGhostType)
return (Waypt*) naGhost_ptr(r);
+
+ if (naGhost_type(r) == &FPLegGhostType) {
+ FlightPlan::Leg* leg = (FlightPlan::Leg*) naGhost_ptr(r);
+ return leg->waypoint();
+ }
+
return 0;
}
static naRef fpLegPrototype;
static naRef procedurePrototype;
-naRef ghostForPositioned(naContext c, const FGPositioned* pos)
-{
- if (!pos) {
- return naNil();
- }
-
- FGPositioned::get(pos); // take a ref
- return naNewGhost(c, &PositionedGhostType, (void*) pos);
-}
-
naRef ghostForAirport(naContext c, const FGAirport* apt)
{
if (!apt) {
return naNewGhost2(c, &RunwayGhostType, (void*) r);
}
+naRef ghostForHelipad(naContext c, const FGHelipad* r)
+{
+ if (!r) {
+ return naNil();
+ }
+
+ FGPositioned::get(r); // take a ref
+ return naNewGhost2(c, &HelipadGhostType, (void*) r);
+}
+
+naRef ghostForTaxiway(naContext c, const FGTaxiway* r)
+{
+ if (!r) {
+ return naNil();
+ }
+
+ FGPositioned::get(r); // take a ref
+ return naNewGhost2(c, &TaxiwayGhostType, (void*) r);
+}
+
+naRef ghostForFix(naContext c, const FGFix* r)
+{
+ if (!r) {
+ return naNil();
+ }
+
+ FGPositioned::get(r); // take a ref
+ return naNewGhost2(c, &FixGhostType, (void*) r);
+}
+
+
naRef ghostForWaypt(naContext c, const Waypt* wpt)
{
if (!wpt) {
return naNil();
}
-
+
Waypt::get(wpt); // take a ref
return naNewGhost2(c, &WayptGhostType, (void*) wpt);
}
*out = naNum(apt->getMetar());
} else if (!strcmp(fieldName, "runways")) {
*out = naNewHash(c);
+ double minLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft");
for(unsigned int r=0; r<apt->numRunways(); ++r) {
FGRunway* rwy(apt->getRunwayByIndex(r));
+ // ignore unusably short runways
+ if (rwy->lengthFt() < minLengthFt) {
+ continue;
+ }
naRef rwyid = stringToNasal(c, rwy->ident());
naRef rwydata = ghostForRunway(c, rwy);
naHash_set(*out, rwyid, rwydata);
}
+ } else if (!strcmp(fieldName, "helipads")) {
+ *out = naNewHash(c);
+
+ for(unsigned int r=0; r<apt->numHelipads(); ++r) {
+ FGHelipad* hp(apt->getHelipadByIndex(r));
+
+ naRef rwyid = stringToNasal(c, hp->ident());
+ naRef rwydata = ghostForHelipad(c, hp);
+ naHash_set(*out, rwyid, rwydata);
+ }
+
+ } else if (!strcmp(fieldName, "taxiways")) {
+ *out = naNewVector(c);
+ for(unsigned int r=0; r<apt->numTaxiways(); ++r) {
+ FGTaxiway* taxi(apt->getTaxiwayByIndex(r));
+ naRef taxidata = ghostForTaxiway(c, taxi);
+ naVec_append(*out, taxidata);
+ }
} else {
return 0;
static const char* waypointCommonGetMember(naContext c, Waypt* wpt, const char* fieldName, naRef* out)
{
- if (!strcmp(fieldName, "wp_name")) *out = stringToNasal(c, wpt->ident());
+ if (!strcmp(fieldName, "wp_name") || !strcmp(fieldName, "id")) *out = stringToNasal(c, wpt->ident());
else if (!strcmp(fieldName, "wp_type")) *out = stringToNasal(c, wpt->type());
- else if (!strcmp(fieldName, "wp_lat")) *out = naNum(wpt->position().getLatitudeDeg());
- else if (!strcmp(fieldName, "wp_lon")) *out = naNum(wpt->position().getLongitudeDeg());
+ else if (!strcmp(fieldName, "wp_role")) *out = wayptFlagToNasal(c, wpt->flags());
+ else if (!strcmp(fieldName, "wp_lat") || !strcmp(fieldName, "lat")) *out = naNum(wpt->position().getLatitudeDeg());
+ else if (!strcmp(fieldName, "wp_lon") || !strcmp(fieldName, "lon")) *out = naNum(wpt->position().getLongitudeDeg());
else if (!strcmp(fieldName, "wp_parent_name")) {
Procedure* proc = dynamic_cast<Procedure*>(wpt->owner());
*out = proc ? stringToNasal(c, proc->ident()) : naNil();
return "";
}
+static void waypointCommonSetMember(naContext c, Waypt* wpt, const char* fieldName, naRef value)
+{
+ if (!strcmp(fieldName, "wp_role")) {
+ if (!naIsString(value)) naRuntimeError(c, "wp_role must be a string");
+ if (wpt->owner() != NULL) naRuntimeError(c, "cannot override wp_role on waypoint with parent");
+ WayptFlag f = wayptFlagFromString(naStr_data(value));
+ if (f == 0) {
+ naRuntimeError(c, "unrecognized wp_role value %s", naStr_data(value));
+ }
+
+ wpt->setFlag(f, true);
+ }
+}
+
static const char* wayptGhostGetMember(naContext c, void* g, naRef field, naRef* out)
{
const char* fieldName = naStr_data(field);
static RouteRestriction routeRestrictionFromString(const char* s)
{
- string u(s);
+ std::string u(s);
boost::to_lower(u);
if (u == "computed") return RESTRICT_COMPUTED;
if (u == "at") return RESTRICT_AT;
if (!strcmp(fieldName, "parents")) {
*out = naNewVector(c);
naVec_append(*out, fpLegPrototype);
+ naVec_append(*out, waypointPrototype);
+ } else if (!strcmp(fieldName, "index")) {
+ *out = naNum(leg->index());
} else if (!strcmp(fieldName, "alt_cstr")) {
*out = naNum(leg->altitudeFt());
} else if (!strcmp(fieldName, "alt_cstr_type")) {
return ""; // success
}
+static void waypointGhostSetMember(naContext c, void* g, naRef field, naRef value)
+{
+ const char* fieldName = naStr_data(field);
+ Waypt* wpt = (Waypt*) g;
+ waypointCommonSetMember(c, wpt, fieldName, value);
+}
+
+static void legGhostSetMember(naContext c, void* g, naRef field, naRef value)
+{
+ const char* fieldName = naStr_data(field);
+ FlightPlan::Leg* leg = (FlightPlan::Leg*) g;
+
+ waypointCommonSetMember(c, leg->waypoint(), fieldName, value);
+}
+
static const char* flightplanGhostGetMember(naContext c, void* g, naRef field, naRef* out)
{
const char* fieldName = naStr_data(field);
return;
}
+ if (naIsNil(value)) {
+ fp->setDeparture(static_cast<FGAirport*>(NULL));
+ return;
+ }
+
naRuntimeError(c, "bad argument type setting departure");
} else if (!strcmp(fieldName, "destination")) {
FGAirport* apt = airportGhost(value);
return;
}
- naRuntimeError(c, "bad argument type setting departure");
+ naRuntimeError(c, "bad argument type setting departure runway");
} else if (!strcmp(fieldName, "destination_runway")) {
FGRunway* rwy = runwayGhost(value);
if (rwy){
return;
}
- naRuntimeError(c, "bad argument type setting departure");
+ naRuntimeError(c, "bad argument type setting destination runway");
} else if (!strcmp(fieldName, "sid")) {
Procedure* proc = procedureGhost(value);
if (proc && (proc->type() == PROCEDURE_SID)) {
else if (!strcmp(fieldName, "radio")) *out = procedureRadioType(c, proc->type());
else if (!strcmp(fieldName, "runways")) {
*out = naNewVector(c);
- BOOST_FOREACH(FGRunwayPtr rwy, proc->runways()) {
+ BOOST_FOREACH(FGRunwayRef rwy, proc->runways()) {
naVec_append(*out, stringToNasal(c, rwy->ident()));
}
} else if (!strcmp(fieldName, "transitions")) {
ArrivalDeparture* ad = static_cast<ArrivalDeparture*>(proc);
*out = naNewVector(c);
- BOOST_FOREACH(string id, ad->transitionIdents()) {
+ BOOST_FOREACH(std::string id, ad->transitionIdents()) {
naVec_append(*out, stringToNasal(c, id));
}
} else {
static const char* runwayGhostGetMember(naContext c, void* g, naRef field, naRef* out)
{
const char* fieldName = naStr_data(field);
- FGRunway* rwy = (FGRunway*) g;
-
- if (!strcmp(fieldName, "id")) *out = stringToNasal(c, rwy->ident());
- else if (!strcmp(fieldName, "lat")) *out = naNum(rwy->latitude());
- else if (!strcmp(fieldName, "lon")) *out = naNum(rwy->longitude());
- else if (!strcmp(fieldName, "heading")) *out = naNum(rwy->headingDeg());
- else if (!strcmp(fieldName, "length")) *out = naNum(rwy->lengthM());
- else if (!strcmp(fieldName, "width")) *out = naNum(rwy->widthM());
- else if (!strcmp(fieldName, "threshold")) *out = naNum(rwy->displacedThresholdM());
- else if (!strcmp(fieldName, "stopway")) *out = naNum(rwy->stopwayM());
- else if (!strcmp(fieldName, "ils_frequency_mhz")) {
- *out = rwy->ILS() ? naNum(rwy->ILS()->get_freq() / 100.0) : naNil();
- } else if (!strcmp(fieldName, "ils")) {
- *out = ghostForNavaid(c, rwy->ILS());
+ FGRunwayBase* base = (FGRunwayBase*) g;
+
+ if (!strcmp(fieldName, "id")) *out = stringToNasal(c, base->ident());
+ else if (!strcmp(fieldName, "lat")) *out = naNum(base->latitude());
+ else if (!strcmp(fieldName, "lon")) *out = naNum(base->longitude());
+ else if (!strcmp(fieldName, "heading")) *out = naNum(base->headingDeg());
+ else if (!strcmp(fieldName, "length")) *out = naNum(base->lengthM());
+ else if (!strcmp(fieldName, "width")) *out = naNum(base->widthM());
+ else if (!strcmp(fieldName, "surface")) *out = naNum(base->surface());
+ else if (base->type() == FGRunwayBase::RUNWAY) {
+ FGRunway* rwy = (FGRunway*) g;
+ if (!strcmp(fieldName, "threshold")) *out = naNum(rwy->displacedThresholdM());
+ else if (!strcmp(fieldName, "stopway")) *out = naNum(rwy->stopwayM());
+ else if (!strcmp(fieldName, "reciprocal")) {
+ *out = ghostForRunway(c, rwy->reciprocalRunway());
+ } else if (!strcmp(fieldName, "ils_frequency_mhz")) {
+ *out = rwy->ILS() ? naNum(rwy->ILS()->get_freq() / 100.0) : naNil();
+ } else if (!strcmp(fieldName, "ils")) {
+ *out = ghostForNavaid(c, rwy->ILS());
+ } else {
+ return 0;
+ }
} else {
- return 0;
+ return 0;
}
return "";
return "";
}
+static const char* fixGhostGetMember(naContext c, void* g, naRef field, naRef* out)
+{
+ const char* fieldName = naStr_data(field);
+ FGFix* fix = (FGFix*) g;
+
+ 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());
+ else {
+ return 0;
+ }
+
+ return "";
+}
+
static bool hashIsCoord(naRef h)
{
naRef parents = naHash_cget(h, (char*) "parents");
return false;
}
- return naEqual(naVec_get(parents, 0), geoCoordClass);
+ return naEqual(naVec_get(parents, 0), geoCoordClass) != 0;
}
bool geodFromHash(naRef ref, SGGeod& result)
if (!naIsHash(ref)) {
return false;
}
+
-// first, see if the hash contains a FGPositioned ghost - in which case
-// we can read off its position directly
- naRef posGhost = naHash_cget(ref, (char*) "_positioned");
- if (!naIsNil(posGhost)) {
- FGPositioned* pos = positionedGhost(posGhost);
- result = pos->geod();
- return true;
- }
-
-// then check for manual latitude / longitude names
+// check for manual latitude / longitude names
naRef lat = naHash_cget(ref, (char*) "lat");
naRef lon = naHash_cget(ref, (char*) "lon");
if (naIsNum(lat) && naIsNum(lon)) {
return 1;
}
+ if (gt == &TaxiwayGhostType) {
+ result = taxiwayGhost(args[offset])->geod();
+ return 1;
+ }
+
+ if (gt == &FixGhostType) {
+ result = fixGhost(args[offset])->geod();
+ return 1;
+ }
+
if (gt == &WayptGhostType) {
result = wayptGhost(args[offset])->position();
return 1;
double lat = naNumValue(args[0]).num;
double lon = naNumValue(args[1]).num;
double elev = argc == 3 ? naNumValue(args[2]).num : 10000;
- const SGMaterial *mat;
+ const simgear::BVHMaterial *material;
SGGeod geod = SGGeod::fromDegM(lon, lat, elev);
- if(!globals->get_scenery()->get_elevation_m(geod, elev, &mat))
+ if(!globals->get_scenery()->get_elevation_m(geod, elev, &material))
return naNil();
+ const SGMaterial *mat = dynamic_cast<const SGMaterial *>(material);
naRef vec = naNewVector(c);
naVec_append(vec, naNum(elev));
naRef matdata = naNil();
}
-class AirportInfoFilter : public FGAirport::AirportFilter
-{
-public:
- AirportInfoFilter() : type(FGPositioned::AIRPORT) {
- }
-
- bool fromArg(naRef arg)
- {
- const char *s = naStr_data(arg);
- if(!strcmp(s, "airport")) type = FGPositioned::AIRPORT;
- else if(!strcmp(s, "seaport")) type = FGPositioned::SEAPORT;
- else if(!strcmp(s, "heliport")) type = FGPositioned::HELIPORT;
- else
- return false;
-
- return true;
- }
-
- 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.
//
double maxRange = 10000.0; // expose this? or pick a smaller value?
- AirportInfoFilter filter; // defaults to airports only
+ FGAirport::TypeRunwayFilter filter; // defaults to airports only
if(argc == 0) {
// fall through and use AIRPORT
} else if(argc == 1 && naIsString(args[0])) {
- if (filter.fromArg(args[0])) {
+ if (filter.fromTypeString(naStr_data(args[0]))) {
// done!
} else {
// user provided an <id>, hopefully
naRuntimeError(c, "findAirportsWithinRange expected range (in nm) as arg %d", argOffset);
}
- AirportInfoFilter filter; // defaults to airports only
+ FGAirport::TypeRunwayFilter filter; // defaults to airports only
double rangeNm = args[argOffset++].num;
if (argOffset < argc) {
- filter.fromArg(args[argOffset++]);
+ filter.fromTypeString(naStr_data(args[argOffset++]));
}
naRef r = naNewVector(c);
- FGPositioned::List apts = FGPositioned::findWithinRange(pos, rangeNm, &filter);
+ FGPositionedList apts = FGPositioned::findWithinRange(pos, rangeNm, &filter);
FGPositioned::sortByRange(apts, pos);
BOOST_FOREACH(FGPositionedRef a, apts) {
}
int argOffset = 0;
- string prefix(naStr_data(args[argOffset++]));
- AirportInfoFilter filter; // defaults to airports only
+ std::string prefix(naStr_data(args[argOffset++]));
+ FGAirport::TypeRunwayFilter filter; // defaults to airports only
if (argOffset < argc) {
- filter.fromArg(args[argOffset++]);
+ filter.fromTypeString(naStr_data(args[argOffset++]));
}
naRef r = naNewVector(c);
- FGPositioned::List apts = FGPositioned::findAllWithIdent(prefix, &filter, false);
+ FGPositionedList apts = FGPositioned::findAllWithIdent(prefix, &filter, false);
BOOST_FOREACH(FGPositionedRef a, apts) {
FGAirport* apt = (FGAirport*) a.get();
naRef comms = naNewVector(c);
// if we have an explicit type, return a simple vector of frequencies
- if (argc > 0 && naIsScalar(args[0])) {
+ if (argc > 0 && !naIsString(args[0])) {
+ naRuntimeError(c, "airport.comms argument must be a frequency type name");
+ }
+
+ if (argc > 0) {
std::string commName = naStr_data(args[0]);
FGPositioned::Type commType = FGPositioned::typeFromName(commName);
if (!apt) {
naRuntimeError(c, "airport.runway called on non-airport object");
}
-
+
if ((argc < 1) || !naIsString(args[0])) {
naRuntimeError(c, "airport.runway expects a runway ident argument");
}
-
+
std::string ident(naStr_data(args[0]));
boost::to_upper(ident);
- if (!apt->hasRunwayWithIdent(ident)) {
- return naNil();
+
+ if (apt->hasRunwayWithIdent(ident)) {
+ return ghostForRunway(c, apt->getRunwayByIdent(ident));
+ } else if (apt->hasHelipadWithIdent(ident)) {
+ return ghostForHelipad(c, apt->getHelipadByIdent(ident));
}
-
- return ghostForRunway(c, apt->getRunwayByIdent(ident));
+ return naNil();
+}
+
+static naRef f_airport_runwaysWithoutReciprocals(naContext c, naRef me, int argc, naRef* args)
+{
+ FGAirport* apt = airportGhost(me);
+ if (!apt) {
+ naRuntimeError(c, "airport.runwaysWithoutReciprocals called on non-airport object");
+ }
+
+ FGRunwayList rwylist(apt->getRunwaysWithoutReciprocals());
+ naRef runways = naNewVector(c);
+ for (unsigned int r=0; r<rwylist.size(); ++r) {
+ FGRunway* rwy(rwylist[r]);
+ naVec_append(runways, ghostForRunway(c, apt->getRunwayByIdent(rwy->ident())));
+ }
+ return runways;
}
static naRef f_airport_sids(naContext c, naRef me, int argc, naRef* args)
}
FGAirportDynamics* dynamics = apt->getDynamics();
- for (int i=0; i<dynamics->getNrOfParkings(); ++i) {
- FGParking* park = dynamics->getParking(i);
- // filter out based on availability and type
- if (onlyAvailable && !park->isAvailable()) {
+ 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;
}
- naRef nm = stringToNasal(c, park->getName());
- naVec_append(r, nm);
+ const SGGeod& parkLoc = park->geod();
+ naRef ph = naNewHash(c);
+ hashset(c, ph, "name", stringToNasal(c, park->getName()));
+ hashset(c, ph, "lat", naNum(parkLoc.getLatitudeDeg()));
+ hashset(c, ph, "lon", naNum(parkLoc.getLongitudeDeg()));
+ hashset(c, ph, "elevation", naNum(parkLoc.getElevationM()));
+ naVec_append(r, ph);
}
return r;
naRuntimeError(c, "airport.getSid passed invalid argument");
}
- string ident = naStr_data(args[0]);
+ std::string ident = naStr_data(args[0]);
return ghostForProcedure(c, apt->findSIDWithIdent(ident));
}
naRuntimeError(c, "airport.getStar passed invalid argument");
}
- string ident = naStr_data(args[0]);
+ std::string ident = naStr_data(args[0]);
return ghostForProcedure(c, apt->findSTARWithIdent(ident));
}
naRuntimeError(c, "airport.getIAP passed invalid argument");
}
- string ident = naStr_data(args[0]);
+ std::string ident = naStr_data(args[0]);
return ghostForProcedure(c, apt->findApproachWithIdent(ident));
}
+static naRef f_airport_findBestRunway(naContext c, naRef me, int argc, naRef* args)
+{
+ FGAirport* apt = airportGhost(me);
+ if (!apt) {
+ naRuntimeError(c, "findBestRunway called on non-airport object");
+ }
+
+ SGGeod pos;
+ if (!geodFromArgs(args, 0, argc, pos)) {
+ naRuntimeError(c, "findBestRunway must be passed a position");
+ }
+
+ return ghostForRunway(c, apt->findBestRunwayForPos(pos));
+}
+
+static naRef f_airport_toString(naContext c, naRef me, int argc, naRef* args)
+{
+ FGAirport* apt = airportGhost(me);
+ if (!apt) {
+ naRuntimeError(c, "airport.tostring called on non-airport object");
+ }
+
+ return stringToNasal(c, "an airport " + apt->ident());
+}
+
// Returns vector of data hash for navaid of a <type>, nil on error
// navaids sorted by ascending distance
// navinfo([<lat>,<lon>],[<type>],[<id>])
return naNil();
}
- navlist = globals->get_navlist()->findByIdentAndFreq( pos, id, 0.0, type );
+ FGNavList::TypeFilter filter(type);
+ navlist = FGNavList::findByIdentAndFreq( pos, id, 0.0, &filter );
naRef reply = naNewVector(c);
for( nav_list_type::const_iterator it = navlist.begin(); it != navlist.end(); ++it ) {
naRef r = naNewVector(c);
FGNavList::TypeFilter filter(type);
- FGPositioned::List navs = FGPositioned::findWithinRange(pos, rangeNm, &filter);
+ FGPositionedList navs = FGPositioned::findWithinRange(pos, rangeNm, &filter);
FGPositioned::sortByRange(navs, pos);
BOOST_FOREACH(FGPositionedRef a, navs) {
type = FGPositioned::typeFromName(naStr_data(args[argOffset]));
}
- nav_list_type navs = globals->get_navlist()->findAllByFreq(freqMhz, pos, type);
+ FGNavList::TypeFilter filter(type);
+ nav_list_type navs = FGNavList::findAllByFreq(freqMhz, pos, &filter);
if (navs.empty()) {
return naNil();
}
}
naRef r = naNewVector(c);
- nav_list_type navs = globals->get_navlist()->findAllByFreq(freqMhz, pos, type);
+
+ FGNavList::TypeFilter filter(type);
+ nav_list_type navs = FGNavList::findAllByFreq(freqMhz, pos, &filter);
BOOST_FOREACH(nav_rec_ptr a, navs) {
naVec_append(r, ghostForNavaid(c, a.ptr()));
}
FGPositioned::Type type = FGPositioned::INVALID;
- string ident = naStr_data(args[argOffset++]);
+ std::string ident = naStr_data(args[argOffset++]);
if (argOffset < argc) {
type = FGPositioned::typeFromName(naStr_data(args[argOffset]));
}
+ FGNavList::TypeFilter filter(type);
naRef r = naNewVector(c);
- nav_list_type navs = globals->get_navlist()->findByIdentAndFreq(pos, ident, 0.0, type);
+ nav_list_type navs = FGNavList::findByIdentAndFreq(pos, ident, 0.0, &filter);
BOOST_FOREACH(nav_rec_ptr a, navs) {
naVec_append(r, ghostForNavaid(c, a.ptr()));
return r;
}
+static naRef f_findFixesByIdent(naContext c, naRef me, int argc, naRef* args)
+{
+ int argOffset = 0;
+ SGGeod pos = globals->get_aircraft_position();
+ argOffset += geodFromArgs(args, 0, argc, pos);
+
+ if (!naIsString(args[argOffset])) {
+ naRuntimeError(c, "findFixesByIdent expectes ident string as arg %d", argOffset);
+ }
+
+ std::string ident(naStr_data(args[argOffset]));
+ naRef r = naNewVector(c);
+
+ FGPositioned::TypeFilter filter(FGPositioned::FIX);
+ FGPositionedList fixes = FGPositioned::findAllWithIdent(ident, &filter);
+ FGPositioned::sortByRange(fixes, pos);
+
+ BOOST_FOREACH(FGPositionedRef f, fixes) {
+ naVec_append(r, ghostForFix(c, (FGFix*) f.ptr()));
+ }
+
+ return r;
+}
// Convert a cartesian point to a geodetic lat/lon/altitude.
static naRef f_magvar(naContext c, naRef me, int argc, naRef* args)
return naNil();
}
+class NasalFPDelegate : public FlightPlan::Delegate
+{
+public:
+ NasalFPDelegate(FlightPlan* fp, FGNasalSys* sys, naRef ins) :
+ _nasal(sys),
+ _plan(fp),
+ _instance(ins)
+ {
+ _gcSaveKey = _nasal->gcSave(ins);
+ }
+
+ virtual ~NasalFPDelegate()
+ {
+ _nasal->gcRelease(_gcSaveKey);
+ }
+
+ virtual void departureChanged()
+ {
+ callDelegateMethod("departureChanged");
+ }
+
+ virtual void arrivalChanged()
+ {
+ callDelegateMethod("arrivalChanged");
+ }
+
+ virtual void waypointsChanged()
+ {
+ callDelegateMethod("waypointsChanged");
+ }
+
+ virtual void currentWaypointChanged()
+ {
+ callDelegateMethod("currentWaypointChanged");
+ }
+
+ virtual void cleared()
+ {
+ callDelegateMethod("cleared");
+ }
+
+ virtual void endOfFlightPlan()
+ {
+ callDelegateMethod("endOfFlightPlan");
+ }
+private:
+
+ void callDelegateMethod(const char* method)
+ {
+ naRef f;
+ if (naMember_cget(_nasal->context(), _instance, method, &f) == 0) {
+ return; // no method on the delegate
+ }
+
+ naRef arg[1];
+ arg[0] = ghostForFlightPlan(_nasal->context(), _plan);
+ _nasal->callMethod(f, _instance, 1, arg, naNil());
+ }
+
+ FGNasalSys* _nasal;
+ FlightPlan* _plan;
+ naRef _instance;
+ int _gcSaveKey;
+};
+
+class NasalFPDelegateFactory : public FlightPlan::DelegateFactory
+{
+public:
+ NasalFPDelegateFactory(naRef code)
+ {
+ _nasal = (FGNasalSys*) globals->get_subsystem("nasal");
+ _func = code;
+ _gcSaveKey = _nasal->gcSave(_func);
+ }
+
+ ~NasalFPDelegateFactory()
+ {
+ _nasal->gcRelease(_gcSaveKey);
+ }
+
+ virtual FlightPlan::Delegate* createFlightPlanDelegate(FlightPlan* fp)
+ {
+ naRef args[1];
+ args[0] = ghostForFlightPlan(_nasal->context(), fp);
+ naRef instance = _nasal->call(_func, 1, args, naNil());
+ if (naIsNil(instance)) {
+ return NULL;
+ }
+
+ return new NasalFPDelegate(fp, _nasal, instance);
+ }
+private:
+ FGNasalSys* _nasal;
+ naRef _func;
+ int _gcSaveKey;
+};
+
+static naRef f_registerFPDelegate(naContext c, naRef me, int argc, naRef* args)
+{
+ if ((argc < 1) || !naIsFunc(args[0])) {
+ naRuntimeError(c, "non-function argument to registerFlightPlanDelegate");
+ }
+
+ NasalFPDelegateFactory* factory = new NasalFPDelegateFactory(args[0]);
+ FlightPlan::registerDelegateFactory(factory);
+
+ return naNil();
+}
+
+static WayptRef wayptFromArg(naRef arg)
+{
+ WayptRef r = wayptGhost(arg);
+ if (r.valid()) {
+ return r;
+ }
+
+ FGPositioned* pos = positionedGhost(arg);
+ if (!pos) {
+ // let's check if the arg is hash, coudl extra a geod and hence build
+ // a simple waypoint
+
+ return WayptRef();
+ }
+
+// special-case for runways
+ if (pos->type() == FGPositioned::RUNWAY) {
+ return new RunwayWaypt((FGRunway*) pos, NULL);
+ }
+
+ return new NavaidWaypoint(pos, NULL);
+}
+
+static naRef convertWayptVecToNasal(naContext c, const WayptVec& wps)
+{
+ naRef result = naNewVector(c);
+ BOOST_FOREACH(WayptRef wpt, wps) {
+ naVec_append(result, ghostForWaypt(c, wpt.get()));
+ }
+ return result;
+}
+
+static naRef f_airwaySearch(naContext c, naRef me, int argc, naRef* args)
+{
+ if (argc < 2) {
+ naRuntimeError(c, "airwaysSearch needs at least two arguments");
+ }
+
+ WayptRef start = wayptFromArg(args[0]),
+ end = wayptFromArg(args[1]);
+
+ if (!start || !end) {
+ SG_LOG(SG_NASAL, SG_WARN, "airwaysSearch: start or end points are invalid");
+ return naNil();
+ }
+
+ bool highLevel = true;
+ if ((argc > 2) && naIsString(args[2])) {
+ if (!strcmp(naStr_data(args[2]), "lowlevel")) {
+ highLevel = false;
+ }
+ }
+
+ WayptVec route;
+ if (highLevel) {
+ Airway::highLevel()->route(start, end, route);
+ } else {
+ Airway::lowLevel()->route(start, end, route);
+ }
+
+ return convertWayptVecToNasal(c, route);
+}
+
+static naRef f_createWP(naContext c, naRef me, int argc, naRef* args)
+{
+ SGGeod pos;
+ int argOffset = geodFromArgs(args, 0, argc, pos);
+
+ if (((argc - argOffset) < 1) || !naIsString(args[argOffset])) {
+ naRuntimeError(c, "createWP: no identifier supplied");
+ }
+
+ std::string ident = naStr_data(args[argOffset++]);
+ WayptRef wpt = new BasicWaypt(pos, ident, NULL);
+
+// set waypt flags - approach, departure, pseudo, etc
+ if (argc > argOffset) {
+ WayptFlag f = wayptFlagFromString(naStr_data(args[argOffset++]));
+ if (f == 0) {
+ naRuntimeError(c, "createWP: bad waypoint role");
+ }
+
+ wpt->setFlag(f);
+ }
+
+ return ghostForWaypt(c, wpt);
+}
+
+static naRef f_createWPFrom(naContext c, naRef me, int argc, naRef* args)
+{
+ if (argc < 1) {
+ naRuntimeError(c, "createWPFrom: need at least one argument");
+ }
+
+ FGPositioned* positioned = positionedGhost(args[0]);
+ if (!positioned) {
+ naRuntimeError(c, "createWPFrom: couldn;t convert arg[0] to FGPositioned");
+ }
+
+ WayptRef wpt;
+ if (positioned->type() == FGPositioned::RUNWAY) {
+ wpt = new RunwayWaypt((FGRunway*) positioned, NULL);
+ } else {
+ wpt = new NavaidWaypoint(positioned, NULL);
+ }
+
+ // set waypt flags - approach, departure, pseudo, etc
+ if (argc > 1) {
+ WayptFlag f = wayptFlagFromString(naStr_data(args[1]));
+ if (f == 0) {
+ naRuntimeError(c, "createWPFrom: bad waypoint role");
+ }
+ wpt->setFlag(f);
+ }
+
+ return ghostForWaypt(c, wpt);
+}
+
static naRef f_flightplan_getWP(naContext c, naRef me, int argc, naRef* args)
{
FlightPlan* fp = flightplanGhost(me);
return naNil();
}
-static naRef f_flightplan_clearPlan(naContext c, naRef me, int argc, naRef* args)
+static naRef f_flightplan_deleteWP(naContext c, naRef me, int argc, naRef* args)
{
FlightPlan* fp = flightplanGhost(me);
if (!fp) {
- naRuntimeError(c, "flightplan.clearPlan called on non-flightplan object");
+ naRuntimeError(c, "flightplan.deleteWP called on non-flightplan object");
}
- fp->clear();
+ if ((argc < 1) || !naIsNum(args[0])) {
+ naRuntimeError(c, "bad argument to flightplan.deleteWP");
+ }
+
+ int index = (int) args[0].num;
+ fp->deleteIndex(index);
return naNil();
}
-static WayptFlag wayptFlagFromString(const char* s)
+static naRef f_flightplan_clearPlan(naContext c, naRef me, int argc, naRef* args)
{
- if (!strcmp(s, "sid")) return WPT_DEPARTURE;
- if (!strcmp(s, "star")) return WPT_ARRIVAL;
- if (!strcmp(s, "approach")) return WPT_APPROACH;
- if (!strcmp(s, "missed")) return WPT_MISS;
- if (!strcmp(s, "pseudo")) return WPT_PSEUDO;
+ FlightPlan* fp = flightplanGhost(me);
+ if (!fp) {
+ naRuntimeError(c, "flightplan.clearPlan called on non-flightplan object");
+ }
- return (WayptFlag) 0;
+ fp->clear();
+ return naNil();
}
static naRef f_flightplan_clearWPType(naContext c, naRef me, int argc, naRef* args)
}
WayptFlag flag = wayptFlagFromString(naStr_data(args[0]));
+ if (flag == 0) {
+ naRuntimeError(c, "clearWPType: bad waypoint role");
+ }
+
fp->clearWayptsWithFlag(flag);
return naNil();
}
return ghostForFlightPlan(c, fp->clone());
}
+static naRef f_flightplan_pathGeod(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan* fp = flightplanGhost(me);
+ if (!fp) {
+ naRuntimeError(c, "flightplan.clone called on non-flightplan object");
+ }
+
+ if ((argc < 1) || !naIsNum(args[0])) {
+ naRuntimeError(c, "bad argument to flightplan.pathGeod");
+ }
+
+ if ((argc > 1) && !naIsNum(args[1])) {
+ naRuntimeError(c, "bad argument to flightplan.pathGeod");
+ }
+
+ int index = (int) args[0].num;
+ double offset = (argc > 1) ? args[1].num : 0.0;
+ naRef result = naNewHash(c);
+ SGGeod g = fp->pointAlongRoute(index, offset);
+ hashset(c, result, "lat", naNum(g.getLatitudeDeg()));
+ hashset(c, result, "lon", naNum(g.getLongitudeDeg()));
+ return result;
+}
+
+static naRef f_flightplan_finish(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan* fp = flightplanGhost(me);
+ if (!fp) {
+ naRuntimeError(c, "flightplan.finish called on non-flightplan object");
+ }
+
+ fp->finish();
+ return naNil();
+}
+
static naRef f_leg_setSpeed(naContext c, naRef me, int argc, naRef* args)
{
FlightPlan::Leg* leg = fpLegGhost(me);
if (!leg) {
naRuntimeError(c, "leg.setSpeed called on non-flightplan-leg object");
}
+
+ double speed = 0.0;
+ if ((argc < 2) || !convertToNum(args[0], speed))
+ naRuntimeError(c, "bad arguments to setSpeed");
+
+ RouteRestriction rr = routeRestrictionFromString(naStr_data(args[1]));
+ leg->setSpeed(rr, speed);
- if (argc < 2) {
- naRuntimeError(c, "bad arguments to leg.setSpeed");
+ return naNil();
+}
+
+static naRef f_leg_setAltitude(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan::Leg* leg = fpLegGhost(me);
+ if (!leg) {
+ naRuntimeError(c, "leg.setAltitude called on non-flightplan-leg object");
}
+ double alt = 0.0;
+ if ((argc < 2) || !convertToNum(args[0], alt))
+ naRuntimeError(c, "bad arguments to leg.setAltitude");
+
RouteRestriction rr = routeRestrictionFromString(naStr_data(args[1]));
- leg->setSpeed(rr, args[0].num);
+ leg->setAltitude(rr, alt);
+
return naNil();
}
-static naRef f_leg_setAltitude(naContext c, naRef me, int argc, naRef* args)
+static naRef f_leg_path(naContext c, naRef me, int argc, naRef* args)
{
FlightPlan::Leg* leg = fpLegGhost(me);
if (!leg) {
naRuntimeError(c, "leg.setAltitude called on non-flightplan-leg object");
}
- if (argc < 2) {
- naRuntimeError(c, "bad arguments to leg.setAltitude");
+ RoutePath path(leg->owner());
+ SGGeodVec gv(path.pathForIndex(leg->index()));
+
+ naRef result = naNewVector(c);
+ BOOST_FOREACH(SGGeod p, gv) {
+ // construct a geo.Coord!
+ naRef coord = naNewHash(c);
+ hashset(c, coord, "lat", naNum(p.getLatitudeDeg()));
+ hashset(c, coord, "lon", naNum(p.getLongitudeDeg()));
+ naVec_append(result, coord);
}
-
- RouteRestriction rr = routeRestrictionFromString(naStr_data(args[1]));
- leg->setAltitude(rr, args[0].num);
- return naNil();
+
+ return result;
+}
+
+static naRef f_leg_courseAndDistanceFrom(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan::Leg* leg = fpLegGhost(me);
+ if (!leg) {
+ naRuntimeError(c, "leg.courseAndDistanceFrom called on non-flightplan-leg object");
+ }
+
+ SGGeod pos;
+ geodFromArgs(args, 0, argc, pos);
+
+ double courseDeg;
+ double distanceM;
+ boost::tie(courseDeg, distanceM) = leg->waypoint()->courseAndDistanceFrom(pos);
+
+ naRef result = naNewVector(c);
+ naVec_append(result, naNum(courseDeg));
+ naVec_append(result, naNum(distanceM * SG_METER_TO_NM));
+ return result;
}
static naRef f_waypoint_navaid(naContext c, naRef me, int argc, naRef* args)
return ghostForProcedure(c, trans);
}
+static naRef f_procedure_route(naContext c, naRef me, int argc, naRef* args)
+{
+ Procedure* proc = procedureGhost(me);
+ if (!proc) {
+ naRuntimeError(c, "procedure.route called on non-procedure object");
+ }
+
+// wrapping up tow different routines here - approach routing from the IAF
+// to the associated runway, and SID/STAR routing via an enroute transition
+// and possibly a runway transition or not.
+ if (Approach::isApproach(proc->type())) {
+ WayptRef iaf;
+ if (argc > 0) {
+ iaf = wayptFromArg(args[0]);
+ }
+
+ 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();
+ }
+
+ return convertWayptVecToNasal(c, r);
+ } else if ((proc->type() != PROCEDURE_SID) && (proc->type() != PROCEDURE_STAR)) {
+ naRuntimeError(c, "procedure.route called on unsuitable procedure type");
+ }
+
+ int argOffset = 0;
+ FGRunway* rwy = runwayGhost(args[0]);
+ if (rwy) ++argOffset;
+
+ ArrivalDeparture* ad = (ArrivalDeparture*) proc;
+ Transition* trans = NULL;
+ if (argOffset < argc) {
+ trans = (Transition*) procedureGhost(args[argOffset]);
+ }
+
+ // note either runway or trans may be NULL - that's ok
+ WayptVec r;
+ if (!ad->route(rwy, trans, r)) {
+ SG_LOG(SG_NASAL, SG_WARN, "prcoedure.route failed for ArrvialDeparture somehow");
+ return naNil();
+ }
+
+ return convertWayptVecToNasal(c, r);
+}
+
+
// Table of extension functions. Terminate with zeros.
static struct { const char* name; naCFunction func; } funcs[] = {
{ "carttogeod", f_carttogeod },
{ "findNavaidByFrequency", f_findNavaidByFrequency },
{ "findNavaidsByFrequency", f_findNavaidsByFrequency },
{ "findNavaidsByID", f_findNavaidsByIdent },
+ { "findFixesByID", f_findFixesByIdent },
{ "flightplan", f_route },
+ { "registerFlightPlanDelegate", f_registerFPDelegate },
+ { "createWP", f_createWP },
+ { "createWPFrom", f_createWPFrom },
+ { "airwaysRoute", f_airwaySearch },
{ "magvar", f_magvar },
{ "courseAndDistance", f_courseAndDistance },
{ "greatCircleMove", f_greatCircleMove },
};
-naRef initNasalPositioned(naRef globals, naContext c, naRef gcSave)
+naRef initNasalPositioned(naRef globals, naContext c)
{
airportPrototype = naNewHash(c);
- hashset(c, gcSave, "airportProto", airportPrototype);
+ naSave(c, airportPrototype);
hashset(c, airportPrototype, "runway", naNewFunc(c, naNewCCode(c, f_airport_runway)));
+ hashset(c, airportPrototype, "runwaysWithoutReciprocals", naNewFunc(c, naNewCCode(c, f_airport_runwaysWithoutReciprocals)));
+ hashset(c, airportPrototype, "helipad", naNewFunc(c, naNewCCode(c, f_airport_runway)));
hashset(c, airportPrototype, "tower", naNewFunc(c, naNewCCode(c, f_airport_tower)));
hashset(c, airportPrototype, "comms", naNewFunc(c, naNewCCode(c, f_airport_comms)));
hashset(c, airportPrototype, "sids", naNewFunc(c, naNewCCode(c, f_airport_sids)));
hashset(c, airportPrototype, "getSid", naNewFunc(c, naNewCCode(c, f_airport_getSid)));
hashset(c, airportPrototype, "getStar", naNewFunc(c, naNewCCode(c, f_airport_getStar)));
hashset(c, airportPrototype, "getIAP", naNewFunc(c, naNewCCode(c, f_airport_getApproach)));
+ hashset(c, airportPrototype, "findBestRunwayForPos", naNewFunc(c, naNewCCode(c, f_airport_findBestRunway)));
+ hashset(c, airportPrototype, "tostring", naNewFunc(c, naNewCCode(c, f_airport_toString)));
flightplanPrototype = naNewHash(c);
- hashset(c, gcSave, "flightplanProto", flightplanPrototype);
+ naSave(c, flightplanPrototype);
hashset(c, flightplanPrototype, "getWP", naNewFunc(c, naNewCCode(c, f_flightplan_getWP)));
hashset(c, flightplanPrototype, "currentWP", naNewFunc(c, naNewCCode(c, f_flightplan_currentWP)));
hashset(c, flightplanPrototype, "getPlanSize", naNewFunc(c, naNewCCode(c, f_flightplan_numWaypoints)));
hashset(c, flightplanPrototype, "appendWP", naNewFunc(c, naNewCCode(c, f_flightplan_appendWP)));
hashset(c, flightplanPrototype, "insertWP", naNewFunc(c, naNewCCode(c, f_flightplan_insertWP)));
+ hashset(c, flightplanPrototype, "deleteWP", naNewFunc(c, naNewCCode(c, f_flightplan_deleteWP)));
hashset(c, flightplanPrototype, "insertWPAfter", naNewFunc(c, naNewCCode(c, f_flightplan_insertWPAfter)));
hashset(c, flightplanPrototype, "insertWaypoints", naNewFunc(c, naNewCCode(c, f_flightplan_insertWaypoints)));
hashset(c, flightplanPrototype, "cleanPlan", naNewFunc(c, naNewCCode(c, f_flightplan_clearPlan)));
hashset(c, flightplanPrototype, "clearWPType", naNewFunc(c, naNewCCode(c, f_flightplan_clearWPType)));
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)));
+
waypointPrototype = naNewHash(c);
- hashset(c, gcSave, "wayptProto", waypointPrototype);
+ naSave(c, waypointPrototype);
hashset(c, waypointPrototype, "navaid", naNewFunc(c, naNewCCode(c, f_waypoint_navaid)));
hashset(c, waypointPrototype, "runway", naNewFunc(c, naNewCCode(c, f_waypoint_runway)));
hashset(c, waypointPrototype, "airport", naNewFunc(c, naNewCCode(c, f_waypoint_airport)));
procedurePrototype = naNewHash(c);
- hashset(c, gcSave, "procedureProto", procedurePrototype);
- // hashset(c, procedurePrototype, "runwayTransition", naNewFunc(c, naNewCCode(c, f_procedure_runwayTransition)));
+ naSave(c, procedurePrototype);
hashset(c, procedurePrototype, "transition", naNewFunc(c, naNewCCode(c, f_procedure_transition)));
- // hashset(c, procedurePrototype, "buildPath", naNewFunc(c, naNewCCode(c, f_procedure_build)));
+ hashset(c, procedurePrototype, "route", naNewFunc(c, naNewCCode(c, f_procedure_route)));
fpLegPrototype = naNewHash(c);
- hashset(c, gcSave, "fpLegProto", fpLegPrototype);
+ naSave(c, fpLegPrototype);
hashset(c, fpLegPrototype, "setSpeed", naNewFunc(c, naNewCCode(c, f_leg_setSpeed)));
hashset(c, fpLegPrototype, "setAltitude", naNewFunc(c, naNewCCode(c, f_leg_setAltitude)));
+ hashset(c, fpLegPrototype, "path", naNewFunc(c, naNewCCode(c, f_leg_path)));
+ hashset(c, fpLegPrototype, "courseAndDistanceFrom", naNewFunc(c, naNewCCode(c, f_leg_courseAndDistanceFrom)));
for(int i=0; funcs[i].name; i++) {
hashset(c, globals, funcs[i].name,