fly/flightgear
1
0
Fork 0
Code Activity

nav.dat parser: small changes

Browse source 
- Try to make log messages less cryptic.
- Lower the level of two of them to SG_INFO, as discussed on the mailing
  list (<https://sourceforge.net/p/flightgear/mailman/message/35537475/>).
- Add a const qualifier.
This commit is contained in:
Florent Rougon 2016-12-10 09:09:42 +01:00
parent a2bf424118
commit a3560adc03
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Navaids/navdb.cxx
View file

@ -157,7 +157,7 @@ namespace flightgear
// Parse a line from a file such as nav.dat or carrier_nav.dat. Load the
// corresponding data into the NavDataCache.
static PositionedID processNavLine(
string& line, const string& utf8Path, unsigned int lineNum,
const string& line, const string& utf8Path, unsigned int lineNum,
FGPositioned::Type type = FGPositioned::INVALID)
{
NavDataCache* cache = NavDataCache::instance();
@ -279,11 +279,16 @@ static PositionedID processNavLine(
if ( simgear::strutils::uppercase(navaid_part[0]) == simgear::strutils::uppercase(dme_part[0]) ) {
navaid_dme = ref.get()->guid();
} else {
SG_LOG(SG_NAVAID, SG_WARN, "DME " << ident << " (" << name << "), closest match has wrong name:"
<< ref->ident() << " (" << ref->name() << ")");
SG_LOG(SG_NAVAID, SG_INFO,
utf8Path << ":" << lineNum << ": DME '" << ident << "' (" <<
name << "): while looking for a colocated navaid, found " <<
"that the closest match has wrong name: '" <<
ref->ident() << "' (" << ref->name() << ")");
}
} else {
SG_LOG(SG_NAVAID, SG_WARN, "Couldn't find navaid for DME:" << ident << " (" << name << ")");
SG_LOG(SG_NAVAID, SG_INFO,
utf8Path << ":" << lineNum << ": couldn't find any colocated "
"navaid for DME '" << ident << "' (" << name << ")");
}
} // of have a co-located navaid to locate
}