fly/flightgear
1
0
Fork 0
Code Activity

Support ICAO identifiers with more than four characters, in the AirportsList.

Browse source
This commit is contained in:
James Turner 2010-05-09 11:11:52 +01:00
parent 06f14d0c80
commit 45fbd8008d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Navaids/positioned.cxx
View file

@ -550,13 +550,14 @@ char** searchAirportNamesAndIdents(const std::string& aFilter)
// We format results as follows (note whitespace!):
// ' name-of-airport-chars (ident)'
// so the total length is:
// 1 + strlen(name) + 4 + 4 (for the ident) + 1 + 1 (for the null)
// which gives a grand total of 11 + the length of the name.
// note the ident is sometimes only three letters for non-ICAO small strips
// 1 + strlen(name) + 4 + strlen(icao) + 1 + 1 (for the null)
// which gives a grand total of 7 + name-length + icao-length.
// note the ident can be three letters (non-ICAO local strip), four
// (default ICAO) or more (extended format ICAO)
for (unsigned int i=0; i<numMatches; ++i) {
int nameLength = matches[i]->name().size();
int icaoLength = matches[i]->ident().size();
char* entry = new char[nameLength + 11];
char* entry = new char[7 + nameLength + icaoLength];
char* dst = entry;
*dst++ = ' ';
memcpy(dst, matches[i]->name().c_str(), nameLength);