mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Use POTA_REF instea of POTA in local adif

master
Stephen Loomis 2024-05-06 07:45:48 -07:00
rodzic d5798169a2
commit 5405e76126
4 zmienionych plików z 31 dodań i 25 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
package.nw/lib/adif.js
Wyświetl plik

@ -1545,7 +1545,7 @@ function sendToLogger(ADIF)
{
if (GT.liveCallsigns[localHash].pota != "?-????")
{
record.POTA = GT.liveCallsigns[localHash].pota;
record.POTA_REF = GT.liveCallsigns[localHash].pota;
}
}
@ -1640,7 +1640,7 @@ function finishSendingReport(record, localMode)
delete record[key];
continue;
}
if (key != "POTA")
if (key != "POTA_REF")
{
report += "<" + key + ":" + Buffer.byteLength(record[key]) + ">" + record[key] + " ";
}
@ -1650,7 +1650,7 @@ function finishSendingReport(record, localMode)
var reportNoPotaNoStateNoCnty = "";
for (const key in record)
{
if (key != "POTA" && key != "STATE" && key != "CNTY")
if (key != "POTA_REF" && key != "STATE" && key != "CNTY")
{
reportNoPotaNoStateNoCnty += "<" + key + ":" + Buffer.byteLength(record[key]) + ">" + record[key] + " ";
}
@ -1670,7 +1670,7 @@ function finishSendingReport(record, localMode)
{
GT.lastReport = report;
if (GT.appSettings.potaEnabled == 1 && "POTA" in record)
if (GT.appSettings.potaEnabled == 1 && "POTA_REF" in record)
{
reportPotaQSO(record);
addLastTraffic("<font style='color:white'>Spotted to POTA</font>");
@ -1788,7 +1788,7 @@ function finishSendingReport(record, localMode)
{
record.GRIDSQUARE = record.GRIDSQUARE.substr(0, 6);
}
if (key != "POTA")
if (key != "POTA_REF")
{
DXreport += "<" + key + ":" + Buffer.byteLength(record[key]) + ">" + record[key] + " ";
}

5
package.nw/lib/adifWorker.js
Wyświetl plik

@ -326,8 +326,8 @@ function onAdiLoadComplete(task)
{
isPhone = GT.modes_phone[finalMode];
}
// TODO: Revisit when we support more than one park ID
var finalPOTA = (object.POTA || "").toUpperCase();
var finalPOTA = (object.POTA_REF || object.POTA || "").toUpperCase();
if (finalPOTA.length == 0)
{
finalPOTA = null;
@ -610,6 +610,7 @@ GT.strictAdif = {
LOTW_QSL_RCVD: false,
EQSL_QSL_RCVD: false,
POTA: false,
POTA_REF: false,
OPERATOR: false,
APP_PSKREP_SNR: false
};

39
package.nw/lib/gtCommon.js
Wyświetl plik

@ -374,25 +374,30 @@ function trackQSO(details, currentYear)
if (details.pota)
{
GT.tracker.worked.pota[dayAsString + details.DEcall + details.pota] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + details.pota + details.mode] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + details.pota + details.band] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + details.pota + details.band + details.mode] = true;
GT.tracker.worked.pota[dayAsString + details.pota + details.band + details.mode] = true;
GT.tracker.worked.pota[details.pota] = true;
GT.tracker.worked.pota[details.pota + details.mode] = true;
GT.tracker.worked.pota[details.pota + details.band] = true;
GT.tracker.worked.pota[details.pota + details.band + details.mode] = true;
if (isDigi == true)
var potas = details.pota.split(",");
for (let x in potas)
{
GT.tracker.worked.pota[dayAsString + details.DEcall + details.pota + "dg"] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + details.pota + details.band + "dg"] = true;
let pota = potas[x].trim();
GT.tracker.worked.pota[dayAsString + details.DEcall + pota] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + pota + details.mode] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + pota + details.band] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + pota + details.band + details.mode] = true;
GT.tracker.worked.pota[details.pota + "dg"] = true;
GT.tracker.worked.pota[details.pota + details.band + "dg"] = true;
GT.tracker.worked.pota[dayAsString + pota + details.band + details.mode] = true;
GT.tracker.worked.pota[pota] = true;
GT.tracker.worked.pota[pota + details.mode] = true;
GT.tracker.worked.pota[pota + details.band] = true;
GT.tracker.worked.pota[pota + details.band + details.mode] = true;
if (isDigi == true)
{
GT.tracker.worked.pota[dayAsString + details.DEcall + pota + "dg"] = true;
GT.tracker.worked.pota[dayAsString + details.DEcall + pota + details.band + "dg"] = true;
GT.tracker.worked.pota[pota + "dg"] = true;
GT.tracker.worked.pota[pota + details.band + "dg"] = true;
}
}
}

2
package.nw/lib/pota.js
Wyświetl plik

@ -297,7 +297,7 @@ function reportPotaQSO(record)
activator: record.CALL,
spotter: record.STATION_CALLSIGN,
frequency: record.FREQ,
reference: record.POTA,
reference: record.POTA_REF,
mode: record.MODE,
source: "GT",
comments: record.COMMENT ? record.COMMENT : "",