Track Grid Field

Remove dupe method initQSOdata

callObj with field

package.nw/lib/adifWorker.js

@@ -442,10 +442,12 @@ function addQSO(
       if (details.grid.length < 6 && (details.grid.substr(0, 4) == finalGrid.substr(0, 4) || details.grid.length == 0))
       {
         details.grid = finalGrid;
+        details.fieild = finalGrid.substring(0,2);
       }
       else if (details.grid.length != 0 && confirmed == true && canWrite == true)
       {
         details.grid = finalGrid;
+        details.fieild = finalGrid.substring(0,2);
       }
     }
 
@@ -487,6 +489,7 @@ function addQSO(
   {
     details = {};
     details.grid = finalGrid;
+    details.fieild = finalGrid.substring(0,2);
     details.RSTsent = finalRSTsent;
     details.RSTrecv = finalRSTrecv;
     details.msg = "-";

package.nw/lib/gt.js

@@ -506,35 +506,6 @@ const TRANSMIT_INACTIVTY_SECONDS = 1800;
 
 initQSOdata();
 
-function initQSOdata()
-{
-  GT.tracker = {};
-  GT.tracker.worked = {};
-  GT.tracker.confirmed = {};
-
-  GT.tracker.worked.call = {};
-  GT.tracker.worked.grid = {};
-  GT.tracker.worked.dxcc = {};
-  GT.tracker.worked.cqz = {};
-  GT.tracker.worked.ituz = {};
-  GT.tracker.worked.state = {};
-  GT.tracker.worked.px = {};
-  GT.tracker.worked.cnty = {};
-  GT.tracker.worked.cont = {};
-  GT.tracker.worked.pota = {};
-
-  GT.tracker.confirmed.call = {};
-  GT.tracker.confirmed.grid = {};
-  GT.tracker.confirmed.dxcc = {};
-  GT.tracker.confirmed.cqz = {};
-  GT.tracker.confirmed.ituz = {};
-  GT.tracker.confirmed.state = {};
-  GT.tracker.confirmed.px = {};
-  GT.tracker.confirmed.cnty = {};
-  GT.tracker.confirmed.cont = {};
-  GT.tracker.confirmed.pota = {};
-}
-
 GT.offlineLayer = null;
 GT.mapsLayer = Array();
 GT.tileLayer = null;
@@ -1075,6 +1046,7 @@ function addLiveCallsign(
     var newCallsign = {};
     newCallsign.DEcall = finalDXcall;
     newCallsign.grid = finalGrid;
+    newCallsign.field = finalGrid.substring(0,2);
     newCallsign.mode = mode;
     newCallsign.band = band;
     newCallsign.msg = finalMsg;
@@ -1175,6 +1147,7 @@ function addLiveCallsign(
       callsign.wspr = wspr;
       if (finalGrid.length > callsign.grid.length) callsign.grid = finalGrid;
       if (finalGrid.length == callsign.grid.length && finalGrid != callsign.grid) callsign.grid = finalGrid;
+      callsign.field = callsign.grid.substring(0,2);
       if (finalRSTsent != null) callsign.RSTsent = finalRSTsent;
       if (finalRSTrecv != null) callsign.RSTrecv = finalRSTrecv;
       callsign.vucc_grids = [];
@@ -3730,7 +3703,9 @@ function qthToBox(iQTH, iDEcallsign, iCQ, locked, DE, band, wspr, hash)
 
       newRect.rectangle.pin.qso = false;
       GT.liveGrids[iQTH] = newRect;
+      return newRect;
     }
+    return null;
   }
   else
   {
@@ -3766,6 +3741,8 @@ function qthToBox(iQTH, iDEcallsign, iCQ, locked, DE, band, wspr, hash)
       zIndex: zIndex
     });
     rect.rectangle.setStyle(featureHoverStyle);
+
+    return rect;
   }
 }
 
@@ -5051,6 +5028,7 @@ function setHomeGridsquare()
   
   newCallsign.DEcall = GT.appSettings.myCall;
   newCallsign.grid = GT.appSettings.myGrid;
+  newCallsign.field = newCallsign.grid.substring(0,2);
   newCallsign.wspr = null;
   newCallsign.msg = GT.appSettings.myGrid;
   newCallsign.RSTsent = "-";
@@ -5965,6 +5943,7 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
       let newCallsign = {};
       newCallsign.DEcall = msgDEcallsign;
       newCallsign.grid = theirQTH;
+      newCallsign.field = theirQTH.substring(0, 2);
       newCallsign.wspr = null;
       newCallsign.msg = newMessage.Msg;
       newCallsign.RSTsent = newMessage.SR;
@@ -6070,6 +6049,7 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
     callsign.band = newMessage.OB;
     callsign.instance = newMessage.instance;
     callsign.grid = callsign.grid.substr(0, 4);
+    callsign.field = callsign.grid.substring(0, 2);
     callsign.CQ = CQ;
     callsign.RR73 = RR73;
     callsign.UTC = toColonHMS(parseInt(newMessage.TM / 1000));

package.nw/lib/gtCommon.js

@@ -177,6 +177,7 @@ function initQSOdata()
 
   GT.tracker.worked.call = {};
   GT.tracker.worked.grid = {};
+  GT.tracker.worked.field = {};
   GT.tracker.worked.dxcc = {};
   GT.tracker.worked.cqz = {};
   GT.tracker.worked.ituz = {};
@@ -188,6 +189,7 @@ function initQSOdata()
 
   GT.tracker.confirmed.call = {};
   GT.tracker.confirmed.grid = {};
+  GT.tracker.confirmed.field = {};
   GT.tracker.confirmed.dxcc = {};
   GT.tracker.confirmed.cqz = {};
   GT.tracker.confirmed.ituz = {};
@@ -203,7 +205,7 @@ function trackQSO(details, currentYear)
   let qsoDate = new Date(1970, 0, 1); qsoDate.setSeconds(details.time);
   let isCurrentYear = (qsoDate.getFullYear() == currentYear);
   let dayAsString = String(parseInt(details.time / 86400));
-  let fourGrid = details.grid.substr(0, 4);
+  let fourGrid = details.grid.substring(0, 4);
   let isDigi = details.digital;
   let isPhone = details.phone;
 
@@ -223,11 +225,22 @@ function trackQSO(details, currentYear)
     GT.tracker.worked.grid[fourGrid] = true;
     GT.tracker.worked.grid[fourGrid + details.mode] = true;
     GT.tracker.worked.grid[fourGrid + details.band] = true;
-    GT.tracker.worked.grid[fourGrid + details.band + details.mode] = true
+    GT.tracker.worked.grid[fourGrid + details.band + details.mode] = true;
+
+    let field = fourGrid.substring(0, 2);
+
+    GT.tracker.worked.field[field] = true;
+    GT.tracker.worked.field[field + details.mode] = true;
+    GT.tracker.worked.field[field + details.band] = true;
+    GT.tracker.worked.field[field + details.band + details.mode] = true;
+
     if (isDigi == true)
     {
       GT.tracker.worked.grid[fourGrid + "dg"] = true;
       GT.tracker.worked.grid[fourGrid + details.band + "dg"] = true;
+
+      GT.tracker.worked.field[field + "dg"] = true;
+      GT.tracker.worked.field[field + details.band + "dg"] = true;
     }
   }