Updated to r8541

logbook/countrydat.cpp

@@ -18,7 +18,7 @@
 #include "countrydat.h"
 #include <QFile>
 #include <QTextStream>
-
+#include <QDebug>
 
 void CountryDat::init(const QString filename)
 {
@@ -91,6 +91,11 @@ void CountryDat::load()
             QString name = _extractName(line1);
             if (name.length()>0)
             {
+              QString continent=line1.mid(36,2);
+              QString principalPrefix=line1.mid(69,4);
+              int i1=principalPrefix.indexOf(":");
+              if(i1>0) principalPrefix=principalPrefix.mid(0,i1);
+              name += "; " + principalPrefix + "; " + continent;
                 _countryNames << name;
                 bool more = true;
                 QStringList prefixs;
@@ -147,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)
     {
-      country.replace ("Guantanamo Bay", "United States");
+      country.replace ("Guantanamo Bay; KG4; NA", "United States; K; NA");
     }
   return country;
 }