fly/flightgear
1
0
Fork 0
Code Activity

Airport-search can be filtered by type

Browse source 
Adjust the special NavCache function used for airport search, to
allow filtering by type (which is exposed in an upcoming patch to the
dialog code).

Patch by Daniel Wickstrom
This commit is contained in:
James Turner 2019-01-14 12:14:20 +00:00
parent b3c72a6f2e
commit fac110ca40
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Navaids/NavDataCache.cxx
View file

@ -2030,17 +2030,30 @@ NavDataCache::getOctreeLeafChildren(int64_t octreeNodeId)
* implement the AirportList dialog. It's unfortunate that it needs to reside
* here, but for now it's least ugly solution.
*/
char** NavDataCache::searchAirportNamesAndIdents(const std::string& aFilter)
char** NavDataCache::searchAirportNamesAndIdents(const std::string& searchInput)
{
sqlite3_stmt_ptr stmt;
unsigned int numMatches = 0, numAllocated = 16;
string heliport("HELIPORT");
bool heli_p = searchInput.substr(0, heliport.length()) == heliport;
auto pos = searchInput.find(":");
string aFilter((pos != string::npos) ? searchInput.substr(pos+1) : searchInput);
string searchTerm("%" + aFilter + "%");
if (aFilter.empty()) {
if (aFilter.empty() && !heli_p) {
stmt = d->getAllAirports;
numAllocated = 4096; // start much larger for all airports
} else {
stmt = d->searchAirports;
sqlite_bind_stdstring(stmt, 1, searchTerm);
if (heli_p) {
sqlite3_bind_int(stmt, 2, FGPositioned::HELIPORT);
sqlite3_bind_int(stmt, 3, FGPositioned::HELIPORT);
}
else {
sqlite3_bind_int(stmt, 2, FGPositioned::AIRPORT);
sqlite3_bind_int(stmt, 3, FGPositioned::SEAPORT);
}
}
char** result = (char**) malloc(sizeof(char*) * numAllocated);