remove unneeded rect response

cbayer-ccc
Tag Loomis 2024-02-17 15:22:45 -08:00
rodzic 90847ef94f
commit 02eac05181
1 zmienionych plików z 2 dodań i 40 usunięć

Wyświetl plik

@ -3703,9 +3703,7 @@ function qthToBox(iQTH, iDEcallsign, iCQ, locked, DE, band, wspr, hash)
newRect.rectangle.pin.qso = false; newRect.rectangle.pin.qso = false;
GT.liveGrids[iQTH] = newRect; GT.liveGrids[iQTH] = newRect;
return newRect;
} }
return null;
} }
else else
{ {
@ -3741,8 +3739,6 @@ function qthToBox(iQTH, iDEcallsign, iCQ, locked, DE, band, wspr, hash)
zIndex: zIndex zIndex: zIndex
}); });
rect.rectangle.setStyle(featureHoverStyle); rect.rectangle.setStyle(featureHoverStyle);
return rect;
} }
} }
@ -5848,7 +5844,6 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
} }
} }
var rect = null;
// Grab the last word in the decoded message // Grab the last word in the decoded message
var qth = decodeWords[decodeWords.length - 1].trim(); var qth = decodeWords[decodeWords.length - 1].trim();
if (qth.length == 4) if (qth.length == 4)
@ -5924,16 +5919,11 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
GT.appSettings.gtModeFilter == "Digital") GT.appSettings.gtModeFilter == "Digital")
) )
{ {
rect = qthToBox(theirQTH, msgDEcallsign, CQ, false, msgDXcallsign, newMessage.OB, null, hash); qthToBox(theirQTH, msgDEcallsign, CQ, false, msgDXcallsign, newMessage.OB, null, hash);
canPath = true; canPath = true;
} }
if (rect != null && theirQTH == "") if (theirQTH in GT.liveGrids)
{
theirQTH = rect.qth;
}
if (rect)
{ {
GT.liveGrids[theirQTH].age = GT.timeNow; GT.liveGrids[theirQTH].age = GT.timeNow;
} }
@ -6006,34 +5996,6 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
if (validQTH) if (validQTH)
{ {
callsign.grid = theirQTH; callsign.grid = theirQTH;
if (rect != null && callsign.grid != rect.qth)
{
if (
(GT.appSettings.gtBandFilter.length == 0 ||
(GT.appSettings.gtBandFilter == "auto" &&
newMessage.OB == GT.appSettings.myBand) ||
newMessage.OB == GT.appSettings.gtBandFilter) &&
(GT.appSettings.gtModeFilter.length == 0 ||
(GT.appSettings.gtModeFilter == "auto" &&
newMessage.OM == GT.appSettings.myMode) ||
newMessage.OM == GT.appSettings.gtModeFilter ||
GT.appSettings.gtModeFilter == "Digital")
)
{
rect = qthToBox(
theirQTH,
msgDEcallsign,
CQ,
false,
msgDXcallsign,
newMessage.OB,
null,
hash
);
canPath = true;
}
}
} }
callsign.time = theTimeStamp; callsign.time = theTimeStamp;