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
+ // 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);
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;
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 {
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());
}
-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 <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);
}
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);
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);
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");
- }
-
- if ((argc < 1) || !naIsString(args[0])) {
- naRuntimeError(c, "airport.taxiway expects a taxiway ident argument");
+ naRuntimeError(c, "airport.runwaysWithoutReciprocals called on non-airport object");
}
-
- 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; r<rwylist.size(); ++r) {
+ FGRunway* rwy(rwylist[r]);
+ naVec_append(runways, ghostForRunway(c, apt->getRunwayByIdent(rwy->ident())));
}
-
- return taxiways;
+ return runways;
}
static naRef f_airport_sids(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));
}
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));
}
}
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]));
}
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);
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
hashset(c, gcSave, "airportProto", 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, "taxiway", naNewFunc(c, naNewCCode(c, f_airport_taxiway)));
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)));
projects / flightgear.git / blobdiff