X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalPositioned.cxx;h=eb572973e015316121a883eff935ee3a0ae49017;hb=22a1c9b2af9fd6c4c2758d095c3004da28e83b85;hp=66bfb5826a370b55bf7af5642dbdf78096d6baf3;hpb=12076bce0e9fb66286f14931e8f4eb12fc0b9b82;p=flightgear.git diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx index 66bfb5826..eb572973e 100644 --- a/src/Scripting/NasalPositioned.cxx +++ b/src/Scripting/NasalPositioned.cxx @@ -28,6 +28,7 @@ #include #include +#include // for boost::tie #include #include @@ -36,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -72,6 +73,7 @@ naGhostType NavaidGhostType = { positionedGhostDestroy, "navaid", navaidGhostGet 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); @@ -288,6 +290,16 @@ naRef ghostForRunway(naContext c, const FGRunway* r) 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) { @@ -367,16 +379,24 @@ static const char* airportGhostGetMember(naContext c, void* g, naRef field, naRe double minLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft"); for(unsigned int r=0; rnumRunways(); ++r) { FGRunway* rwy(apt->getRunwayByIndex(r)); - - // ignore unusably short runways + // 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; rnumHelipads(); ++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); @@ -442,7 +462,7 @@ static const char* wayptGhostGetMember(naContext c, void* g, naRef field, naRef* 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; @@ -708,7 +728,7 @@ static const char* procedureGhostGetMember(naContext c, void* g, naRef field, na ArrivalDeparture* ad = static_cast(proc); *out = naNewVector(c); - BOOST_FOREACH(string id, ad->transitionIdents()) { + BOOST_FOREACH(std::string id, ad->transitionIdents()) { naVec_append(*out, stringToNasal(c, id)); } } else { @@ -734,7 +754,9 @@ static const char* runwayGhostGetMember(naContext c, void* g, naRef field, naRef 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, "ils_frequency_mhz")) { + 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()); @@ -961,49 +983,6 @@ static naRef f_geodinfo(naContext c, naRef me, int argc, naRef* args) } -class AirportInfoFilter : public FGAirport::AirportFilter -{ -public: - AirportInfoFilter() : type(FGPositioned::AIRPORT) { - minRunwayLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft", 0.0); - } - - 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; - } - - virtual bool pass(FGPositioned* aPos) const - { - FGAirport* apt = (FGAirport*) aPos; - if ((apt->type() == FGPositioned::AIRPORT) && - !apt->hasHardRunwayOfLengthFt(minRunwayLengthFt)) - { - return false; - } - - return true; - } - - FGPositioned::Type type; - double minRunwayLengthFt; -}; - // Returns data hash for particular or nearest airport of a , or nil // on error. // @@ -1024,12 +1003,12 @@ static naRef f_airportinfo(naContext c, naRef me, int argc, naRef* args) 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 , hopefully @@ -1064,10 +1043,10 @@ static naRef f_findAirportsWithinRange(naContext c, naRef me, int argc, naRef* a 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); @@ -1090,10 +1069,10 @@ static naRef f_findAirportsByICAO(naContext c, naRef me, int argc, naRef* args) } 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); @@ -1159,38 +1138,36 @@ static naRef f_airport_runway(naContext c, naRef me, int argc, naRef* args) 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_taxiway(naContext c, naRef me, int argc, naRef* args) +static naRef f_airport_runwaysWithoutReciprocals(naContext c, naRef me, int argc, naRef* args) { FGAirport* apt = airportGhost(me); if (!apt) { - naRuntimeError(c, "airport.taxiway called on non-airport object"); + naRuntimeError(c, "airport.runwaysWithoutReciprocals called on non-airport object"); } - - if ((argc < 1) || !naIsString(args[0])) { - naRuntimeError(c, "airport.taxiway expects a taxiway ident argument"); - } - - naRef taxiways = naNewVector(c); - - for (unsigned int i = 0; i < apt->numTaxiways(); i++) { - naVec_append(taxiways, ghostForTaxiway(c, apt->getTaxiwayByIndex(i))); + + FGRunwayList rwylist(apt->getRunwaysWithoutReciprocals()); + naRef runways = naNewVector(c); + for (unsigned int r=0; rgetRunwayByIdent(rwy->ident()))); } - - return taxiways; + return runways; } static naRef f_airport_sids(naContext c, naRef me, int argc, naRef* args) @@ -1377,7 +1354,7 @@ static naRef f_airport_getSid(naContext c, naRef me, int argc, naRef* args) 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)); } @@ -1392,7 +1369,7 @@ static naRef f_airport_getStar(naContext c, naRef me, int argc, naRef* args) 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)); } @@ -1407,7 +1384,7 @@ static naRef f_airport_getApproach(naContext c, naRef me, int argc, naRef* args) 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)); } @@ -1581,7 +1558,7 @@ static naRef f_findNavaidsByIdent(naContext c, naRef me, int argc, naRef* args) } 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])); } @@ -1607,7 +1584,7 @@ static naRef f_findFixesByIdent(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "findFixesByIdent expectes ident string as arg %d", argOffset); } - string ident(naStr_data(args[argOffset])); + std::string ident(naStr_data(args[argOffset])); naRef r = naNewVector(c); FGPositioned::TypeFilter filter(FGPositioned::FIX); @@ -1772,6 +1749,11 @@ public: { callDelegateMethod("currentWaypointChanged"); } + + virtual void cleared() + { + callDelegateMethod("cleared"); + } private: void callDelegateMethod(const char* method) @@ -1909,7 +1891,7 @@ static naRef f_createWP(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "createWP: no identifier supplied"); } - string ident = naStr_data(args[argOffset++]); + std::string ident = naStr_data(args[argOffset++]); WayptRef wpt = new BasicWaypt(pos, ident, NULL); // set waypt flags - approach, departure, pseudo, etc @@ -2204,6 +2186,26 @@ static naRef f_leg_path(naContext c, naRef me, int argc, naRef* args) 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) { flightgear::Waypt* w = wayptGhost(me); @@ -2363,7 +2365,8 @@ naRef initNasalPositioned(naRef globals, naContext c, naRef gcSave) hashset(c, gcSave, "airportProto", airportPrototype); hashset(c, airportPrototype, "runway", naNewFunc(c, naNewCCode(c, f_airport_runway))); - hashset(c, airportPrototype, "taxiway", naNewFunc(c, naNewCCode(c, f_airport_taxiway))); + 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))); @@ -2409,6 +2412,7 @@ naRef initNasalPositioned(naRef globals, naContext c, naRef gcSave) 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,