X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FATC%2Ftrafficcontrol.cxx;h=124b1740fcbc4d09f7eb524e38b748deae181404;hb=8eca7590777cf4cf9d79a7a83187b588d5e53f2d;hp=8079933b167d45a6542518ec292049c112a9f594;hpb=f5c2c630ebe3599f2b72dc4e0bca2ad427767b80;p=flightgear.git diff --git a/src/ATC/trafficcontrol.cxx b/src/ATC/trafficcontrol.cxx index 8079933b1..124b1740f 100644 --- a/src/ATC/trafficcontrol.cxx +++ b/src/ATC/trafficcontrol.cxx @@ -26,11 +26,23 @@ #include +#include +#include +#include +#include + +#include +#include +#include +#include + #include "trafficcontrol.hxx" +#include "atc_mgr.hxx" #include #include #include #include +#include #include #include #include @@ -53,7 +65,7 @@ time_t ActiveRunway::requestTimeSlot(time_t eta) TimeVectorIterator i = estimatedArrivalTimes.begin(); //cerr << "Checking eta slots " << eta << ": " << endl; for (i = estimatedArrivalTimes.begin(); - i != estimatedArrivalTimes.end(); i++) { + i != estimatedArrivalTimes.end(); i++) { //cerr << "Stored time : " << (*i) << endl; } i = estimatedArrivalTimes.begin(); @@ -74,7 +86,7 @@ time_t ActiveRunway::requestTimeSlot(time_t eta) } } else { if ((((*j) - (*i)) > (separation * 2))) { // found a potential slot - // now check whether this slow is usable: + // now check whether this slot is usable: // 1) eta should fall between the two points // i.e. eta > i AND eta < j // @@ -128,22 +140,45 @@ time_t ActiveRunway::requestTimeSlot(time_t eta) return newEta; } +void ActiveRunway::printDepartureCue() +{ + cout << "Departure cue for " << rwy << ": " << endl; + for (AircraftVecIterator atc = departureCue.begin(); atc != departureCue.end(); atc++) { + cout << " " << (*atc)->getCallSign() << " " << (*atc)->getTakeOffStatus(); + cout << " " << (*atc)->_getLatitude() << " " << (*atc)->_getLongitude() << (*atc)-> getSpeed() << " " << (*atc)->getAltitude() << endl; + } + +} + +FGAIAircraft* ActiveRunway::getFirstOfStatus(int stat) +{ + for (AircraftVecIterator atc =departureCue.begin(); atc != departureCue.end(); atc++) { + if ((*atc)->getTakeOffStatus() == stat) + return (*atc); + } + return 0; +} + + + /*************************************************************************** * FGTrafficRecord **************************************************************************/ FGTrafficRecord::FGTrafficRecord(): -id(0), waitsForId(0), -currentPos(0), -leg(0), -frequencyId(0), -state(0), -allowTransmission(true), -latitude(0), longitude(0), heading(0), speed(0), altitude(0), radius(0) + id(0), waitsForId(0), + currentPos(0), + leg(0), + frequencyId(0), + state(0), + allowTransmission(true), + allowPushback(true), + priority(0), + latitude(0), longitude(0), heading(0), speed(0), altitude(0), radius(0) { } void FGTrafficRecord::setPositionAndIntentions(int pos, - FGAIFlightPlan * route) + FGAIFlightPlan * route) { currentPos = pos; @@ -151,13 +186,13 @@ void FGTrafficRecord::setPositionAndIntentions(int pos, intVecIterator i = intentions.begin(); if ((*i) != pos) { SG_LOG(SG_GENERAL, SG_ALERT, - "Error in FGTrafficRecord::setPositionAndIntentions"); - //cerr << "Pos : " << pos << " Curr " << *(intentions.begin()) << endl; + "Error in FGTrafficRecord::setPositionAndIntentions at " << SG_ORIGIN); + cerr << "Pos : " << pos << " Curr " << *(intentions.begin()) << endl; for (intVecIterator i = intentions.begin(); - i != intentions.end(); i++) { - //cerr << (*i) << " "; + i != intentions.end(); i++) { + cerr << (*i) << " "; } - //cerr << endl; + cerr << endl; } intentions.erase(i); } else { @@ -181,6 +216,11 @@ void FGTrafficRecord::setPositionAndIntentions(int pos, } //exit(1); } +/** + * Check if another aircraft is ahead of the current one, and on the same + * return true / false is the is/isn't the case. + * + ****************************************************************************/ bool FGTrafficRecord::checkPositionAndIntentions(FGTrafficRecord & other) { @@ -190,10 +230,10 @@ bool FGTrafficRecord::checkPositionAndIntentions(FGTrafficRecord & other) //cerr << callsign << ": Check Position and intentions: we are on the same taxiway" << other.callsign << "Index = " << currentPos << endl; result = true; } - // else if (other.intentions.size()) + // else if (other.intentions.size()) // { // cerr << "Start check 2" << endl; - // intVecIterator i = other.intentions.begin(); + // intVecIterator i = other.intentions.begin(); // while (!((i == other.intentions.end()) || ((*i) == currentPos))) // i++; // if (i != other.intentions.end()) { @@ -220,8 +260,8 @@ bool FGTrafficRecord::checkPositionAndIntentions(FGTrafficRecord & other) } void FGTrafficRecord::setPositionAndHeading(double lat, double lon, - double hdg, double spd, - double alt) + double hdg, double spd, + double alt) { latitude = lat; longitude = lon; @@ -234,12 +274,12 @@ int FGTrafficRecord::crosses(FGGroundNetwork * net, FGTrafficRecord & other) { if (checkPositionAndIntentions(other) - || (other.checkPositionAndIntentions(*this))) + || (other.checkPositionAndIntentions(*this))) return -1; intVecIterator i, j; int currentTargetNode = 0, otherTargetNode = 0; if (currentPos > 0) - currentTargetNode = net->findSegment(currentPos)->getEnd()->getIndex(); // OKAY,... + currentTargetNode = net->findSegment(currentPos)->getEnd()->getIndex(); // OKAY,... if (other.currentPos > 0) otherTargetNode = net->findSegment(other.currentPos)->getEnd()->getIndex(); // OKAY,... if ((currentTargetNode == otherTargetNode) && currentTargetNode > 0) @@ -248,7 +288,7 @@ int FGTrafficRecord::crosses(FGGroundNetwork * net, for (i = intentions.begin(); i != intentions.end(); i++) { if ((*i) > 0) { if ((currentTargetNode == - net->findSegment(*i)->getEnd()->getIndex())) { + net->findSegment(*i)->getEnd()->getIndex())) { //cerr << "Current crosses at " << currentTargetNode < 0) { if (otherTargetNode == - net->findSegment(*i)->getEnd()->getIndex()) { + net->findSegment(*i)->getEnd()->getIndex()) { //cerr << "Other crosses at " << currentTargetNode < 0) && ((*j) > 0)) { currentTargetNode = @@ -301,7 +341,7 @@ bool FGTrafficRecord::onRoute(FGGroundNetwork * net, return true; if (other.intentions.size()) { for (intVecIterator i = other.intentions.begin(); - i != other.intentions.end(); i++) { + i != other.intentions.end(); i++) { if (*i > 0) { othernode = net->findSegment(*i)->getEnd()->getIndex(); if ((node == othernode) && (node > -1)) @@ -315,7 +355,7 @@ bool FGTrafficRecord::onRoute(FGGroundNetwork * net, // { // for (intVecIterator i = intentions.begin(); i != intentions.end(); i++) // { - // if (*i > 0) + // if (*i > 0) // { // node = net->findSegment(*i)->getEnd()->getIndex(); // if ((node == othernode) && (node > -1)) @@ -341,13 +381,13 @@ bool FGTrafficRecord::isOpposing(FGGroundNetwork * net, } for (intVecIterator i = intentions.begin(); i != intentions.end(); - i++) { + i++) { if ((opp = net->findSegment(other.currentPos)->opposite())) { if ((*i) > 0) if (opp->getIndex() == - net->findSegment(*i)->getIndex()) { + net->findSegment(*i)->getIndex()) { if (net->findSegment(*i)->getStart()->getIndex() == - node) { + node) { { //cerr << "Found the node " << node << endl; return true; @@ -357,17 +397,17 @@ bool FGTrafficRecord::isOpposing(FGGroundNetwork * net, } if (other.intentions.size()) { for (intVecIterator j = other.intentions.begin(); - j != other.intentions.end(); j++) { + j != other.intentions.end(); j++) { // cerr << "Current segment 1 " << (*i) << endl; if ((*i) > 0) { if ((opp = net->findSegment(*i)->opposite())) { if (opp->getIndex() == - net->findSegment(*j)->getIndex()) { + net->findSegment(*j)->getIndex()) { //cerr << "Nodes " << net->findSegment(*i)->getIndex() // << " and " << net->findSegment(*j)->getIndex() // << " are opposites " << endl; if (net->findSegment(*i)->getStart()-> - getIndex() == node) { + getIndex() == node) { { //cerr << "Found the node " << node << endl; return true; @@ -383,6 +423,14 @@ bool FGTrafficRecord::isOpposing(FGGroundNetwork * net, return false; } +bool FGTrafficRecord::isActive(int margin) +{ + time_t now = time(NULL) + fgGetLong("/sim/time/warp"); + time_t deptime = aircraft->getTrafficRef()->getDepartureTime(); + return ((now + margin) > deptime); +} + + void FGTrafficRecord::setSpeedAdjustment(double spd) { instruction.setChangeSpeed(true); @@ -397,21 +445,12 @@ void FGTrafficRecord::setHeadingAdjustment(double heading) bool FGTrafficRecord::pushBackAllowed() { - double course, az2, dist; - SGGeod curr(SGGeod::fromDegM(getLongitude(), - getLatitude(), getAltitude())); - - double userLatitude = fgGetDouble("/position/latitude-deg"); - double userLongitude = fgGetDouble("/position/longitude-deg"); - SGGeod user(SGGeod::fromDeg(userLongitude, userLatitude)); - SGGeodesy::inverse(curr, user, course, az2, dist); - //cerr << "Distance to user : " << dist << endl; - return (dist > 250); - + return allowPushback; } + /*************************************************************************** * FGATCInstruction * @@ -447,9 +486,16 @@ bool FGATCInstruction::hasInstruction() FGATCController::FGATCController() { + //cerr << "running FGATController constructor" << endl; dt_count = 0; available = true; lastTransmission = 0; + initialized = false; +} + +FGATCController::~FGATCController() +{ + //cerr << "running FGATController destructor" << endl; } string FGATCController::getGateName(FGAIAircraft * ref) @@ -457,16 +503,23 @@ string FGATCController::getGateName(FGAIAircraft * ref) return ref->atGate(); } +bool FGATCController::isUserAircraft(FGAIAircraft* ac) +{ + return (ac->getCallSign() == fgGetString("/sim/multiplay/callsign")) ? true : false; +}; + void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, - AtcMsgDir msgDir) + AtcMsgDir msgDir, bool audible) { string sender, receiver; int stationFreq = 0; int taxiFreq = 0; + int towerFreq = 0; int freqId = 0; string atisInformation; string text; string taxiFreqStr; + string towerFreqStr; double heading = 0; string activeRunway; string fltType; @@ -475,28 +528,37 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, string transponderCode; FGAIFlightPlan *fp; string fltRules; + string instructionText; //double commFreqD; sender = rec->getAircraft()->getTrafficRef()->getCallSign(); + if (rec->getAircraft()->getTaxiClearanceRequest()) { + instructionText = "push-back and taxi"; + } else { + instructionText = "taxi"; + } //cerr << "transmitting for: " << sender << "Leg = " << rec->getLeg() << endl; switch (rec->getLeg()) { + case 1: case 2: - case 3: freqId = rec->getNextFrequency(); stationFreq = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> getDynamics()->getGroundFrequency(rec->getLeg() + freqId); taxiFreq = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> - getDynamics()->getGroundFrequency(3); + getDynamics()->getGroundFrequency(2); + towerFreq = + rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> + getDynamics()->getTowerFrequency(2); receiver = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> getName() + "-Ground"; atisInformation = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> - getDynamics()->getAtisInformation(); + getDynamics()->getAtisSequence(); break; - case 4: + case 3: receiver = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> getName() + "-Tower"; @@ -535,11 +597,11 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, getRunwayClassFromTrafficType(fltType); rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> - getDynamics()->getActiveRunway(rwyClass, 1, activeRunway, - heading); + getDynamics()->getActiveRunway(rwyClass, 1, activeRunway, + heading); rec->getAircraft()->GetFlightPlan()->setRunway(activeRunway); fp = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> - getDynamics()->getSID(activeRunway, heading); + getDynamics()->getSID(activeRunway, heading); rec->getAircraft()->GetFlightPlan()->setSID(fp); if (fp) { SID = fp->getName() + " departure"; @@ -554,7 +616,7 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, receiver + ". Start-up approved. " + atisInformation + " correct, runway " + activeRunway + ", " + SID + ", squawk " + transponderCode + ". " + - "For push-back and taxi clearance call " + taxiFreqStr + ". " + + "For "+ instructionText + " clearance call " + taxiFreqStr + ". " + sender + " control."; break; case MSG_DENY_ENGINE_START: @@ -572,11 +634,12 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, taxiFreqStr = formatATCFrequency3_2(taxiFreq); activeRunway = rec->getAircraft()->GetFlightPlan()->getRunway(); transponderCode = rec->getAircraft()->GetTransponderCode(); + text = receiver + ". Start-up approved. " + atisInformation + " correct, runway " + activeRunway + ", " + SID + ", squawk " + transponderCode + ". " + - "For push-back and taxi clearance call " + taxiFreqStr + ". " + + "For " + instructionText + " clearance call " + taxiFreqStr + ". " + sender; break; case MSG_ACKNOWLEDGE_SWITCH_GROUND_FREQUENCY: @@ -590,10 +653,18 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, text = receiver + ". Roger. " + sender; break; case MSG_REQUEST_PUSHBACK_CLEARANCE: - text = receiver + ". Request push-back. " + sender; + if (rec->getAircraft()->getTaxiClearanceRequest()) { + text = receiver + ". Request push-back. " + sender; + } else { + text = receiver + ". Request Taxi clearance. " + sender; + } break; case MSG_PERMIT_PUSHBACK_CLEARANCE: - text = receiver + ". Push-back approved. " + sender; + if (rec->getAircraft()->getTaxiClearanceRequest()) { + text = receiver + ". Push-back approved. " + sender; + } else { + text = receiver + ". Cleared to Taxi." + sender; + } break; case MSG_HOLD_PUSHBACK_CLEARANCE: text = receiver + ". Standby. " + sender; @@ -619,26 +690,60 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, case MSG_ACKNOWLEDGE_RESUME_TAXI: text = receiver + ". Continuing Taxi. " + sender; break; + case MSG_REPORT_RUNWAY_HOLD_SHORT: + activeRunway = rec->getAircraft()->GetFlightPlan()->getRunway(); + //activeRunway = "test"; + text = receiver + ". Holding short runway " + + activeRunway + + ". " + sender; + //text = "test1"; + //cerr << "1 Currently at leg " << rec->getLeg() << endl; + break; + case MSG_ACKNOWLEDGE_REPORT_RUNWAY_HOLD_SHORT: + activeRunway = rec->getAircraft()->GetFlightPlan()->getRunway(); + text = receiver + "Roger. Holding short runway " + // + activeRunway + + ". " + sender; + //text = "test2"; + //cerr << "2 Currently at leg " << rec->getLeg() << endl; + break; + case MSG_SWITCH_TOWER_FREQUENCY: + towerFreqStr = formatATCFrequency3_2(towerFreq); + text = receiver + "Contact Tower at " + towerFreqStr + ". " + sender; + //text = "test3"; + //cerr << "3 Currently at leg " << rec->getLeg() << endl; + break; + case MSG_ACKNOWLEDGE_SWITCH_TOWER_FREQUENCY: + towerFreqStr = formatATCFrequency3_2(towerFreq); + text = receiver + "Roger, switching to tower at " + towerFreqStr + ". " + sender; + //text = "test4"; + //cerr << "4 Currently at leg " << rec->getLeg() << endl; + break; default: + //text = "test3"; text = text + sender + ". Transmitting unknown Message"; break; } - double onBoardRadioFreq0 = - fgGetDouble("/instrumentation/comm[0]/frequencies/selected-mhz"); - double onBoardRadioFreq1 = - fgGetDouble("/instrumentation/comm[1]/frequencies/selected-mhz"); - int onBoardRadioFreqI0 = (int) floor(onBoardRadioFreq0 * 100 + 0.5); - int onBoardRadioFreqI1 = (int) floor(onBoardRadioFreq1 * 100 + 0.5); - //cerr << "Using " << onBoardRadioFreq0 << ", " << onBoardRadioFreq1 << " and " << stationFreq << " for " << text << endl; - - // Display ATC message only when one of the radios is tuned - // the relevant frequency. - // Note that distance attenuation is currently not yet implemented - if ((onBoardRadioFreqI0 == stationFreq) - || (onBoardRadioFreqI1 == stationFreq)) { - if (rec->allowTransmissions()) { - fgSetString("/sim/messages/atc", text.c_str()); + if (audible) { + double onBoardRadioFreq0 = + fgGetDouble("/instrumentation/comm[0]/frequencies/selected-mhz"); + double onBoardRadioFreq1 = + fgGetDouble("/instrumentation/comm[1]/frequencies/selected-mhz"); + int onBoardRadioFreqI0 = (int) floor(onBoardRadioFreq0 * 100 + 0.5); + int onBoardRadioFreqI1 = (int) floor(onBoardRadioFreq1 * 100 + 0.5); + //cerr << "Using " << onBoardRadioFreq0 << ", " << onBoardRadioFreq1 << " and " << stationFreq << " for " << text << endl; + + // Display ATC message only when one of the radios is tuned + // the relevant frequency. + // Note that distance attenuation is currently not yet implemented + if ((onBoardRadioFreqI0 == stationFreq) + || (onBoardRadioFreqI1 == stationFreq)) { + if (rec->allowTransmissions()) { + fgSetString("/sim/messages/atc", text.c_str()); + } } + } else { + FGATCDialogNew::instance()->addEntry(1, text); } } @@ -650,7 +755,7 @@ string FGATCController::formatATCFrequency3_2(int freq) } // TODO: Set transponder codes according to real-world routes. -// The current version just returns a random string of four octal numbers. +// The current version just returns a random string of four octal numbers. string FGATCController::genTransponderCode(string fltRules) { if (fltRules == "VFR") { @@ -663,24 +768,35 @@ string FGATCController::genTransponderCode(string fltRules) } } +void FGATCController::init() +{ + if (!initialized) { + FGATCManager *mgr = (FGATCManager*) globals->get_subsystem("ATC"); + mgr->addController(this); + initialized = true; + } +} + /*************************************************************************** * class FGTowerController * **************************************************************************/ -FGTowerController::FGTowerController(): -FGATCController() +FGTowerController::FGTowerController(FGAirportDynamics *par) : + FGATCController() { + parent = par; } -// +// void FGTowerController::announcePosition(int id, - FGAIFlightPlan * intendedRoute, - int currentPosition, double lat, - double lon, double heading, - double speed, double alt, - double radius, int leg, - FGAIAircraft * ref) + FGAIFlightPlan * intendedRoute, + int currentPosition, double lat, + double lon, double heading, + double speed, double alt, + double radius, int leg, + FGAIAircraft * ref) { + init(); TrafficVectorIterator i = activeTraffic.begin(); // Search whether the current id alread has an entry // This might be faster using a map instead of a vector, but let's start by taking a safe route @@ -702,16 +818,37 @@ void FGTowerController::announcePosition(int id, rec.setRunway(intendedRoute->getRunway()); rec.setLeg(leg); //rec.setCallSign(callsign); + rec.setRadius(radius); rec.setAircraft(ref); activeTraffic.push_back(rec); + // Don't just schedule the aircraft for the tower controller, also assign if to the correct active runway. + ActiveRunwayVecIterator rwy = activeRunways.begin(); + if (activeRunways.size()) { + while (rwy != activeRunways.end()) { + if (rwy->getRunwayName() == intendedRoute->getRunway()) { + break; + } + rwy++; + } + } + if (rwy == activeRunways.end()) { + ActiveRunway aRwy(intendedRoute->getRunway(), id); + aRwy.addToDepartureCue(ref); + activeRunways.push_back(aRwy); + rwy = (activeRunways.end()-1); + } else { + rwy->addToDepartureCue(ref); + } + + //cerr << ref->getTrafficRef()->getCallSign() << " You are number " << rwy->getDepartureCueSize() << " for takeoff " << endl; } else { i->setPositionAndHeading(lat, lon, heading, speed, alt); } } -void FGTowerController::update(int id, double lat, double lon, - double heading, double speed, double alt, - double dt) +void FGTowerController::updateAircraftInformation(int id, double lat, double lon, + double heading, double speed, double alt, + double dt) { TrafficVectorIterator i = activeTraffic.begin(); // Search whether the current id has an entry @@ -729,39 +866,70 @@ void FGTowerController::update(int id, double lat, double lon, // // update position of the current aircraft if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: updating aircraft without traffic record"); + "AI error: updating aircraft without traffic record at " << SG_ORIGIN); } else { i->setPositionAndHeading(lat, lon, heading, speed, alt); current = i; } setDt(getDt() + dt); -// // see if we already have a clearance record for the currently active runway + // see if we already have a clearance record for the currently active runway + // NOTE: dd. 2011-08-07: Because the active runway has been constructed in the announcePosition function, we may safely assume that is + // already exists here. So, we can simplify the current code. + ActiveRunwayVecIterator rwy = activeRunways.begin(); - // again, a map might be more efficient here - if (activeRunways.size()) { - //while ((rwy->getRunwayName() != current->getRunway()) && (rwy != activeRunways.end())) { - while (rwy != activeRunways.end()) { - if (rwy->getRunwayName() == current->getRunway()) { - break; + //if (parent->getId() == fgGetString("/sim/presets/airport-id")) { + // for (rwy = activeRunways.begin(); rwy != activeRunways.end(); rwy++) { + // rwy->printDepartureCue(); + // } + //} + + rwy = activeRunways.begin(); + while (rwy != activeRunways.end()) { + if (rwy->getRunwayName() == current->getRunway()) { + break; + } + rwy++; + } + + // only bother running the following code if the current aircraft is the + // first in line for depature + /* if (current->getAircraft() == rwy->getFirstAircraftInDepartureCue()) { + if (rwy->getCleared()) { + if (id == rwy->getCleared()) { + current->setHoldPosition(false); + } else { + current->setHoldPosition(true); } - rwy++; + } else { + // For now. At later stages, this will probably be the place to check for inbound traffc. + rwy->setCleared(id); } + } */ + // only bother with aircraft that have a takeoff status of 2, since those are essentially under tower control + FGAIAircraft* ac= rwy->getFirstAircraftInDepartureCue(); + if (ac->getTakeOffStatus() == 1) { + ac->setTakeOffStatus(2); } - if (rwy == activeRunways.end()) { - ActiveRunway aRwy(current->getRunway(), id); - activeRunways.push_back(aRwy); // Since there are no clearance records for this runway yet - current->setHoldPosition(false); // Clear the current aircraft to continue + if (current->getAircraft()->getTakeOffStatus() == 2) { + current -> setHoldPosition(false); } else { - // Okay, we have a clearance record for this runway, so check - // whether the clearence ID matches that of the current aircraft - if (id == rwy->getCleared()) { + current->setHoldPosition(true); + } + int clearanceId = rwy->getCleared(); + if (clearanceId) { + if (id == clearanceId) { current->setHoldPosition(false); - } else { - current->setHoldPosition(true); + } + } else { + if (current->getAircraft() == rwy->getFirstAircraftInDepartureCue()) { + rwy->setCleared(id); + FGAIAircraft *ac = rwy->getFirstOfStatus(1); + if (ac) + ac->setTakeOffStatus(2); } } -} +} void FGTowerController::signOff(int id) @@ -789,23 +957,26 @@ void FGTowerController::signOff(int id) rwy++; } if (rwy != activeRunways.end()) { - rwy = activeRunways.erase(rwy); + rwy->setCleared(0); + rwy->updateDepartureCue(); } else { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: Attempting to erase non-existing runway clearance record in FGTowerController::signoff"); + "AI error: Attempting to erase non-existing runway clearance record in FGTowerController::signoff at " << SG_ORIGIN); } } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: Aircraft without traffic record is signing off from tower"); + "AI error: Aircraft without traffic record is signing off from tower at " << SG_ORIGIN); } else { + i->getAircraft()->resetTakeOffStatus(); i = activeTraffic.erase(i); + //cerr << "Signing off from tower controller" << endl; } } // NOTE: // IF WE MAKE TRAFFICRECORD A MEMBER OF THE BASE CLASS -// THE FOLLOWING THREE FUNCTIONS: SIGNOFF, HAS INSTRUCTION AND GETINSTRUCTION CAN +// THE FOLLOWING THREE FUNCTIONS: SIGNOFF, HAS INSTRUCTION AND GETINSTRUCTION CAN // BECOME DEVIRTUALIZED AND BE A MEMBER OF THE BASE ATCCONTROLLER CLASS // WHICH WOULD SIMPLIFY CODE MAINTENANCE. // Note that this function is probably obsolete @@ -825,7 +996,7 @@ bool FGTowerController::hasInstruction(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: checking ATC instruction for aircraft without traffic record"); + "AI error: checking ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->hasInstruction(); } @@ -849,30 +1020,47 @@ FGATCInstruction FGTowerController::getInstruction(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: requesting ATC instruction for aircraft without traffic record"); + "AI error: requesting ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->getInstruction(); } return FGATCInstruction(); } +void FGTowerController::render(bool visible) { + //cerr << "FGTowerController::render function not yet implemented" << endl; +} + +string FGTowerController::getName() { + return string(parent->getId() + "-tower"); +} + +void FGTowerController::update(double dt) +{ + +} + + + /*************************************************************************** * class FGStartupController * **************************************************************************/ -FGStartupController::FGStartupController(): -FGATCController() +FGStartupController::FGStartupController(FGAirportDynamics *par): + FGATCController() { + parent = par; } void FGStartupController::announcePosition(int id, - FGAIFlightPlan * intendedRoute, - int currentPosition, double lat, - double lon, double heading, - double speed, double alt, - double radius, int leg, - FGAIAircraft * ref) + FGAIFlightPlan * intendedRoute, + int currentPosition, double lat, + double lon, double heading, + double speed, double alt, + double radius, int leg, + FGAIAircraft * ref) { + init(); TrafficVectorIterator i = activeTraffic.begin(); // Search whether the current id alread has an entry // This might be faster using a map instead of a vector, but let's start by taking a safe route @@ -893,11 +1081,13 @@ void FGStartupController::announcePosition(int id, rec.setPositionAndHeading(lat, lon, heading, speed, alt); rec.setRunway(intendedRoute->getRunway()); rec.setLeg(leg); + rec.setPositionAndIntentions(currentPosition, intendedRoute); //rec.setCallSign(callsign); rec.setAircraft(ref); rec.setHoldPosition(true); activeTraffic.push_back(rec); } else { + i->setPositionAndIntentions(currentPosition, intendedRoute); i->setPositionAndHeading(lat, lon, heading, speed, alt); } @@ -905,7 +1095,7 @@ void FGStartupController::announcePosition(int id, // NOTE: // IF WE MAKE TRAFFICRECORD A MEMBER OF THE BASE CLASS -// THE FOLLOWING THREE FUNCTIONS: SIGNOFF, HAS INSTRUCTION AND GETINSTRUCTION CAN +// THE FOLLOWING THREE FUNCTIONS: SIGNOFF, HAS INSTRUCTION AND GETINSTRUCTION CAN // BECOME DEVIRTUALIZED AND BE A MEMBER OF THE BASE ATCCONTROLLER CLASS // WHICH WOULD SIMPLIFY CODE MAINTENANCE. // Note that this function is probably obsolete @@ -925,7 +1115,7 @@ bool FGStartupController::hasInstruction(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: checking ATC instruction for aircraft without traffic record"); + "AI error: checking ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->hasInstruction(); } @@ -949,7 +1139,7 @@ FGATCInstruction FGStartupController::getInstruction(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: requesting ATC instruction for aircraft without traffic record"); + "AI error: requesting ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->getInstruction(); } @@ -972,15 +1162,49 @@ void FGStartupController::signOff(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: Aircraft without traffic record is signing off from tower"); + "AI error: Aircraft without traffic record is signing off from tower at " << SG_ORIGIN); } else { + //cerr << i->getAircraft()->getCallSign() << " signing off from startupcontroller" << endl; i = activeTraffic.erase(i); } } -void FGStartupController::update(int id, double lat, double lon, - double heading, double speed, double alt, - double dt) +bool FGStartupController::checkTransmissionState(int st, time_t now, time_t startTime, TrafficVectorIterator i, AtcMsgId msgId, + AtcMsgDir msgDir) +{ + int state = i->getState(); + if ((state == st) && available) { + if ((msgDir == ATC_AIR_TO_GROUND) && isUserAircraft(i->getAircraft())) { + + //cerr << "Checking state " << st << " for " << i->getAircraft()->getCallSign() << endl; + static SGPropertyNode_ptr trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true); + int n = trans_num->getIntValue(); + if (n == 0) { + trans_num->setIntValue(-1); + // PopupCallback(n); + //cerr << "Selected transmission message " << n << endl; + FGATCDialogNew::instance()->removeEntry(1); + } else { + //cerr << "creading message for " << i->getAircraft()->getCallSign() << endl; + transmit(&(*i), msgId, msgDir, false); + return false; + } + } + if (now > startTime) { + //cerr << "Transmitting startup msg" << endl; + transmit(&(*i), msgId, msgDir, true); + i->updateState(); + lastTransmission = now; + available = false; + return true; + } + } + return false; +} + +void FGStartupController::updateAircraftInformation(int id, double lat, double lon, + double heading, double speed, double alt, + double dt) { TrafficVectorIterator i = activeTraffic.begin(); // Search search if the current id has an entry @@ -996,9 +1220,10 @@ void FGStartupController::update(int id, double lat, double lon, } } // // update position of the current aircraft + if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: updating aircraft without traffic record"); + "AI error: updating aircraft without traffic record at " << SG_ORIGIN); } else { i->setPositionAndHeading(lat, lon, heading, speed, alt); current = i; @@ -1006,10 +1231,12 @@ void FGStartupController::update(int id, double lat, double lon, setDt(getDt() + dt); int state = i->getState(); - time_t startTime = - i->getAircraft()->getTrafficRef()->getDepartureTime(); + + // The user controlled aircraft should have crased here, because it doesn't have a traffic reference. + // NOTE: if we create a traffic schedule for the user aircraft, we can use this to plan a flight. + time_t startTime = i->getAircraft()->getTrafficRef()->getDepartureTime(); time_t now = time(NULL) + fgGetLong("/sim/time/warp"); - //cerr << i->getAircraft()->getTrafficRef()->getCallSign() + //cerr << i->getAircraft()->getTrafficRef()->getCallSign() // << " is scheduled to depart in " << startTime-now << " seconds. Available = " << available // << " at parking " << getGateName(i->getAircraft()) << endl; @@ -1017,91 +1244,29 @@ void FGStartupController::update(int id, double lat, double lon, available = true; } - if ((state == 0) && available) { - if (now > startTime) { - //cerr << "Transmitting startup msg" << endl; - transmit(&(*i), MSG_ANNOUNCE_ENGINE_START, ATC_AIR_TO_GROUND); - i->updateState(); - lastTransmission = now; - available = false; - } - } - if ((state == 1) && available) { - if (now > startTime + 60) { - transmit(&(*i), MSG_REQUEST_ENGINE_START, ATC_AIR_TO_GROUND); - i->updateState(); - lastTransmission = now; - available = false; - } - } - if ((state == 2) && available) { - if (now > startTime + 80) { - transmit(&(*i), MSG_PERMIT_ENGINE_START, ATC_GROUND_TO_AIR); - i->updateState(); - lastTransmission = now; - available = false; - } - } - if ((state == 3) && available) { - if (now > startTime + 100) { - transmit(&(*i), MSG_ACKNOWLEDGE_ENGINE_START, - ATC_AIR_TO_GROUND); - i->updateState(); - lastTransmission = now; - available = false; - } - } - // Note: The next four stages are only necessesary when Startup control is - // on a different frequency, compared to ground control - if ((state == 4) && available) { - if (now > startTime + 130) { - transmit(&(*i), MSG_ACKNOWLEDGE_SWITCH_GROUND_FREQUENCY, - ATC_AIR_TO_GROUND); - i->updateState(); - i->nextFrequency(); - lastTransmission = now; - available = false; - } - } - if ((state == 5) && available) { - if (now > startTime + 140) { - transmit(&(*i), MSG_INITIATE_CONTACT, ATC_AIR_TO_GROUND); - i->updateState(); - lastTransmission = now; - available = false; - } - } - if ((state == 6) && available) { - if (now > startTime + 150) { - transmit(&(*i), MSG_ACKNOWLEDGE_INITIATE_CONTACT, - ATC_GROUND_TO_AIR); - i->updateState(); - lastTransmission = now; - available = false; - } + checkTransmissionState(0, now, (startTime + 0 ), i, MSG_ANNOUNCE_ENGINE_START, ATC_AIR_TO_GROUND); + checkTransmissionState(1, now, (startTime + 60 ), i, MSG_REQUEST_ENGINE_START, ATC_AIR_TO_GROUND); + checkTransmissionState(2, now, (startTime + 80 ), i, MSG_PERMIT_ENGINE_START, ATC_GROUND_TO_AIR); + checkTransmissionState(3, now, (startTime + 100), i, MSG_ACKNOWLEDGE_ENGINE_START, ATC_AIR_TO_GROUND); + if (checkTransmissionState(4, now, (startTime + 130), i, MSG_ACKNOWLEDGE_SWITCH_GROUND_FREQUENCY, ATC_AIR_TO_GROUND)) { + i->nextFrequency(); } + checkTransmissionState(5, now, (startTime + 140), i, MSG_INITIATE_CONTACT, ATC_AIR_TO_GROUND); + checkTransmissionState(6, now, (startTime + 150), i, MSG_ACKNOWLEDGE_INITIATE_CONTACT, ATC_GROUND_TO_AIR); + checkTransmissionState(7, now, (startTime + 180), i, MSG_REQUEST_PUSHBACK_CLEARANCE, ATC_AIR_TO_GROUND); + + - // TODO: Switch to APRON control and request pushback Clearance. - // Get Push back clearance - if ((state == 7) && available) { - if (now > startTime + 180) { - transmit(&(*i), MSG_REQUEST_PUSHBACK_CLEARANCE, - ATC_AIR_TO_GROUND); - i->updateState(); - lastTransmission = now; - available = false; - } - } if ((state == 8) && available) { if (now > startTime + 200) { if (i->pushBackAllowed()) { i->allowRepeatedTransmissions(); transmit(&(*i), MSG_PERMIT_PUSHBACK_CLEARANCE, - ATC_GROUND_TO_AIR); + ATC_GROUND_TO_AIR, true); i->updateState(); } else { transmit(&(*i), MSG_HOLD_PUSHBACK_CLEARANCE, - ATC_GROUND_TO_AIR); + ATC_GROUND_TO_AIR, true); i->suppressRepeatedTransmissions(); } lastTransmission = now; @@ -1113,25 +1278,246 @@ void FGStartupController::update(int id, double lat, double lon, } } +// Note that this function is copied from simgear. for maintanance purposes, it's probabtl better to make a general function out of that. +static void WorldCoordinate(osg::Matrix& obj_pos, double lat, + double lon, double elev, double hdg, double slope) +{ + SGGeod geod = SGGeod::fromDegM(lon, lat, elev); + obj_pos = geod.makeZUpFrame(); + // hdg is not a compass heading, but a counter-clockwise rotation + // around the Z axis + obj_pos.preMult(osg::Matrix::rotate(hdg * SGD_DEGREES_TO_RADIANS, + 0.0, 0.0, 1.0)); + obj_pos.preMult(osg::Matrix::rotate(slope * SGD_DEGREES_TO_RADIANS, + 0.0, 1.0, 0.0)); +} + + +void FGStartupController::render(bool visible) +{ + + SGMaterialLib *matlib = globals->get_matlib(); + if (group) { + //int nr = ; + globals->get_scenery()->get_scene_graph()->removeChild(group); + //while (group->getNumChildren()) { + // cerr << "Number of children: " << group->getNumChildren() << endl; + //simgear::EffectGeode* geode = (simgear::EffectGeode*) group->getChild(0); + //osg::MatrixTransform *obj_trans = (osg::MatrixTransform*) group->getChild(0); + //geode->releaseGLObjects(); + //group->removeChild(geode); + //delete geode; + group = 0; + } + if (visible) { + group = new osg::Group; + FGScenery * local_scenery = globals->get_scenery(); + double elevation_meters = 0.0; + double elevation_feet = 0.0; + + + //for ( FGTaxiSegmentVectorIterator i = segments.begin(); i != segments.end(); i++) { + double dx = 0; + time_t now = time(NULL) + fgGetLong("/sim/time/warp"); + for (TrafficVectorIterator i = activeTraffic.begin(); i != activeTraffic.end(); i++) { + if (i->isActive(300)) { + // Handle start point + int pos = i->getCurrentPosition(); + //cerr << "rendering for " << i->getAircraft()->getCallSign() << "pos = " << pos << endl; + if (pos > 0) { + FGTaxiSegment *segment = parent->getGroundNetwork()->findSegment(pos); + SGGeod start(SGGeod::fromDeg((i->getLongitude()), (i->getLatitude()))); + SGGeod end (SGGeod::fromDeg(segment->getEnd()->getLongitude(), segment->getEnd()->getLatitude())); + + double length = SGGeodesy::distanceM(start, end); + //heading = SGGeodesy::headingDeg(start->getGeod(), end->getGeod()); + + double az2, heading; //, distanceM; + SGGeodesy::inverse(start, end, heading, az2, length); + double coveredDistance = length * 0.5; + SGGeod center; + SGGeodesy::direct(start, heading, coveredDistance, center, az2); + //cerr << "Active Aircraft : Centerpoint = (" << center.getLatitudeDeg() << ", " << center.getLongitudeDeg() << "). Heading = " << heading << endl; + /////////////////////////////////////////////////////////////////////////////// + // Make a helper function out of this + osg::Matrix obj_pos; + osg::MatrixTransform *obj_trans = new osg::MatrixTransform; + obj_trans->setDataVariance(osg::Object::STATIC); + // Experimental: Calculate slope here, based on length, and the individual elevations + double elevationStart; + if (isUserAircraft((i)->getAircraft())) { + elevationStart = fgGetDouble("/position/ground-elev-m"); + } else { + elevationStart = ((i)->getAircraft()->_getAltitude() * SG_FEET_TO_METER); + } + double elevationEnd = segment->getEnd()->getElevationM(parent->getElevation()*SG_FEET_TO_METER); + if ((elevationEnd == 0) || (elevationEnd == parent->getElevation())) { + SGGeod center2 = end; + center2.setElevationM(SG_MAX_ELEVATION_M); + if (local_scenery->get_elevation_m( center2, elevationEnd, NULL )) { + elevation_feet = elevationEnd * SG_METER_TO_FEET + 0.5; + //elevation_meters += 0.5; + } + else { + elevationEnd = parent->getElevation(); + } + segment->getEnd()->setElevation(elevationEnd); + } + + double elevationMean = (elevationStart + elevationEnd) / 2.0; + double elevDiff = elevationEnd - elevationStart; + + double slope = atan2(elevDiff, length) * SGD_RADIANS_TO_DEGREES; + + //cerr << "1. Using mean elevation : " << elevationMean << " and " << slope << endl; + + WorldCoordinate( obj_pos, center.getLatitudeDeg(), center.getLongitudeDeg(), elevationMean + 0.5 + dx, -(heading), slope ); + ; + + obj_trans->setMatrix( obj_pos ); + //osg::Vec3 center(0, 0, 0) + + float width = length /2.0; + osg::Vec3 corner(-width, 0, 0.25f); + osg::Vec3 widthVec(2*width + 1, 0, 0); + osg::Vec3 heightVec(0, 1, 0); + osg::Geometry* geometry; + geometry = osg::createTexturedQuadGeometry(corner, widthVec, heightVec); + simgear::EffectGeode* geode = new simgear::EffectGeode; + geode->setName("test"); + geode->addDrawable(geometry); + //osg::Node *custom_obj; + SGMaterial *mat; + if (segment->hasBlock(now)) { + mat = matlib->find("UnidirectionalTaperRed"); + } else { + mat = matlib->find("UnidirectionalTaperGreen"); + } + if (mat) + geode->setEffect(mat->get_effect()); + obj_trans->addChild(geode); + // wire as much of the scene graph together as we can + //->addChild( obj_trans ); + group->addChild( obj_trans ); + ///////////////////////////////////////////////////////////////////// + } else { + //cerr << "BIG FAT WARNING: current position is here : " << pos << endl; + } + for (intVecIterator j = (i)->getIntentions().begin(); j != (i)->getIntentions().end(); j++) { + osg::Matrix obj_pos; + int k = (*j); + if (k > 0) { + //cerr << "rendering for " << i->getAircraft()->getCallSign() << "intention = " << k << endl; + osg::MatrixTransform *obj_trans = new osg::MatrixTransform; + obj_trans->setDataVariance(osg::Object::STATIC); + FGTaxiSegment *segment = parent->getGroundNetwork()->findSegment(k); + + double elevationStart = segment->getStart()->getElevationM(parent->getElevation()*SG_FEET_TO_METER); + double elevationEnd = segment->getEnd ()->getElevationM(parent->getElevation()*SG_FEET_TO_METER); + if ((elevationStart == 0) || (elevationStart == parent->getElevation())) { + SGGeod center2 = segment->getStart()->getGeod(); + center2.setElevationM(SG_MAX_ELEVATION_M); + if (local_scenery->get_elevation_m( center2, elevationStart, NULL )) { + elevation_feet = elevationStart * SG_METER_TO_FEET + 0.5; + //elevation_meters += 0.5; + } + else { + elevationStart = parent->getElevation(); + } + segment->getStart()->setElevation(elevationStart); + } + if ((elevationEnd == 0) || (elevationEnd == parent->getElevation())) { + SGGeod center2 = segment->getEnd()->getGeod(); + center2.setElevationM(SG_MAX_ELEVATION_M); + if (local_scenery->get_elevation_m( center2, elevationEnd, NULL )) { + elevation_feet = elevationEnd * SG_METER_TO_FEET + 0.5; + //elevation_meters += 0.5; + } + else { + elevationEnd = parent->getElevation(); + } + segment->getEnd()->setElevation(elevationEnd); + } + + double elevationMean = (elevationStart + elevationEnd) / 2.0; + double elevDiff = elevationEnd - elevationStart; + double length = segment->getLength(); + double slope = atan2(elevDiff, length) * SGD_RADIANS_TO_DEGREES; + + //cerr << "2. Using mean elevation : " << elevationMean << " and " << slope << endl; + + + WorldCoordinate( obj_pos, segment->getLatitude(), segment->getLongitude(), elevationMean + 0.5 + dx, -(segment->getHeading()), slope ); + + //WorldCoordinate( obj_pos, segment->getLatitude(), segment->getLongitude(), parent->getElevation()+8+dx, -(segment->getHeading()) ); + + obj_trans->setMatrix( obj_pos ); + //osg::Vec3 center(0, 0, 0) + + float width = segment->getLength() /2.0; + osg::Vec3 corner(-width, 0, 0.25f); + osg::Vec3 widthVec(2*width + 1, 0, 0); + osg::Vec3 heightVec(0, 1, 0); + osg::Geometry* geometry; + geometry = osg::createTexturedQuadGeometry(corner, widthVec, heightVec); + simgear::EffectGeode* geode = new simgear::EffectGeode; + geode->setName("test"); + geode->addDrawable(geometry); + //osg::Node *custom_obj; + SGMaterial *mat; + if (segment->hasBlock(now)) { + mat = matlib->find("UnidirectionalTaperRed"); + } else { + mat = matlib->find("UnidirectionalTaperGreen"); + } + if (mat) + geode->setEffect(mat->get_effect()); + obj_trans->addChild(geode); + // wire as much of the scene graph together as we can + //->addChild( obj_trans ); + group->addChild( obj_trans ); + } else { + //cerr << "BIG FAT WARNING: k is here : " << pos << endl; + } + } + dx += 0.2; + } + } + globals->get_scenery()->get_scene_graph()->addChild(group); + } +} + +string FGStartupController::getName() { + return string(parent->getId() + "-startup"); +} + +void FGStartupController::update(double dt) +{ + +} + + /*************************************************************************** * class FGApproachController * **************************************************************************/ -FGApproachController::FGApproachController(): -FGATCController() +FGApproachController::FGApproachController(FGAirportDynamics *par): + FGATCController() { + parent = par; } -// +// void FGApproachController::announcePosition(int id, - FGAIFlightPlan * intendedRoute, - int currentPosition, - double lat, double lon, - double heading, double speed, - double alt, double radius, - int leg, FGAIAircraft * ref) + FGAIFlightPlan * intendedRoute, + int currentPosition, + double lat, double lon, + double heading, double speed, + double alt, double radius, + int leg, FGAIAircraft * ref) { + init(); TrafficVectorIterator i = activeTraffic.begin(); // Search whether the current id alread has an entry // This might be faster using a map instead of a vector, but let's start by taking a safe route @@ -1160,9 +1546,9 @@ void FGApproachController::announcePosition(int id, } } -void FGApproachController::update(int id, double lat, double lon, - double heading, double speed, double alt, - double dt) +void FGApproachController::updateAircraftInformation(int id, double lat, double lon, + double heading, double speed, double alt, + double dt) { TrafficVectorIterator i = activeTraffic.begin(); // Search search if the current id has an entry @@ -1180,7 +1566,7 @@ void FGApproachController::update(int id, double lat, double lon, // // update position of the current aircraft if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: updating aircraft without traffic record"); + "AI error: updating aircraft without traffic record at " << SG_ORIGIN); } else { i->setPositionAndHeading(lat, lon, heading, speed, alt); current = i; @@ -1228,12 +1614,16 @@ void FGApproachController::signOff(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: Aircraft without traffic record is signing off from approach"); + "AI error: Aircraft without traffic record is signing off from approach at " << SG_ORIGIN); } else { i = activeTraffic.erase(i); } } +void FGApproachController::update(double dt) +{ + +} @@ -1253,7 +1643,7 @@ bool FGApproachController::hasInstruction(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: checking ATC instruction for aircraft without traffic record"); + "AI error: checking ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->hasInstruction(); } @@ -1277,7 +1667,7 @@ FGATCInstruction FGApproachController::getInstruction(int id) } if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { SG_LOG(SG_GENERAL, SG_ALERT, - "AI error: requesting ATC instruction for aircraft without traffic record"); + "AI error: requesting ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->getInstruction(); } @@ -1303,3 +1693,13 @@ ActiveRunway *FGApproachController::getRunway(string name) } return &(*rwy); } + +void FGApproachController::render(bool visible) { + //cerr << "FGApproachController::render function not yet implemented" << endl; +} + + + +string FGApproachController::getName() { + return string(parent->getId() + "-approach"); +}