chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged master 8748

Browse Source
This commit is contained in:
Jordan Sherer
2018-08-05 11:33:30 -04:00
parent 8f8772f1bd
commit 62899069bf
1222 changed files with 70382 additions and 406763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logbook/countrydat.cpp
+8 -6
View File
@@ -19,6 +19,7 @@
#include <QFile>
#include <QTextStream>
#include <QDebug>
#include "Radio.hpp"
void CountryDat::init(const QString filename)
{
@@ -131,14 +132,15 @@ QString CountryDat::find(QString call) const
return fixup (_data.value ("=" + call), call);
}
auto prefix = call;
while (prefix.size () >= 1)
auto prefix = Radio::effective_prefix (call);
auto match_candidate = prefix;
while (match_candidate.size () >= 1)
{
if (_data.contains (prefix))
if (_data.contains (match_candidate))
{
return fixup (_data.value (prefix), call);
return fixup (_data.value (match_candidate), prefix);
}
prefix = prefix.left (prefix.size () - 1);
match_candidate = match_candidate.left (match_candidate.size () - 1);
}
return QString {};
}
@@ -150,7 +152,7 @@ QString CountryDat::fixup (QString country, QString const& call) const
//
// KG4 2x1 and 2x3 calls that map to Gitmo are mainland US not Gitmo
if (call.startsWith ("KG4") && call.size () != 5)
if (call.startsWith ("KG4") && call.size () != 5 && call.size () != 3)
{
country.replace ("Guantanamo Bay; KG4; NA", "United States; K; NA");
}