fly/flightgear
1
0
Fork 0
Code Activity

Load APT1000 comm frequencies correctly.

Browse source 
See discussion in:
https://sourceforge.net/p/flightgear/codetickets/2336/
This commit is contained in:
James Turner 2020-08-19 11:48:35 +01:00
parent 5b3cdb49c5
commit 94ff2f8ee4
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/Airports/apt_loader.cxx
View file

@ -258,6 +258,11 @@ const FGAirport* APTLoader::loadAirportFromFile(std::string id, const SGPath& ap
return loadAirport(aptdb_file.c_str(), id, &rawInfo, true); return loadAirport(aptdb_file.c_str(), id, &rawInfo, true);
} }
static bool isCommLine(const int code)
{
return ((code >= 50) && (code <= 56)) || ((code >= 1050) && (code <= 1056));
}
const FGAirport* APTLoader::loadAirport(const string aptDat, const std::string airportID, RawAirportInfo* airport_info, bool createFGAirport) const FGAirport* APTLoader::loadAirport(const string aptDat, const std::string airportID, RawAirportInfo* airport_info, bool createFGAirport)
{ {
// The first line for this airport was already split over whitespace, but // The first line for this airport was already split over whitespace, but
@ -300,14 +305,14 @@ const FGAirport* APTLoader::loadAirport(const string aptDat, const std::string a
// custom startup locations (ignore) // custom startup locations (ignore)
} else if ( rowCode == 0 ) { } else if ( rowCode == 0 ) {
// ?? // ??
} else if ( rowCode >= 50 && rowCode <= 56) { } else if (isCommLine(rowCode)) {
parseCommLine(aptDat, linesIt->number, rowCode, parseCommLine(aptDat, linesIt->number, rowCode,
simgear::strutils::split(linesIt->str)); simgear::strutils::split(linesIt->str));
} else if ( rowCode == 110 ) { } else if (rowCode == 110) {
current_block = Pavement; current_block = Pavement;
parsePavementLine850(simgear::strutils::split(linesIt->str, 0, 4)); parsePavementLine850(simgear::strutils::split(linesIt->str, 0, 4));
} else if ( rowCode >= 111 && rowCode <= 116 ) { } else if (rowCode >= 111 && rowCode <= 116) {
switch(current_block) { switch (current_block) {
case Pavement : case Pavement :
parseNodeLine850(&pavements, aptDat, linesIt->number, rowCode, parseNodeLine850(&pavements, aptDat, linesIt->number, rowCode,
simgear::strutils::split(linesIt->str)); simgear::strutils::split(linesIt->str));
@ -330,19 +335,18 @@ const FGAirport* APTLoader::loadAirport(const string aptDat, const std::string a
throw sg_format_exception(oss.str(), cleanedLine); throw sg_format_exception(oss.str(), cleanedLine);
break; break;
} }
} else if ( rowCode == 120 ) { } else if (rowCode == 120) {
current_block = LinearFeature; current_block = LinearFeature;
} else if ( rowCode == 130 ) { } else if (rowCode == 130) {
current_block = AirportBoundary; current_block = AirportBoundary;
} else if ( rowCode >= 1000 ) { } else if (rowCode >= 1000) {
// airport traffic flow (ignore) // airport traffic flow (ignore)
} else { } else {
std::ostringstream oss; std::ostringstream oss;
string cleanedLine = cleanLine(linesIt->str); string cleanedLine = cleanLine(linesIt->str);
oss << aptDat << ":" << linesIt->number << ": unknown row code " << oss << aptDat << ":" << linesIt->number << ": unknown row code " << rowCode;
rowCode; SG_LOG(SG_GENERAL, SG_ALERT, oss.str() << " (" << cleanedLine << ")");
SG_LOG( SG_GENERAL, SG_ALERT, oss.str() << " (" << cleanedLine << ")" ); throw sg_format_exception(oss.str(), cleanedLine);
throw sg_format_exception(oss.str(), cleanedLine);
} }
} // of loop over the second and subsequent apt.dat lines for the airport } // of loop over the second and subsequent apt.dat lines for the airport
@ -814,8 +818,13 @@ void APTLoader::parseCommLine(const string& aptDat,
rwy_lat_accum / (double)rwy_count, rwy_lat_accum / (double)rwy_count,
last_apt_elev); last_apt_elev);
// short int representing tens of kHz: const bool isAPT1000Code = rowCode > 1000;
int freqKhz = atoi(token[1].c_str()) * 10; if (isAPT1000Code) {
rowCode -= 1000;
}
// short int representing tens of kHz, or just kHz directly
int freqKhz = std::stoi(token[1]) * (isAPT1000Code ? 1 : 10);
int rangeNm = 50; int rangeNm = 50;
FGPositioned::Type ty; FGPositioned::Type ty;