bigcty update, grid-to-state fix

package.nw/lib/adif.js

@@ -108,6 +108,9 @@ function initAdifWorker()
   task.prefixToCQzone = GT.prefixToCQzone;
   task.prefixToMap = GT.prefixToMap;
   task.gridToState = GT.gridToState;
+  task.callsignDatabaseDXCC = GT.callsignDatabaseDXCC;
+  task.callsignDatabaseUS = GT.callsignDatabaseUS;
+  task.callsignDatabaseUSplus = GT.callsignDatabaseUSplus;
   task.modes = GT.modes;
   task.modes_phone = GT.modes_phone;
   task.QSOhash = GT.QSOhash;

package.nw/lib/adifWorker.js

@@ -38,6 +38,9 @@ function initGlobals(task)
   GT.prefixToCQzone = task.prefixToCQzone;
   GT.prefixToMap = task.prefixToMap;
   GT.gridToState = task.gridToState;
+  GT.callsignDatabaseDXCC = task.callsignDatabaseDXCC;
+  GT.callsignDatabaseUS = task.callsignDatabaseUS;
+  GT.callsignDatabaseUSplus = task.callsignDatabaseUSplus;
   GT.modes = task.modes;
   GT.modes_phone = task.modes_phone;
   GT.QSOhash = task.QSOhash;
@@ -548,7 +551,7 @@ function addQSO(
     details.qual = true;
   }
 
-  if (details.state == null && fourGrid.length > 0)
+  if (details.state == null && fourGrid.length > 0 && isKnownCallsignDXCC(finalDxcc))
   {
     if (fourGrid in GT.gridToState && GT.gridToState[fourGrid].length == 1)
     {

package.nw/lib/gt.js

@@ -102,7 +102,8 @@ GT.callsignDatabaseDXCC = {
   1: true,
   6: true,
   110: true,
-  202: true
+  202: true,
+  150: true
 };
 
 GT.callsignDatabaseUS = {
@@ -960,21 +961,6 @@ function applyQSOs(task)
   }
 }
 
-function isKnownCallsignDXCC(dxcc)
-{
-  return (dxcc in GT.callsignDatabaseDXCC);
-}
-
-function isKnownCallsignUS(dxcc)
-{
-  return (dxcc in GT.callsignDatabaseUS);
-}
-
-function isKnownCallsignUSplus(dxcc)
-{
-  return (dxcc in GT.callsignDatabaseUSplus);
-}
-
 function addLiveCallsign(
   finalGrid,
   finalDXcall,
@@ -1097,7 +1083,7 @@ function addLiveCallsign(
     newCallsign.satName = finalSatName;
     newCallsign.hash = hash;
 
-    if (newCallsign.state == null)
+    if (newCallsign.state == null && isKnownCallsignDXCC(newCallsign.dxcc))
     {
       var fourGrid = finalGrid.substr(0, 4);
       if (fourGrid in GT.gridToState && GT.gridToState[fourGrid].length == 1)
@@ -1333,51 +1319,6 @@ function remove_duplicates(arr)
   return ret_arr;
 }
 
-function splitNoParen(s)
-{
-  var results = [];
-  var next;
-  var str = "";
-  var left = 0,
-    right = 0;
-
-  function keepResult()
-  {
-    results.push(str.trim());
-    str = "";
-  }
-
-  for (var i = 0; i < s.length; i++)
-  {
-    switch (s[i])
-    {
-      case ",":
-        if (left == right)
-        {
-          keepResult();
-          left = right = 0;
-        }
-        else
-        {
-          str += s[i];
-        }
-        break;
-      case "(":
-        left++;
-        str += s[i];
-        break;
-      case ")":
-        right++;
-        str += s[i];
-        break;
-      default:
-        str += s[i];
-    }
-  }
-  keepResult();
-  return results;
-}
-
 function createSpotTipTable(toolElement)
 {
   try
@@ -5967,7 +5908,7 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
     callsign.UTC = toColonHMS(parseInt(newMessage.TM / 1000));
     callsign.qrz = (msgDXcallsign == GT.appSettings.myCall);
 
-    if (callsign.grid.length > 0)
+    if (callsign.grid.length > 0 && isKnownCallsignDXCC(callsign.dxcc))
     {
       if (callsign.grid in GT.gridToState && GT.gridToState[callsign.grid].length == 1)
       {

package.nw/lib/gtCommon.js

@@ -28,6 +28,21 @@ function validateGridFromString(inputText)
   return validGrid;
 }
 
+function isKnownCallsignDXCC(dxcc)
+{
+  return (dxcc in GT.callsignDatabaseDXCC);
+}
+
+function isKnownCallsignUS(dxcc)
+{
+  return (dxcc in GT.callsignDatabaseUS);
+}
+
+function isKnownCallsignUSplus(dxcc)
+{
+  return (dxcc in GT.callsignDatabaseUSplus);
+}
+
 function cqZoneFromCallsign(insign, dxcc)
 {
   var callsign = insign;