diff --git a/package.nw/gt_update.pdf b/package.nw/gt_update.pdf index 9482913..cfddd8a 100644 Binary files a/package.nw/gt_update.pdf and b/package.nw/gt_update.pdf differ diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index addeeb4..2a272d4 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -480,21 +480,18 @@ function grabLOtWLog(test) { if ( g_isGettingLOTW == false ) { - var lastQSLDateString = "&qso_qslsince=1900-01-01"; - if ( test ) + var lastQSLDateString = "&qso_qsorxsince=1945-01-01&qso_qslsince=1945-01-01"; + if ( test == true ) { lotwTestResult.innerHTML = "Testing"; - lastQSLDateString = "&qso_qslsince=2100-01-01"; + lastQSLDateString = "&qso_qsosince=2100-01-01"; } - - getABuffer("https://lotw.arrl.org/lotwuser/lotwreport.adi?login=" + lotwLogin.value + "&password=" + encodeURIComponent(lotwPassword.value) +"&qso_query=1&qso_qsldetail=yes&qso_withown=yes&qso_qsl=yes"+lastQSLDateString, lotwCallback, test,"https",443, lotwLogImg,"g_isGettingLOTW", 120000); + + getABuffer("https://lotw.arrl.org/lotwuser/lotwreport.adi?login=" + lotwLogin.value + "&password=" + encodeURIComponent(lotwPassword.value) +"&qso_query=1&qso_qsl=no&qso_qsldetail=yes&qso_withown=yes"+lastQSLDateString, lotwCallback, test,"https",443, lotwLogImg,"g_isGettingLOTW", 120000); } } - - - function qrzCallback(buffer, flag) { if ( buffer.indexOf("invalid api key") > -1 ) diff --git a/package.nw/lib/callsigns.js b/package.nw/lib/callsigns.js index 18fbf35..01bff1f 100644 --- a/package.nw/lib/callsigns.js +++ b/package.nw/lib/callsigns.js @@ -453,7 +453,7 @@ function updateQSO() { if (details.cnty.indexOf(",") == -1) { - if (!(details.state + "," + details.cnty in g_cntyToCounty[details.cnty])) + if (!(details.state + "," + details.cnty in g_cntyToCounty)) lookupCall = true; } else diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index afbecaa..7b74e4e 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -1,8 +1,8 @@ // GridTracker ©2020 N0TTL var gtComment1 = "GridTracker is not open source, you may not change, modify or 'borrow' code for your needs that is redistributed in any form without first asking and receiving permission from N0TTL *and* N2VFL"; var gtComment2 = "Third party libraries and functions used are seperated to third-party.js or their respective lib .js files, the GT close-source directive does not apply to these files of course"; -var gtVersion = 1200922; -var gtBeta = "Elsa"; +var gtVersion = 1200923; +var gtBeta = "Elsa II"; var g_startVersion = 0; @@ -6053,9 +6053,10 @@ function handleWsjtxDecode(newMessage) { lastMessageWasInfo = true; } - if ( g_appSettings.gtSpotEnable === true && callsign.DEcall in g_gtCallsigns ) + if ( g_appSettings.gtSpotEnable === true && g_appSettings.gtSpotEnable === true && callsign.DEcall in g_gtCallsigns ) { - g_spotCollector[g_gtCallsigns[callsign.DEcall]] = callsign.RSTsent; + if ( g_gtCallsigns[callsign.DEcall] in g_gtFlagPins && g_gtFlagPins[g_gtCallsigns[callsign.DEcall]].o == 1) + g_spotCollector[g_gtCallsigns[callsign.DEcall]] = callsign.RSTsent; } } diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js index e028916..2bfc07e 100644 --- a/package.nw/lib/gtws.js +++ b/package.nw/lib/gtws.js @@ -470,6 +470,7 @@ function gtChatNewList(jsmesg) g_gtFlagPins[cid].mode = jsmesg.data.mode[key]; g_gtFlagPins[cid].cid = cid; g_gtFlagPins[cid].canmsg = jsmesg.data.canmsg[key]; + g_gtFlagPins[cid].o = jsmesg.data.o[key]; g_gtFlagPins[cid].dxcc = callsignToDxcc(g_gtFlagPins[cid].call); g_gtFlagPins[cid].live = true; g_gtCallsigns[g_gtFlagPins[cid].call] = cid;