Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6497568813 | ||
|
|
9f62808392 | ||
|
|
9d8b69d804 | ||
|
|
6825af135a | ||
|
|
ca42fd90f9 | ||
|
|
18a583901c | ||
|
|
2cb1add3db | ||
|
|
a3815c24a1 | ||
|
|
f6f5235a8b | ||
|
|
86a644863a |
@@ -696,6 +696,7 @@ type App struct {
|
|||||||
awardSnapRev string // logbook revision the snapshot was built at ("" = none)
|
awardSnapRev string // logbook revision the snapshot was built at ("" = none)
|
||||||
awardSnapUsed time.Time // last read — the snapshot is dropped once it goes cold (see awardSnapshotJanitor)
|
awardSnapUsed time.Time // last read — the snapshot is dropped once it goes cold (see awardSnapshotJanitor)
|
||||||
webpub webPublisher // log-to-website publishing: debounce timer, periodic ticker, last result
|
webpub webPublisher // log-to-website publishing: debounce timer, periodic ticker, last result
|
||||||
|
bandOpen bandOpenState // sporadic-E / band-opening detector over the spot stream
|
||||||
dataDir string // <exeDir>/data — holds config.json, logs, cty.dat
|
dataDir string // <exeDir>/data — holds config.json, logs, cty.dat
|
||||||
|
|
||||||
// shuttingDown gates beforeClose re-entry: the first user attempt to
|
// shuttingDown gates beforeClose re-entry: the first user attempt to
|
||||||
@@ -2471,6 +2472,19 @@ func (a *App) groupDigitalSlots() bool {
|
|||||||
// Off (default) → a call worked on any band/mode reads as already worked. On →
|
// Off (default) → a call worked on any band/mode reads as already worked. On →
|
||||||
// the WORKED-call flag needs the same band and mode (digital-grouped when that
|
// the WORKED-call flag needs the same band and mode (digital-grouped when that
|
||||||
// option is also on).
|
// option is also on).
|
||||||
|
// clusterSlotHighlight reports the "colour the stations I have NOT worked on
|
||||||
|
// this band and mode" preference (Settings -> DX Cluster). It needs the same
|
||||||
|
// per-slot index as clusterWorkedSameSlot, which is why the index is built when
|
||||||
|
// EITHER is on: that map is one entry per worked call+band+mode, so on a large
|
||||||
|
// log it is not something to hold for an operator using neither.
|
||||||
|
func (a *App) clusterSlotHighlight() bool {
|
||||||
|
if a.settings == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
v, _ := a.settings.Get(a.ctx, "ui.opslog.clusterSlotHighlight")
|
||||||
|
return v == "1"
|
||||||
|
}
|
||||||
|
|
||||||
func (a *App) clusterWorkedSameSlot() bool {
|
func (a *App) clusterWorkedSameSlot() bool {
|
||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return false
|
return false
|
||||||
@@ -7824,6 +7838,10 @@ func (a *App) clusterEventWorker() {
|
|||||||
if s.Historical {
|
if s.Historical {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// Band-opening detector. Deliberately AFTER the Historical guard above: a
|
||||||
|
// SH/DX reply replays a hundred past spots in a second, which is exactly
|
||||||
|
// the shape of a burst and would announce an opening that ended hours ago.
|
||||||
|
a.detectBandOpening(s)
|
||||||
// Fire any matching alert rules (sound / visual / e-mail).
|
// Fire any matching alert rules (sound / visual / e-mail).
|
||||||
a.evaluateAlerts(s)
|
a.evaluateAlerts(s)
|
||||||
// Mirror the spot onto the FlexRadio panadapter when enabled. Infer the
|
// Mirror the spot onto the FlexRadio panadapter when enabled. Infer the
|
||||||
@@ -16376,6 +16394,11 @@ type SpotStatus struct {
|
|||||||
// is resolved from the callsign via the offline ULS store (US only, and only
|
// is resolved from the callsign via the offline ULS store (US only, and only
|
||||||
// when that database has been downloaded); POTA from the spot's tagged park.
|
// when that database has been downloaded); POTA from the spot's tagged park.
|
||||||
NewCounty bool `json:"new_county"`
|
NewCounty bool `json:"new_county"`
|
||||||
|
// County and State are that resolved county, so the cluster can show it as a
|
||||||
|
// column instead of only flagging it. Free: the ULS lookup that decides
|
||||||
|
// NewCounty already has them in hand.
|
||||||
|
County string `json:"county,omitempty"`
|
||||||
|
State string `json:"state,omitempty"`
|
||||||
NewPOTA bool `json:"new_pota"`
|
NewPOTA bool `json:"new_pota"`
|
||||||
// NewPfx flags a CQ WPX prefix never worked before, and Pfx is that prefix.
|
// NewPfx flags a CQ WPX prefix never worked before, and Pfx is that prefix.
|
||||||
// Also orthogonal: a common entity on a worked band can still carry a prefix
|
// Also orthogonal: a common entity on a worked band can still carry a prefix
|
||||||
@@ -16383,6 +16406,12 @@ type SpotStatus struct {
|
|||||||
// scanning the cluster for.
|
// scanning the cluster for.
|
||||||
NewPfx bool `json:"new_pfx"`
|
NewPfx bool `json:"new_pfx"`
|
||||||
Pfx string `json:"pfx,omitempty"`
|
Pfx string `json:"pfx,omitempty"`
|
||||||
|
// WorkedSlot: this exact callsign already worked on THIS band and mode.
|
||||||
|
// Distinct from WorkedCall, which follows the "same slot" preference and so
|
||||||
|
// means different things depending on it. This one is always slot-scoped, so
|
||||||
|
// the UI can highlight what is still to be worked here without the two
|
||||||
|
// options having to agree. Only filled when the slot index is built.
|
||||||
|
WorkedSlot bool `json:"worked_slot"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// clusterStatusCache holds the whole-logbook maps ClusterSpotStatuses colours
|
// clusterStatusCache holds the whole-logbook maps ClusterSpotStatuses colours
|
||||||
@@ -16401,6 +16430,7 @@ type clusterStatusCache struct {
|
|||||||
normMode func(string) string // nil unless digital-mode grouping is on
|
normMode func(string) string // nil unless digital-mode grouping is on
|
||||||
groupDigital bool // settings the maps were built under —
|
groupDigital bool // settings the maps were built under —
|
||||||
sameSlot bool // a change rebuilds the snapshot
|
sameSlot bool // a change rebuilds the snapshot
|
||||||
|
slotHighlight bool // (same: the slot index is built for either)
|
||||||
}
|
}
|
||||||
|
|
||||||
// clusterStatusMaps returns the cached worked-index snapshot, building it once
|
// clusterStatusMaps returns the cached worked-index snapshot, building it once
|
||||||
@@ -16410,12 +16440,13 @@ type clusterStatusCache struct {
|
|||||||
func (a *App) clusterStatusMaps() *clusterStatusCache {
|
func (a *App) clusterStatusMaps() *clusterStatusCache {
|
||||||
groupDigital := a.groupDigitalSlots()
|
groupDigital := a.groupDigitalSlots()
|
||||||
sameSlot := a.clusterWorkedSameSlot()
|
sameSlot := a.clusterWorkedSameSlot()
|
||||||
|
slotHighlight := a.clusterSlotHighlight()
|
||||||
a.clusterStatusMu.Lock()
|
a.clusterStatusMu.Lock()
|
||||||
defer a.clusterStatusMu.Unlock()
|
defer a.clusterStatusMu.Unlock()
|
||||||
if c := a.clusterStatusIdx; c != nil && c.groupDigital == groupDigital && c.sameSlot == sameSlot {
|
if c := a.clusterStatusIdx; c != nil && c.groupDigital == groupDigital && c.sameSlot == sameSlot && c.slotHighlight == slotHighlight {
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
c := &clusterStatusCache{groupDigital: groupDigital, sameSlot: sameSlot}
|
c := &clusterStatusCache{groupDigital: groupDigital, sameSlot: sameSlot, slotHighlight: slotHighlight}
|
||||||
if a.qso == nil {
|
if a.qso == nil {
|
||||||
a.clusterStatusIdx = c
|
a.clusterStatusIdx = c
|
||||||
return c
|
return c
|
||||||
@@ -16455,7 +16486,7 @@ func (a *App) clusterStatusMaps() *clusterStatusCache {
|
|||||||
// "Already worked only on the same slot" option (Settings → DX Cluster): the
|
// "Already worked only on the same slot" option (Settings → DX Cluster): the
|
||||||
// WORKED-call flag then needs the SAME band and mode (digital-grouped through
|
// WORKED-call flag then needs the SAME band and mode (digital-grouped through
|
||||||
// the same normMode when that option is on) rather than the call anywhere.
|
// the same normMode when that option is on) rather than the call anywhere.
|
||||||
if sameSlot {
|
if sameSlot || slotHighlight {
|
||||||
c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode)
|
c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode)
|
||||||
}
|
}
|
||||||
// Orthogonal dimensions: worked US counties (for the ULS callsign→county
|
// Orthogonal dimensions: worked US counties (for the ULS callsign→county
|
||||||
@@ -16505,6 +16536,21 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
|||||||
Band: strings.ToLower(q.Band),
|
Band: strings.ToLower(q.Band),
|
||||||
Mode: strings.ToUpper(q.Mode),
|
Mode: strings.ToUpper(q.Mode),
|
||||||
}
|
}
|
||||||
|
// Slot-scoped worked flag, independent of the sameSlot preference: it is
|
||||||
|
// what "highlight what I have NOT worked here" reads, and that must not
|
||||||
|
// change meaning because a different option was toggled.
|
||||||
|
if workedCallSlots != nil {
|
||||||
|
upCall := strings.ToUpper(q.Call)
|
||||||
|
cm := out[i].Mode
|
||||||
|
if normMode != nil && cm != "" {
|
||||||
|
cm = normMode(cm)
|
||||||
|
}
|
||||||
|
if cm == "" {
|
||||||
|
_, out[i].WorkedSlot = workedCallSlots[upCall+"|"+out[i].Band]
|
||||||
|
} else {
|
||||||
|
_, out[i].WorkedSlot = workedCallSlots[upCall+"|"+out[i].Band+"|"+cm]
|
||||||
|
}
|
||||||
|
}
|
||||||
if sameSlot {
|
if sameSlot {
|
||||||
// Already worked ONLY when this exact band+mode slot was worked. With no
|
// Already worked ONLY when this exact band+mode slot was worked. With no
|
||||||
// inferable mode, fall back to same-band (better than claiming the whole
|
// inferable mode, fall back to same-band (better than claiming the whole
|
||||||
@@ -16539,6 +16585,7 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
|||||||
// store (US only; inert until downloaded) and flag if never worked.
|
// store (US only; inert until downloaded) and flag if never worked.
|
||||||
if a.uls != nil {
|
if a.uls != nil {
|
||||||
if loc, ok := a.uls.Resolve(q.Call); ok {
|
if loc, ok := a.uls.Resolve(q.Call); ok {
|
||||||
|
out[i].County, out[i].State = loc.County, loc.State
|
||||||
if key := award.USCountyKey(loc.State, loc.County); key != "" {
|
if key := award.USCountyKey(loc.State, loc.County); key != "" {
|
||||||
if _, done := workedCounties[key]; !done {
|
if _, done := workedCounties[key]; !done {
|
||||||
out[i].NewCounty = true
|
out[i].NewCounty = true
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Band-opening announcements — the app-side glue for internal/bandopen.
|
||||||
|
//
|
||||||
|
// The detector needs nothing OpsLog does not already compute: the cluster event
|
||||||
|
// worker enriches every spot with the great-circle distance and bearing from
|
||||||
|
// the operator's grid before this is called. So watching for sporadic E costs
|
||||||
|
// one function call per spot and no new data source.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/bandopen"
|
||||||
|
"hamlog/internal/cluster"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
type bandOpenState struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
det *bandopen.Detector
|
||||||
|
last []bandopen.Opening // most recent first, for the UI
|
||||||
|
}
|
||||||
|
|
||||||
|
const maxRememberedOpenings = 20
|
||||||
|
|
||||||
|
// detectBandOpening feeds one spot to the detector and announces a hit.
|
||||||
|
func (a *App) detectBandOpening(s cluster.Spot) {
|
||||||
|
// No operator grid = no distance and no bearing on the spot, and the whole
|
||||||
|
// detection rests on those two. Say nothing rather than guess.
|
||||||
|
if !a.opSet || s.DistanceKm <= 0 || !bandopen.Watched(s.Band) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
if a.bandOpen.det == nil {
|
||||||
|
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
|
||||||
|
}
|
||||||
|
op := a.bandOpen.det.Add(bandopen.Spot{
|
||||||
|
Call: s.DXCall, Band: s.Band, DistKm: s.DistanceKm,
|
||||||
|
Bearing: s.ShortPath, At: s.ReceivedAt,
|
||||||
|
}, a.opLat)
|
||||||
|
if op != nil {
|
||||||
|
a.bandOpen.last = append([]bandopen.Opening{*op}, a.bandOpen.last...)
|
||||||
|
if len(a.bandOpen.last) > maxRememberedOpenings {
|
||||||
|
a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a.bandOpen.mu.Unlock()
|
||||||
|
if op == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
applog.Printf("bandopen: %s opening — %d stations, ~%d km, %s%s (%s)",
|
||||||
|
op.Band, op.Calls, op.MedianKm, op.Sector(),
|
||||||
|
map[bool]string{true: "", false: " — UNUSUAL for the season"}[op.InSeason],
|
||||||
|
strings.Join(op.Examples, " "))
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "bandopen:detected", op)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetBandOpenings returns the openings seen this session, newest first. The UI
|
||||||
|
// polls this so a detection is still visible after its toast has gone.
|
||||||
|
func (a *App) GetBandOpenings() []bandopen.Opening {
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
defer a.bandOpen.mu.Unlock()
|
||||||
|
out := make([]bandopen.Opening, len(a.bandOpen.last))
|
||||||
|
copy(out, a.bandOpen.last)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// BandOpeningSummary is the one-line form used in the toast and the log.
|
||||||
|
func BandOpeningSummary(o bandopen.Opening) string {
|
||||||
|
s := fmt.Sprintf("%s open — %d stations ~%d km, %s", strings.ToUpper(o.Band), o.Calls, o.MedianKm, o.Sector())
|
||||||
|
if !o.InSeason {
|
||||||
|
s += " (unusual for the season)"
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -1,4 +1,20 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.24.3",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Band openings: OpsLog now tells you when 6, 4 or 2 m opens. It watches the spots already arriving from your clusters and RBN — several different stations appearing at single-hop range (500–2400 km) in the same bearing sector within a few minutes is the signature of sporadic E, and nothing else looks like it. You get one message per band per opening, naming the sector and the typical distance. An opening outside the usual season is still announced, and flagged as unusual: those are the ones worth knowing about. Nothing to configure — but the quality depends on having a cluster or RBN feed carrying VHF spots, and 2 m openings are often worked without ever being spotted.",
|
||||||
|
"DX cluster, two display options (Settings › DX cluster). The first drops the colour and the badges on stations you have already worked: they stay in the list, they simply stop competing for your attention. The second colours every callsign you have not worked on this band and this mode, even when the entity itself is long since confirmed — the view for filling slots rather than chasing new ones. Both apply to the cluster list and to the band map, so the two panels always agree.",
|
||||||
|
"DX cluster, clearer at a glance. A novelty now FILLS the cell that carries it — a filled Band cell means new band, a filled Pfx cell means new prefix, a filled County cell means new county — instead of only tinting the text. A US County column joins the list, resolved offline from the ULS database. The station-not-worked-here highlight is its own NEW CALL status with its own filter chip, no longer borrowed from NEW SLOT, which means something narrower. The two display options moved from Preferences into the cluster filter panel, next to Hide worked. The Locator column is now labelled Spotter locator, because that is what a cluster line actually carries.",
|
||||||
|
"Web publishing: the published page sorts properly. The Date column would not sort at all, and neither would callsigns starting with a digit — the script read a number from the front of the text, so every date in the same year counted as equal. A third click on a header now puts the table back in the order it was published in, and an arrow shows which way a column is pointing."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Ouvertures de bande : OpsLog te signale désormais l ouverture du 6, du 4 ou du 2 m. Il surveille les spots qui arrivent déjà de tes clusters et du RBN — plusieurs stations différentes apparaissant à distance de saut simple (500–2400 km) dans le même secteur d azimut en quelques minutes, c est la signature de l Es, et rien d autre n y ressemble. Un message par bande et par ouverture, avec le secteur et la distance typique. Une ouverture hors saison est annoncée quand même, et signalée comme inhabituelle : ce sont celles qu il ne faut surtout pas manquer. Rien à configurer — mais la qualité dépend d avoir un flux cluster ou RBN qui porte des spots VHF, et les ouvertures 2 m sont souvent travaillées sans jamais être spottées.",
|
||||||
|
"Cluster DX, deux options d affichage (Paramètres › Cluster DX). La première enlève la couleur et les badges sur les stations déjà contactées : elles restent dans la liste, elles cessent simplement d attirer l œil. La seconde colore tout indicatif non contacté sur cette bande et ce mode, même si l entité est confirmée depuis longtemps — la vue pour remplir des slots plutôt que pour chasser du nouveau. Les deux s appliquent à la liste cluster et au bandmap, les deux panneaux restent donc cohérents.",
|
||||||
|
"Cluster DX, plus lisible d un coup d œil. Une nouveauté REMPLIT désormais la cellule qui la porte — cellule Bande remplie = nouvelle bande, cellule Préf. remplie = nouveau préfixe, cellule Comté remplie = nouveau comté — au lieu de seulement colorer le texte. Une colonne Comté US rejoint la liste, résolue hors ligne depuis la base ULS. La mise en couleur des stations non contactées ici devient un statut CALL NEUF à part entière, avec sa propre puce de filtre, au lieu d emprunter NOUV SLOT qui veut dire autre chose. Les deux options d affichage passent des Préférences au panneau de filtres du cluster, à côté de Hide worked. La colonne Locator s appelle maintenant Locator du spotter, puisque c est ce qu une ligne de cluster porte réellement.",
|
||||||
|
"Publication web : la page publiée se trie correctement. La colonne Date ne se triait pas du tout, ni les indicatifs commençant par un chiffre — le script lisait un nombre au début du texte, donc toutes les dates d une même année se valaient. Un troisième clic sur un en-tête remet le tableau dans l ordre de publication, et une flèche indique le sens du tri."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.24.2",
|
"version": "0.24.2",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+56
-6
@@ -89,6 +89,7 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
|
|||||||
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
||||||
import { ClusterGrid } from '@/components/ClusterGrid';
|
import { ClusterGrid } from '@/components/ClusterGrid';
|
||||||
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
||||||
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
||||||
import { NetControlPanel } from '@/components/NetControlPanel';
|
import { NetControlPanel } from '@/components/NetControlPanel';
|
||||||
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
||||||
@@ -1484,7 +1485,14 @@ export default function App() {
|
|||||||
// county or a new park is not a DXCC state, it is another dimension of the
|
// county or a new park is not a DXCC state, it is another dimension of the
|
||||||
// same spot — which is why the grid shows them as separate badges. Filtering
|
// same spot — which is why the grid shows them as separate badges. Filtering
|
||||||
// is an OR across all of them, as it already was for a worked callsign.
|
// is an OR across all of them, as it already was for a worked callsign.
|
||||||
type SpotFilterKey = SpotStatusKey | 'new-pota' | 'new-county' | 'new-pfx';
|
// 'new-call' is a DISPLAY status, produced by the slot-highlight option rather
|
||||||
|
// than by the backend, so it is named here and not in SpotStatusKey.
|
||||||
|
type SpotFilterKey = SpotStatusKey | 'new-pota' | 'new-county' | 'new-pfx' | 'new-call';
|
||||||
|
// Display options, shared with the band map through lib/spotDisplay. Kept in
|
||||||
|
// localStorage (mirrored to settings by writeUiPref) so both panels and the
|
||||||
|
// filter predicate read one source without prop-drilling through three levels.
|
||||||
|
const [clusterMuteWorked, setClusterMuteWorked] = useState(() => localStorage.getItem('opslog.clusterMuteWorked') === '1');
|
||||||
|
const [clusterSlotHighlight, setClusterSlotHighlight] = useState(() => localStorage.getItem('opslog.clusterSlotHighlight') === '1');
|
||||||
const [clusterStatusFilter, setClusterStatusFilter] = useState<Set<SpotFilterKey>>(() => lsSet<SpotFilterKey>('opslog.clusterStatusFilter'));
|
const [clusterStatusFilter, setClusterStatusFilter] = useState<Set<SpotFilterKey>>(() => lsSet<SpotFilterKey>('opslog.clusterStatusFilter'));
|
||||||
// Mode filter chips. Empty set = show every mode. Categories map the
|
// Mode filter chips. Empty set = show every mode. Categories map the
|
||||||
// inferred per-spot mode onto SSB (phone) / CW / DATA (digital).
|
// inferred per-spot mode onto SSB (phone) / CW / DATA (digital).
|
||||||
@@ -1580,7 +1588,10 @@ export default function App() {
|
|||||||
// Cached per-call slot status: "new" | "new-band" | "new-slot" | "worked".
|
// Cached per-call slot status: "new" | "new-band" | "new-slot" | "worked".
|
||||||
// Keyed by `${call}|${band}|${mode}` so two spots of the same call on
|
// Keyed by `${call}|${band}|${mode}` so two spots of the same call on
|
||||||
// different slots don't share the same colour.
|
// different slots don't share the same colour.
|
||||||
const [spotStatus, setSpotStatus] = useState<Record<string, { status: string; country?: string; continent?: string; worked_call?: boolean; new_county?: boolean; new_pota?: boolean; new_pfx?: boolean; pfx?: string }>>({});
|
// worked_slot must be carried explicitly like every other field: this map is
|
||||||
|
// assembled field by field, so a backend flag that nobody copies here simply
|
||||||
|
// never reaches the panels — silently, since the extra key is just dropped.
|
||||||
|
const [spotStatus, setSpotStatus] = useState<Record<string, { status: string; country?: string; continent?: string; worked_call?: boolean; worked_slot?: boolean; new_county?: boolean; county?: string; state?: string; new_pota?: boolean; new_pfx?: boolean; pfx?: string }>>({});
|
||||||
// Live mirror of spotStatus so the incoming-spot buffer can tell which slots
|
// Live mirror of spotStatus so the incoming-spot buffer can tell which slots
|
||||||
// still need resolving without re-subscribing the cluster:spot listener.
|
// still need resolving without re-subscribing the cluster:spot listener.
|
||||||
const spotStatusRef = useRef(spotStatus);
|
const spotStatusRef = useRef(spotStatus);
|
||||||
@@ -1630,7 +1641,7 @@ export default function App() {
|
|||||||
const k = `${r.call}|${r.band ?? ''}|${(r.mode ?? '').toUpperCase()}`;
|
const k = `${r.call}|${r.band ?? ''}|${(r.mode ?? '').toUpperCase()}`;
|
||||||
next[k] = {
|
next[k] = {
|
||||||
status: r.status ?? '', country: r.country, continent: (r as any).continent,
|
status: r.status ?? '', country: r.country, continent: (r as any).continent,
|
||||||
worked_call: !!(r as any).worked_call, new_county: !!(r as any).new_county,
|
worked_call: !!(r as any).worked_call, worked_slot: !!(r as any).worked_slot, new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||||
new_pota: !!(r as any).new_pota, new_pfx: !!(r as any).new_pfx, pfx: (r as any).pfx,
|
new_pota: !!(r as any).new_pota, new_pfx: !!(r as any).new_pfx, pfx: (r as any).pfx,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -2077,6 +2088,23 @@ export default function App() {
|
|||||||
return () => { off(); };
|
return () => { off(); };
|
||||||
}, [showToast]);
|
}, [showToast]);
|
||||||
|
|
||||||
|
// Band openings — sporadic E on 6/4/2 m, detected from the spot stream.
|
||||||
|
//
|
||||||
|
// A toast rather than a rule-based alert: this is not "a station you wanted
|
||||||
|
// appeared", it is "the band itself just changed", and it fires a handful of
|
||||||
|
// times a season. The detector already announces each band once per opening,
|
||||||
|
// so there is nothing to throttle here.
|
||||||
|
useEffect(() => {
|
||||||
|
const off = EventsOn('bandopen:detected', (o: any) => {
|
||||||
|
if (!o?.band) return;
|
||||||
|
const season = o.in_season ? '' : ` — ${t('bmp.openUnusual')}`;
|
||||||
|
showToast(`📡 ${t('bmp.openToast', {
|
||||||
|
band: String(o.band).toUpperCase(), n: o.calls, km: o.median_km,
|
||||||
|
})}${season}`);
|
||||||
|
});
|
||||||
|
return () => { off(); };
|
||||||
|
}, [showToast, t]);
|
||||||
|
|
||||||
// DX-cluster spot alerts: a matched rule fires here. Play a beep (WebAudio, no
|
// DX-cluster spot alerts: a matched rule fires here. Play a beep (WebAudio, no
|
||||||
// asset needed — CSP-safe) and/or show a toast, per the rule's chosen actions.
|
// asset needed — CSP-safe) and/or show a toast, per the rule's chosen actions.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -2712,7 +2740,8 @@ export default function App() {
|
|||||||
country: r.country,
|
country: r.country,
|
||||||
continent: (r as any).continent,
|
continent: (r as any).continent,
|
||||||
worked_call: !!(r as any).worked_call,
|
worked_call: !!(r as any).worked_call,
|
||||||
new_county: !!(r as any).new_county,
|
worked_slot: !!(r as any).worked_slot,
|
||||||
|
new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||||
new_pota: !!(r as any).new_pota,
|
new_pota: !!(r as any).new_pota,
|
||||||
new_pfx: !!(r as any).new_pfx,
|
new_pfx: !!(r as any).new_pfx,
|
||||||
pfx: (r as any).pfx,
|
pfx: (r as any).pfx,
|
||||||
@@ -3179,7 +3208,8 @@ export default function App() {
|
|||||||
country: r.country,
|
country: r.country,
|
||||||
continent: (r as any).continent,
|
continent: (r as any).continent,
|
||||||
worked_call: !!(r as any).worked_call,
|
worked_call: !!(r as any).worked_call,
|
||||||
new_county: !!(r as any).new_county,
|
worked_slot: !!(r as any).worked_slot,
|
||||||
|
new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||||
new_pota: !!(r as any).new_pota,
|
new_pota: !!(r as any).new_pota,
|
||||||
new_pfx: !!(r as any).new_pfx,
|
new_pfx: !!(r as any).new_pfx,
|
||||||
pfx: (r as any).pfx,
|
pfx: (r as any).pfx,
|
||||||
@@ -4659,7 +4689,10 @@ export default function App() {
|
|||||||
}
|
}
|
||||||
if (clusterStatusFilter.size > 0) {
|
if (clusterStatusFilter.size > 0) {
|
||||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||||
const e = spotStatus[k];
|
// Filter on what is DISPLAYED, not on the raw backend status: NEW CALL is
|
||||||
|
// produced by the slot-highlight option, so a filter reading the raw
|
||||||
|
// entry would offer a chip that never matches a single row.
|
||||||
|
const e = applySpotDisplay(spotStatus[k], readSpotDisplayOptions());
|
||||||
const st = (e?.status || '') as SpotStatusKey;
|
const st = (e?.status || '') as SpotStatusKey;
|
||||||
// WORKED means "I've worked THIS callsign" — the blue WKD-CALL flag —
|
// WORKED means "I've worked THIS callsign" — the blue WKD-CALL flag —
|
||||||
// NOT the entity status 'worked' (entity/band/mode already worked, which
|
// NOT the entity status 'worked' (entity/band/mode already worked, which
|
||||||
@@ -4729,6 +4762,20 @@ export default function App() {
|
|||||||
<Checkbox checked={clusterGroup} onCheckedChange={(c) => setClusterGroup(!!c)} />
|
<Checkbox checked={clusterGroup} onCheckedChange={(c) => setClusterGroup(!!c)} />
|
||||||
Group duplicates
|
Group duplicates
|
||||||
</label>
|
</label>
|
||||||
|
{/* Two ways to cut through a busy cluster, and they compose: mute what
|
||||||
|
is done, light up what is not. They sit HERE, with the other things
|
||||||
|
an operator changes mid-run, and not in the preferences dialog.
|
||||||
|
Both drive the band map as well, through lib/spotDisplay. */}
|
||||||
|
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||||
|
<Checkbox checked={clusterMuteWorked}
|
||||||
|
onCheckedChange={(c) => { const v = !!c; setClusterMuteWorked(v); writeUiPref('opslog.clusterMuteWorked', v ? '1' : '0'); }} />
|
||||||
|
{t('clu.muteWorkedShort')}
|
||||||
|
</label>
|
||||||
|
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||||
|
<Checkbox checked={clusterSlotHighlight}
|
||||||
|
onCheckedChange={(c) => { const v = !!c; setClusterSlotHighlight(v); writeUiPref('opslog.clusterSlotHighlight', v ? '1' : '0'); }} />
|
||||||
|
{t('clu.slotHighlightShort')}
|
||||||
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Band filter — multi-select listbox */}
|
{/* Band filter — multi-select listbox */}
|
||||||
@@ -4788,6 +4835,9 @@ export default function App() {
|
|||||||
{ k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' },
|
{ k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' },
|
||||||
{ k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
{ k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
|
// NEW CALL is about the CALLSIGN, not the entity: never worked on this
|
||||||
|
// band and mode. Only appears when the slot-highlight option is on.
|
||||||
|
{ k: 'new-call' as SpotFilterKey, label: 'NEW CALL', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
// Same colours as the badges in the grid — a filter that does not
|
// Same colours as the badges in the grid — a filter that does not
|
||||||
// look like what it selects has to be learned twice.
|
// look like what it selects has to be learned twice.
|
||||||
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { cn } from '@/lib/utils';
|
|||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
||||||
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
||||||
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
|
|
||||||
// BandMap — vertical spectrum panel inspired by Log4OM.
|
// BandMap — vertical spectrum panel inspired by Log4OM.
|
||||||
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
||||||
@@ -32,9 +33,14 @@ type SpotStatusEntry = {
|
|||||||
status?: string;
|
status?: string;
|
||||||
country?: string;
|
country?: string;
|
||||||
worked_call?: boolean;
|
worked_call?: boolean;
|
||||||
|
// worked_slot: this exact callsign already worked on THIS band and mode.
|
||||||
|
worked_slot?: boolean;
|
||||||
new_county?: boolean;
|
new_county?: boolean;
|
||||||
new_pota?: boolean;
|
new_pota?: boolean;
|
||||||
new_pfx?: boolean;
|
new_pfx?: boolean;
|
||||||
|
// muted: the status was emptied on purpose by the "no colour on worked
|
||||||
|
// stations" option, so an empty status here is a choice, not an unknown.
|
||||||
|
muted?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
||||||
@@ -146,17 +152,39 @@ function LegendDot({ cls, colour, label }: { cls?: string; colour?: string; labe
|
|||||||
|
|
||||||
// Human-readable label for a spot status — used in the pill hover tooltip
|
// Human-readable label for a spot status — used in the pill hover tooltip
|
||||||
// so the operator can see WHY a spot is coloured the way it is.
|
// so the operator can see WHY a spot is coloured the way it is.
|
||||||
function statusLabel(s: string, t: (k: string) => string): string {
|
function statusLabel(s: string, t: (k: string) => string, muted = false): string {
|
||||||
switch (s) {
|
switch (s) {
|
||||||
case 'new': return t('bmp.statusNew');
|
case 'new': return t('bmp.statusNew');
|
||||||
case 'new-band': return t('bmp.statusNewBand');
|
case 'new-band': return t('bmp.statusNewBand');
|
||||||
|
case 'new-mode': return t('bmp.statusNewMode');
|
||||||
case 'new-slot': return t('bmp.statusNewSlot');
|
case 'new-slot': return t('bmp.statusNewSlot');
|
||||||
|
case 'new-call': return t('bmp.statusNewCall');
|
||||||
case 'worked': return t('bmp.statusWorked');
|
case 'worked': return t('bmp.statusWorked');
|
||||||
default: return t('bmp.statusUnresolved');
|
// An empty status means the entity could not be resolved — EXCEPT when the
|
||||||
|
// "no colour on worked stations" option emptied it on purpose. Saying
|
||||||
|
// "entity not resolved" there was a flat contradiction of the country
|
||||||
|
// printed two words earlier in the same tooltip.
|
||||||
|
default: return muted ? t('bmp.statusMuted') : t('bmp.statusUnresolved');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusStyle(s: string): { pill: string; bar: string; line: string; dot: string } {
|
// QUIET: no status colour at all. The pill keeps the card background and the
|
||||||
|
// accent drops to a plain border grey, so the spot is present but says nothing.
|
||||||
|
const QUIET_STYLE = {
|
||||||
|
pill: 'bg-card text-muted-foreground border-border/60 hover:bg-muted/50',
|
||||||
|
bar: 'bg-muted-foreground/30',
|
||||||
|
line: 'stroke-border',
|
||||||
|
dot: 'fill-border',
|
||||||
|
};
|
||||||
|
|
||||||
|
function statusStyle(s: string, muted = false): { pill: string; bar: string; line: string; dot: string } {
|
||||||
|
// A muted spot must land on QUIET, never on the default branch below. That
|
||||||
|
// default paints bg-primary/60 — the theme's burnt orange at 60 % over a dark
|
||||||
|
// card, i.e. brown — because it was written for the rare unresolved entity and
|
||||||
|
// orange is this app's "look here" colour. With the mute option on, most of
|
||||||
|
// the map is muted, so the whole band map turned brown and the quietest spots
|
||||||
|
// shouted the loudest.
|
||||||
|
if (muted) return QUIET_STYLE;
|
||||||
// pill = full pill background+text+border
|
// pill = full pill background+text+border
|
||||||
// bar = thick left accent inside the pill
|
// bar = thick left accent inside the pill
|
||||||
// line = SVG leader stroke (visible on hover)
|
// line = SVG leader stroke (visible on hover)
|
||||||
@@ -174,18 +202,14 @@ function statusStyle(s: string): { pill: string; bar: string; line: string; dot:
|
|||||||
line: 'stroke-warning',
|
line: 'stroke-warning',
|
||||||
dot: 'fill-warning',
|
dot: 'fill-warning',
|
||||||
};
|
};
|
||||||
|
case 'new-call':
|
||||||
case 'new-slot': return {
|
case 'new-slot': return {
|
||||||
pill: 'bg-caution-muted text-caution-muted-foreground border-caution-border hover:bg-caution-muted',
|
pill: 'bg-caution-muted text-caution-muted-foreground border-caution-border hover:bg-caution-muted',
|
||||||
bar: 'bg-caution',
|
bar: 'bg-caution',
|
||||||
line: 'stroke-caution',
|
line: 'stroke-caution',
|
||||||
dot: 'fill-caution',
|
dot: 'fill-caution',
|
||||||
};
|
};
|
||||||
case 'worked': return {
|
case 'worked': return QUIET_STYLE;
|
||||||
pill: 'bg-card text-muted-foreground border-border/60 hover:bg-muted/50',
|
|
||||||
bar: 'bg-muted-foreground/30',
|
|
||||||
line: 'stroke-border',
|
|
||||||
dot: 'fill-border',
|
|
||||||
};
|
|
||||||
default: return {
|
default: return {
|
||||||
pill: 'bg-card text-foreground border-border hover:bg-accent/40',
|
pill: 'bg-card text-foreground border-border hover:bg-accent/40',
|
||||||
bar: 'bg-primary/60',
|
bar: 'bg-primary/60',
|
||||||
@@ -213,8 +237,24 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
|||||||
// last; ties broken by closeness to the rig freq).
|
// last; ties broken by closeness to the rig freq).
|
||||||
const MAX_VISIBLE_SPOTS = 30;
|
const MAX_VISIBLE_SPOTS = 30;
|
||||||
|
|
||||||
export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
// The two display options are applied ONCE here, on the whole map, so the
|
||||||
|
// leader lines, the dots, the pills and the badges can never disagree — and so
|
||||||
|
// the map and the cluster list share the single rule set in lib/spotDisplay.
|
||||||
|
// Re-derived whenever the poll delivers a new status map, which is also when a
|
||||||
|
// just-changed option takes effect.
|
||||||
|
// Read at render time, not inside the memo: the options must be part of the
|
||||||
|
// dependencies. Keyed only on spotStatusRaw, toggling an option changed
|
||||||
|
// nothing until the next poll happened to hand over a fresh object.
|
||||||
|
const dispOpts = readSpotDisplayOptions();
|
||||||
|
const spotStatus = useMemo(() => {
|
||||||
|
if (!dispOpts.muteWorked && !dispOpts.slotHighlight) return spotStatusRaw;
|
||||||
|
const out: Record<string, SpotStatusEntry> = {};
|
||||||
|
for (const k of Object.keys(spotStatusRaw)) out[k] = applySpotDisplay(spotStatusRaw[k], dispOpts) as SpotStatusEntry;
|
||||||
|
return out;
|
||||||
|
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]);
|
||||||
const range = BAND_RANGES[band];
|
const range = BAND_RANGES[band];
|
||||||
const segments = SEGMENT_COLORS[band] ?? [];
|
const segments = SEGMENT_COLORS[band] ?? [];
|
||||||
const [zoomIdx, setZoomIdx] = useState(2); // default 32 px/kHz
|
const [zoomIdx, setZoomIdx] = useState(2); // default 32 px/kHz
|
||||||
@@ -282,6 +322,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
case 'new': return 0;
|
case 'new': return 0;
|
||||||
case 'new-band': return 1;
|
case 'new-band': return 1;
|
||||||
case 'new-slot': return 2;
|
case 'new-slot': return 2;
|
||||||
|
case 'new-call': return 2;
|
||||||
case 'worked': return 4;
|
case 'worked': return 4;
|
||||||
default: return 3;
|
default: return 3;
|
||||||
}
|
}
|
||||||
@@ -540,7 +581,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
{placed.map((p, i) => {
|
{placed.map((p, i) => {
|
||||||
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
||||||
const st = spotStatus[k]?.status ?? '';
|
const st = spotStatus[k]?.status ?? '';
|
||||||
const style = statusStyle(st);
|
const style = statusStyle(st, spotStatus[k]?.muted);
|
||||||
const labelMidY = p.labelY + PILL_H / 2;
|
const labelMidY = p.labelY + PILL_H / 2;
|
||||||
const bumped = Math.abs(p.freqY - labelMidY) > 0.5;
|
const bumped = Math.abs(p.freqY - labelMidY) > 0.5;
|
||||||
return (
|
return (
|
||||||
@@ -588,7 +629,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
||||||
const entry = spotStatus[k];
|
const entry = spotStatus[k];
|
||||||
const st = entry?.status ?? '';
|
const st = entry?.status ?? '';
|
||||||
const style = statusStyle(st);
|
const style = statusStyle(st, entry?.muted);
|
||||||
const mode = inferSpotMode(p.spot.comment ?? '', p.spot.freq_hz);
|
const mode = inferSpotMode(p.spot.comment ?? '', p.spot.freq_hz);
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
@@ -601,7 +642,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
'hover:translate-x-0.5 hover:shadow',
|
'hover:translate-x-0.5 hover:shadow',
|
||||||
style.pill,
|
style.pill,
|
||||||
)}
|
)}
|
||||||
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t, entry?.muted)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||||
>
|
>
|
||||||
{/* Left accent strip. With no extra marker it repeats the status
|
{/* Left accent strip. With no extra marker it repeats the status
|
||||||
colour, exactly as before; otherwise it splits into one
|
colour, exactly as before; otherwise it splits into one
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { Button } from '@/components/ui/button';
|
|||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import { cleanSpotter, inferSpotMode, spotStatusKey } from '@/lib/spot';
|
import { cleanSpotter, inferSpotMode, spotStatusKey } from '@/lib/spot';
|
||||||
import { markerColour } from '@/lib/spotMarkers';
|
import { markerColour } from '@/lib/spotMarkers';
|
||||||
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs';
|
import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
|
||||||
@@ -52,7 +53,14 @@ export type SpotStatusEntry = {
|
|||||||
country?: string;
|
country?: string;
|
||||||
continent?: string;
|
continent?: string;
|
||||||
worked_call?: boolean;
|
worked_call?: boolean;
|
||||||
|
// worked_slot: this exact callsign already worked on THIS band and mode.
|
||||||
|
// Always slot-scoped, unlike worked_call which follows the "same slot" option.
|
||||||
|
worked_slot?: boolean;
|
||||||
new_county?: boolean;
|
new_county?: boolean;
|
||||||
|
// The resolved US county and state, so the grid can SHOW them and not merely
|
||||||
|
// flag them. Filled from the offline ULS store, US callsigns only.
|
||||||
|
county?: string;
|
||||||
|
state?: string;
|
||||||
new_pota?: boolean;
|
new_pota?: boolean;
|
||||||
new_pfx?: boolean;
|
new_pfx?: boolean;
|
||||||
pfx?: string;
|
pfx?: string;
|
||||||
@@ -97,26 +105,54 @@ type ColEntry = ColDef<ClusterSpot> & { group: string; label: string; defaultVis
|
|||||||
// statusFor resolves the precomputed spot status (new / new-band / new-slot /
|
// statusFor resolves the precomputed spot status (new / new-band / new-slot /
|
||||||
// worked-call) for an ag-Grid cell's row.
|
// worked-call) for an ag-Grid cell's row.
|
||||||
function statusFor(p: any): SpotStatusEntry | undefined {
|
function statusFor(p: any): SpotStatusEntry | undefined {
|
||||||
return p?.context?.spotStatus?.[
|
const s = p?.context?.spotStatus?.[
|
||||||
spotStatusKey(p.data?.dx_call, p.data?.band ?? '', p.data?.comment ?? '', p.data?.freq_hz)
|
spotStatusKey(p.data?.dx_call, p.data?.band ?? '', p.data?.comment ?? '', p.data?.freq_hz)
|
||||||
];
|
];
|
||||||
|
// One chokepoint: the colour, the badges and the Status text all read through
|
||||||
|
// here, so the two display options are applied once rather than in each
|
||||||
|
// renderer — and the band map applies the very same function.
|
||||||
|
return applySpotDisplay(s, readSpotDisplayOptions());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Spot status is shown by COLOURING THE TEXT, never by a pill or a badge.
|
// Spot status is shown on the CELL that carries the fact — filled background for
|
||||||
|
// a novelty, tinted text otherwise — never by a pill or a badge.
|
||||||
//
|
//
|
||||||
// The pills were dropped: a rounded box has its own height and padding, so it
|
// The pills were dropped and stay dropped: a rounded box has its own height and
|
||||||
// sat off the row's baseline and the callsign inside it no longer lined up with
|
// padding, so it sat off the row's baseline and the callsign inside it no longer
|
||||||
// the plain callsigns above and below. A whole column of them read as chrome
|
// lined up with the plain callsigns above and below. A whole column of them read
|
||||||
// rather than as data. Same reasoning — and the same semantic tokens — as the
|
// as chrome rather than as data. Same reasoning — and the same semantic tokens —
|
||||||
// Y/N/R QSL columns in lib/qslStatus.ts.
|
// as the Y/N/R QSL columns in lib/qslStatus.ts.
|
||||||
//
|
//
|
||||||
// Which cell is coloured IS the message, so one colour is enough for all three:
|
// Which cell is marked IS the message:
|
||||||
//
|
//
|
||||||
// yellow call → new DXCC yellow band → new band yellow mode → new mode
|
// filled call → new DXCC filled band → new band filled mode → new mode
|
||||||
// blue call → already worked
|
// filled pfx → new prefix filled POTA → new park filled county → new county
|
||||||
|
// blue call → already worked (not a novelty, so text only)
|
||||||
const NEW = 'var(--warning)'; // yellow: something here is new
|
const NEW = 'var(--warning)'; // yellow: something here is new
|
||||||
const WKD = 'var(--info)'; // blue: this callsign is already in the log
|
const WKD = 'var(--info)'; // blue: this callsign is already in the log
|
||||||
|
|
||||||
|
// FILLING the cell that carries the fact, rather than only tinting its text.
|
||||||
|
//
|
||||||
|
// This is not a return to the pills that were dropped. A pill is a box INSIDE
|
||||||
|
// the cell: it has its own height and padding, so it sat off the row baseline
|
||||||
|
// and the callsign inside it stopped lining up with the plain callsigns above
|
||||||
|
// and below. A cell background has no geometry of its own — the text does not
|
||||||
|
// move by a single pixel — and it reads from across the room, which a tinted
|
||||||
|
// glyph does not.
|
||||||
|
//
|
||||||
|
// Which cell is filled is still the whole message: filled Band means new band,
|
||||||
|
// filled Pfx means new prefix, filled County means new county.
|
||||||
|
//
|
||||||
|
// The colours come from the same places they already came from — the semantic
|
||||||
|
// status tokens and lib/spotMarkers — so a fact keeps one colour across the
|
||||||
|
// grid, the band map and the filter chips. 22 % is the wash that survived both
|
||||||
|
// themes: enough to see at a glance, not enough to fight the text on it.
|
||||||
|
const fillStyle = (colour: string) => ({
|
||||||
|
background: `color-mix(in srgb, ${colour} 22%, transparent)`,
|
||||||
|
color: colour,
|
||||||
|
fontWeight: 700,
|
||||||
|
});
|
||||||
|
|
||||||
// cellText renders a cell value in an optional colour. An empty value keeps the
|
// cellText renders a cell value in an optional colour. An empty value keeps the
|
||||||
// muted dash the grid used before, so blank cells still read as "nothing here"
|
// muted dash the grid used before, so blank cells still read as "nothing here"
|
||||||
// rather than as a gap.
|
// rather than as a gap.
|
||||||
@@ -135,6 +171,7 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
|||||||
case 'new-band':
|
case 'new-band':
|
||||||
case 'new-mode':
|
case 'new-mode':
|
||||||
case 'new-slot':
|
case 'new-slot':
|
||||||
|
case 'new-call':
|
||||||
return NEW;
|
return NEW;
|
||||||
default:
|
default:
|
||||||
return s?.worked_call ? WKD : null;
|
return s?.worked_call ? WKD : null;
|
||||||
@@ -150,7 +187,7 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
|||||||
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
||||||
function isDull(s: SpotStatusEntry | undefined): boolean {
|
function isDull(s: SpotStatusEntry | undefined): boolean {
|
||||||
if (!s || !s.status) return false;
|
if (!s || !s.status) return false;
|
||||||
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot') return false;
|
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||||
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx);
|
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -177,11 +214,12 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
headerName: t('clg2.c.call'), field: 'dx_call' as any, width: 120,
|
headerName: t('clg2.c.call'), field: 'dx_call' as any, width: 120,
|
||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellClass: 'font-mono',
|
cellClass: 'font-mono',
|
||||||
// NEW DXCC → yellow call. Already worked → blue call. Anything else keeps
|
// NEW DXCC fills the call cell. Already worked only tints the text blue:
|
||||||
// the theme's normal ink so ordinary callsigns don't shout.
|
// 'worked' is not a novelty, and filling it would wash most of the rows.
|
||||||
|
cellStyle: (p: any) => (statusFor(p)?.status === 'new' ? fillStyle('var(--danger)') : null) as any,
|
||||||
cellRenderer: (p: any) => {
|
cellRenderer: (p: any) => {
|
||||||
const s = statusFor(p);
|
const s = statusFor(p);
|
||||||
const color = s?.status === 'new' ? NEW : s?.worked_call ? WKD : null;
|
const color = s?.status === 'new' ? null : s?.worked_call ? WKD : null;
|
||||||
return <span style={{ color: color ?? undefined, fontWeight: 700 }}>{p.value ?? ''}</span>;
|
return <span style={{ color: color ?? undefined, fontWeight: 700 }}>{p.value ?? ''}</span>;
|
||||||
},
|
},
|
||||||
tooltipValueGetter: (p: any) => {
|
tooltipValueGetter: (p: any) => {
|
||||||
@@ -204,6 +242,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
|
else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
|
||||||
else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
|
else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
|
||||||
else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
|
else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
|
||||||
|
else if (s?.status === 'new-call') parts.push(t('clg2.newCall'));
|
||||||
else if (s?.worked_call) parts.push(t('clg2.wkdCall'));
|
else if (s?.worked_call) parts.push(t('clg2.wkdCall'));
|
||||||
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
||||||
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
||||||
@@ -219,6 +258,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
: s?.status === 'new-band' ? t('clg2.newBand')
|
: s?.status === 'new-band' ? t('clg2.newBand')
|
||||||
: s?.status === 'new-mode' ? t('clg2.newMode')
|
: s?.status === 'new-mode' ? t('clg2.newMode')
|
||||||
: s?.status === 'new-slot' ? t('clg2.newSlot')
|
: s?.status === 'new-slot' ? t('clg2.newSlot')
|
||||||
|
: s?.status === 'new-call' ? t('clg2.newCall')
|
||||||
: t('clg2.wkdCall');
|
: t('clg2.wkdCall');
|
||||||
parts.push({ text: label, color: main });
|
parts.push({ text: label, color: main });
|
||||||
}
|
}
|
||||||
@@ -243,6 +283,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
|
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
|
||||||
if (s?.status === 'new-band') return t('clg2.tipNewBand');
|
if (s?.status === 'new-band') return t('clg2.tipNewBand');
|
||||||
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
|
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
|
||||||
|
if (s?.status === 'new-call') return t('clg2.tipNewCall');
|
||||||
if (s?.worked_call) return t('clg2.tipWorkedCall');
|
if (s?.worked_call) return t('clg2.tipWorkedCall');
|
||||||
return undefined;
|
return undefined;
|
||||||
},
|
},
|
||||||
@@ -251,7 +292,9 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
group: 'Spot', label: t('clg2.c.pota'), colId: 'pota',
|
group: 'Spot', label: t('clg2.c.pota'), colId: 'pota',
|
||||||
headerName: t('clg2.c.pota'), field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
|
headerName: t('clg2.c.pota'), field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
|
||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellStyle: { color: 'var(--success)' },
|
cellStyle: (p: any) => (statusFor(p)?.new_pota
|
||||||
|
? fillStyle(markerColour('new_pota'))
|
||||||
|
: { color: 'var(--success)' }) as any,
|
||||||
tooltipValueGetter: (p: any) => (p.data?.pota_name ? t('clg2.tipPota', { name: p.data.pota_name }) : undefined),
|
tooltipValueGetter: (p: any) => (p.data?.pota_name ? t('clg2.tipPota', { name: p.data.pota_name }) : undefined),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -266,8 +309,9 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
|
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
|
||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellClass: 'font-mono',
|
cellClass: 'font-mono',
|
||||||
// NEW BAND for this entity → the band text turns yellow.
|
// NEW BAND for this entity → the band cell is filled.
|
||||||
cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-band' ? NEW : null),
|
cellStyle: (p: any) => (statusFor(p)?.status === 'new-band' ? fillStyle(NEW) : null) as any,
|
||||||
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
|
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -280,7 +324,8 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
// for the entity. NEW SLOT means band AND mode were each worked before (just
|
// for the entity. NEW SLOT means band AND mode were each worked before (just
|
||||||
// not together), so highlighting the mode cell would wrongly imply "CW is new";
|
// not together), so highlighting the mode cell would wrongly imply "CW is new";
|
||||||
// that case is signalled by the Status badge alone.
|
// that case is signalled by the Status badge alone.
|
||||||
cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-mode' ? NEW : null),
|
cellStyle: (p: any) => (statusFor(p)?.status === 'new-mode' ? fillStyle('var(--caution)') : null) as any,
|
||||||
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
tooltipValueGetter: (p: any) => {
|
tooltipValueGetter: (p: any) => {
|
||||||
const st = statusFor(p)?.status;
|
const st = statusFor(p)?.status;
|
||||||
if (st === 'new-mode') return t('clg2.tipNewMode');
|
if (st === 'new-mode') return t('clg2.tipNewMode');
|
||||||
@@ -292,7 +337,25 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
group: 'Spot', label: t('clg2.c.pfx'), colId: 'pfx',
|
group: 'Spot', label: t('clg2.c.pfx'), colId: 'pfx',
|
||||||
headerName: t('clg2.c.pfx'), width: 60, cellClass: 'font-mono',
|
headerName: t('clg2.c.pfx'), width: 60, cellClass: 'font-mono',
|
||||||
valueGetter: (p: any) => fmtPfx(p.data?.dx_call ?? ''),
|
valueGetter: (p: any) => fmtPfx(p.data?.dx_call ?? ''),
|
||||||
cellStyle: { color: 'var(--muted-foreground)' },
|
// NEW PFX fills the prefix cell, in the prefix marker's own colour.
|
||||||
|
cellStyle: (p: any) => (statusFor(p)?.new_pfx
|
||||||
|
? fillStyle(markerColour('new_pfx'))
|
||||||
|
: { color: 'var(--muted-foreground)' }) as any,
|
||||||
|
tooltipValueGetter: (p: any) => (statusFor(p)?.new_pfx ? t('clg2.tipNewPfx') : undefined),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
group: 'Geo', label: t('clg2.c.county'), colId: 'county',
|
||||||
|
headerName: t('clg2.c.county'), width: 130, cellClass: 'font-mono',
|
||||||
|
// Not on the spot: resolved per callsign from the offline ULS store, so it
|
||||||
|
// stays empty for non-US calls and until that database is downloaded.
|
||||||
|
valueGetter: (p: any) => {
|
||||||
|
const s = statusFor(p);
|
||||||
|
if (!s?.county) return '';
|
||||||
|
return s.state ? s.county + ', ' + s.state : s.county;
|
||||||
|
},
|
||||||
|
cellStyle: (p: any) => (statusFor(p)?.new_county ? fillStyle(markerColour('new_county')) : null) as any,
|
||||||
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
|
tooltipValueGetter: (p: any) => (statusFor(p)?.new_county ? t('clg2.tipNewCounty') : undefined),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
group: 'Geo', label: t('clg2.c.cqz'), colId: 'cqz',
|
group: 'Geo', label: t('clg2.c.cqz'), colId: 'cqz',
|
||||||
|
|||||||
@@ -4137,6 +4137,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
|
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
|
||||||
<span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
|
<span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
|
||||||
</label>
|
</label>
|
||||||
|
{/* "No colour on worked" and "colour what is unworked here" used to live
|
||||||
|
here. They moved to the Cluster tab's filter panel, next to Hide
|
||||||
|
worked: they are things an operator changes while working a run, not
|
||||||
|
things set up once. A preferences dialog you reopen every ten minutes
|
||||||
|
is a filter in the wrong place. */}
|
||||||
|
|
||||||
{/* Self-spot. The interval only shows once it's on — an interval for
|
{/* Self-spot. The interval only shows once it's on — an interval for
|
||||||
something switched off is just a question the operator can't act on. */}
|
something switched off is just a question the operator can't act on. */}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,85 @@
|
|||||||
|
// Two operator options that change how a spot LOOKS, shared by the DX-cluster
|
||||||
|
// list and the band map so the two panels can never disagree about the same
|
||||||
|
// spot — the lesson already learnt with the marker colours.
|
||||||
|
//
|
||||||
|
// muteWorked — a station already worked gets no colour and no badge. It
|
||||||
|
// stays in the list, it simply stops competing for attention.
|
||||||
|
// slotHighlight — a callsign not yet worked on THIS band and mode is coloured,
|
||||||
|
// whatever the entity says. For an operator filling slots, a
|
||||||
|
// common entity on a new band+mode is the whole point, and the
|
||||||
|
// entity-level status calls it "worked".
|
||||||
|
//
|
||||||
|
// They compose deliberately: mute what is done, light up what is not.
|
||||||
|
|
||||||
|
export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean };
|
||||||
|
|
||||||
|
export function readSpotDisplayOptions(): SpotDisplayOptions {
|
||||||
|
try {
|
||||||
|
return {
|
||||||
|
muteWorked: localStorage.getItem('opslog.clusterMuteWorked') === '1',
|
||||||
|
slotHighlight: localStorage.getItem('opslog.clusterSlotHighlight') === '1',
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return { muteWorked: false, slotHighlight: false };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Entry = {
|
||||||
|
status?: string;
|
||||||
|
worked_call?: boolean;
|
||||||
|
worked_slot?: boolean;
|
||||||
|
new_county?: boolean;
|
||||||
|
new_pota?: boolean;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
muted?: boolean;
|
||||||
|
} | undefined;
|
||||||
|
|
||||||
|
// bringsNothingNew: the ENTITY is resolved and worked, and no other dimension
|
||||||
|
// (county, park, prefix) is new. Same test the cluster list already used to dim
|
||||||
|
// a row — muting reuses it rather than inventing a second notion of "done".
|
||||||
|
//
|
||||||
|
// Entity-level, NOT callsign-level: an operator can be on their 421st Bulgarian
|
||||||
|
// and still have never worked that particular station. That spot is muted here
|
||||||
|
// by design — it brings nothing to an award — and turning on the slot option is
|
||||||
|
// what brings it back, which is why the promotion above runs first.
|
||||||
|
//
|
||||||
|
// Note what is NOT muted: a status of new-band / new-slot survives, because
|
||||||
|
// having worked that callsign once on another band says nothing about the band
|
||||||
|
// in front of you.
|
||||||
|
function bringsNothingNew(s: Entry): boolean {
|
||||||
|
if (!s || !s.status) return false; // unresolved — never hide, it would flicker
|
||||||
|
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||||
|
return !(s.new_pota || s.new_county || s.new_pfx);
|
||||||
|
}
|
||||||
|
|
||||||
|
// applySpotDisplay rewrites a status entry per the options, so every consumer —
|
||||||
|
// colour, badge, status text — follows from one decision instead of each panel
|
||||||
|
// re-deriving it.
|
||||||
|
export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions): T {
|
||||||
|
if (!s) return s;
|
||||||
|
let e = s;
|
||||||
|
|
||||||
|
// ORDER MATTERS, and it is the whole difference between the two options
|
||||||
|
// composing and one cancelling the other.
|
||||||
|
//
|
||||||
|
// Slot promotion runs FIRST. A callsign not yet worked on this band and mode
|
||||||
|
// is not "done", so it must never be swallowed by the mute below — yet the
|
||||||
|
// mute test only looks at the entity, and an unworked callsign inside a worked
|
||||||
|
// entity is precisely the spot the second option exists to surface. Promoting
|
||||||
|
// first protects it for free: bringsNothingNew() returns false on new-slot.
|
||||||
|
if (o.slotHighlight && e.worked_slot === false && (!e.status || e.status === 'worked')) {
|
||||||
|
e = { ...e, status: 'new-call' } as NonNullable<T>;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (o.muteWorked && bringsNothingNew(e)) {
|
||||||
|
// Strip everything that paints: the row keeps its data, loses its emphasis.
|
||||||
|
//
|
||||||
|
// muted says WHY the status went empty. An empty status already meant
|
||||||
|
// "entity not resolved" in the band map, so without this flag every muted
|
||||||
|
// spot claimed its entity was unknown — with the country printed right next
|
||||||
|
// to it. Blanking is still what drives the colour, the badges and the
|
||||||
|
// ranking; muted only lets the tooltip stay honest.
|
||||||
|
return { ...e, status: '', worked_call: false, muted: true } as T;
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
}
|
||||||
@@ -39,6 +39,8 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
||||||
'opslog.activeTab', // last selected tab
|
'opslog.activeTab', // last selected tab
|
||||||
'opslog.mainSplit', // Main tab: width share of the left pane (percent)
|
'opslog.mainSplit', // Main tab: width share of the left pane (percent)
|
||||||
|
'opslog.clusterMuteWorked', // cluster/band map: no colour or badge on worked spots
|
||||||
|
'opslog.clusterSlotHighlight', // cluster/band map: colour calls not worked on this band+mode
|
||||||
'opslog.bandMapWidth', // docked band map: column width (px)
|
'opslog.bandMapWidth', // docked band map: column width (px)
|
||||||
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
||||||
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Single source of truth for the app version shown in the UI (header + About).
|
// Single source of truth for the app version shown in the UI (header + About).
|
||||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
export const APP_VERSION = '0.24.2';
|
export const APP_VERSION = '0.24.3';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+3
@@ -10,6 +10,7 @@ import {catemu} from '../models';
|
|||||||
import {antgenius} from '../models';
|
import {antgenius} from '../models';
|
||||||
import {award} from '../models';
|
import {award} from '../models';
|
||||||
import {awardref} from '../models';
|
import {awardref} from '../models';
|
||||||
|
import {bandopen} from '../models';
|
||||||
import {cluster} from '../models';
|
import {cluster} from '../models';
|
||||||
import {extsvc} from '../models';
|
import {extsvc} from '../models';
|
||||||
import {powergenius} from '../models';
|
import {powergenius} from '../models';
|
||||||
@@ -386,6 +387,8 @@ export function GetAwards():Promise<Array<award.Result>>;
|
|||||||
|
|
||||||
export function GetBackupSettings():Promise<main.BackupSettings>;
|
export function GetBackupSettings():Promise<main.BackupSettings>;
|
||||||
|
|
||||||
|
export function GetBandOpenings():Promise<Array<bandopen.Opening>>;
|
||||||
|
|
||||||
export function GetCATSettings():Promise<main.CATSettings>;
|
export function GetCATSettings():Promise<main.CATSettings>;
|
||||||
|
|
||||||
export function GetCATState():Promise<cat.RigState>;
|
export function GetCATState():Promise<cat.RigState>;
|
||||||
|
|||||||
@@ -718,6 +718,10 @@ export function GetBackupSettings() {
|
|||||||
return window['go']['main']['App']['GetBackupSettings']();
|
return window['go']['main']['App']['GetBackupSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetBandOpenings() {
|
||||||
|
return window['go']['main']['App']['GetBandOpenings']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetCATSettings() {
|
export function GetCATSettings() {
|
||||||
return window['go']['main']['App']['GetCATSettings']();
|
return window['go']['main']['App']['GetCATSettings']();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -677,6 +677,56 @@ export namespace awardref {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace bandopen {
|
||||||
|
|
||||||
|
export class Opening {
|
||||||
|
band: string;
|
||||||
|
calls: number;
|
||||||
|
median_km: number;
|
||||||
|
bearing_min: number;
|
||||||
|
bearing_max: number;
|
||||||
|
in_season: boolean;
|
||||||
|
// Go type: time
|
||||||
|
at: any;
|
||||||
|
examples: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Opening(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.band = source["band"];
|
||||||
|
this.calls = source["calls"];
|
||||||
|
this.median_km = source["median_km"];
|
||||||
|
this.bearing_min = source["bearing_min"];
|
||||||
|
this.bearing_max = source["bearing_max"];
|
||||||
|
this.in_season = source["in_season"];
|
||||||
|
this.at = this.convertValues(source["at"], null);
|
||||||
|
this.examples = source["examples"];
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace cat {
|
export namespace cat {
|
||||||
|
|
||||||
export class FlexMeter {
|
export class FlexMeter {
|
||||||
@@ -2959,9 +3009,12 @@ export namespace main {
|
|||||||
status: string;
|
status: string;
|
||||||
worked_call: boolean;
|
worked_call: boolean;
|
||||||
new_county: boolean;
|
new_county: boolean;
|
||||||
|
county?: string;
|
||||||
|
state?: string;
|
||||||
new_pota: boolean;
|
new_pota: boolean;
|
||||||
new_pfx: boolean;
|
new_pfx: boolean;
|
||||||
pfx?: string;
|
pfx?: string;
|
||||||
|
worked_slot: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new SpotStatus(source);
|
return new SpotStatus(source);
|
||||||
@@ -2977,9 +3030,12 @@ export namespace main {
|
|||||||
this.status = source["status"];
|
this.status = source["status"];
|
||||||
this.worked_call = source["worked_call"];
|
this.worked_call = source["worked_call"];
|
||||||
this.new_county = source["new_county"];
|
this.new_county = source["new_county"];
|
||||||
|
this.county = source["county"];
|
||||||
|
this.state = source["state"];
|
||||||
this.new_pota = source["new_pota"];
|
this.new_pota = source["new_pota"];
|
||||||
this.new_pfx = source["new_pfx"];
|
this.new_pfx = source["new_pfx"];
|
||||||
this.pfx = source["pfx"];
|
this.pfx = source["pfx"];
|
||||||
|
this.worked_slot = source["worked_slot"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class StartupStatus {
|
export class StartupStatus {
|
||||||
|
|||||||
@@ -0,0 +1,253 @@
|
|||||||
|
// Package bandopen spots a band OPENING in the cluster stream — sporadic-E on
|
||||||
|
// 6 m, 4 m and 2 m above all.
|
||||||
|
//
|
||||||
|
// This is observation, not prediction. Every spot OpsLog receives is already
|
||||||
|
// enriched with the great-circle distance and bearing from the operator's own
|
||||||
|
// grid, so the signature of a single-hop Es opening is directly measurable:
|
||||||
|
// several distinct stations appearing on a VHF band, all at single-hop range,
|
||||||
|
// all in the same bearing sector, within a few minutes. That combination does
|
||||||
|
// not happen by chance — scattered spots at random distances and bearings are
|
||||||
|
// just a busy band.
|
||||||
|
//
|
||||||
|
// The season is REPORTED, never used to suppress. Es peaks in late spring and
|
||||||
|
// summer, so an opening in November is unusual — and an unusual opening is
|
||||||
|
// precisely the one an operator must not be told about last. InSeason only
|
||||||
|
// labels the announcement.
|
||||||
|
package bandopen
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Spot is the little a detection needs, taken from an enriched cluster spot.
|
||||||
|
type Spot struct {
|
||||||
|
Call string
|
||||||
|
Band string
|
||||||
|
DistKm int
|
||||||
|
Bearing int // degrees from the operator, short path
|
||||||
|
At time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// Config tunes the detector. The defaults describe single-hop sporadic E.
|
||||||
|
type Config struct {
|
||||||
|
Window time.Duration // how far back a burst may span
|
||||||
|
MinCalls int // distinct DX calls before it counts as an opening
|
||||||
|
MinKm, MaxKm int // single-hop Es range
|
||||||
|
BearingSpread int // widest arc (degrees) the spots may cover
|
||||||
|
Requiet time.Duration // silence after announcing a band, so it is announced once
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultConfig is the single-hop Es envelope.
|
||||||
|
//
|
||||||
|
// 500–2400 km: below ~500 km a 6 m contact is ordinary tropo or ground wave and
|
||||||
|
// says nothing about the ionosphere; beyond ~2400 km it is no longer one hop, so
|
||||||
|
// the bearing test stops meaning anything. 90° of spread because a genuine Es
|
||||||
|
// cloud illuminates a sector, not the whole horizon — the constraint that
|
||||||
|
// separates an opening from a merely busy evening.
|
||||||
|
func DefaultConfig() Config {
|
||||||
|
return Config{
|
||||||
|
Window: 12 * time.Minute,
|
||||||
|
MinCalls: 4,
|
||||||
|
MinKm: 500,
|
||||||
|
MaxKm: 2400,
|
||||||
|
BearingSpread: 90,
|
||||||
|
Requiet: 45 * time.Minute,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bands watched. HF is deliberately absent: an "opening" on 20 m is the normal
|
||||||
|
// state of the band and announcing it would be noise.
|
||||||
|
var watched = map[string]bool{"6m": true, "4m": true, "2m": true}
|
||||||
|
|
||||||
|
// Watched reports whether a band is one the detector looks at.
|
||||||
|
func Watched(band string) bool { return watched[strings.ToLower(strings.TrimSpace(band))] }
|
||||||
|
|
||||||
|
// Opening is a detected opening, ready to be announced.
|
||||||
|
type Opening struct {
|
||||||
|
Band string `json:"band"`
|
||||||
|
Calls int `json:"calls"` // distinct DX stations seen
|
||||||
|
MedianKm int `json:"median_km"` // typical hop length
|
||||||
|
BearingMin int `json:"bearing_min"` // sector, degrees
|
||||||
|
BearingMax int `json:"bearing_max"`
|
||||||
|
InSeason bool `json:"in_season"` // false = unusual for the time of year
|
||||||
|
At time.Time `json:"at"`
|
||||||
|
Examples []string `json:"examples"` // a few callsigns, for the announcement
|
||||||
|
}
|
||||||
|
|
||||||
|
// Detector keeps the rolling window and the per-band quiet period.
|
||||||
|
type Detector struct {
|
||||||
|
cfg Config
|
||||||
|
recent []Spot
|
||||||
|
lastFire map[string]time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(cfg Config) *Detector {
|
||||||
|
if cfg.Window <= 0 {
|
||||||
|
cfg = DefaultConfig()
|
||||||
|
}
|
||||||
|
return &Detector{cfg: cfg, lastFire: map[string]time.Time{}}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add records a spot and returns an Opening when this spot completes one.
|
||||||
|
//
|
||||||
|
// Returns nil far more often than not; that is the point. lat is the operator's
|
||||||
|
// latitude, for the hemisphere the season depends on.
|
||||||
|
func (d *Detector) Add(s Spot, lat float64) *Opening {
|
||||||
|
if !Watched(s.Band) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
band := strings.ToLower(strings.TrimSpace(s.Band))
|
||||||
|
s.Band = band
|
||||||
|
if s.At.IsZero() {
|
||||||
|
s.At = time.Now()
|
||||||
|
}
|
||||||
|
// Out-of-range spots are dropped rather than stored: they can never be part
|
||||||
|
// of a single-hop detection, and keeping them only grows the window.
|
||||||
|
if s.DistKm < d.cfg.MinKm || s.DistKm > d.cfg.MaxKm {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
d.recent = append(d.recent, s)
|
||||||
|
d.prune(s.At)
|
||||||
|
|
||||||
|
if last, ok := d.lastFire[band]; ok && s.At.Sub(last) < d.cfg.Requiet {
|
||||||
|
return nil // already announced this band recently
|
||||||
|
}
|
||||||
|
|
||||||
|
inBand := make([]Spot, 0, len(d.recent))
|
||||||
|
for _, r := range d.recent {
|
||||||
|
if r.Band == band {
|
||||||
|
inBand = append(inBand, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
op := evaluate(band, inBand, d.cfg)
|
||||||
|
if op == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
op.At = s.At
|
||||||
|
op.InSeason = InSeason(band, s.At, lat)
|
||||||
|
d.lastFire[band] = s.At
|
||||||
|
return op
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Detector) prune(now time.Time) {
|
||||||
|
cut := now.Add(-d.cfg.Window)
|
||||||
|
keep := d.recent[:0]
|
||||||
|
for _, r := range d.recent {
|
||||||
|
if r.At.After(cut) {
|
||||||
|
keep = append(keep, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.recent = keep
|
||||||
|
}
|
||||||
|
|
||||||
|
// evaluate decides whether a band's recent spots look like one opening.
|
||||||
|
func evaluate(band string, spots []Spot, cfg Config) *Opening {
|
||||||
|
// Distinct callsigns, not spot count: one station spotted by six skimmers is
|
||||||
|
// six spots and one station, and it is not an opening.
|
||||||
|
seen := map[string]Spot{}
|
||||||
|
for _, s := range spots {
|
||||||
|
c := strings.ToUpper(strings.TrimSpace(s.Call))
|
||||||
|
if c == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, dup := seen[c]; !dup {
|
||||||
|
seen[c] = s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(seen) < cfg.MinCalls {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
bearings := make([]int, 0, len(seen))
|
||||||
|
dists := make([]int, 0, len(seen))
|
||||||
|
calls := make([]string, 0, len(seen))
|
||||||
|
for c, s := range seen {
|
||||||
|
bearings = append(bearings, ((s.Bearing%360)+360)%360)
|
||||||
|
dists = append(dists, s.DistKm)
|
||||||
|
calls = append(calls, c)
|
||||||
|
}
|
||||||
|
lo, hi, spread := arc(bearings)
|
||||||
|
if spread > cfg.BearingSpread {
|
||||||
|
return nil // spots all round the compass — a busy band, not an opening
|
||||||
|
}
|
||||||
|
sort.Ints(dists)
|
||||||
|
sort.Strings(calls)
|
||||||
|
if len(calls) > 5 {
|
||||||
|
calls = calls[:5]
|
||||||
|
}
|
||||||
|
return &Opening{
|
||||||
|
Band: band, Calls: len(seen), MedianKm: dists[len(dists)/2],
|
||||||
|
BearingMin: lo, BearingMax: hi, Examples: calls,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// arc returns the smallest compass sector containing every bearing, coping with
|
||||||
|
// the wrap at north: 350° and 10° are 20° apart, not 340°.
|
||||||
|
func arc(b []int) (lo, hi, spread int) {
|
||||||
|
if len(b) == 0 {
|
||||||
|
return 0, 0, 0
|
||||||
|
}
|
||||||
|
s := append([]int(nil), b...)
|
||||||
|
sort.Ints(s)
|
||||||
|
// The widest GAP between consecutive bearings (round the circle) is the part
|
||||||
|
// NOT covered; the sector is everything else.
|
||||||
|
worst, at := -1, 0
|
||||||
|
for i := range s {
|
||||||
|
next := s[(i+1)%len(s)]
|
||||||
|
gap := next - s[i]
|
||||||
|
if i == len(s)-1 {
|
||||||
|
gap = next + 360 - s[i]
|
||||||
|
}
|
||||||
|
if gap > worst {
|
||||||
|
worst, at = gap, i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lo = s[(at+1)%len(s)]
|
||||||
|
hi = s[at]
|
||||||
|
spread = 360 - worst
|
||||||
|
return lo, hi, spread
|
||||||
|
}
|
||||||
|
|
||||||
|
// InSeason reports whether the time of year is one where sporadic E is common
|
||||||
|
// at the operator's latitude.
|
||||||
|
//
|
||||||
|
// Each hemisphere has a strong summer peak AND a smaller winter one, and both
|
||||||
|
// count as expected: a December opening in Europe surprises nobody. What the
|
||||||
|
// label marks is the genuinely odd month — an equinox opening.
|
||||||
|
//
|
||||||
|
// This LABELS a detection, it never gates one. Out-of-season Es exists, and it
|
||||||
|
// is precisely the opening an operator must not be told about last.
|
||||||
|
func InSeason(band string, t time.Time, lat float64) bool {
|
||||||
|
m := t.UTC().Month()
|
||||||
|
var months map[time.Month]bool
|
||||||
|
if lat >= 0 {
|
||||||
|
months = map[time.Month]bool{
|
||||||
|
time.May: true, time.June: true, time.July: true, time.August: true, // main
|
||||||
|
time.December: true, time.January: true, // lesser winter peak
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
months = map[time.Month]bool{
|
||||||
|
time.November: true, time.December: true, time.January: true, time.February: true,
|
||||||
|
time.June: true, time.July: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return months[m]
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sector renders the bearing range for a human, e.g. "NE (35–75°)".
|
||||||
|
func (o *Opening) Sector() string {
|
||||||
|
return compass(float64(o.BearingMin+o.BearingMax)/2) +
|
||||||
|
" (" + strconv.Itoa(o.BearingMin) + "–" + strconv.Itoa(o.BearingMax) + "°)"
|
||||||
|
}
|
||||||
|
|
||||||
|
func compass(deg float64) string {
|
||||||
|
names := []string{"N", "NE", "E", "SE", "S", "SW", "W", "NW"}
|
||||||
|
i := int(math.Round(deg/45)) % 8
|
||||||
|
if i < 0 {
|
||||||
|
i += 8
|
||||||
|
}
|
||||||
|
return names[i]
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
package bandopen
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func at(min int) time.Time {
|
||||||
|
return time.Date(2026, time.June, 15, 12, min, 0, 0, time.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
// feed pushes spots and returns the last Opening produced, if any.
|
||||||
|
func feed(d *Detector, lat float64, spots ...Spot) *Opening {
|
||||||
|
var last *Opening
|
||||||
|
for _, s := range spots {
|
||||||
|
if o := d.Add(s, lat); o != nil {
|
||||||
|
last = o
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return last
|
||||||
|
}
|
||||||
|
|
||||||
|
// The signature that must fire: several distinct stations, single-hop range,
|
||||||
|
// one bearing sector, within the window.
|
||||||
|
func TestDetectsSingleHopEs(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
o := feed(d, 46,
|
||||||
|
Spot{Call: "I0ABC", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||||
|
Spot{Call: "IK1DEF", Band: "6m", DistKm: 900, Bearing: 150, At: at(1)},
|
||||||
|
Spot{Call: "9A2GHI", Band: "6m", DistKm: 1200, Bearing: 120, At: at(2)},
|
||||||
|
Spot{Call: "S51JKL", Band: "6m", DistKm: 1000, Bearing: 130, At: at(3)},
|
||||||
|
)
|
||||||
|
if o == nil {
|
||||||
|
t.Fatal("four stations at single-hop range in one sector must read as an opening")
|
||||||
|
}
|
||||||
|
if o.Band != "6m" || o.Calls != 4 {
|
||||||
|
t.Errorf("got band=%s calls=%d, want 6m/4", o.Band, o.Calls)
|
||||||
|
}
|
||||||
|
if o.MedianKm < 900 || o.MedianKm > 1200 {
|
||||||
|
t.Errorf("median %d km outside the fed range", o.MedianKm)
|
||||||
|
}
|
||||||
|
if !o.InSeason {
|
||||||
|
t.Error("June in the northern hemisphere is Es season")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spots all round the compass are a busy band, not an opening — the bearing
|
||||||
|
// test is what separates the two.
|
||||||
|
func TestScatteredBearingsAreNotAnOpening(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
if o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 10, At: at(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 110, At: at(1)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 210, At: at(2)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 300, At: at(3)},
|
||||||
|
); o != nil {
|
||||||
|
t.Errorf("bearings spread round the compass must not fire (got %+v)", o)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One station spotted by six skimmers is six spots and one station.
|
||||||
|
func TestRepeatedSpotsOfOneStationDoNotFire(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
var spots []Spot
|
||||||
|
for i := 0; i < 6; i++ {
|
||||||
|
spots = append(spots, Spot{Call: "I0ABC", Band: "6m", DistKm: 1100, Bearing: 140, At: at(i)})
|
||||||
|
}
|
||||||
|
if o := feed(d, 46, spots...); o != nil {
|
||||||
|
t.Error("one distinct callsign is not an opening however often it is spotted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Out of the single-hop window there is nothing to conclude: under ~500 km a
|
||||||
|
// 6 m contact is ordinary tropo.
|
||||||
|
func TestTropoRangeIsIgnored(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
if o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 120, Bearing: 140, At: at(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 200, Bearing: 145, At: at(1)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 90, Bearing: 150, At: at(2)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 150, Bearing: 135, At: at(3)},
|
||||||
|
); o != nil {
|
||||||
|
t.Error("short-range spots must not read as sporadic E")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spread over more than the window is not one burst.
|
||||||
|
func TestSpotsOutsideTheWindowDoNotAccumulate(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
if o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: at(20)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: at(40)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: at(60)},
|
||||||
|
); o != nil {
|
||||||
|
t.Error("spots an hour apart are not one opening")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// HF is never announced: an "opening" on 20 m is the band's normal state.
|
||||||
|
func TestHFIsNotWatched(t *testing.T) {
|
||||||
|
if Watched("20m") || Watched("40m") {
|
||||||
|
t.Error("HF must not be watched")
|
||||||
|
}
|
||||||
|
if !Watched("6m") || !Watched("2m") || !Watched("4m") {
|
||||||
|
t.Error("6/4/2 m must be watched")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Announced once, then quiet — an opening lasts hours and produces hundreds of
|
||||||
|
// spots; one alert is information, forty is noise.
|
||||||
|
func TestOneAnnouncementPerOpening(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := []Spot{
|
||||||
|
{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||||
|
{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: at(1)},
|
||||||
|
{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: at(2)},
|
||||||
|
{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: at(3)},
|
||||||
|
}
|
||||||
|
if o := feed(d, 46, base...); o == nil {
|
||||||
|
t.Fatal("expected the first opening")
|
||||||
|
}
|
||||||
|
if o := d.Add(Spot{Call: "E", Band: "6m", DistKm: 1050, Bearing: 135, At: at(4)}, 46); o != nil {
|
||||||
|
t.Error("a second alert inside the quiet period is noise")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Out-of-season openings still fire — they are the ones worth knowing about —
|
||||||
|
// and are simply labelled as unusual.
|
||||||
|
func TestOutOfSeasonStillFiresButIsLabelled(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
nov := func(m int) time.Time { return time.Date(2026, time.November, 3, 9, m, 0, 0, time.UTC) }
|
||||||
|
o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: nov(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: nov(1)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: nov(2)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: nov(3)},
|
||||||
|
)
|
||||||
|
if o == nil {
|
||||||
|
t.Fatal("an out-of-season opening must still be announced")
|
||||||
|
}
|
||||||
|
if o.InSeason {
|
||||||
|
t.Error("November in the north is not Es season — it must be flagged unusual")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Both hemispheres have a summer peak and a lesser winter one, and both read as
|
||||||
|
// expected. What must come out as UNUSUAL is an equinox month.
|
||||||
|
func TestSeasonFollowsTheHemisphere(t *testing.T) {
|
||||||
|
on := func(m time.Month) time.Time { return time.Date(2026, m, 15, 0, 0, 0, 0, time.UTC) }
|
||||||
|
const north, south = 46.0, -33.0
|
||||||
|
|
||||||
|
if !InSeason("6m", on(time.June), north) {
|
||||||
|
t.Error("June is the northern main season")
|
||||||
|
}
|
||||||
|
if !InSeason("6m", on(time.December), north) {
|
||||||
|
t.Error("December is the northern winter peak — not a surprise")
|
||||||
|
}
|
||||||
|
if !InSeason("6m", on(time.December), south) {
|
||||||
|
t.Error("December is the southern main season")
|
||||||
|
}
|
||||||
|
if !InSeason("6m", on(time.June), south) {
|
||||||
|
t.Error("June is the southern winter peak")
|
||||||
|
}
|
||||||
|
// The equinoxes are the quiet months in both hemispheres.
|
||||||
|
for _, lat := range []float64{north, south} {
|
||||||
|
for _, m := range []time.Month{time.March, time.April, time.September, time.October} {
|
||||||
|
if InSeason("6m", on(m), lat) {
|
||||||
|
t.Errorf("%v at lat %.0f should read as unusual", m, lat)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The sector must cope with the wrap at north: 350° and 10° are 20° apart.
|
||||||
|
func TestBearingArcWrapsAtNorth(t *testing.T) {
|
||||||
|
lo, hi, spread := arc([]int{350, 10, 0, 355})
|
||||||
|
if spread > 30 {
|
||||||
|
t.Errorf("spread %d° across north should be small (lo=%d hi=%d)", spread, lo, hi)
|
||||||
|
}
|
||||||
|
if _, _, s := arc([]int{0, 90, 180, 270}); s < 270 {
|
||||||
|
t.Errorf("bearings on all four quadrants should span nearly the circle, got %d", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -233,6 +233,9 @@ th,td{padding:.45rem .6rem;text-align:left;border-bottom:1px solid var(--line);w
|
|||||||
th{position:sticky;top:0;background:var(--head);font-size:.72rem;letter-spacing:.05em;
|
th{position:sticky;top:0;background:var(--head);font-size:.72rem;letter-spacing:.05em;
|
||||||
text-transform:uppercase;color:var(--mut);cursor:pointer;user-select:none}
|
text-transform:uppercase;color:var(--mut);cursor:pointer;user-select:none}
|
||||||
th:hover{color:var(--fg)}
|
th:hover{color:var(--fg)}
|
||||||
|
th::after{content:'';font-size:.7em;opacity:.7}
|
||||||
|
th[data-asc="1"]::after{content:' \25B2'}
|
||||||
|
th[data-asc="0"]::after{content:' \25BC'}
|
||||||
tbody tr:nth-child(even){background:var(--zebra)}
|
tbody tr:nth-child(even){background:var(--zebra)}
|
||||||
tbody tr:last-child td{border-bottom:0}
|
tbody tr:last-child td{border-bottom:0}
|
||||||
td.call{font-family:ui-monospace,Consolas,monospace;font-weight:700;color:var(--accent)}
|
td.call{font-family:ui-monospace,Consolas,monospace;font-weight:700;color:var(--accent)}
|
||||||
@@ -248,7 +251,9 @@ td.call{font-family:ui-monospace,Consolas,monospace;font-weight:700;color:var(--
|
|||||||
}
|
}
|
||||||
b.WriteString(`</tr></thead><tbody>`)
|
b.WriteString(`</tr></thead><tbody>`)
|
||||||
for i := range qsos {
|
for i := range qsos {
|
||||||
b.WriteString(`<tr>`)
|
// The row's position as published. Sorting is a view on top of it, so a
|
||||||
|
// third click can put the table back the way the operator first saw it.
|
||||||
|
b.WriteString(`<tr data-i="` + strconv.Itoa(i) + `">`)
|
||||||
for _, c := range cols {
|
for _, c := range cols {
|
||||||
cls := ""
|
cls := ""
|
||||||
if c.Key == "callsign" {
|
if c.Key == "callsign" {
|
||||||
@@ -262,23 +267,38 @@ td.call{font-family:ui-monospace,Consolas,monospace;font-weight:700;color:var(--
|
|||||||
<p class="foot">Generated by OpsLog</p>
|
<p class="foot">Generated by OpsLog</p>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
// Click a header to sort. Kept tiny and dependency-free: the page has to work
|
// Click a header to sort: ascending, descending, then back to the published
|
||||||
// offline and on any hosting.
|
// order. Kept tiny and dependency-free — the page has to work offline and on any
|
||||||
|
// hosting, so no library is loaded.
|
||||||
|
//
|
||||||
|
// NUM is deliberately strict: the whole cell must be a number. parseFloat alone
|
||||||
|
// accepts a numeric PREFIX, so "2026-08-10" became 2026 and every date in a year
|
||||||
|
// compared equal — the date column looked as though it simply would not sort.
|
||||||
|
// Callsigns starting with a digit (8B81SU) hit the same trap.
|
||||||
|
var NUM=/^[+-]?\d+(\.\d+)?$/;
|
||||||
document.querySelectorAll('th').forEach(function(th,i){
|
document.querySelectorAll('th').forEach(function(th,i){
|
||||||
th.addEventListener('click',function(){
|
th.addEventListener('click',function(){
|
||||||
var tb=th.closest('table').tBodies[0],
|
var tb=th.closest('table').tBodies[0],
|
||||||
rows=Array.prototype.slice.call(tb.rows),
|
rows=Array.prototype.slice.call(tb.rows),
|
||||||
asc=th.dataset.asc!=='1';
|
cur=th.dataset.asc,
|
||||||
|
next=cur===undefined?'1':(cur==='1'?'0':'');
|
||||||
|
if(next===''){
|
||||||
|
// Third click: restore the order the page was published in.
|
||||||
|
rows.sort(function(a,b){return a.dataset.i-b.dataset.i});
|
||||||
|
}else{
|
||||||
|
var asc=next==='1';
|
||||||
rows.sort(function(a,b){
|
rows.sort(function(a,b){
|
||||||
var x=a.cells[i].textContent.trim(), y=b.cells[i].textContent.trim(),
|
var x=a.cells[i].textContent.trim(), y=b.cells[i].textContent.trim();
|
||||||
nx=parseFloat(x), ny=parseFloat(y),
|
// Blanks always sink, whichever way the column is pointing: an empty
|
||||||
n=!isNaN(nx)&&!isNaN(ny)&&x!==''&&y!=='';
|
// cell is missing data, not the smallest value.
|
||||||
var c=n?(nx-ny):x.localeCompare(y);
|
if(x===''||y==='') return x===y?0:(x===''?1:-1);
|
||||||
|
var c=NUM.test(x)&&NUM.test(y)?(parseFloat(x)-parseFloat(y)):x.localeCompare(y);
|
||||||
return asc?c:-c;
|
return asc?c:-c;
|
||||||
});
|
});
|
||||||
|
}
|
||||||
rows.forEach(function(r){tb.appendChild(r)});
|
rows.forEach(function(r){tb.appendChild(r)});
|
||||||
th.closest('tr').querySelectorAll('th').forEach(function(o){delete o.dataset.asc});
|
th.closest('tr').querySelectorAll('th').forEach(function(o){delete o.dataset.asc});
|
||||||
th.dataset.asc=asc?'1':'0';
|
if(next!=='') th.dataset.asc=next;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package webpub
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The published page carries its own sort script, so a regression there is
|
||||||
|
// silent: the table still renders, it just sorts wrongly. These pin the two
|
||||||
|
// things that were actually broken in the field.
|
||||||
|
|
||||||
|
func renderSample(t *testing.T) string {
|
||||||
|
t.Helper()
|
||||||
|
cfg := Config{Columns: []string{"qso_date", "callsign", "freq"}}
|
||||||
|
cfg.Normalise()
|
||||||
|
qsos := []qso.QSO{
|
||||||
|
{Callsign: "8B81SU", QSODate: time.Date(2026, 8, 10, 9, 56, 0, 0, time.UTC)},
|
||||||
|
{Callsign: "LZ8NG", QSODate: time.Date(2025, 12, 31, 23, 1, 0, 0, time.UTC)},
|
||||||
|
}
|
||||||
|
return string(renderHTML(cfg, columnsFor(cfg.Columns), qsos, "F4BPO"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// A third click restores the published order, which is only possible if each row
|
||||||
|
// remembers where it started.
|
||||||
|
func TestRowsCarryTheirPublishedIndex(t *testing.T) {
|
||||||
|
html := renderSample(t)
|
||||||
|
for _, want := range []string{`<tr data-i="0">`, `<tr data-i="1">`} {
|
||||||
|
if !strings.Contains(html, want) {
|
||||||
|
t.Errorf("published page is missing %s — the reset-to-original click cannot work", want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseFloat accepts a numeric PREFIX, so "2026-08-10" became 2026 and every
|
||||||
|
// date in the same year compared equal: the Date column looked unsortable.
|
||||||
|
// Callsigns starting with a digit ("8B81SU") hit the same trap. The whole cell
|
||||||
|
// must match for a numeric comparison to be used.
|
||||||
|
func TestSortScriptRejectsNumericPrefixes(t *testing.T) {
|
||||||
|
html := renderSample(t)
|
||||||
|
if !strings.Contains(html, `var NUM=/^[+-]?\d+(\.\d+)?$/;`) {
|
||||||
|
t.Error("the anchored numeric test is gone; a bare parseFloat makes dates and 8-prefixed calls sort as equal")
|
||||||
|
}
|
||||||
|
if strings.Contains(html, "n=!isNaN(nx)&&!isNaN(ny)") {
|
||||||
|
t.Error("the old prefix-tolerant numeric detection is back")
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||||
appVersion = "0.24.2"
|
appVersion = "0.24.3"
|
||||||
|
|
||||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||||
// to https://us.i.posthog.com for a US project.
|
// to https://us.i.posthog.com for a US project.
|
||||||
|
|||||||
Reference in New Issue
Block a user