X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FATC%2Ftrafficcontrol.cxx;h=a25f9195646b2f5da7915b6f010cedba82a6cfb3;hb=9fa790bcac7e535bb06cd228ae15178f1b10b26f;hp=2690d5a3f7838c2eae61eb53f3bbb171b9269738;hpb=37591d0ac9c316f107a3c38043edd3a7f89b4892;p=flightgear.git diff --git a/src/ATC/trafficcontrol.cxx b/src/ATC/trafficcontrol.cxx index 2690d5a3f..a25f91956 100644 --- a/src/ATC/trafficcontrol.cxx +++ b/src/ATC/trafficcontrol.cxx @@ -47,6 +47,8 @@ #include #include #include +#include +#include using std::sort; @@ -65,7 +67,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(); @@ -140,36 +142,53 @@ 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; if (intentions.size()) { intVecIterator i = intentions.begin(); if ((*i) != pos) { - SG_LOG(SG_GENERAL, SG_ALERT, - "Error in FGTrafficRecord::setPositionAndIntentions"); - //cerr << "Pos : " << pos << " Curr " << *(intentions.begin()) << endl; - for (intVecIterator i = intentions.begin(); - i != intentions.end(); i++) { - //cerr << (*i) << " "; - } - //cerr << endl; + SG_LOG(SG_ATC, SG_ALERT, + "Error in FGTrafficRecord::setPositionAndIntentions at " << SG_ORIGIN); } intentions.erase(i); } else { @@ -177,22 +196,17 @@ void FGTrafficRecord::setPositionAndIntentions(int pos, int size = route->getNrOfWayPoints(); //cerr << "Setting pos" << pos << " "; //cerr << "setting intentions "; - for (int i = 0; i < size; i++) { + for (int i = 2; i < size; i++) { int val = route->getRouteIndex(i); - //cerr << val<< " "; - if ((val) && (val != pos)) { - intentions.push_back(val); - //cerr << "[set] "; - } + intentions.push_back(val); } - //cerr << endl; - //while (route->next(&legNr, &routeNr)) { - //intentions.push_back(routeNr); - //} - //route->rewind(currentPos); } - //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) { @@ -202,10 +216,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()) { @@ -232,8 +246,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; @@ -246,12 +260,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) @@ -259,8 +273,8 @@ int FGTrafficRecord::crosses(FGGroundNetwork * net, if (intentions.size()) { for (i = intentions.begin(); i != intentions.end(); i++) { if ((*i) > 0) { - if ((currentTargetNode == - net->findSegment(*i)->getEnd()->getIndex())) { + if (currentTargetNode == + 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 = @@ -313,7 +327,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)) @@ -327,7 +341,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)) @@ -353,13 +367,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; @@ -369,17 +383,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; @@ -395,6 +409,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); @@ -409,31 +431,12 @@ void FGTrafficRecord::setHeadingAdjustment(double heading) bool FGTrafficRecord::pushBackAllowed() { - // With the user ATC / AI integration, checking whether the user's aircraft is near no longer works, because - // this will effectively block the user's aircraft itself from receiving pushback clearance. - // So, what can we do? - /* - 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); - */ - - - // In essence, we should check whether the pusbback route itself, as well as the associcated - // taxiways near the pushback point are free of traffic. - // To do so, we need to - return true; + return allowPushback; } + /*************************************************************************** * FGATCInstruction * @@ -478,7 +481,7 @@ FGATCController::FGATCController() FGATCController::~FGATCController() { - //cerr << "running FGATController destructor" << endl; + //cerr << "running FGATController destructor" << endl; } string FGATCController::getGateName(FGAIAircraft * ref) @@ -486,21 +489,23 @@ string FGATCController::getGateName(FGAIAircraft * ref) return ref->atGate(); } -bool FGATCController::isUserAircraft(FGAIAircraft* ac) -{ - return (ac->getCallSign() == fgGetString("/sim/multiplay/callsign")) ? true : false; +bool FGATCController::isUserAircraft(FGAIAircraft* ac) +{ + return (ac->getCallSign() == fgGetString("/sim/multiplay/callsign")) ? true : false; }; -void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, +void FGATCController::transmit(FGTrafficRecord * rec, FGAirportDynamics *parent, AtcMsgId msgId, 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; @@ -509,9 +514,16 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, string transponderCode; FGAIFlightPlan *fp; string fltRules; + string instructionText; + int ground_to_air=0; //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: @@ -523,6 +535,9 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, taxiFreq = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> getDynamics()->getGroundFrequency(2); + towerFreq = + rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> + getDynamics()->getTowerFrequency(2); receiver = rec->getAircraft()->getTrafficRef()->getDepartureAirport()-> getName() + "-Ground"; @@ -541,6 +556,7 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, string tmp = sender; sender = receiver; receiver = tmp; + ground_to_air=1; } switch (msgId) { case MSG_ANNOUNCE_ENGINE_START: @@ -569,11 +585,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"; @@ -588,7 +604,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: @@ -606,11 +622,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: @@ -624,10 +641,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; @@ -653,7 +678,37 @@ 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; } @@ -669,19 +724,44 @@ void FGATCController::transmit(FGTrafficRecord * rec, AtcMsgId msgId, // 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 ((stationFreq > 0)&& + ((onBoardRadioFreqI0 == stationFreq)|| + (onBoardRadioFreqI1 == stationFreq))) { if (rec->allowTransmissions()) { - fgSetString("/sim/messages/atc", text.c_str()); + + if( fgGetBool( "/sim/radio/use-itm-attenuation", false ) ) { + //cerr << "Using ITM radio propagation" << endl; + FGRadioTransmission* radio = new FGRadioTransmission(); + SGGeod sender_pos; + double sender_alt_ft, sender_alt; + if(ground_to_air) { + sender_alt_ft = parent->getElevation(); + sender_alt = sender_alt_ft * SG_FEET_TO_METER; + sender_pos= SGGeod::fromDegM( parent->getLongitude(), + parent->getLatitude(), sender_alt ); + } + else { + sender_alt_ft = rec->getAltitude(); + sender_alt = sender_alt_ft * SG_FEET_TO_METER; + sender_pos= SGGeod::fromDegM( rec->getLongitude(), + rec->getLatitude(), sender_alt ); + } + double frequency = ((double)stationFreq) / 100; + radio->receiveATC(sender_pos, frequency, text, ground_to_air); + delete radio; + } + else { + fgSetString("/sim/messages/atc", text.c_str()); + } } } } else { - FGATCManager *atc = (FGATCManager*) globals->get_subsystem("atc"); - atc->getATCDialog()->addEntry(1, text); - + FGATCDialogNew::instance()->addEntry(1, text); } } + string FGATCController::formatATCFrequency3_2(int freq) { char buffer[7]; @@ -690,7 +770,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") { @@ -703,12 +783,12 @@ string FGATCController::genTransponderCode(string fltRules) } } -void FGATCController::init() +void FGATCController::init() { - if (!initialized) { - FGATCManager *mgr = (FGATCManager*) globals->get_subsystem("ATC"); - mgr->addController(this); - initialized = true; + if (!initialized) { + FGATCManager *mgr = (FGATCManager*) globals->get_subsystem("ATC"); + mgr->addController(this); + initialized = true; } } @@ -717,19 +797,19 @@ void FGATCController::init() * **************************************************************************/ FGTowerController::FGTowerController(FGAirportDynamics *par) : -FGATCController() + 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(); @@ -753,17 +833,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); - cerr << ref->getTrafficRef()->getCallSign() << " You are number " << activeTraffic.size() << " for takeoff " << endl; + // 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::updateAircraftInformation(int id, double lat, double lon, - double heading, double speed, double alt, - double dt) + double heading, double speed, double alt, + double dt) { TrafficVectorIterator i = activeTraffic.begin(); // Search whether the current id has an entry @@ -780,40 +880,71 @@ void FGTowerController::updateAircraftInformation(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"); + SG_LOG(SG_ATC, SG_ALERT, + "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) @@ -841,16 +972,18 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "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"); + SG_LOG(SG_ATC, SG_ALERT, + "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; } @@ -858,7 +991,7 @@ void FGTowerController::signOff(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 @@ -877,8 +1010,8 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: checking ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->hasInstruction(); } @@ -901,8 +1034,8 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: requesting ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->getInstruction(); } @@ -917,6 +1050,11 @@ string FGTowerController::getName() { return string(parent->getId() + "-tower"); } +void FGTowerController::update(double dt) +{ + +} + /*************************************************************************** @@ -924,18 +1062,18 @@ string FGTowerController::getName() { * **************************************************************************/ FGStartupController::FGStartupController(FGAirportDynamics *par): - FGATCController() + 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(); @@ -972,7 +1110,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 @@ -991,8 +1129,8 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: checking ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->hasInstruction(); } @@ -1015,8 +1153,8 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: requesting ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->getInstruction(); } @@ -1038,8 +1176,8 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "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); @@ -1047,30 +1185,29 @@ void FGStartupController::signOff(int id) } bool FGStartupController::checkTransmissionState(int st, time_t now, time_t startTime, TrafficVectorIterator i, AtcMsgId msgId, - AtcMsgDir msgDir) + 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; - FGATCManager *atc = (FGATCManager*) globals->get_subsystem("atc"); - atc->getATCDialog()->removeEntry(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); + transmit(&(*i), &(*parent), msgId, msgDir, false); return false; } } if (now > startTime) { //cerr << "Transmitting startup msg" << endl; - transmit(&(*i), msgId, msgDir, true); + transmit(&(*i), &(*parent), msgId, msgDir, true); i->updateState(); lastTransmission = now; available = false; @@ -1081,8 +1218,8 @@ bool FGStartupController::checkTransmissionState(int st, time_t now, time_t star } void FGStartupController::updateAircraftInformation(int id, double lat, double lon, - double heading, double speed, double alt, - double dt) + double heading, double speed, double alt, + double dt) { TrafficVectorIterator i = activeTraffic.begin(); // Search search if the current id has an entry @@ -1100,8 +1237,8 @@ void FGStartupController::updateAircraftInformation(int id, double lat, double l // // 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: updating aircraft without traffic record at " << SG_ORIGIN); } else { i->setPositionAndHeading(lat, lon, heading, speed, alt); current = i; @@ -1110,11 +1247,11 @@ void FGStartupController::updateAircraftInformation(int id, double lat, double l int state = i->getState(); - // The user controlled aircraft should have crased here, because it doesn't have a traffic reference. + // 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; @@ -1134,16 +1271,16 @@ void FGStartupController::updateAircraftInformation(int id, double lat, double l checkTransmissionState(7, now, (startTime + 180), i, MSG_REQUEST_PUSHBACK_CLEARANCE, ATC_AIR_TO_GROUND); - + if ((state == 8) && available) { if (now > startTime + 200) { if (i->pushBackAllowed()) { i->allowRepeatedTransmissions(); - transmit(&(*i), MSG_PERMIT_PUSHBACK_CLEARANCE, + transmit(&(*i), &(*parent), MSG_PERMIT_PUSHBACK_CLEARANCE, ATC_GROUND_TO_AIR, true); i->updateState(); } else { - transmit(&(*i), MSG_HOLD_PUSHBACK_CLEARANCE, + transmit(&(*i), &(*parent), MSG_HOLD_PUSHBACK_CLEARANCE, ATC_GROUND_TO_AIR, true); i->suppressRepeatedTransmissions(); } @@ -1158,14 +1295,16 @@ void FGStartupController::updateAircraftInformation(int id, double lat, double l // 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 lon, double elev, double hdg, double slope) { SGGeod geod = SGGeod::fromDegM(lon, lat, elev); - obj_pos = geod.makeZUpFrame(); + obj_pos = makeZUpFrame(geod); // 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)); } @@ -1178,82 +1317,82 @@ void FGStartupController::render(bool visible) 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; + //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++) { - // 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); - - WorldCoordinate( obj_pos, center.getLatitudeDeg(), center.getLongitudeDeg(), parent->getElevation()+8+dx, -(heading) ); - - 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 = matlib->find("UnidirectionalTaper"); - 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; + 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); - FGTaxiSegment *segment = parent->getGroundNetwork()->findSegment(k); - WorldCoordinate( obj_pos, segment->getLatitude(), segment->getLongitude(), parent->getElevation()+8+dx, -(segment->getHeading()) ); + // 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 = segment->getLength() /2.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); @@ -1263,18 +1402,101 @@ void FGStartupController::render(bool visible) geode->setName("test"); geode->addDrawable(geometry); //osg::Node *custom_obj; - SGMaterial *mat = matlib->find("UnidirectionalTaper"); + 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; + //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; } - //dx += 0.1; } globals->get_scenery()->get_scene_graph()->addChild(group); } @@ -1284,25 +1506,31 @@ string FGStartupController::getName() { return string(parent->getId() + "-startup"); } +void FGStartupController::update(double dt) +{ + +} + + /*************************************************************************** * class FGApproachController * **************************************************************************/ FGApproachController::FGApproachController(FGAirportDynamics *par): -FGATCController() + 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(); @@ -1334,8 +1562,8 @@ void FGApproachController::announcePosition(int id, } void FGApproachController::updateAircraftInformation(int id, double lat, double lon, - double heading, double speed, double alt, - double dt) + double heading, double speed, double alt, + double dt) { TrafficVectorIterator i = activeTraffic.begin(); // Search search if the current id has an entry @@ -1352,8 +1580,8 @@ void FGApproachController::updateAircraftInformation(int id, double lat, double } // // 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: updating aircraft without traffic record at " << SG_ORIGIN); } else { i->setPositionAndHeading(lat, lon, heading, speed, alt); current = i; @@ -1400,13 +1628,17 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: Aircraft without traffic record is signing off from approach at " << SG_ORIGIN); } else { i = activeTraffic.erase(i); } } +void FGApproachController::update(double dt) +{ + +} @@ -1425,8 +1657,8 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: checking ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->hasInstruction(); } @@ -1449,8 +1681,8 @@ 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"); + SG_LOG(SG_ATC, SG_ALERT, + "AI error: requesting ATC instruction for aircraft without traffic record at " << SG_ORIGIN); } else { return i->getInstruction(); }