diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index eb8ed91c..45a88243 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -10712,20 +10712,22 @@ function renderBandActivity() if (band in bandData) { var place = bandData[band]; + var data = g_oamsBandActivityData[grid][band]; - place.oamsDecodes += g_oamsBandActivityData[grid][band].d; - place.oamsRxSpots += g_oamsBandActivityData[grid][band].rS; - place.oamsTxSpots += g_oamsBandActivityData[grid][band].tS; - place.oamsTx += g_oamsBandActivityData[grid][band].t; - place.oamsRx += g_oamsBandActivityData[grid][band].r + place.oamsScore ??= 0; + place.oamsDecodes += data.d; + place.oamsRxSpots += data.rS; + place.oamsTxSpots += data.tS; + 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 { - 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; }