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

More chat fixes and CQ tracking in WSJT-X

merge-requests/237/merge
Tag 2022-11-27 13:51:21 -08:00
rodzic 6ec9ed33b7
commit 6b6c829609
3 zmienionych plików z 200 dodań i 361 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -2394,8 +2394,7 @@ function sendLotwLogEntry(report)
lotwStation.value.length > 0 lotwStation.value.length > 0
) )
{ {
var header = var header = "Generated " + userTimeString(null) + " for " + myDEcall + "\r\n\r\n";
"Generated " + userTimeString(null) + " for " + myDEcall + "\r\n\r\n";
var pid = "GridTracker"; var pid = "GridTracker";
var pver = String(gtVersion); var pver = String(gtVersion);
header += "<PROGRAMID:" + pid.length + ">" + pid + "\r\n"; header += "<PROGRAMID:" + pid.length + ">" + pid + "\r\n";

505
package.nw/lib/gt.js
Wyświetl plik

@ -175,6 +175,7 @@ loadAllSettings();
var myDEcall = g_appSettings.myDEcall; var myDEcall = g_appSettings.myDEcall;
var myDEGrid = g_appSettings.myDEGrid; var myDEGrid = g_appSettings.myDEGrid;
var myDXGrid = "";
var myMode = g_appSettings.myMode; var myMode = g_appSettings.myMode;
var myBand = g_appSettings.myBand; var myBand = g_appSettings.myBand;
var myRawFreq = g_appSettings.myRawFreq; var myRawFreq = g_appSettings.myRawFreq;
@ -1823,67 +1824,19 @@ function createFlagTipTable(toolElement)
workColor = "#00FF00"; workColor = "#00FF00";
} }
worker += worker += "<div style='background-color:" + workColor + ";color:#000;font-weight:bold;font-size:18px;border:2px solid gray;margin:0px' class='roundBorder'>" + g_gtFlagPins[key].call.formatCallsign() + "</div>";
"<div style='background-color:" +
workColor +
";color:#000;font-weight:bold;font-size:18px;border:2px solid gray;margin:0px' class='roundBorder'>" +
g_gtFlagPins[key].call.formatCallsign() +
"</div>";
worker += "<table id='tooltipTable' class='darkTable' >"; worker += "<table id='tooltipTable' class='darkTable' >";
worker += "<tr><td>DXCC</td><td style='color:orange;'>" + dxccName + " <font color='lightgreen'>(" + g_dxccInfo[dxcc].pp + ")</font></td>";
worker += "<tr><td>Grid</td><td style='color:cyan;' >" + g_gtFlagPins[key].grid + "</td></tr>";
worker += "<tr><td>Freq</td><td style='color:lightgreen' >" + Number(g_gtFlagPins[key].freq / 1000).formatMhz(3, 3) + " <font color='yellow'>(" + Number(g_gtFlagPins[key].freq / 1000000).formatBand() + ")</font></td></tr>";
worker += "<tr><td>Mode</td><td style='color:orange' >" + g_gtFlagPins[key].mode + "</td></tr>";
worker += var LL = squareToCenter(g_gtFlagPins[key].grid);
"<tr><td>DXCC</td><td style='color:orange;'>" + var bearing = parseInt(MyCircle.bearing(g_myLat, g_myLon, LL.a, LL.o));
dxccName +
" <font color='lightgreen'>(" + worker += "<tr><td>Dist</td><td style='color:cyan'>" + parseInt(MyCircle.distance(g_myLat, g_myLon, LL.a, LL.o, distanceUnit.value) * MyCircle.validateRadius(distanceUnit.value)) + distanceUnit.value.toLowerCase() + "</td></tr>";
g_dxccInfo[dxcc].pp + worker += "<tr><td>Azim</td><td style='color:yellow'>" + bearing + "&deg;</td></tr>";
")</font></td>";
worker +=
"<tr><td>Grid</td><td style='color:cyan;' >" +
g_gtFlagPins[key].grid +
"</td></tr>";
worker +=
"<tr><td>Freq</td><td style='color:lightgreen' >" +
Number(g_gtFlagPins[key].freq / 1000).formatMhz(3, 3) +
" <font color='yellow'>(" +
Number(g_gtFlagPins[key].freq / 1000000).formatBand() +
")</font></td></tr>";
worker +=
"<tr><td>Mode</td><td style='color:orange' >" +
g_gtFlagPins[key].mode +
"</td></tr>";
var LL = squareToLatLongAll(g_gtFlagPins[key].grid);
var bearing = parseInt(
MyCircle.bearing(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2
)
);
worker +=
"<tr><td>Dist</td><td style='color:cyan'>" +
parseInt(
MyCircle.distance(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2,
distanceUnit.value
) * MyCircle.validateRadius(distanceUnit.value)
) +
distanceUnit.value.toLowerCase() +
"</td></tr>";
worker +=
"<tr><td>Azim</td><td style='color:yellow'>" +
bearing +
"&deg;</td></tr>";
worker += "</table>"; worker += "</table>";
} }
else if (toolElement.size == 73) else if (toolElement.size == 73)
@ -1992,94 +1945,35 @@ function createSpotTipTable(toolElement)
g_layerSources["psk-hop"].clear(); g_layerSources["psk-hop"].clear();
var report = g_receptionReports.spots[toolElement.spot]; var report = g_receptionReports.spots[toolElement.spot];
var LL = squareToLatLongAll(myRawGrid); var LL = squareToCenter(myRawGrid);
var Lat = LL.la2 - (LL.la2 - LL.la1) / 2; var fromPoint = ol.proj.fromLonLat([LL.o, LL.a]);
var Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
var fromPoint = ol.proj.fromLonLat([Lon, Lat]);
worker = worker = "<table id='tooltipTable' class='darkTable' ><tr><th colspan=2 style='color:cyan'>Rx Spot</th></tr>";
"<table id='tooltipTable' class='darkTable' ><tr><th colspan=2 style='color:cyan'>Rx Spot</th></tr>"; worker += "<tr><td>Age</td><td>" + Number(now - report.when).toDHMS() + "</td></tr>";
worker += worker += "<tr><td>dB</td><td style='color:#DD44DD' >" + Number(report.snr).formatSignalReport() + "</td></tr>";
"<tr><td>Age</td><td>" + worker += "<tr><td>Call</td><td style='color:#ff0' >" + report.call.formatCallsign() + "</td></tr>";
Number(now - report.when).toDHMS() +
"</td></tr>";
worker +=
"<tr><td>dB</td><td style='color:#DD44DD' >" +
Number(report.snr).formatSignalReport() +
"</td></tr>";
worker +=
"<tr><td>Call</td><td style='color:#ff0' >" +
report.call.formatCallsign() +
"</td></tr>";
if (report.dxcc > 0) if (report.dxcc > 0)
{ {
worker += worker += "<tr><td>DXCC</td><td style='color:orange;'>" + g_dxccToAltName[report.dxcc] + " <font color='lightgreen'>(" + g_dxccInfo[report.dxcc].pp + ")</font></td>";
"<tr><td>DXCC</td><td style='color:orange;'>" +
g_dxccToAltName[report.dxcc] +
" <font color='lightgreen'>(" +
g_dxccInfo[report.dxcc].pp +
")</font></td>";
} }
worker += worker += "<tr><td>Grid</td><td style='color:cyan;cursor:pointer' >" + report.grid + "</td></tr>";
"<tr><td>Grid</td><td style='color:cyan;cursor:pointer' >" + worker += "<tr><td>Freq</td><td style='color:lightgreen' >" + report.freq.formatMhz() + " <font color='yellow'>(" + report.band + ")</font></td></tr>";
report.grid + worker += "<tr><td>Mode</td><td style='color:orange' >" + report.mode + "</td></tr>";
"</td></tr>";
worker +=
"<tr><td>Freq</td><td style='color:lightgreen' >" +
report.freq.formatMhz() +
" <font color='yellow'>(" +
report.band +
")</font></td></tr>";
worker +=
"<tr><td>Mode</td><td style='color:orange' >" +
report.mode +
"</td></tr>";
LL = squareToLatLongAll(report.grid); LL = squareToCenter(report.grid);
report.bearing = parseInt(
MyCircle.bearing(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2
)
);
worker +=
"<tr><td>Dist</td><td style='color:cyan'>" +
parseInt(
MyCircle.distance(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2,
distanceUnit.value
) * MyCircle.validateRadius(distanceUnit.value)
) +
distanceUnit.value.toLowerCase() +
"</td></tr>";
worker +=
"<tr><td>Azim</td><td style='color:yellow'>" +
report.bearing +
"&deg;</td></tr>";
worker +=
"<tr><td>Time</td><td>" +
userTimeString(report.when * 1000) +
"</td></tr>";
report.bearing = parseInt(MyCircle.bearing(g_myLat, g_myLon, LL.a, LL.o));
worker += "<tr><td>Dist</td><td style='color:cyan'>" + parseInt(MyCircle.distance(g_myLat, g_myLon, LL.a, LL.o, distanceUnit.value) * MyCircle.validateRadius(distanceUnit.value)) + distanceUnit.value.toLowerCase() + "</td></tr>";
worker += "<tr><td>Azim</td><td style='color:yellow'>" + report.bearing + "&deg;</td></tr>";
worker += "<tr><td>Time</td><td>" + userTimeString(report.when * 1000) + "</td></tr>";
worker += "</table>"; worker += "</table>";
var strokeWeight = pathWidthValue.value; var strokeWeight = pathWidthValue.value;
var toPoint = ol.proj.fromLonLat([LL.o, LL.a]);
Lat = LL.la2 - (LL.la2 - LL.la1) / 2; flightFeature(
Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
var toPoint = ol.proj.fromLonLat([Lon, Lat]);
var feature = flightFeature(
[fromPoint, toPoint], [fromPoint, toPoint],
{ {
weight: strokeWeight, weight: strokeWeight,
@ -4087,6 +3981,15 @@ function twoWideToLatLong(qth)
return LatLong; return LatLong;
} }
function squareToCenter(qth)
{
var LL = squareToLatLongAll(qth);
var obj = {};
obj.a = LL.la2 - (LL.la2 - LL.la1) / 2;
obj.o = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
return obj;
}
function squareToLatLongAll(qth) function squareToLatLongAll(qth)
{ {
qth = qth.toUpperCase(); qth = qth.toUpperCase();
@ -6155,15 +6058,9 @@ function haltAllTx(allTx = false)
function initiateQso(thisCall) function initiateQso(thisCall)
{ {
if ( if (thisCall in g_callRoster && g_callRoster[thisCall].message.instance in g_instances)
thisCall in g_callRoster &&
g_callRoster[thisCall].message.instance in g_instances
)
{ {
if ( if (g_mapSettings.focusRig && g_activeInstance != g_callRoster[thisCall].message.instance)
g_mapSettings.focusRig &&
g_activeInstance != g_callRoster[thisCall].message.instance
)
{ {
activeRig(g_callRoster[thisCall].message.instance); activeRig(g_callRoster[thisCall].message.instance);
} }
@ -6204,11 +6101,7 @@ function spotLookupAndSetCall(spot)
var mode = g_receptionReports.spots[spot].mode; var mode = g_receptionReports.spots[spot].mode;
for (var instance in g_instances) for (var instance in g_instances)
{ {
if ( if (g_instances[instance].valid && g_instances[instance].status.Band == band && g_instances[instance].status.MO == mode)
g_instances[instance].valid &&
g_instances[instance].status.Band == band &&
g_instances[instance].status.MO == mode
)
{ {
setCallAndGrid(call, grid, instance); setCallAndGrid(call, grid, instance);
return; return;
@ -6217,7 +6110,7 @@ function spotLookupAndSetCall(spot)
setCallAndGrid(call, grid, null); setCallAndGrid(call, grid, null);
} }
function setCallAndGrid(callsign, grid, instance = null) function setCallAndGrid(callsign, grid, instance = null, genMessages = true)
{ {
var thisInstance = null; var thisInstance = null;
var port; var port;
@ -6230,7 +6123,10 @@ function setCallAndGrid(callsign, grid, instance = null)
port = g_instances[instance].remote.port; port = g_instances[instance].remote.port;
address = g_instances[instance].remote.address; address = g_instances[instance].remote.address;
} }
else alert("major instance error"); else
{
alert("major instance error");
}
} }
else else
{ {
@ -6241,7 +6137,7 @@ function setCallAndGrid(callsign, grid, instance = null)
address = g_instances[g_activeInstance].remote.address; address = g_instances[g_activeInstance].remote.address;
} }
} }
if (thisInstance && thisInstance.TxEnabled == 0) if (thisInstance && (thisInstance.TxEnabled == 0 || genMessages == false))
{ {
var responseArray = Buffer.alloc(1024); var responseArray = Buffer.alloc(1024);
var length = 0; var length = 0;
@ -6255,25 +6151,50 @@ function setCallAndGrid(callsign, grid, instance = null)
length = encodeQBOOL(responseArray, length, thisInstance.Fastmode); length = encodeQBOOL(responseArray, length, thisInstance.Fastmode);
length = encodeQUINT32(responseArray, length, thisInstance.TRP); length = encodeQUINT32(responseArray, length, thisInstance.TRP);
length = encodeQUINT32(responseArray, length, thisInstance.RxDF); length = encodeQUINT32(responseArray, length, thisInstance.RxDF);
length = encodeQUTF8(responseArray, length, callsign);
if (genMessages == true)
{
length = encodeQUTF8(responseArray, length, callsign);
var hash = liveHash(callsign, thisInstance.Band, thisInstance.MO); var hash = liveHash(callsign, thisInstance.Band, thisInstance.MO);
if (hash in g_liveCallsigns && g_liveCallsigns[hash].grid.length > 1) { grid = g_liveCallsigns[hash].grid; } if (hash in g_liveCallsigns && g_liveCallsigns[hash].grid.length > 1) { grid = g_liveCallsigns[hash].grid; }
if (grid.length == 0) grid = " "; if (grid.length == 0) grid = " ";
length = encodeQUTF8(responseArray, length, grid); length = encodeQUTF8(responseArray, length, grid);
length = encodeQBOOL(responseArray, length, 1); length = encodeQBOOL(responseArray, length, 1);
responseArray = responseArray.slice(0, length);
wsjtUdpMessage(responseArray, responseArray.length, port, address);
addLastTraffic("<font color='lightgreen'>Generated Msgs</font>");
}
else
{
// Callsign
length = encodeQUTF8(responseArray, length, " ");
// Grid
length = encodeQUTF8(responseArray, length, " ");
length = encodeQBOOL(responseArray, length, 1);
responseArray = responseArray.slice(0, length);
wsjtUdpMessage(responseArray, responseArray.length, port, address);
responseArray = responseArray.slice(0, length); responseArray = Buffer.alloc(1024);
wsjtUdpMessage(responseArray, responseArray.length, port, address); length = 0;
addLastTraffic("<font color='lightgreen'>Generated Msgs</font>"); length = encodeQUINT32(responseArray, length, thisInstance.magic_key);
length = encodeQUINT32(responseArray, length, thisInstance.schema_number);
length = encodeQUINT32(responseArray, length, 9);
length = encodeQUTF8(responseArray, length, thisInstance.Id);
length = encodeQUTF8(responseArray, length, "");
length = encodeQBOOL(responseArray, length, 0);
responseArray = responseArray.slice(0, length);
wsjtUdpMessage(responseArray, responseArray.length, port, address);
}
} }
if (thisInstance && thisInstance.TxEnabled == 1) if (thisInstance && thisInstance.TxEnabled == 1 && genMessages == true)
{ {
addLastTraffic( addLastTraffic("<font color='yellow'>Transmit Enabled!</font><br/><font color='yellow'>Generate Msgs Aborted</font>");
"<font color='yellow'>Transmit Enabled!</font><br/><font color='yellow'>Generate Msgs Aborted</font>"
);
} }
} }
@ -6321,7 +6242,6 @@ function handleWsjtxQSO(newMessage)
function handleWsjtxNotSupported(newMessage) { } function handleWsjtxNotSupported(newMessage) { }
var g_gtShareCount = 0;
var g_lastBand = ""; var g_lastBand = "";
var g_lastMode = ""; var g_lastMode = "";
@ -6389,9 +6309,9 @@ function activeRig(instance)
} }
} }
var g_lastDecodeCallsign = "";
var g_lastTransmitCallsign = {}; var g_lastTransmitCallsign = {};
var g_lastStatusCallsign = {}; var g_lastStatusCallsign = {};
var g_lastTxMessage = "";
function handleWsjtxStatus(newMessage) function handleWsjtxStatus(newMessage)
{ {
@ -6431,11 +6351,7 @@ function handleWsjtxStatus(newMessage)
if (!(newMessage.instance in g_lastStatusCallsign)) { g_lastStatusCallsign[newMessage.instance] = ""; } if (!(newMessage.instance in g_lastStatusCallsign)) { g_lastStatusCallsign[newMessage.instance] = ""; }
if ( if (lookupOnTx.checked == true && newMessage.Transmitting == 1 && g_lastTransmitCallsign[newMessage.instance] != DXcall)
lookupOnTx.checked == true &&
newMessage.Transmitting == 1 &&
g_lastTransmitCallsign[newMessage.instance] != DXcall
)
{ {
openLookupWindow(true); openLookupWindow(true);
g_lastTransmitCallsign[newMessage.instance] = DXcall; g_lastTransmitCallsign[newMessage.instance] = DXcall;
@ -6470,8 +6386,7 @@ function handleWsjtxStatus(newMessage)
var bandChange = false; var bandChange = false;
var modeChange = false; var modeChange = false;
var origMode = g_lastMode;
var origBand = g_lastBand;
wsjtxMode.innerHTML = "<font color='orange'>" + newMessage.MO + "</font>"; wsjtxMode.innerHTML = "<font color='orange'>" + newMessage.MO + "</font>";
myMode = newMessage.MO; myMode = newMessage.MO;
myBand = newMessage.Band; myBand = newMessage.Band;
@ -6505,28 +6420,20 @@ function handleWsjtxStatus(newMessage)
redrawParks(); redrawParks();
redrawPins(); redrawPins();
var msg = ""; var msg = "<font color='yellow'>" + myBand + "</font> / <font color='orange'>" + myMode + "</font>";
msg += "<font color='yellow'>" + myBand + "</font> / ";
msg += "<font color='orange'>" + myMode + "</font>";
addLastTraffic(msg); addLastTraffic(msg);
ackAlerts(); ackAlerts();
updateChatWindow(); updateChatWindow();
} }
myRawFreq = newMessage.Frequency;
frequency.innerHTML =
"<font color='lightgreen'>" +
Number(newMessage.Frequency / 1000).formatMhz(3, 3) +
" Hz </font><font color='yellow'>(" +
myBand +
")</font>";
myRawCall = newMessage.DEcall.trim();
myRawFreq = newMessage.Frequency;
frequency.innerHTML = "<font color='lightgreen'>" + Number(newMessage.Frequency / 1000).formatMhz(3, 3) + " Hz </font><font color='yellow'>(" + myBand + ")</font>";
myRawCall = newMessage.DEcall.trim();
myRawGrid = newMessage.DEgrid.trim().substr(0, 6); myRawGrid = newMessage.DEgrid.trim().substr(0, 6);
var LL = squareToLatLongAll(myRawGrid); var LL = squareToCenter(myRawGrid);
g_mapSettings.latitude = g_myLat = LL.la2 - (LL.la2 - LL.la1) / 2; g_mapSettings.latitude = g_myLat = LL.a;
g_mapSettings.longitude = g_myLon = LL.lo2 - (LL.lo2 - LL.lo1) / 2; g_mapSettings.longitude = g_myLon = LL.o;
if (myRawGrid != g_lastRawGrid) if (myRawGrid != g_lastRawGrid)
{ {
g_lastRawGrid = myRawGrid; g_lastRawGrid = myRawGrid;
@ -6545,6 +6452,18 @@ function handleWsjtxStatus(newMessage)
dxCallBoxDiv.className = "DXCallBoxConfirmed"; dxCallBoxDiv.className = "DXCallBoxConfirmed";
} }
if (newMessage.Transmitting == 1 && newMessage.TxMessage && g_lastTxMessage != newMessage.TxMessage)
{
g_lastTxMessage = newMessage.TxMessage;
addLastTraffic(newMessage.TxMessage);
if (newMessage.TxMessage.substr(0, 2) == "CQ" && DXcall.length > 0)
{
setCallAndGrid("", "", newMessage.instance, false);
DXcall = "";
newMessage.DXgrid = "";
}
}
g_localDXcall = DXcall; g_localDXcall = DXcall;
localDXcall.innerHTML = DXcall.formatCallsign(); localDXcall.innerHTML = DXcall.formatCallsign();
if (localDXcall.innerHTML.length == 0) if (localDXcall.innerHTML.length == 0)
@ -6556,10 +6475,7 @@ function handleWsjtxStatus(newMessage)
if (myDXGrid.length == 0 && hash in g_liveCallsigns) if (myDXGrid.length == 0 && hash in g_liveCallsigns)
{ {
localDXGrid.innerHTML = myDXGrid = g_liveCallsigns[hash].grid.substr( localDXGrid.innerHTML = myDXGrid = g_liveCallsigns[hash].grid.substr(0, 4);
0,
4
);
} }
if (localDXGrid.innerHTML.length == 0) if (localDXGrid.innerHTML.length == 0)
@ -6570,39 +6486,28 @@ function handleWsjtxStatus(newMessage)
} }
else else
{ {
var LL = squareToLatLongAll(myDXGrid); var LL = squareToCenter(myDXGrid);
localDXDistance.innerHTML = localDXDistance.innerHTML = parseInt(MyCircle.distance(g_myLat, g_myLon, LL.a, distanceUnit.value) * MyCircle.validateRadius(distanceUnit.value)) + distanceUnit.value.toLowerCase();
parseInt( localDXAzimuth.innerHTML = parseInt(MyCircle.bearing(g_myLat, g_myLon, LL.a, LL.o)) + "&deg;";
MyCircle.distance(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2,
distanceUnit.value
) * MyCircle.validateRadius(distanceUnit.value)
) + distanceUnit.value.toLowerCase();
localDXAzimuth.innerHTML =
parseInt(
MyCircle.bearing(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2
)
) + "&deg;";
} }
if (localDXcall.innerHTML != "-") if (localDXcall.innerHTML != "-")
{ {
localDXReport.innerHTML = Number( localDXReport.innerHTML = Number(newMessage.Report.trim()).formatSignalReport();
newMessage.Report.trim() if (DXcall.length > 0)
).formatSignalReport(); {
if (DXcall.length > 0) { localDXCountry.innerHTML = g_dxccToAltName[callsignToDxcc(DXcall)]; } localDXCountry.innerHTML = g_dxccToAltName[callsignToDxcc(DXcall)];
else localDXCountry.innerHTML = "&nbsp;"; }
else
{
localDXCountry.innerHTML = "&nbsp;";
}
} }
else else
{ {
localDXReport.innerHTML = localDXCountry.innerHTML = ""; localDXReport.innerHTML = localDXCountry.innerHTML = "";
} }
myDEcall = newMessage.DEcall; myDEcall = newMessage.DEcall;
myDEGrid = newMessage.DEgrid.trim().substr(0, 6); myDEGrid = newMessage.DEgrid.trim().substr(0, 6);
if (myDEGrid.length > 0) setHomeGridsquare(); if (myDEGrid.length > 0) setHomeGridsquare();
@ -6632,37 +6537,24 @@ function handleWsjtxStatus(newMessage)
if (g_appSettings.gtShareEnable == "true") if (g_appSettings.gtShareEnable == "true")
{ {
g_gtLiveStatusUpdate = true; g_gtLiveStatusUpdate = true;
g_gtShareCount++;
} }
else g_gtShareCount = 0;
if (bandChange || modeChange) reloadInfo(bandChange || modeChange); if (bandChange || modeChange) reloadInfo(bandChange || modeChange);
var worker = ""; var worker = "";
worker += worker += "<div style='vertical-align:top;display:inline-block;margin-right:8px;'>";
"<div style='vertical-align:top;display:inline-block;margin-right:8px;'>";
worker += "<table class='darkTable' align=center>"; worker += "<table class='darkTable' align=center>";
worker += worker += "<tr><th colspan=7>Last " + g_lastMessages.length + " Decoded Messages</th></tr>";
"<tr><th colspan=7>Last " + worker += "<tr><th>Time</th><th>dB</th><th>DT</th><th>Freq</th><th>Mode</th><th>Message</th><th>DXCC</th></tr>";
g_lastMessages.length +
" Decoded Messages</th></tr>";
worker +=
"<tr><th>Time</th><th>dB</th><th>DT</th><th>Freq</th><th>Mode</th><th>Message</th><th>DXCC</th></tr>";
worker += g_lastMessages.join(""); worker += g_lastMessages.join("");
worker += "</table></div>"; worker += "</table></div>";
setStatsDiv("decodeLastListDiv", worker); setStatsDiv("decodeLastListDiv", worker);
setStatsDivHeight( setStatsDivHeight("decodeLastListDiv", getStatsWindowHeight() + 26 + "px");
"decodeLastListDiv",
getStatsWindowHeight() + 26 + "px"
);
if ( if (g_appSettings.gtShareEnable === true && Object.keys(g_spotCollector).length > 0)
g_appSettings.gtShareEnable === true &&
Object.keys(g_spotCollector).length > 0
)
{ {
gtChatSendSpots(g_spotCollector, g_spotDetailsCollector); gtChatSendSpots(g_spotCollector, g_spotDetailsCollector);
g_spotCollector = {}; g_spotCollector = {};
@ -6677,10 +6569,7 @@ function handleWsjtxStatus(newMessage)
if (newMessage.TxEnabled) if (newMessage.TxEnabled)
{ {
if ( if (g_mapSettings.fitQRZ && (!g_spotsEnabled || g_receptionSettings.mergeSpots))
g_mapSettings.fitQRZ &&
(!g_spotsEnabled || g_receptionSettings.mergeSpots)
)
{ {
if (g_lastMapView == null) if (g_lastMapView == null)
{ {
@ -6692,19 +6581,12 @@ function handleWsjtxStatus(newMessage)
{ {
fitViewBetweenPoints([getPoint(myRawGrid), getPoint(myDXGrid)]); fitViewBetweenPoints([getPoint(myRawGrid), getPoint(myDXGrid)]);
} }
else if ( else if (g_mapSettings.qrzDxccFallback && DXcall.length > 0 && callsignToDxcc(DXcall) > 0)
g_mapSettings.qrzDxccFallback &&
DXcall.length > 0 &&
callsignToDxcc(DXcall) > 0
)
{ {
var dxcc = callsignToDxcc(DXcall); var dxcc = callsignToDxcc(DXcall);
var Lat = g_dxccInfo[dxcc].lat; var Lat = g_dxccInfo[dxcc].lat;
var Lon = g_dxccInfo[dxcc].lon; var Lon = g_dxccInfo[dxcc].lon;
fitViewBetweenPoints( fitViewBetweenPoints([getPoint(myRawGrid), ol.proj.fromLonLat([Lon, Lat])], 15);
[getPoint(myRawGrid), ol.proj.fromLonLat([Lon, Lat])],
15
);
} }
} }
} }
@ -6721,6 +6603,7 @@ function handleWsjtxStatus(newMessage)
if (newMessage.Transmitting == 0) if (newMessage.Transmitting == 0)
{ {
// Not Transmitting // Not Transmitting
g_lastTxMessage = "";
g_layerSources.transmit.clear(); g_layerSources.transmit.clear();
g_transmitFlightPath = null; g_transmitFlightPath = null;
} }
@ -6733,53 +6616,31 @@ function handleWsjtxStatus(newMessage)
txrxdec.innerHTML = "TRANSMIT"; txrxdec.innerHTML = "TRANSMIT";
g_layerSources.transmit.clear(); g_layerSources.transmit.clear();
g_transmitFlightPath = null; g_transmitFlightPath = null;
if (
qrzPathWidthValue.value != 0 && if (qrzPathWidthValue.value != 0 && g_appSettings.gridViewMode != 2 && validateGridFromString(myRawGrid))
g_appSettings.gridViewMode != 2 &&
validateGridFromString(myRawGrid)
)
{ {
var strokeColor = getQrzPathColor(); var strokeColor = getQrzPathColor();
var strokeWeight = qrzPathWidthValue.value; var strokeWeight = qrzPathWidthValue.value;
var LL = squareToLatLongAll(myRawGrid); var LL = squareToCenter(myRawGrid);
var Lat = LL.la2 - (LL.la2 - LL.la1) / 2; var fromPoint = ol.proj.fromLonLat([LL.o, LL.a]);
var Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
var fromPoint = ol.proj.fromLonLat([Lon, Lat]);
var toPoint = null; var toPoint = null;
if (validateGridFromString(myDXGrid)) if (validateGridFromString(myDXGrid))
{ {
LL = squareToLatLongAll(myDXGrid); LL = squareToCenter(myDXGrid);
Lat = LL.la2 - (LL.la2 - LL.la1) / 2; toPoint = ol.proj.fromLonLat([LL.o, LL.a]);
Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
toPoint = ol.proj.fromLonLat([Lon, Lat]);
} }
else if ( else if (g_mapSettings.qrzDxccFallback && DXcall.length > 0 && callsignToDxcc(DXcall) > 0)
g_mapSettings.qrzDxccFallback &&
DXcall.length > 0 &&
callsignToDxcc(DXcall) > 0
)
{ {
var dxcc = callsignToDxcc(DXcall); var dxcc = callsignToDxcc(DXcall);
Lat = g_dxccInfo[dxcc].lat; toPoint = ol.proj.fromLonLat([g_dxccInfo[dxcc].lon, g_dxccInfo[dxcc].lat]);
Lon = g_dxccInfo[dxcc].lon;
toPoint = ol.proj.fromLonLat([Lon, Lat]);
var locality = g_dxccInfo[dxcc].geo; var locality = g_dxccInfo[dxcc].geo;
if (locality == "deleted") locality = null; if (locality == "deleted") locality = null;
if (locality != null) if (locality != null)
{ {
var feature = shapeFeature( var feature = shapeFeature("qrz", locality, "qrz", "#FFFF0010", "#FF0000FF", 1.0);
"qrz",
locality,
"qrz",
"#FFFF0010",
"#FF0000FF",
1.0
);
g_layerSources.transmit.addFeature(feature); g_layerSources.transmit.addFeature(feature);
} }
} }
@ -6847,14 +6708,12 @@ function drawTraffic()
} }
trafficDiv.innerHTML = worker; trafficDiv.innerHTML = worker;
} }
function getPoint(grid) function getPoint(grid)
{ {
var LL = squareToLatLongAll(grid); var LL = squareToCenter(grid);
var Lat = LL.la2 - (LL.la2 - LL.la1) / 2; return ol.proj.fromLonLat([LL.o, LL.a]);
var Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
return ol.proj.fromLonLat([Lon, Lat]);
} }
var g_showCQRU = true;
function fitViewBetweenPoints(points, maxZoom = 20) function fitViewBetweenPoints(points, maxZoom = 20)
{ {
@ -7143,25 +7002,13 @@ function handleWsjtxDecode(newMessage)
callsign.CQ = CQ; callsign.CQ = CQ;
callsign.RR73 = RR73; callsign.RR73 = RR73;
if (msgDXcallsign == myDEcall) callsign.qrz = true; callsign.qrz = (msgDXcallsign == myDEcall);
else callsign.qrz = false;
if (callsign.grid.length > 0 && callsign.distance == 0) if (callsign.grid.length > 0 && callsign.distance == 0)
{ {
var LL = squareToLatLongAll(callsign.grid); var LL = squareToCenter(callsign.grid);
callsign.distance = MyCircle.distance( callsign.distance = MyCircle.distance(g_myLat, g_myLon, LL.a, LL.o, distanceUnit.value);
g_myLat, callsign.heading = MyCircle.bearing(g_myLat, g_myLon, LL.a, LL.o);
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2,
distanceUnit.value
);
callsign.heading = MyCircle.bearing(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2
);
} }
if (g_appSettings.potaEnabled == 1) if (g_appSettings.potaEnabled == 1)
@ -9524,16 +9371,8 @@ function renderStatsBox()
if (finalGrid.length > 0) if (finalGrid.length > 0)
{ {
LL = squareToLatLongAll(finalGrid); LL = squareToCenter(finalGrid);
unit = parseInt( unit = parseInt(MyCircle.distance(g_myLat, g_myLon, LL.a, LL.o, distanceUnit.value) * MyCircle.validateRadius(distanceUnit.value));
MyCircle.distance(
g_myLat,
g_myLon,
LL.la2 - (LL.la2 - LL.la1) / 2,
LL.lo2 - (LL.lo2 - LL.lo1) / 2,
distanceUnit.value
) * MyCircle.validateRadius(distanceUnit.value)
);
if (unit > long_distance.worked_unit) if (unit > long_distance.worked_unit)
{ {
@ -12324,9 +12163,7 @@ function drawAllGrids()
} }
} }
var LL = twoWideToLatLong( var LL = twoWideToLatLong(String.fromCharCode(x) + String.fromCharCode(y));
String.fromCharCode(x) + String.fromCharCode(y)
);
var Lat = LL.la2 - (LL.la2 - LL.la1) / 2; var Lat = LL.la2 - (LL.la2 - LL.la1) / 2;
var Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2; var Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
var point = ol.proj.fromLonLat([Lon, Lat]); var point = ol.proj.fromLonLat([Lon, Lat]);
@ -13914,6 +13751,15 @@ function updateWsjtxListener(port)
{ {
newMessage.ConfName = null; newMessage.ConfName = null;
} }
if (message.length > 0)
{
newMessage.TxMessage = decodeQUTF8(message);
message = message.slice(g_qtToSplice);
}
else
{
newMessage.TxMessage = null;
}
g_instances[instanceId].oldStatus = g_instances[instanceId].status; g_instances[instanceId].oldStatus = g_instances[instanceId].status;
g_instances[instanceId].status = newMessage; g_instances[instanceId].status = newMessage;
g_instances[instanceId].valid = true; g_instances[instanceId].valid = true;
@ -15945,38 +15791,33 @@ function createSpot(report, key, fromPoint, addToLayer = true)
{ {
try try
{ {
var LL = squareToLatLongAll(report.grid); var LL = squareToCenter(report.grid);
if (isNaN(LL.la1)) if (isNaN(LL.a))
{ {
// Bad value in grid, don't map // // Bad value in grid, don't map //
return; return;
} }
var Lat = LL.la2 - (LL.la2 - LL.la1) / 2; var spot = spotFeature([LL.o, LL.a]);
var Lon = LL.lo2 - (LL.lo2 - LL.lo1) / 2;
var spot = spotFeature([Lon, Lat]);
var colorNoAlpha = "#" + g_bandToColor[report.band]; var colorNoAlpha = "#" + g_bandToColor[report.band];
var colorAlpha = intAlphaToRGB(colorNoAlpha, report.color); var colorAlpha = intAlphaToRGB(colorNoAlpha, report.color);
var spotColor = colorAlpha; var spotColor = colorAlpha;
var workingColor = var workingColor = g_mapSettings.nightMapEnable && g_nightTime ? g_receptionSettings.pathNightColor : g_receptionSettings.pathColor;
g_mapSettings.nightMapEnable && g_nightTime
? g_receptionSettings.pathNightColor
: g_receptionSettings.pathColor;
if (workingColor != -1) if (workingColor != -1)
{ {
var testColor = var testColor = workingColor < 1 ? "#0000000" : workingColor == 361 ? "#FFFFFF" : "hsla(" + workingColor + ", 100%, 50%," + report.color / 255 + ")";
workingColor < 1 if (workingColor < 1 || workingColor == 361)
? "#0000000" {
: workingColor == 361 spotColor = intAlphaToRGB(testColor.substr(0, 7), report.color);
? "#FFFFFF" }
: "hsla(" + workingColor + ", 100%, 50%," + report.color / 255 + ")"; else
if (workingColor < 1 || workingColor == 361) { spotColor = intAlphaToRGB(testColor.substr(0, 7), report.color); } {
else spotColor = testColor; spotColor = testColor;
}
} }
featureStyle = new ol.style.Style({ featureStyle = new ol.style.Style({
@ -15993,7 +15834,7 @@ function createSpot(report, key, fromPoint, addToLayer = true)
spot.size = 6; // Mouseover detection spot.size = 6; // Mouseover detection
g_layerSources["psk-spots"].addFeature(spot); g_layerSources["psk-spots"].addFeature(spot);
var toPoint = ol.proj.fromLonLat([Lon, Lat]); var toPoint = ol.proj.fromLonLat([LL.o, LL.a]);
var lonLat = new ol.geom.Point(toPoint); var lonLat = new ol.geom.Point(toPoint);
@ -16015,7 +15856,7 @@ function createSpot(report, key, fromPoint, addToLayer = true)
? g_spotNightFlightColor ? g_spotNightFlightColor
: g_spotFlightColor; : g_spotFlightColor;
var feature = flightFeature( flightFeature(
[fromPoint, toPoint], [fromPoint, toPoint],
{ {
weight: strokeWeight, weight: strokeWeight,

53
package.nw/lib/gtws.js
Wyświetl plik

@ -165,17 +165,23 @@ function gtClosedSocket()
g_gtState = ChatState.none; g_gtState = ChatState.none;
} }
var g_lastConnectAttempt = 0;
function gtCanConnect() function gtCanConnect()
{ {
g_lastConnectAttempt = timeNowSec();
g_gtState = ChatState.connect; g_gtState = ChatState.connect;
} }
function gtSetIdle() function gtSetIdle()
{ {
g_gtStatusCount = 0; if (timeNowSec() - g_lastConnectAttempt >= 30)
g_gtNeedUsersList = true; {
g_gtState = ChatState.idle; g_gtStatusCount = 0;
g_lastGtStatus = ""; g_gtNeedUsersList = true;
g_gtState = ChatState.idle;
g_lastGtStatus = "";
}
} }
function gtStatusCheck() function gtStatusCheck()
@ -220,7 +226,8 @@ function sendGtJson(json)
} }
} }
} }
else g_gtState = ChatState.closed; // if we don't have a socketHandle, don't go changing the state willy nilly!
// else g_gtState = ChatState.closed;
} }
var g_lastGtStatus = ""; var g_lastGtStatus = "";
@ -370,7 +377,9 @@ function redrawPins()
makeGtPin(g_gtFlagPins[cid]); makeGtPin(g_gtFlagPins[cid]);
if (g_gtFlagPins[cid].pin != null) if (g_gtFlagPins[cid].pin != null)
{ g_layerSources.gtflags.addFeature(g_gtFlagPins[cid].pin); } {
g_layerSources.gtflags.addFeature(g_gtFlagPins[cid].pin);
}
} }
} }
@ -381,7 +390,9 @@ function makeGtPin(obj)
if (obj.pin) if (obj.pin)
{ {
if (g_layerSources.gtflags.hasFeature(obj.pin)) if (g_layerSources.gtflags.hasFeature(obj.pin))
{ g_layerSources.gtflags.removeFeature(obj.pin); } {
g_layerSources.gtflags.removeFeature(obj.pin);
}
delete obj.pin; delete obj.pin;
obj.pin = null; obj.pin = null;
} }
@ -394,19 +405,13 @@ function makeGtPin(obj)
if (validateGridFromString(obj.grid) == false) return; if (validateGridFromString(obj.grid) == false) return;
if ( if (g_appSettings.gtFlagImgSrc == 2 && (obj.mode != myMode || obj.band != myBand))
g_appSettings.gtFlagImgSrc == 2 && {
(obj.mode != myMode || obj.band != myBand) return;
) }
{ return; }
var LL = squareToLatLongAll(obj.grid); var LL = squareToCenter(obj.grid);
var myLonLat = [ obj.pin = iconFeature(ol.proj.fromLonLat([LL.o, LL.a]), g_gtFlagIcon, 100);
LL.lo2 - (LL.lo2 - LL.lo1) / 2,
LL.la2 - (LL.la2 - LL.la1) / 2
];
obj.pin = iconFeature(ol.proj.fromLonLat(myLonLat), g_gtFlagIcon, 100);
obj.pin.key = obj.cid; obj.pin.key = obj.cid;
obj.pin.isGtFlag = true; obj.pin.isGtFlag = true;
obj.pin.size = 1; obj.pin.size = 1;
@ -570,10 +575,7 @@ function gtChatSetUUID(jsmesg)
function gtChatStateMachine() function gtChatStateMachine()
{ {
if ( if (g_appSettings.gtShareEnable == true && g_mapSettings.offlineMode == false)
g_appSettings.gtShareEnable == true &&
g_mapSettings.offlineMode == false
)
{ {
var now = timeNowSec(); var now = timeNowSec();
g_gtStateToFunction[g_gtState](); g_gtStateToFunction[g_gtState]();
@ -584,10 +586,7 @@ function gtChatStateMachine()
} }
else msgImg.style.webkitFilter = ""; else msgImg.style.webkitFilter = "";
if ( if (g_msgSettings.msgFrequencySelect > 0 && Object.keys(g_gtUnread).length > 0)
g_msgSettings.msgFrequencySelect > 0 &&
Object.keys(g_gtUnread).length > 0
)
{ {
if (now - g_lastChatMsgAlert > g_msgSettings.msgFrequencySelect * 60) if (now - g_lastChatMsgAlert > g_msgSettings.msgFrequencySelect * 60)
{ {