X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fdclgps.cxx;h=42157d7a1836ffcde8db0f510c4b7c97977b24eb;hb=15724a6a446317f83d429670ebb0e2204c72bdb5;hp=af232d70b0e4a83cdab95f7238dc27551c7b7883;hpb=40639d38a877b7f58702db0c2b8831985b8ddbaf;p=flightgear.git diff --git a/src/Instrumentation/dclgps.cxx b/src/Instrumentation/dclgps.cxx index af232d70b..42157d7a1 100644 --- a/src/Instrumentation/dclgps.cxx +++ b/src/Instrumentation/dclgps.cxx @@ -26,14 +26,18 @@ #include "dclgps.hxx" #include +#include #include #include +#include #include
#include #include #include +#include +#include #include using namespace std; @@ -148,12 +152,6 @@ DCLGPS::DCLGPS(RenderArea2D* instrument) { _instrument = instrument; _nFields = 1; _maxFields = 2; - - // Units - lets default to US units - FG can set them to other units from config during startup if desired. - _altUnits = GPS_ALT_UNITS_FT; - _baroUnits = GPS_PRES_UNITS_IN; - _velUnits = GPS_VEL_UNITS_KT; - _distUnits = GPS_DIST_UNITS_NM; _lon_node = fgGetNode("/instrumentation/gps/indicated-longitude-deg", true); _lat_node = fgGetNode("/instrumentation/gps/indicated-latitude-deg", true); @@ -207,8 +205,6 @@ DCLGPS::DCLGPS(RenderArea2D* instrument) { // Configuration Initialisation // Should this be in kln89.cxx ? _turnAnticipationEnabled = false; - _suaAlertEnabled = false; - _altAlertEnabled = false; _time = new SGTime; @@ -231,32 +227,30 @@ DCLGPS::~DCLGPS() { } void DCLGPS::draw(osg::State& state) { - _instrument->draw(state); + _instrument->Draw(state); } void DCLGPS::init() { // Not sure if this should be here, but OK for now. CreateDefaultFlightPlans(); + + LoadApproachData(); } void DCLGPS::bind() { - fgTie("/instrumentation/gps/waypoint-alert", this, &DCLGPS::GetWaypointAlert); - fgTie("/instrumentation/gps/leg-mode", this, &DCLGPS::GetLegMode); - fgTie("/instrumentation/gps/obs-mode", this, &DCLGPS::GetOBSMode); - fgTie("/instrumentation/gps/approach-arm", this, &DCLGPS::GetApproachArm); - fgTie("/instrumentation/gps/approach-active", this, &DCLGPS::GetApproachActive); - fgTie("/instrumentation/gps/cdi-deflection", this, &DCLGPS::GetCDIDeflection); - fgTie("/instrumentation/gps/to-flag", this, &DCLGPS::GetToFlag); + _tiedProperties.setRoot(fgGetNode("/instrumentation/gps", true)); + _tiedProperties.Tie("waypoint-alert", this, &DCLGPS::GetWaypointAlert); + _tiedProperties.Tie("leg-mode", this, &DCLGPS::GetLegMode); + _tiedProperties.Tie("obs-mode", this, &DCLGPS::GetOBSMode); + _tiedProperties.Tie("approach-arm", this, &DCLGPS::GetApproachArm); + _tiedProperties.Tie("approach-active", this, &DCLGPS::GetApproachActive); + _tiedProperties.Tie("cdi-deflection", this, &DCLGPS::GetCDIDeflection); + _tiedProperties.Tie("to-flag", this, &DCLGPS::GetToFlag); } void DCLGPS::unbind() { - fgUntie("/instrumentation/gps/waypoint-alert"); - fgUntie("/instrumentation/gps/leg-mode"); - fgUntie("/instrumentation/gps/obs-mode"); - fgUntie("/instrumentation/gps/approach-arm"); - fgUntie("/instrumentation/gps/approach-active"); - fgUntie("/instrumentation/gps/cdi-deflection"); + _tiedProperties.Untie(); } void DCLGPS::update(double dt) { @@ -485,8 +479,7 @@ void DCLGPS::update(double dt) { _fromWaypoint = _activeWaypoint; _activeWaypoint = *_activeFP->waypoints[idx + 1]; _dto = false; - // TODO - course alteration message format is dependent on whether we are slaved HSI/CDI indicator or not. - // For now assume we are not. + // Course alteration message format is dependent on whether we are slaved HSI/CDI indicator or not. string s; if(fgGetBool("/instrumentation/nav[0]/slaved-to-gps")) { // TODO - avoid the hardwiring on nav[0] @@ -521,6 +514,444 @@ void DCLGPS::update(double dt) { } } +/* + Expand a SIAP ident to the full procedure name (as shown on the approach chart). + NOTE: Some of this is inferred from data, some is from documentation. + + Example expansions from ARINC 424-18 [and the airport they're taken from]: + "R10LY" <--> "RNAV (GPS) Y RWY 10 L" [KBOI] + "R10-Z" <--> "RNAV (GPS) Z RWY 10" [KHTO] + "S25" <--> "VOR or GPS RWY 25" [KHHR] + "P20" <--> "GPS RWY 20" [KDAN] + "NDB-B" <--> "NDB or GPS-B" [KDAW] + "NDBC" <--> "NDB or GPS-C" [KEMT] + "VDMA" <--> "VOR/DME or GPS-A" [KDAW] + "VDM-A" <--> "VOR/DME or GPS-A" [KEAG] + "VDMB" <--> "VOR/DME or GPS-B" [KDKX] + "VORA" <--> "VOR or GPS-A" [KEMT] + + It seems that there are 2 basic types of expansions; those that include + the runway and those that don't. Of those that don't, it seems that 2 + different positions within the string to encode the identifying letter + are used, i.e. with a dash and without. +*/ +string DCLGPS::ExpandSIAPIdent(const string& ident) { + string name; + bool has_rwy = false; + + switch(ident[0]) { + case 'N': name = "NDB or GPS"; has_rwy = false; break; + case 'P': name = "GPS"; has_rwy = true; break; + case 'R': name = "RNAV (GPS)"; has_rwy = true; break; + case 'S': name = "VOR or GPS"; has_rwy = true; break; + case 'V': + if(ident[1] == 'D') name = "VOR/DME or GPS"; + else name = "VOR or GPS"; + has_rwy = false; + break; + default: // TODO output a log message + break; + } + + if(has_rwy) { + // Add the identifying letter if present + if(ident.size() == 5) { + name += ' '; + name += ident[4]; + } + + // Add the runway + name += " RWY "; + name += ident.substr(1, 2); + + // Add a left/right/centre indication if present. + if(ident.size() > 3) { + if((ident[3] != '-') && (ident[3] != ' ')) { // Early versions of the spec allowed a blank instead of a dash so check for both + name += ' '; + name += ident[3]; + } + } + } else { + // Add the identifying letter, which I *think* should always be present, but seems to be inconsistent as to whether a dash is used. + if(ident.size() == 5) { + name += '-'; + name += ident[4]; + } else if(ident.size() == 4) { + name += '-'; + name += ident[3]; + } else { + // No suffix letter + } + } + + return(name); +} + +/* + Load instrument approaches from an ARINC 424 file. + Tested on ARINC 424-18. + Known / current best guess at the format: + Col 1: Always 'S'. If it isn't, ditch it. + Col 2-4: "Customer area" code, eg "USA", "CAN". I think that CAN is used for Alaska. + Col 5: Section code. Used in conjunction with sub-section code. Definitions are with sub-section code. + Col 6: Always blank. + Col 7-10: ICAO (or FAA) airport ident. Left justified if < 4 chars. + Col 11-12: Based on ICAO geographical region. + Col 13: Sub-section code. Used in conjunction with section code. + "HD/E/F" => Helicopter record. + "HS" => Helicopter minimum safe altitude. + "PA" => Airport record. + "PF" => Approach segment. + "PG" => Runway record. + "PP" => Path point record. ??? + "PS" => MSA record (minimum safe altitude). + + ------ The following is for "PF", approach segment ------- + + Col 14-19: SIAP ident for this approach (left justified). This is a standardised abbreviated approach name. + e.g. "R10LZ" expands to "RNAV (GPS) Z RWY 10 L". See the comment block for ExpandSIAPIdent for full details. + Col 20: Route type. This is tricky - I don't have full documentation and am having to guess a bit. + 'A' => Arrival route? This seems to be used to encode arrival routes from the IAF to the approach proper. + Note that the final fix of the arrival route is duplicated in the approach proper. + 'D' => VOR/DME or GPS + 'N' => NDB or GPS + 'P' => GPS (ARINC 424-18), GPS and RNAV (GPS) (ARINC 424-15 and before). + 'R' => RNAV (GPS) (ARINC 424-18). + 'S' => VOR or GPS + Col 21-25: Transition identifier. AFAICT, this is the ident of the IAF for this initial approach route, and left blank for the final approach course. See col 30-34 for the actual fix ident. + Col 26: BLANK + Col 27-29: Sequence number - position within the route segment. Rule: 10-20-30 etc. + Col 30-34: Fix identifer. The ident of the waypoint. + Col 35-36: ICAO geographical region code. I think we can ignore this for now. + Col 37: Section code - ??? I don't know what this means + Col 38 Subsection code - ??? ditto - no idea! + Col 40: Waypoint type. + 'A' => Airport as waypoint + 'E' => Essential waypoint (e.g. change of heading at this waypoint, etc). + 'G' => Runway or helipad as waypoint + 'H' => Heliport as waypoint + 'N' => NDB as waypoint + 'P' => Phantom waypoint (not sure if this is used in rev 18?) + 'V' => VOR as waypoint + Col 41: Waypoint type. + 'B' => Flyover, approach transition, or final approach. + 'E' => end of route segment (transition waypoint). (Actually "End of terminal procedure route type" in the docs). + 'N' => ??? I've also seen 'N' in this column, but don't know what it indicates. + 'Y' => Flyover. + Col 43: Waypoint type. May also be blank when none of the below. + 'A' => Initial approach fix (IAF) + 'F' => Final approach fix + 'H' => Holding fix + 'I' => Final approach course fix + 'M' => Missed approach point + 'P' => ??? This is present, but I don't know what this means and it wasn't in the FAA docs that I found the above in! + ??? Possibly procedure turn? + 'C' => ??? This is also present in the data, but missing from the docs. Is at airport 00R. + Col 107-111 MSA center fix. We can ignore this. +*/ +void DCLGPS::LoadApproachData() { + FGNPIAP* iap = NULL; + GPSWaypoint* wp; + GPSFlightPlan* fp; + const GPSWaypoint* cwp; + + std::ifstream fin; + SGPath path = globals->get_fg_root(); + path.append("Navaids/rnav.dat"); + fin.open(path.c_str(), ios::in); + if(!fin) { + //cout << "Unable to open input file " << path.c_str() << '\n'; + return; + } else { + //cout << "Opened " << path.c_str() << " for reading\n"; + } + char tmp[256]; + string s; + + string apt_ident; // This gets set to the ICAO code of the current airport being processed. + string iap_ident; // The abbreviated name of the current approach being processed. + string wp_ident; // The ident of the waypoint of the current line + string last_apt_ident; + string last_iap_ident; + string last_wp_ident; + // There is no need to save the full name - it can be generated on the fly from the abbreviated name as and when needed. + bool apt_in_progress = false; // Set true whilst loading all the approaches for a given airport. + bool iap_in_progress = false; // Set true whilst loading a given approach. + bool iap_error = false; // Set true if there is an error loading a given approach. + bool route_in_progress = false; // Set true when we are loading a "route" segment of the approach. + int last_sequence_number = 0; // Position within the route, rule (rev 18): 10, 20, 30 etc. + int sequence_number; + char last_route_type = 0; + char route_type; + char waypoint_fix_type; // This is the waypoint type from col 43, i.e. the type of fix. May be blank. + + int j; + + // Debugging info + unsigned int nLoaded = 0; + unsigned int nErrors = 0; + + //for(i=0; i<64; ++i) { + while(!fin.eof()) { + fin.getline(tmp, 256); + //s = Fake_rnav_dat[i]; + s = tmp; + if(s.size() < 132) continue; + if(s[0] == 'S') { // Valid line + string country_code = s.substr(1, 3); + if(country_code == "USA") { // For now we'll stick to US procedures in case there are unknown gotchas with others + if(s[4] == 'P') { // Includes approaches. + if(s[12] == 'A') { // Airport record + apt_ident = s.substr(6, 4); + // Trim any whitespace from the ident. The ident is left justified, + // so any space will be at the end. + if(apt_ident[3] == ' ') apt_ident = apt_ident.substr(0, 3); + // I think that all idents are either 3 or 4 chars - could check this though! + if(!apt_in_progress) { + last_apt_ident = apt_ident; + apt_in_progress = 1; + } else { + if(last_apt_ident != apt_ident) { + if(iap_in_progress) { + if(iap_error) { + //cout << "ERROR: Unable to load approach " << iap->_ident << " at " << iap->_aptIdent << '\n'; + nErrors++; + } else { + _np_iap[iap->_aptIdent].push_back(iap); + //cout << "** Loaded " << iap->_aptIdent << "\t" << iap->_ident << '\n'; + nLoaded++; + } + iap_in_progress = false; + } + } + last_apt_ident = apt_ident; + } + iap_in_progress = 0; + } else if(s[12] == 'F') { // Approach segment + if(apt_in_progress) { + iap_ident = s.substr(13, 6); + // Trim any whitespace from the RH end. + for(j=0; j<6; ++j) { + if(iap_ident[5-j] == ' ') { + iap_ident = iap_ident.substr(0, 5-j); + } else { + // It's important to break here, since earlier versions of ARINC 424 allowed spaces in the ident. + break; + } + } + if(iap_in_progress) { + if(iap_ident != last_iap_ident) { + // This is a new approach - store the last one and trigger + // starting afresh by setting the in progress flag to false. + if(iap_error) { + //cout << "ERROR: Unable to load approach " << iap->_ident << " at " << iap->_aptIdent << '\n'; + nErrors++; + } else { + _np_iap[iap->_aptIdent].push_back(iap); + //cout << "Loaded " << iap->_aptIdent << "\t" << iap->_ident << '\n'; + nLoaded++; + } + iap_in_progress = false; + } + } + if(!iap_in_progress) { + iap = new FGNPIAP; + iap->_aptIdent = apt_ident; + iap->_ident = iap_ident; + iap->_name = ExpandSIAPIdent(iap_ident); // I suspect that it's probably better to just store idents, and to expand the names as needed. + // Note, we haven't set iap->_rwyStr yet. + last_iap_ident = iap_ident; + iap_in_progress = true; + iap_error = false; + } + + // Route type + route_type = s[19]; + sequence_number = atoi(s.substr(26,3).c_str()); + wp_ident = s.substr(29, 5); + waypoint_fix_type = s[42]; + // Trim any whitespace from the RH end + for(j=0; j<5; ++j) { + if(wp_ident[4-j] == ' ') { + wp_ident = wp_ident.substr(0, 4-j); + } else { + break; + } + } + + // Ignore lines with no waypoint ID for now - these are normally part of the + // missed approach procedure, and we don't use them in the KLN89. + if(!wp_ident.empty()) { + // Make a local copy of the waypoint for now, since we're not yet sure if we'll be using it + GPSWaypoint w; + w.id = wp_ident; + bool wp_error = false; + if(w.id.substr(0, 2) == "RW" && waypoint_fix_type == 'M') { + // Assume that this is a missed-approach point based on the runway number, which appears to be standard for most approaches. + // Note: Currently fgFindAirportID returns NULL on error, but getRunwayByIdent throws an exception. + const FGAirport* apt = fgFindAirportID(iap->_aptIdent); + if(apt) { + string rwystr; + try { + rwystr = w.id.substr(2, 2); + // TODO - sanity check the rwystr at this point to ensure we have a double digit number + if(w.id.size() > 4) { + if(w.id[4] == 'L' || w.id[4] == 'C' || w.id[4] == 'R') { + rwystr += w.id[4]; + } + } + FGRunway* rwy = apt->getRunwayByIdent(rwystr); + w.lat = rwy->begin().getLatitudeRad(); + w.lon = rwy->begin().getLongitudeRad(); + } catch(const sg_exception&) { + SG_LOG(SG_INSTR, SG_WARN, "Unable to find runway " << w.id.substr(2, 2) << " at airport " << iap->_aptIdent); + //cout << "Unable to find runway " << w.id.substr(2, 2) << " at airport " << iap->_aptIdent << " ( w.id = " << w.id << ", rwystr = " << rwystr << " )\n"; + wp_error = true; + } + } else { + wp_error = true; + } + } else { + cwp = FindFirstByExactId(w.id); + if(cwp) { + w = *cwp; + } else { + wp_error = true; + } + } + switch(waypoint_fix_type) { + case 'A': w.appType = GPS_IAF; break; + case 'F': w.appType = GPS_FAF; break; + case 'H': w.appType = GPS_MAHP; break; + case 'I': w.appType = GPS_IAP; break; + case 'M': w.appType = GPS_MAP; break; + case ' ': w.appType = GPS_APP_NONE; break; + //default: cout << "Unknown waypoint_fix_type: \'" << waypoint_fix_type << "\' [" << apt_ident << ", " << iap_ident << "]\n"; + } + + if(wp_error) { + //cout << "Unable to find waypoint " << w.id << " [" << apt_ident << ", " << iap_ident << "]\n"; + iap_error = true; + } + + if(!wp_error) { + if(route_in_progress) { + if(sequence_number > last_sequence_number) { + // TODO - add a check for runway numbers + // Check for the waypoint ID being the same as the previous line. + // This is often the case for the missed approach holding point. + if(wp_ident == last_wp_ident) { + if(waypoint_fix_type == 'H') { + if(!iap->_IAP.empty()) { + if(iap->_IAP[iap->_IAP.size() - 1]->appType == GPS_APP_NONE) { + iap->_IAP[iap->_IAP.size() - 1]->appType = GPS_MAHP; + } else { + //cout << "Waypoint is MAHP and another type! " << w.id << " [" << apt_ident << ", " << iap_ident << "]\n"; + } + } + } + } else { + // Create a new waypoint on the heap, copy the local copy into it, and push it onto the approach. + wp = new GPSWaypoint; + *wp = w; + if(route_type == 'A') { + fp->waypoints.push_back(wp); + } else { + iap->_IAP.push_back(wp); + } + } + } else if(sequence_number == last_sequence_number) { + // This seems to happen once per final approach route - one of the waypoints + // is duplicated with the same sequence number - I'm not sure what information + // the second line give yet so ignore it for now. + // TODO - figure this out! + } else { + // Finalise the current route and start a new one + // + // Finalise the current route + if(last_route_type == 'A') { + // Push the flightplan onto the approach + iap->_approachRoutes.push_back(fp); + } else { + // All the waypoints get pushed individually - don't need to do it. + } + // Start a new one + // There are basically 2 possibilities here - either it's one of the arrival transitions, + // or it's the core final approach course. + wp = new GPSWaypoint; + *wp = w; + if(route_type == 'A') { // It's one of the arrival transition(s) + fp = new GPSFlightPlan; + fp->waypoints.push_back(wp); + } else { + iap->_IAP.push_back(wp); + } + route_in_progress = true; + } + } else { + // Start a new route. + // There are basically 2 possibilities here - either it's one of the arrival transitions, + // or it's the core final approach course. + wp = new GPSWaypoint; + *wp = w; + if(route_type == 'A') { // It's one of the arrival transition(s) + fp = new GPSFlightPlan; + fp->waypoints.push_back(wp); + } else { + iap->_IAP.push_back(wp); + } + route_in_progress = true; + } + last_route_type = route_type; + last_wp_ident = wp_ident; + last_sequence_number = sequence_number; + } + } + } else { + // ERROR - no airport record read. + } + } + } else { + // Check and finalise any approaches in progress + // TODO - sanity check that the approach has all the required elements + if(iap_in_progress) { + // This is a new approach - store the last one and trigger + // starting afresh by setting the in progress flag to false. + if(iap_error) { + //cout << "ERROR: Unable to load approach " << iap->_ident << " at " << iap->_aptIdent << '\n'; + nErrors++; + } else { + _np_iap[iap->_aptIdent].push_back(iap); + //cout << "* Loaded " << iap->_aptIdent << "\t" << iap->_ident << '\n'; + nLoaded++; + } + iap_in_progress = false; + } + } + } + } + } + + // If we get to the end of the file, load any approach that is still in progress + // TODO - sanity check that the approach has all the required elements + if(iap_in_progress) { + if(iap_error) { + //cout << "ERROR: Unable to load approach " << iap->_ident << " at " << iap->_aptIdent << '\n'; + nErrors++; + } else { + _np_iap[iap->_aptIdent].push_back(iap); + //cout << "*** Loaded " << iap->_aptIdent << "\t" << iap->_ident << '\n'; + nLoaded++; + } + } + + //cout << "Done loading approach database\n"; + //cout << "Loaded: " << nLoaded << '\n'; + //cout << "Failed: " << nErrors << '\n'; + + fin.close(); +} + GPSWaypoint* DCLGPS::GetActiveWaypoint() { return &_activeWaypoint; } @@ -553,21 +984,26 @@ double DCLGPS::GetCDIDeflection() const { } void DCLGPS::DtoInitiate(const string& s) { - //cout << "DtoInitiate, s = " << s << '\n'; const GPSWaypoint* wp = FindFirstByExactId(s); if(wp) { - //cout << "Waypoint found, starting dto operation!\n"; + // TODO - Currently we start DTO operation unconditionally, regardless of which mode we are in. + // In fact, the following rules apply: + // In LEG mode, start DTO as we currently do. + // In OBS mode, set the active waypoint to the requested waypoint, and then: + // If the KLN89 is not connected to an external HSI or CDI, set the OBS course to go direct to the waypoint. + // If the KLN89 *is* connected to an external HSI or CDI, it cannot set the course itself, and will display + // a scratchpad message with the course to set manually on the HSI/CDI. + // In both OBS cases, leave _dto false, since we don't need the virtual waypoint created. _dto = true; _activeWaypoint = *wp; _fromWaypoint.lat = _gpsLat; _fromWaypoint.lon = _gpsLon; _fromWaypoint.type = GPS_WP_VIRT; - _fromWaypoint.id = "DTOWP"; - delete wp; + _fromWaypoint.id = "_DTOWP_"; + delete wp; } else { - //cout << "Waypoint not found, ignoring dto request\n"; - // Should bring up the user waypoint page, but we're not implementing that yet. - _dto = false; // TODO - implement this some day. + // TODO - Should bring up the user waypoint page. + _dto = false; } } @@ -583,9 +1019,37 @@ void DCLGPS::DtoCancel() { void DCLGPS::ToggleOBSMode() { _obsMode = !_obsMode; if(_obsMode) { - if(!_activeWaypoint.id.empty()) { - _obsHeading = static_cast(_dtkMag); + // We need to set the OBS heading. The rules for this are: + // + // If the KLN89 is connected to an external HSI or CDI, then the OBS heading must be set + // to the OBS radial on the external indicator, and cannot be changed in the KLN89. + // + // If the KLN89 is not connected to an external indicator, then: + // If there is an active waypoint, the OBS heading is set such that the + // deviation indicator remains at the same deviation (i.e. set to DTK, + // although there may be some small difference). + // + // If there is not an active waypoint, I am not sure what value should be + // set. + // + if(fgGetBool("/instrumentation/nav/slaved-to-gps")) { + _obsHeading = static_cast(fgGetDouble("/instrumentation/nav/radials/selected-deg") + 0.5); + } else if(!_activeWaypoint.id.empty()) { + // NOTE: I am not sure if this is completely correct. There are sometimes small differences + // between DTK and default OBS heading in the simulator (~ 1 or 2 degrees). It might also + // be that OBS heading should be stored as float and only displayed as int, in order to maintain + // the initial bar deviation? + _obsHeading = static_cast(_dtkMag + 0.5); + //cout << "_dtkMag = " << _dtkMag << ", _dtkTrue = " << _dtkTrue << ", _obsHeading = " << _obsHeading << '\n'; + } else { + // TODO - what should we really do here? + _obsHeading = 0; } + + // Valid OBS heading values are 0 -> 359 degrees inclusive (from kln89 simulator). + if(_obsHeading > 359) _obsHeading -= 360; + if(_obsHeading < 0) _obsHeading += 360; + // TODO - the _fromWaypoint location will change as the OBS heading changes. // Might need to store the OBS initiation position somewhere in case it is needed again. SetOBSFromWaypoint(); @@ -599,7 +1063,8 @@ void DCLGPS::SetOBSFromWaypoint() { // TODO - base the 180 deg correction on the to/from flag. _fromWaypoint = GetPositionOnMagRadial(_activeWaypoint, 10, _obsHeading + 180.0); - _fromWaypoint.id = "OBSWP"; + _fromWaypoint.type = GPS_WP_VIRT; + _fromWaypoint.id = "_OBSWP_"; } void DCLGPS::CDIFSDIncrease() { @@ -623,16 +1088,6 @@ void DCLGPS::DrawChar(char c, int field, int px, int py, bool bold) { void DCLGPS::DrawText(const string& s, int field, int px, int py, bool bold) { } -void DCLGPS::SetBaroUnits(int n, bool wrap) { - if(n < 1) { - _baroUnits = (GPSPressureUnits)(wrap ? 3 : 1); - } else if(n > 3) { - _baroUnits = (GPSPressureUnits)(wrap ? 1 : 3); - } else { - _baroUnits = (GPSPressureUnits)n; - } -} - void DCLGPS::CreateDefaultFlightPlans() {} // Get the time to the active waypoint in seconds. @@ -934,7 +1389,8 @@ FGPositioned* DCLGPS::FindTypedFirstById(const string& id, FGPositioned::Type ty if (exact) { FGPositioned::List matches = - FGPositioned::findAllWithIdentSortedByRange(id, SGGeod::fromRad(_lon, _lat), &filter); + FGPositioned::findAllWithIdent(id, &filter); + FGPositioned::sortByRange(matches, SGGeod::fromRad(_lon, _lat)); multi = (matches.size() > 1); return matches.empty() ? NULL : matches.front().ptr(); }