flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 11:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

ref #701, "improved countries"

Browse Source 
* utility function for "accent free" strings
* added 3 letter ISO, alias names
* improved searching in countries
This commit is contained in:
Klaus Basan
2016-07-03 00:40:23 +02:00
parent 50f1d71978
commit 773f318a07
7 changed files with 189 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/countrylist.cpp
View File

@@ -33,13 +33,14 @@ namespace BlackMisc
{
if (countryName.isEmpty()) { return CCountry(); }
static const QRegExp reg("[^a-z]", Qt::CaseInsensitive);
QString cn(countryName);
cn.remove(reg);
static const QRegExp reg("^[a-z]+", Qt::CaseInsensitive);
int pos = reg.indexIn(countryName);
const QString cn(pos >= 0 ? reg.cap(0) : countryName);
CCountryList countries = this->findBy([&](const CCountry & country)
{
return country.matchesCountryName(cn);
});
if (countries.isEmpty()) { return this->findFirstByAlias(cn); }
if (countries.size() < 2) { return countries.frontOrDefault(); }
// find best match by further reducing
@@ -52,6 +53,17 @@ namespace BlackMisc
return countries.front();
}
CCountry CCountryList::findFirstByAlias(const QString &alias) const
{
if (alias.isEmpty()) { return CCountry(); }
const QString a(alias.toUpper().trimmed());
for (const CCountry &country : (*this))
{
if (country.matchesAlias(a)) { return country;}
}
return CCountry();
}
QStringList CCountryList::toIsoNameList() const
{
QStringList sl;
@@ -88,7 +100,6 @@ namespace BlackMisc
return sl;
}
CCountryList CCountryList::fromDatabaseJson(const QJsonArray &array)
{
CCountryList countries;
@@ -99,5 +110,4 @@ namespace BlackMisc
}
return countries;
}
} // namespace