OAMS score sum from each grid

merge-requests/237/merge
Tag 2023-02-11 22:36:22 -08:00
rodzic 9323e5a767
commit 2d6d2ed3b9
1 zmienionych plików z 10 dodań i 8 usunięć

Wyświetl plik

@ -10712,20 +10712,22 @@ function renderBandActivity()
if (band in bandData) if (band in bandData)
{ {
var place = bandData[band]; var place = bandData[band];
var data = g_oamsBandActivityData[grid][band];
place.oamsDecodes += g_oamsBandActivityData[grid][band].d; place.oamsScore ??= 0;
place.oamsRxSpots += g_oamsBandActivityData[grid][band].rS; place.oamsDecodes += data.d;
place.oamsTxSpots += g_oamsBandActivityData[grid][band].tS; place.oamsRxSpots += data.rS;
place.oamsTx += g_oamsBandActivityData[grid][band].t; place.oamsTxSpots += data.tS;
place.oamsRx += g_oamsBandActivityData[grid][band].r place.oamsTx += data.t;
place.oamsRx += data.r;
if (place.oamsRx > 0) if (data.r > 0)
{ {
place.oamsScore = parseInt((place.oamsDecodes > place.oamsRxSpots) ? (place.oamsDecodes / place.oamsRx) + (place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0) : (place.oamsRxSpots / place.oamsRx) + (place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0)); place.oamsScore += parseInt((data.d > data.rS) ? (data.d / data.r) + (data.t > 0 ? data.tS / data.t : 0) : (data.rS / data.r) + (data.t > 0 ? data.tS / data.t : 0));
} }
else else
{ {
place.oamsScore = parseInt(place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0); place.oamsScore += parseInt(data.t > 0 ? data.tS / data.t : 0);
} }
if (maxValue < place.oamsScore) maxValue = place.oamsScore; if (maxValue < place.oamsScore) maxValue = place.oamsScore;
} }