Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db87ef39c0 | ||
|
|
3ce930e9cc | ||
|
|
aca4dc5678 | ||
|
|
c495dced0f | ||
|
|
1b736272c9 | ||
|
|
05fc8ad80c | ||
|
|
4e88bdfaa7 | ||
|
|
30143b01bf | ||
|
|
fbd62fda30 | ||
|
|
ab0db0ef3a | ||
|
|
380472bda8 | ||
|
|
4e2a5877d6 | ||
|
|
d44a971acf | ||
|
|
fabd1becce | ||
|
|
345be94c65 | ||
|
|
d0c6e420d2 | ||
|
|
f0026b8bd3 | ||
|
|
2007479da6 | ||
|
|
4ba5569ca8 | ||
|
|
dc0b00b474 | ||
|
|
2695747db6 | ||
|
|
eba54344b0 | ||
|
|
93879a0ce1 | ||
|
|
8fccfa29b1 | ||
|
|
784d809290 | ||
|
|
700b688fc0 | ||
|
|
03598cfaff | ||
|
|
ed517eb8d3 | ||
|
|
1cfba19ed2 | ||
|
|
b18f5c491e | ||
|
|
741364bf99 | ||
|
|
d0f06d9670 | ||
|
|
8e49d37cbd | ||
|
|
b2382a6135 | ||
|
|
f8fb57210f | ||
|
|
8762131248 | ||
|
|
e5f79b18c2 | ||
|
|
1605e30f60 | ||
|
|
6aff322be6 | ||
|
|
ed3c132f70 | ||
|
|
385e8c4c86 | ||
|
|
61e5736f1e | ||
|
|
6ca808a6c9 | ||
|
|
f698096f53 | ||
|
|
ef628e066a | ||
|
|
4ffdfc2548 | ||
|
|
83e7727aab | ||
|
|
1348dc2177 | ||
|
|
57ac382f91 | ||
|
|
858c04d267 | ||
|
|
2484cd2515 | ||
|
|
62256942a1 | ||
|
|
3c8aadf41f | ||
|
|
2f5fd63afd | ||
|
|
4f3c3edaee | ||
|
|
7d33379fe1 | ||
|
|
82a49150d2 | ||
|
|
1ef9e553f7 | ||
|
|
39fab68bd4 | ||
|
|
bbddba6e74 | ||
|
|
b659f6f16d | ||
|
|
b4ad12bdc6 | ||
|
|
5dd3532074 | ||
|
|
dd7b63c059 | ||
|
|
8fc6673611 | ||
|
|
d33291b521 | ||
|
|
1b32b1ddec | ||
|
|
65bbaa85f3 | ||
|
|
99d903eb44 | ||
|
|
13515c58c0 | ||
|
|
e4014e11d2 | ||
|
|
025472820b | ||
|
|
8b66030c89 | ||
|
|
d4f23a52af | ||
|
|
b4b9674d8c | ||
|
|
f7d2de0777 | ||
|
|
344e8b2091 | ||
|
|
c5e0ec9033 | ||
|
|
210a99983e | ||
|
|
2a6e09a1d7 | ||
|
|
1b7f8ec9c1 | ||
|
|
75a2f73992 | ||
|
|
deee8c4618 | ||
|
|
92a5f30ac0 | ||
|
|
d3a405f4f6 | ||
|
|
f7b9bfd0bc | ||
|
|
102097c5c4 | ||
|
|
3b90ef6b7a | ||
|
|
839cf0aafd | ||
|
|
9fd801ea69 | ||
|
|
298c2fde44 | ||
|
|
78e99afc63 | ||
|
|
740f007395 | ||
|
|
43095a1d89 | ||
|
|
fa01968207 | ||
|
|
91452cefc0 | ||
|
|
904b451951 | ||
|
|
c4d90e6880 | ||
|
|
1ac00c101e | ||
|
|
e107b0b741 | ||
|
|
24668d5981 | ||
|
|
8aa0e39aff | ||
|
|
96c99f0ae6 | ||
|
|
0550ecdac3 | ||
|
|
9c33feecfa | ||
|
|
8afba2c4e8 | ||
|
|
2d3bfa704e | ||
|
|
29bdea1e43 | ||
|
|
b93c67f3cb | ||
|
|
735dfe69db | ||
|
|
67fe5bcff0 | ||
|
|
d36d431d9a | ||
|
|
0c8d79e2fa | ||
|
|
796a1d8e7d | ||
|
|
9531a54ac1 | ||
|
|
d2d64706f5 | ||
|
|
cfdd24d52e | ||
|
|
8052bd2935 | ||
|
|
55879809f2 | ||
|
|
6969560efb | ||
|
|
7eff19f6e2 | ||
|
|
e0dfa53f54 | ||
|
|
4f87cedc2c | ||
|
|
d273d21f1a | ||
|
|
bde136b98b | ||
|
|
ae7472a67d | ||
|
|
0d48dbfd17 | ||
|
|
d6ed9f03eb | ||
|
|
c95a1137fc | ||
|
|
d41352a3a5 | ||
|
|
9b2115be8f | ||
|
|
0a8c1ac45f | ||
|
|
6497568813 | ||
|
|
9f62808392 | ||
|
|
9d8b69d804 | ||
|
|
6825af135a | ||
|
|
ca42fd90f9 | ||
|
|
18a583901c | ||
|
|
2cb1add3db | ||
|
|
a3815c24a1 | ||
|
|
f6f5235a8b | ||
|
|
86a644863a | ||
|
|
dd9fddbc5b | ||
|
|
74acf88976 | ||
|
|
da9c76e161 | ||
|
|
fb78b1c052 | ||
|
|
e51abd262e | ||
|
|
0ec855d95a | ||
|
|
ae06495f91 | ||
|
|
4dd2c3b997 |
@@ -0,0 +1,63 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The coupling is a SET, not a global switch.
|
||||||
|
//
|
||||||
|
// A station can run a combiner pair AND a third amplifier that has nothing to
|
||||||
|
// do with it — two SPE on the combiner, a PowerGenius on another antenna. A
|
||||||
|
// global flag would send that third one into OPERATE alongside them.
|
||||||
|
func TestAmpTargetsFollowTheGroup(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
a.ampInsts = map[string]*ampInst{"spe1": {}, "spe2": {}, "pgxl": {}}
|
||||||
|
group := []string{"spe1", "spe2"}
|
||||||
|
|
||||||
|
// A member commands the whole group, itself first.
|
||||||
|
got := a.ampTargets("spe2", group)
|
||||||
|
if len(got) != 2 || got[0] != "spe2" || got[1] != "spe1" {
|
||||||
|
t.Errorf("member = %v, want [spe2 spe1] — the clicked one first", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The amplifier OUTSIDE the group keeps its buttons to itself.
|
||||||
|
if got := a.ampTargets("pgxl", group); len(got) != 1 || got[0] != "pgxl" {
|
||||||
|
t.Errorf("outsider = %v, want just [pgxl]", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// No group at all: everyone is on their own.
|
||||||
|
if got := a.ampTargets("spe1", nil); len(got) != 1 || got[0] != "spe1" {
|
||||||
|
t.Errorf("no group = %v, want just [spe1]", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A group remembering an amplifier that is gone must not carry it: it would
|
||||||
|
// fail the command for a member that no longer exists.
|
||||||
|
if got := a.ampTargets("spe1", []string{"spe1", "deleted"}); len(got) != 1 || got[0] != "spe1" {
|
||||||
|
t.Errorf("stale member = %v, want it dropped", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One amplifier coupled to itself is not a group — storing it would make every
|
||||||
|
// command fan out to a single member for ever, which is just noise.
|
||||||
|
func TestLinkedAmpsNeedsTwo(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
in []string
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{[]string{"a", "b"}, 2},
|
||||||
|
{[]string{"a"}, 0},
|
||||||
|
{[]string{" ", "a"}, 0}, // blanks are not members
|
||||||
|
{nil, 0},
|
||||||
|
} {
|
||||||
|
clean := make([]string, 0, len(tc.in))
|
||||||
|
for _, id := range tc.in {
|
||||||
|
if id != "" && id != " " {
|
||||||
|
clean = append(clean, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(clean) < 2 {
|
||||||
|
clean = nil
|
||||||
|
}
|
||||||
|
if len(clean) != tc.want {
|
||||||
|
t.Errorf("SetLinkedAmps(%v) would keep %d, want %d", tc.in, len(clean), tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,6 +16,8 @@ var deniedCallHashes = map[string]struct{}{
|
|||||||
"2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {},
|
"2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {},
|
||||||
"0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {},
|
"0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {},
|
||||||
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
||||||
|
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
||||||
|
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
||||||
|
|||||||
@@ -748,3 +748,165 @@ func sampleQSO() qso.QSO {
|
|||||||
QSLMsg: "TNX FB QSO — 73!",
|
QSLMsg: "TNX FB QSO — 73!",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// QSLForeignTemplate is one card design belonging to ANOTHER profile, offered
|
||||||
|
// for copying into the active one.
|
||||||
|
type QSLForeignTemplate struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
ProfileID int64 `json:"profile_id"`
|
||||||
|
ProfileName string `json:"profile_name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// QSLListOtherProfileTemplates lists the designs the ACTIVE profile cannot see.
|
||||||
|
//
|
||||||
|
// A second profile is usually the same operator with a different rig or a
|
||||||
|
// different locator — same callsign, same cards. Redrawing a design because the
|
||||||
|
// antenna changed is work nobody should have to do, and the designs a profile
|
||||||
|
// already sees (its own, and the shared ones) are deliberately left out: they
|
||||||
|
// are not something to copy.
|
||||||
|
func (a *App) QSLListOtherProfileTemplates() ([]QSLForeignTemplate, error) {
|
||||||
|
if a.qslTemplates == nil || a.profiles == nil {
|
||||||
|
return nil, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
active := int64(-1)
|
||||||
|
if p, err := a.profiles.Active(a.ctx); err == nil {
|
||||||
|
active = p.ID
|
||||||
|
}
|
||||||
|
names := map[int64]string{}
|
||||||
|
if list, err := a.ListProfiles(); err == nil {
|
||||||
|
for _, p := range list {
|
||||||
|
names[p.ID] = p.Name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
all, err := a.qslTemplates.List(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out := []QSLForeignTemplate{}
|
||||||
|
for _, r := range all {
|
||||||
|
// Shared designs (no profile) already appear in every profile's list.
|
||||||
|
if r.ProfileID == nil || *r.ProfileID == active {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, QSLForeignTemplate{
|
||||||
|
ID: r.ID, Name: r.Name, ProfileID: *r.ProfileID,
|
||||||
|
ProfileName: firstNonEmptyStr(names[*r.ProfileID], fmt.Sprintf("profile %d", *r.ProfileID)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// QSLCopyTemplateToActiveProfile duplicates another profile's design into the
|
||||||
|
// active one and returns the new id.
|
||||||
|
//
|
||||||
|
// A COPY, not a move or a share. The original profile keeps its design
|
||||||
|
// untouched, and the copy is free to diverge — a second profile usually exists
|
||||||
|
// because something differs, and that something often ends up on the card.
|
||||||
|
func (a *App) QSLCopyTemplateToActiveProfile(id int64) (int64, error) {
|
||||||
|
if a.qslTemplates == nil {
|
||||||
|
return 0, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
src, err := a.qslTemplates.Get(a.ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
// The stored document references photos by NAME, relative to the template's
|
||||||
|
// own asset folder — so copying the JSON alone would point the new design at
|
||||||
|
// files that are not in its folder, and the save would fail validation.
|
||||||
|
//
|
||||||
|
// The files are copied too, giving the duplicate its own folder. Sharing the
|
||||||
|
// source's would mean deleting one design silently emptied the other.
|
||||||
|
rec := qslcard.Record{Name: src.Name + " (copy)", JSON: src.JSON}
|
||||||
|
if p, e := a.profiles.Active(a.ctx); e == nil {
|
||||||
|
rec.ProfileID = &p.ID
|
||||||
|
}
|
||||||
|
// Saved first: a new template needs its id before it can own a folder.
|
||||||
|
if err := a.qslTemplates.Save(a.ctx, &rec); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
srcDir := qslcard.TemplateDir(a.qslDir(), id)
|
||||||
|
dstDir := qslcard.TemplateDir(a.qslDir(), rec.ID)
|
||||||
|
// A design with no pictures at all has no folder, and that is not a failure.
|
||||||
|
// Anything else IS: this used to be written as "ignore os.IsNotExist", which
|
||||||
|
// also swallowed every ENOENT raised while copying — so a failed copy looked
|
||||||
|
// like a design that had nothing to copy, and the operator got "hero photo
|
||||||
|
// not found" with no clue why.
|
||||||
|
if _, statErr := os.Stat(srcDir); statErr == nil {
|
||||||
|
if err := copyDirContents(srcDir, dstDir); err != nil {
|
||||||
|
// Roll back rather than leave a design whose pictures are missing.
|
||||||
|
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
|
||||||
|
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
|
||||||
|
return 0, fmt.Errorf("copy template assets: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Every failure from here rolls back BOTH halves: deleting only the row would
|
||||||
|
// leave the copied pictures on disk under an id nothing refers to.
|
||||||
|
rollback := func() {
|
||||||
|
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
|
||||||
|
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
|
||||||
|
}
|
||||||
|
t, err := qslcard.Parse([]byte(rec.JSON))
|
||||||
|
if err != nil {
|
||||||
|
rollback()
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
if err := qslcard.Validate(t, qslcard.PhotoExistsIn(dstDir)); err != nil {
|
||||||
|
rollback()
|
||||||
|
return 0, fmt.Errorf("copied design is incomplete: %w", err)
|
||||||
|
}
|
||||||
|
applog.Printf("qsl: copied template %q (id %d) into the active profile as %q (id %d)",
|
||||||
|
src.Name, id, rec.Name, rec.ID)
|
||||||
|
return rec.ID, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// copyQSLTemplatesToProfile duplicates one profile's QSL designs into another,
|
||||||
|
// PICTURES INCLUDED.
|
||||||
|
//
|
||||||
|
// This was an INSERT … SELECT, which cloned the rows and nothing else. A design
|
||||||
|
// references its photos by name, relative to its own asset folder, so every
|
||||||
|
// duplicated design pointed at a folder that did not exist: no thumbnail in the
|
||||||
|
// designer, and nothing to print. The rows looked right, which is why it went
|
||||||
|
// unnoticed — the damage is entirely on disk.
|
||||||
|
//
|
||||||
|
// Row by row rather than in one statement, because each new design needs its id
|
||||||
|
// before it can own a folder. A design whose files cannot be copied is dropped
|
||||||
|
// rather than kept empty: an operator who sees the design listed will believe
|
||||||
|
// it works.
|
||||||
|
func (a *App) copyQSLTemplatesToProfile(fromProfile, toProfile int64) error {
|
||||||
|
if a.qslTemplates == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
all, err := a.qslTemplates.List(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, src := range all {
|
||||||
|
if src.ProfileID == nil || *src.ProfileID != fromProfile {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
rec := qslcard.Record{Name: src.Name, JSON: src.JSON, IsDefault: src.IsDefault}
|
||||||
|
to := toProfile
|
||||||
|
rec.ProfileID = &to
|
||||||
|
if err := a.qslTemplates.Save(a.ctx, &rec); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
srcDir := qslcard.TemplateDir(a.qslDir(), src.ID)
|
||||||
|
if _, statErr := os.Stat(srcDir); statErr != nil {
|
||||||
|
continue // a design with no pictures at all — nothing to carry over
|
||||||
|
}
|
||||||
|
if err := copyDirContents(srcDir, qslcard.TemplateDir(a.qslDir(), rec.ID)); err != nil {
|
||||||
|
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
|
||||||
|
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
|
||||||
|
return fmt.Errorf("copy assets of %q: %w", src.Name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstNonEmptyStr(a, b string) string {
|
||||||
|
if strings.TrimSpace(a) != "" {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ var sensitiveSettingKeys = map[string]bool{
|
|||||||
keyExtHRDLogCode: true,
|
keyExtHRDLogCode: true,
|
||||||
keyExtEQSLPassword: true,
|
keyExtEQSLPassword: true,
|
||||||
keyExtCloudlogAPIKey: true,
|
keyExtCloudlogAPIKey: true,
|
||||||
|
// The web-publish config is one JSON blob and the FTP password lives inside
|
||||||
|
// it, so the whole blob is encrypted. That costs nothing — it is read and
|
||||||
|
// written as a unit anyway — and beats storing a server password in clear
|
||||||
|
// next to the rest.
|
||||||
|
keyWebPublish: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
func isSensitiveSetting(key string) bool { return sensitiveSettingKeys[key] }
|
func isSensitiveSetting(key string) bool { return sensitiveSettingKeys[key] }
|
||||||
|
|||||||
+159
@@ -0,0 +1,159 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Row colouring for the log grid, by QSL / LoTW status — the thing Logger32 does
|
||||||
|
// and the reason an operator can tell at a glance what still needs sending.
|
||||||
|
//
|
||||||
|
// Rules are ORDERED and the first match wins, because a contact is usually
|
||||||
|
// several things at once: one confirmed on LoTW and by card is confirmed, not
|
||||||
|
// "sent, awaiting reply". Putting the order in the data rather than in a chain
|
||||||
|
// of ifs is what lets the settings panel show it in the same order it applies.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RowColorRule is one status and the colour it paints.
|
||||||
|
type RowColorRule struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Color string `json:"color"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz.
|
||||||
|
//
|
||||||
|
// Empty means ALL of them — what an operator expects from a rule they have
|
||||||
|
// not narrowed, and what keeps a config written before this field meaningful.
|
||||||
|
Channels []string `json:"channels"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// The QSL channels a rule can be scoped to.
|
||||||
|
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz"}
|
||||||
|
|
||||||
|
// RowColorSettings is the whole appearance block.
|
||||||
|
type RowColorSettings struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
// Style is how the colour is shown: "bar" paints a stripe down the left edge,
|
||||||
|
// "tint" washes the row, "both" does each.
|
||||||
|
//
|
||||||
|
// A bar is the default because a filled row is a poor signal in a log where
|
||||||
|
// nearly every contact has SOME QSL state: colour that is always present
|
||||||
|
// stops being information and becomes a striped background, with the data
|
||||||
|
// behind it. The stripe says the same thing and costs nothing to read.
|
||||||
|
Style string `json:"style"`
|
||||||
|
// Intensity is the tint strength in percent. Only used by "tint"/"both".
|
||||||
|
Intensity int `json:"intensity"`
|
||||||
|
// BandMapLotw marks stations that upload to LoTW on the band map, with the
|
||||||
|
// same "L" badge the cluster list uses — one visual vocabulary across the two
|
||||||
|
// views rather than a second invention.
|
||||||
|
BandMapLotw bool `json:"bandmap_lotw"`
|
||||||
|
// Configured distinguishes "saved with this off" from "saved before the
|
||||||
|
// option existed", so a new marker can default ON without silently turning
|
||||||
|
// itself back on for an operator who switched it off.
|
||||||
|
Configured bool `json:"configured"`
|
||||||
|
Rules []RowColorRule `json:"rules"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// The rule ids, in priority order. The frontend matches on these and holds the
|
||||||
|
// labels, so a translated name never has to travel through the settings.
|
||||||
|
// The four categories, in the order they are tested — first match wins.
|
||||||
|
//
|
||||||
|
// "To send" comes FIRST on purpose. A contact can be confirmed on LoTW and
|
||||||
|
// still owe a paper card, and the colour an operator scans for is the one that
|
||||||
|
// means "there is something left to do here". Put after "confirmed", that row
|
||||||
|
// would go green and the card would never be printed.
|
||||||
|
//
|
||||||
|
// "Worked" is the catch-all: a contact with nothing sent, nothing asked for and
|
||||||
|
// nothing back. Off by default — with it on, every remaining row is painted.
|
||||||
|
var rowColorOrder = []string{
|
||||||
|
"to_send", // requested or queued on a watched channel, not gone out
|
||||||
|
"confirmed", // a watched channel has a confirmation back
|
||||||
|
"sent", // gone out on a watched channel, nothing back yet
|
||||||
|
"worked", // none of the above
|
||||||
|
}
|
||||||
|
|
||||||
|
// Defaults: green for done, amber for waiting, blue for owed. Deliberately
|
||||||
|
// muted — they are composited at low opacity over a dark grid, and a saturated
|
||||||
|
// value there reads as an error state rather than a status.
|
||||||
|
var rowColorDefaults = map[string]string{
|
||||||
|
"to_send": "#a855f7",
|
||||||
|
"confirmed": "#16a34a",
|
||||||
|
"sent": "#f59e0b",
|
||||||
|
"worked": "#64748b",
|
||||||
|
}
|
||||||
|
|
||||||
|
// hexColor guards what reaches the stylesheet. The value is interpolated into a
|
||||||
|
// CSS color-mix() by the grid, so anything that is not plainly a hex colour is
|
||||||
|
// refused rather than passed through.
|
||||||
|
var hexColor = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
|
||||||
|
|
||||||
|
func normRowColors(s RowColorSettings) RowColorSettings {
|
||||||
|
byID := map[string]RowColorRule{}
|
||||||
|
for _, r := range s.Rules {
|
||||||
|
byID[r.ID] = r
|
||||||
|
}
|
||||||
|
out := RowColorSettings{
|
||||||
|
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
||||||
|
BandMapLotw: s.BandMapLotw, Configured: true,
|
||||||
|
}
|
||||||
|
if !s.Configured {
|
||||||
|
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
||||||
|
}
|
||||||
|
switch out.Style {
|
||||||
|
case "bar", "tint", "both":
|
||||||
|
default:
|
||||||
|
out.Style = "bar"
|
||||||
|
}
|
||||||
|
// Clamped rather than rejected: the value only shapes a colour-mix, and a
|
||||||
|
// number outside the range is a slider that got away, not a fault worth
|
||||||
|
// resetting the operator's whole choice for.
|
||||||
|
if out.Intensity < 5 {
|
||||||
|
out.Intensity = 12
|
||||||
|
} else if out.Intensity > 45 {
|
||||||
|
out.Intensity = 45
|
||||||
|
}
|
||||||
|
ok := map[string]bool{}
|
||||||
|
for _, c := range rowColorChannels {
|
||||||
|
ok[c] = true
|
||||||
|
}
|
||||||
|
for _, id := range rowColorOrder {
|
||||||
|
r := byID[id]
|
||||||
|
r.ID = id
|
||||||
|
if !hexColor.MatchString(strings.TrimSpace(r.Color)) {
|
||||||
|
r.Color = rowColorDefaults[id]
|
||||||
|
}
|
||||||
|
// Keep only channels we know, in the canonical order, de-duplicated.
|
||||||
|
want := map[string]bool{}
|
||||||
|
for _, c := range r.Channels {
|
||||||
|
want[strings.ToLower(strings.TrimSpace(c))] = true
|
||||||
|
}
|
||||||
|
chans := []string{}
|
||||||
|
for _, c := range rowColorChannels {
|
||||||
|
if want[c] {
|
||||||
|
chans = append(chans, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
r.Channels = chans
|
||||||
|
out.Rules = append(out.Rules, r)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRowColors returns the row-colouring configuration, defaults included so the
|
||||||
|
// panel never has to invent one.
|
||||||
|
func (a *App) GetRowColors() RowColorSettings {
|
||||||
|
var s RowColorSettings
|
||||||
|
if raw := a.settingOr(keyRowColors, ""); raw != "" {
|
||||||
|
_ = json.Unmarshal([]byte(raw), &s)
|
||||||
|
}
|
||||||
|
return normRowColors(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveRowColors persists it.
|
||||||
|
func (a *App) SaveRowColors(s RowColorSettings) error {
|
||||||
|
b, err := json.Marshal(normRowColors(s))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.setSetting(keyRowColors, string(b))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The colour is interpolated into a CSS color-mix() by the grid, so anything
|
||||||
|
// that is not plainly a hex colour has to be refused rather than passed on.
|
||||||
|
func TestRowColorsRefuseAnythingButHex(t *testing.T) {
|
||||||
|
in := RowColorSettings{Enabled: true, Rules: []RowColorRule{
|
||||||
|
{ID: "confirmed", Color: "#123abc", Enabled: true},
|
||||||
|
{ID: "sent", Color: "red; background:url(x)", Enabled: true},
|
||||||
|
{ID: "to_send", Color: "", Enabled: true},
|
||||||
|
}}
|
||||||
|
got := normRowColors(in)
|
||||||
|
|
||||||
|
byID := map[string]RowColorRule{}
|
||||||
|
for _, r := range got.Rules {
|
||||||
|
byID[r.ID] = r
|
||||||
|
}
|
||||||
|
if byID["confirmed"].Color != "#123abc" {
|
||||||
|
t.Errorf("a valid colour was rewritten: %q", byID["confirmed"].Color)
|
||||||
|
}
|
||||||
|
if byID["sent"].Color != rowColorDefaults["sent"] {
|
||||||
|
t.Errorf("an injection attempt survived: %q", byID["sent"].Color)
|
||||||
|
}
|
||||||
|
if byID["to_send"].Color != rowColorDefaults["to_send"] {
|
||||||
|
t.Errorf("an empty colour was kept: %q", byID["to_send"].Color)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Priority lives in the data, not in a chain of ifs: a contact confirmed on
|
||||||
|
// LoTW AND by card is confirmed, not "sent, awaiting reply". The panel shows
|
||||||
|
// the rules in the order they apply, so that order must survive a round trip.
|
||||||
|
func TestRowColorsKeepPriorityOrder(t *testing.T) {
|
||||||
|
// Saved in a jumbled order, as a hand-edited settings row could be.
|
||||||
|
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||||
|
{ID: "to_send", Color: "#111111"},
|
||||||
|
{ID: "confirmed", Color: "#222222"},
|
||||||
|
}})
|
||||||
|
if len(got.Rules) != len(rowColorOrder) {
|
||||||
|
t.Fatalf("got %d rules, want every one present", len(got.Rules))
|
||||||
|
}
|
||||||
|
for i, id := range rowColorOrder {
|
||||||
|
if got.Rules[i].ID != id {
|
||||||
|
t.Errorf("rule %d is %q, want %q", i, got.Rules[i].ID, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// The saved colours survived the reordering: each stayed with its own rule.
|
||||||
|
byID := map[string]string{}
|
||||||
|
for _, r := range got.Rules {
|
||||||
|
byID[r.ID] = r.Color
|
||||||
|
}
|
||||||
|
if byID["to_send"] != "#111111" || byID["confirmed"] != "#222222" {
|
||||||
|
t.Errorf("colours moved between rules: %v", byID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Style and strength are normalised, not rejected: they only shape a colour, and
|
||||||
|
// a value that got away is a slider, not a fault worth resetting the operator's
|
||||||
|
// whole choice for.
|
||||||
|
func TestRowColorsNormaliseStyleAndIntensity(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
inStyle string
|
||||||
|
inPct int
|
||||||
|
wantStyle string
|
||||||
|
wantPct int
|
||||||
|
}{
|
||||||
|
{"bar", 12, "bar", 12},
|
||||||
|
{"tint", 30, "tint", 30},
|
||||||
|
{"both", 45, "both", 45},
|
||||||
|
{"", 0, "bar", 12}, // never configured
|
||||||
|
{"wallpaper", 12, "bar", 12}, // not a style we draw
|
||||||
|
{"tint", 900, "tint", 45}, // clamped, not reset
|
||||||
|
{"tint", -5, "tint", 12},
|
||||||
|
} {
|
||||||
|
got := normRowColors(RowColorSettings{Style: tc.inStyle, Intensity: tc.inPct})
|
||||||
|
if got.Style != tc.wantStyle || got.Intensity != tc.wantPct {
|
||||||
|
t.Errorf("(%q,%d) -> (%q,%d), want (%q,%d)",
|
||||||
|
tc.inStyle, tc.inPct, got.Style, got.Intensity, tc.wantStyle, tc.wantPct)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Channels are normalised to the canonical order, and anything unknown is
|
||||||
|
// dropped. Empty stays empty, because empty means "every channel" — a rule the
|
||||||
|
// operator has not narrowed must not silently become a rule about nothing.
|
||||||
|
func TestRowColorChannelsNormalise(t *testing.T) {
|
||||||
|
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||||
|
{ID: "confirmed", Color: "#111111", Channels: []string{"LOTW", "pigeon", "qsl", "lotw"}},
|
||||||
|
{ID: "sent", Color: "#222222"},
|
||||||
|
}})
|
||||||
|
byID := map[string][]string{}
|
||||||
|
for _, r := range got.Rules {
|
||||||
|
byID[r.ID] = r.Channels
|
||||||
|
}
|
||||||
|
if len(byID["confirmed"]) != 2 || byID["confirmed"][0] != "qsl" || byID["confirmed"][1] != "lotw" {
|
||||||
|
t.Errorf("confirmed channels = %v, want [qsl lotw] — canonical order, deduped, unknown dropped", byID["confirmed"])
|
||||||
|
}
|
||||||
|
if len(byID["sent"]) != 0 {
|
||||||
|
t.Errorf("sent channels = %v, want empty (meaning every channel)", byID["sent"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The order IS the priority, and "to send" leads. A contact confirmed on LoTW
|
||||||
|
// that still owes a paper card must read as owing the card — put after
|
||||||
|
// "confirmed" it would go green and never be printed.
|
||||||
|
func TestToSendOutranksConfirmed(t *testing.T) {
|
||||||
|
got := normRowColors(RowColorSettings{})
|
||||||
|
if got.Rules[0].ID != "to_send" {
|
||||||
|
t.Errorf("first rule is %q, want to_send", got.Rules[0].ID)
|
||||||
|
}
|
||||||
|
if got.Rules[len(got.Rules)-1].ID != "worked" {
|
||||||
|
t.Errorf("last rule is %q, want worked as the catch-all", got.Rules[len(got.Rules)-1].ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,260 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// The data sources band-opening detection depends on, and the settings that
|
||||||
|
// switch them on.
|
||||||
|
//
|
||||||
|
// The detection shipped reading whatever the operator's cluster nodes happened
|
||||||
|
// to carry. That was a design mistake of the worst kind: the feature depended
|
||||||
|
// on RBN feeds and a PSK Reporter subscription that nobody could know were
|
||||||
|
// needed, so it looked broken rather than unconfigured. Nexus showed a 6 m
|
||||||
|
// opening with 869 stations while OpsLog, on the same PC, showed nothing.
|
||||||
|
//
|
||||||
|
// So enabling the watch ARRANGES ITS OWN SOURCES: it adds the two RBN nodes if
|
||||||
|
// they are missing and brings the PSK Reporter feed up. Turning it off leaves
|
||||||
|
// the nodes alone — they may have been wanted for their own sake, and silently
|
||||||
|
// removing a cluster node an operator is using would be worse than leaving one
|
||||||
|
// they no longer need.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/bandopen"
|
||||||
|
"hamlog/internal/cluster"
|
||||||
|
"hamlog/internal/geo"
|
||||||
|
"hamlog/internal/gridcache"
|
||||||
|
"hamlog/internal/pskr"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
keyBandOpenEnabled = "bandopen.enabled"
|
||||||
|
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
|
||||||
|
)
|
||||||
|
|
||||||
|
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
|
||||||
|
// digital are separate ports and carry different skimmers.
|
||||||
|
var rbnNodes = []cluster.ServerConfig{
|
||||||
|
{Name: "RBN CW", Host: "telnet.reversebeacon.net", Port: 7000, Enabled: true},
|
||||||
|
{Name: "RBN FTx", Host: "telnet.reversebeacon.net", Port: 7001, Enabled: true},
|
||||||
|
}
|
||||||
|
|
||||||
|
// BandOpenSettings is the panel's shape.
|
||||||
|
type BandOpenSettings struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
Bands []string `json:"bands"`
|
||||||
|
// Available is every band that can be watched, so the UI does not carry its
|
||||||
|
// own copy of a list that belongs to the detector.
|
||||||
|
Available []string `json:"available"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) GetBandOpenSettings() BandOpenSettings {
|
||||||
|
s := BandOpenSettings{
|
||||||
|
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
|
||||||
|
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
|
||||||
|
Available: pskr.Bands,
|
||||||
|
}
|
||||||
|
// Keep only bands that are still offered. A saved selection outlives the code
|
||||||
|
// that made it: 12 m was dropped from the watched set, but every operator who
|
||||||
|
// had already enabled the watch kept subscribing to it — paying for a firehose
|
||||||
|
// whose messages the detector then threw away.
|
||||||
|
s.Bands = keepKnownBands(s.Bands)
|
||||||
|
if len(s.Bands) == 0 {
|
||||||
|
s.Bands = append(s.Bands, pskr.Bands...)
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func keepKnownBands(want []string) []string {
|
||||||
|
ok := make(map[string]bool, len(pskr.Bands))
|
||||||
|
for _, b := range pskr.Bands {
|
||||||
|
ok[b] = true
|
||||||
|
}
|
||||||
|
out := make([]string, 0, len(want))
|
||||||
|
for _, b := range want {
|
||||||
|
if ok[strings.ToLower(strings.TrimSpace(b))] {
|
||||||
|
out = append(out, b)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
|
||||||
|
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
|
||||||
|
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
|
||||||
|
if s.Enabled {
|
||||||
|
a.ensureRBNNodes()
|
||||||
|
}
|
||||||
|
a.startBandOpenFeed()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensureRBNNodes adds the RBN endpoints when they are absent.
|
||||||
|
//
|
||||||
|
// Matched on host AND port rather than on name: an operator who renamed theirs
|
||||||
|
// "Skimmers CW" has the node, and adding a second one pointed at the same
|
||||||
|
// server would give them every spot twice — which the detector would read as
|
||||||
|
// twice as many stations, i.e. an opening that is not there.
|
||||||
|
func (a *App) ensureRBNNodes() {
|
||||||
|
have, err := a.ListClusterServers()
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("bandopen: cannot read the cluster nodes (%v) — not adding RBN", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, want := range rbnNodes {
|
||||||
|
found := false
|
||||||
|
for _, h := range have {
|
||||||
|
if strings.EqualFold(strings.TrimSpace(h.Host), want.Host) && h.Port == want.Port {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if found {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := a.SaveClusterServer(want); err != nil {
|
||||||
|
applog.Printf("bandopen: could not add %s: %v", want.Name, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
applog.Printf("bandopen: added cluster node %s (%s:%d) — the watch needs it",
|
||||||
|
want.Name, want.Host, want.Port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// startBandOpenFeed brings the PSK Reporter subscription up or down to match
|
||||||
|
// the setting. Called at startup and whenever the setting is saved.
|
||||||
|
func (a *App) startBandOpenFeed() {
|
||||||
|
if a.pskr != nil {
|
||||||
|
a.pskr.Stop()
|
||||||
|
a.pskr = nil
|
||||||
|
}
|
||||||
|
s := a.GetBandOpenSettings()
|
||||||
|
a.bandOpen.on.Store(s.Enabled)
|
||||||
|
a.setBandOpenBands(s.Bands)
|
||||||
|
if !s.Enabled {
|
||||||
|
// Put out whatever is currently lit. Leaving the badges up would keep
|
||||||
|
// announcing an opening from a watch that is now off, and they only fade
|
||||||
|
// on a timer fed by spots this path no longer looks at — so they would
|
||||||
|
// hang there until the app restarted.
|
||||||
|
a.clearBandOpenings()
|
||||||
|
}
|
||||||
|
chaseGrids := a.gridStore != nil
|
||||||
|
if !s.Enabled && !chaseGrids {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Every spot is measured from the operator's position. Without one there is
|
||||||
|
// nothing to measure, and a detector fed unmeasurable spots reports nothing
|
||||||
|
// while looking like it is working.
|
||||||
|
if !a.opSet {
|
||||||
|
applog.Printf("pskr: no station grid set — the feed needs one to measure a path")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Grid chasing wants every band; the opening watch wants its four. "+" is the
|
||||||
|
// MQTT single-level wildcard, so one subscription per square covers the lot.
|
||||||
|
bands := s.Bands
|
||||||
|
if chaseGrids {
|
||||||
|
bands = []string{"+"}
|
||||||
|
}
|
||||||
|
// Filter at the BROKER on the receiver's square rather than receiving the
|
||||||
|
// world and discarding it here. Measured on the live feed: the four opening
|
||||||
|
// bands unfiltered are 83 messages a second, of which roughly one in a
|
||||||
|
// hundred survived the NearKm test below. One ring of squares — about the
|
||||||
|
// same 300 km — is 0.2 to 1.2 a second, and the same for every operator,
|
||||||
|
// where filtering by DXCC ranged from 1.2 (OH) to 72.5 (K).
|
||||||
|
rxGrids := geo.NeighbourGrids(a.opLat, a.opLon, 1)
|
||||||
|
|
||||||
|
var onGrid func(call, grid string)
|
||||||
|
if chaseGrids {
|
||||||
|
onGrid = func(call, grid string) { a.rememberDecodeGrid(call, grid, gridcache.SourceMQTT) }
|
||||||
|
}
|
||||||
|
var onSpot func(pskr.Spot)
|
||||||
|
if s.Enabled {
|
||||||
|
onSpot = a.feedBandOpen
|
||||||
|
}
|
||||||
|
|
||||||
|
a.pskr = pskr.New(pskr.Config{
|
||||||
|
Bands: bands,
|
||||||
|
RxGrids: rxGrids,
|
||||||
|
OpLat: a.opLat, OpLon: a.opLon,
|
||||||
|
Geo: func(grid string) (int, int, bool) {
|
||||||
|
lat, lon, ok := gridToLatLon(grid)
|
||||||
|
if !ok {
|
||||||
|
return 0, 0, false
|
||||||
|
}
|
||||||
|
// The same arithmetic the cluster path uses, so one spot cannot be
|
||||||
|
// 2000 km away down one road and 2100 km down the other.
|
||||||
|
d := int(haversineKm(a.opLat, a.opLon, lat, lon) + 0.5)
|
||||||
|
b := int(initialBearingDeg(a.opLat, a.opLon, lat, lon) + 0.5)
|
||||||
|
return d, b, true
|
||||||
|
},
|
||||||
|
OnSpot: onSpot,
|
||||||
|
OnGrid: onGrid,
|
||||||
|
Logf: applog.Printf,
|
||||||
|
})
|
||||||
|
if err := a.pskr.Start(); err != nil {
|
||||||
|
applog.Printf("pskr: feed did not start: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("pskr: feed up — bands %v, %d receiver squares (openings=%v, grids=%v)",
|
||||||
|
bands, len(rxGrids), s.Enabled, chaseGrids)
|
||||||
|
}
|
||||||
|
|
||||||
|
// feedBandOpen hands one PSK Reporter decode to the detector.
|
||||||
|
//
|
||||||
|
// Called from the MQTT goroutine at up to thousands a minute when 6 m is open,
|
||||||
|
// so it does the least possible: the detector's own window and de-duplication
|
||||||
|
// by callsign are what turn that flood into one announcement.
|
||||||
|
func (a *App) feedBandOpen(s pskr.Spot) {
|
||||||
|
if !a.bandOpenWanted(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.Call, Band: s.Band, DistKm: s.DistKm, Bearing: s.Bearing, At: s.At,
|
||||||
|
}, a.opLat)
|
||||||
|
if op != nil {
|
||||||
|
a.rememberOpening(*op)
|
||||||
|
}
|
||||||
|
if s.DistKm >= bandopen.DefaultConfig().MinKm {
|
||||||
|
a.markBandAlive(s.Band, s.At)
|
||||||
|
}
|
||||||
|
a.bandOpen.mu.Unlock()
|
||||||
|
if op != nil {
|
||||||
|
a.announceOpening(*op)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPSKReporterStatus is what the settings panel polls.
|
||||||
|
func (a *App) GetPSKReporterStatus() pskr.Status {
|
||||||
|
if a.pskr == nil {
|
||||||
|
return pskr.Status{Bands: pskr.Bands}
|
||||||
|
}
|
||||||
|
return a.pskr.Status()
|
||||||
|
}
|
||||||
|
|
||||||
|
// settingOr reads one key, falling back when the store is not up yet or the
|
||||||
|
// value is blank. The settings store is a plain string key/value and every
|
||||||
|
// caller does this by hand; two of them here earn the helper.
|
||||||
|
func (a *App) settingOr(key, def string) string {
|
||||||
|
if a.settings == nil {
|
||||||
|
return def
|
||||||
|
}
|
||||||
|
v, _ := a.settings.Get(a.ctx, key)
|
||||||
|
if strings.TrimSpace(v) == "" {
|
||||||
|
return def
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
func splitCSV(s string) []string {
|
||||||
|
var out []string
|
||||||
|
for _, p := range strings.Split(s, ",") {
|
||||||
|
if p = strings.TrimSpace(p); p != "" {
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
+230
@@ -0,0 +1,230 @@
|
|||||||
|
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"
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/bandopen"
|
||||||
|
"hamlog/internal/cluster"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
type bandOpenState struct {
|
||||||
|
// on mirrors the "Watch for band openings" setting.
|
||||||
|
//
|
||||||
|
// Cached rather than read per spot: this is the cluster hot path, where a
|
||||||
|
// settings query per spot is exactly what the rest of this file avoids.
|
||||||
|
// startBandOpenFeed owns it — it runs at startup and again on every save, so
|
||||||
|
// the switch takes effect without a restart.
|
||||||
|
on atomic.Bool
|
||||||
|
// bands is the operator's SELECTED set, held as map[string]bool.
|
||||||
|
//
|
||||||
|
// bandopen.Watched only says which bands the detector is capable of; it
|
||||||
|
// knows nothing about the chips in Settings. Nothing checked the selection
|
||||||
|
// on either feed path, so unticking 10 m and 2 m changed the subscription and
|
||||||
|
// left the cluster path announcing them anyway.
|
||||||
|
bands atomic.Value
|
||||||
|
mu sync.Mutex
|
||||||
|
det *bandopen.Detector
|
||||||
|
last []bandopen.Opening // most recent first, for the UI
|
||||||
|
// live holds the announced openings that are still going, keyed by band, and
|
||||||
|
// aliveUntil says when each stops counting as current.
|
||||||
|
//
|
||||||
|
// The detector announces an opening ONCE and then goes quiet for 45 minutes,
|
||||||
|
// which is right for a message but useless for a badge that has to stay lit
|
||||||
|
// while the band is open and go out when it closes. Nothing tells us an
|
||||||
|
// opening ended, so it is inferred: every qualifying spot on that band pushes
|
||||||
|
// the deadline out, and when they stop arriving the badge fades by itself.
|
||||||
|
live map[string]bandopen.Opening
|
||||||
|
aliveUntil map[string]time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// openingIdle is how long a band may go without a qualifying spot before its
|
||||||
|
// badge goes out. Longer than the detector's own 12-minute window, so a quiet
|
||||||
|
// couple of minutes mid-opening does not blink the badge off and on again.
|
||||||
|
const openingIdle = 15 * time.Minute
|
||||||
|
|
||||||
|
const maxRememberedOpenings = 20
|
||||||
|
|
||||||
|
// detectBandOpening feeds one spot to the detector and announces a hit.
|
||||||
|
func (a *App) detectBandOpening(s cluster.Spot) {
|
||||||
|
// The watch has to be switched on.
|
||||||
|
//
|
||||||
|
// It was not checked here at all: the setting only ever governed the extra
|
||||||
|
// DATA SOURCES (the RBN nodes and the PSK Reporter feed), while the detector
|
||||||
|
// itself ran on every ordinary cluster spot. So an operator who had never
|
||||||
|
// enabled the watch still got opening banners, from a feature they had
|
||||||
|
// deliberately left off.
|
||||||
|
if !a.bandOpen.on.Load() || !a.bandOpenWanted(s.Band) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// 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.rememberOpening(*op)
|
||||||
|
}
|
||||||
|
// Keeps a lit badge lit. Gated on the same floor the detector uses, or a
|
||||||
|
// band busy with short-range tropo would hold an Es badge on for ever.
|
||||||
|
if s.DistanceKm >= bandopen.DefaultConfig().MinKm {
|
||||||
|
a.markBandAlive(s.Band, s.ReceivedAt)
|
||||||
|
}
|
||||||
|
a.bandOpen.mu.Unlock()
|
||||||
|
if op != nil {
|
||||||
|
a.announceOpening(*op)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// markBandAlive pushes a band's badge deadline out. Called for every spot the
|
||||||
|
// detector accepted, from either feed. Cheap on purpose: this runs on the MQTT
|
||||||
|
// goroutine at thousands a minute when 6 m is open.
|
||||||
|
//
|
||||||
|
// Caller holds bandOpen.mu.
|
||||||
|
func (a *App) markBandAlive(band string, at time.Time) {
|
||||||
|
if _, lit := a.bandOpen.live[strings.ToLower(band)]; !lit {
|
||||||
|
return // nothing announced for this band, nothing to keep alive
|
||||||
|
}
|
||||||
|
if a.bandOpen.aliveUntil == nil {
|
||||||
|
a.bandOpen.aliveUntil = map[string]time.Time{}
|
||||||
|
}
|
||||||
|
a.bandOpen.aliveUntil[strings.ToLower(band)] = at.Add(openingIdle)
|
||||||
|
}
|
||||||
|
|
||||||
|
// rememberOpening files a detection and lights its badge. Caller holds the mutex.
|
||||||
|
func (a *App) rememberOpening(op bandopen.Opening) {
|
||||||
|
a.bandOpen.last = append([]bandopen.Opening{op}, a.bandOpen.last...)
|
||||||
|
if len(a.bandOpen.last) > maxRememberedOpenings {
|
||||||
|
a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings]
|
||||||
|
}
|
||||||
|
if a.bandOpen.live == nil {
|
||||||
|
a.bandOpen.live = map[string]bandopen.Opening{}
|
||||||
|
a.bandOpen.aliveUntil = map[string]time.Time{}
|
||||||
|
}
|
||||||
|
b := strings.ToLower(op.Band)
|
||||||
|
a.bandOpen.live[b] = op
|
||||||
|
a.bandOpen.aliveUntil[b] = op.At.Add(openingIdle)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetLiveOpenings returns the openings still under way, for the status-bar
|
||||||
|
// badge. Expired ones are dropped as they are noticed — there is no janitor for
|
||||||
|
// something that holds at most five entries.
|
||||||
|
func (a *App) GetLiveOpenings() []bandopen.Opening {
|
||||||
|
now := time.Now()
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
defer a.bandOpen.mu.Unlock()
|
||||||
|
out := make([]bandopen.Opening, 0, len(a.bandOpen.live))
|
||||||
|
for b, op := range a.bandOpen.live {
|
||||||
|
if until, ok := a.bandOpen.aliveUntil[b]; !ok || now.After(until) {
|
||||||
|
delete(a.bandOpen.live, b)
|
||||||
|
delete(a.bandOpen.aliveUntil, b)
|
||||||
|
applog.Printf("bandopen: %s opening has gone quiet", strings.ToUpper(b))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, op)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// bandOpenWanted reports whether the operator has this band ticked. Falls back
|
||||||
|
// to the detector's own set until a selection has been stored, so a band is
|
||||||
|
// never silently dropped before the settings have been read.
|
||||||
|
func (a *App) bandOpenWanted(band string) bool {
|
||||||
|
if !bandopen.Watched(band) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
sel, ok := a.bandOpen.bands.Load().(map[string]bool)
|
||||||
|
if !ok || len(sel) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return sel[strings.ToLower(strings.TrimSpace(band))]
|
||||||
|
}
|
||||||
|
|
||||||
|
// setBandOpenBands records the selection and puts out badges for bands that
|
||||||
|
// have just been unticked — they fade on a timer fed by spots the detector no
|
||||||
|
// longer looks at, so they would otherwise stay lit until the next restart.
|
||||||
|
func (a *App) setBandOpenBands(bands []string) {
|
||||||
|
sel := make(map[string]bool, len(bands))
|
||||||
|
for _, b := range bands {
|
||||||
|
sel[strings.ToLower(strings.TrimSpace(b))] = true
|
||||||
|
}
|
||||||
|
a.bandOpen.bands.Store(sel)
|
||||||
|
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
defer a.bandOpen.mu.Unlock()
|
||||||
|
for b := range a.bandOpen.live {
|
||||||
|
if len(sel) > 0 && !sel[b] {
|
||||||
|
delete(a.bandOpen.live, b)
|
||||||
|
delete(a.bandOpen.aliveUntil, b)
|
||||||
|
applog.Printf("bandopen: %s is no longer watched — badge cleared", strings.ToUpper(b))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// clearBandOpenings puts out every lit badge and forgets the detector's window.
|
||||||
|
// Called when the watch is switched off: the badges fade on a timer fed by
|
||||||
|
// spots the detector no longer looks at, so without this they would stay up
|
||||||
|
// until the next restart. The remembered list is left alone — those openings
|
||||||
|
// really did happen, and the operator may still want to see what he missed.
|
||||||
|
func (a *App) clearBandOpenings() {
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
defer a.bandOpen.mu.Unlock()
|
||||||
|
a.bandOpen.live = nil
|
||||||
|
a.bandOpen.aliveUntil = nil
|
||||||
|
// Drop the accumulated spot window too, so switching the watch back on starts
|
||||||
|
// from what is on the air now rather than from an hour-old burst.
|
||||||
|
a.bandOpen.det = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// announceOpening logs and pushes one detection. Shared by both feeds — the
|
||||||
|
// cluster path here and the PSK Reporter path in bandopen_sources.go — so an
|
||||||
|
// opening reads the same however it was noticed.
|
||||||
|
func (a *App) announceOpening(op bandopen.Opening) {
|
||||||
|
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
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/bandopen"
|
||||||
|
"hamlog/internal/cluster"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The "Watch for band openings" switch has to gate the DETECTOR, not just the
|
||||||
|
// extra data sources.
|
||||||
|
//
|
||||||
|
// It originally governed only the RBN nodes and the PSK Reporter feed, while
|
||||||
|
// the detector itself ran on every ordinary cluster spot — so an operator who
|
||||||
|
// had never enabled the watch still got opening banners for a feature he had
|
||||||
|
// deliberately left off. That is what this pins.
|
||||||
|
func TestBandOpenWatchGatesTheDetector(t *testing.T) {
|
||||||
|
spot := func() cluster.Spot {
|
||||||
|
return cluster.Spot{
|
||||||
|
DXCall: "EA1ABC", Band: "6m", DistanceKm: 1400, ShortPath: 210,
|
||||||
|
ReceivedAt: time.Now(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switched off: the spot must not even reach the detector.
|
||||||
|
off := &App{opSet: true, opLat: 48.0, opLon: 2.0}
|
||||||
|
off.detectBandOpening(spot())
|
||||||
|
if off.bandOpen.det != nil {
|
||||||
|
t.Error("the detector ran with the watch switched off")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switched on: the same spot is accepted (one spot is not an opening, so
|
||||||
|
// nothing is announced — but the detector now exists and is collecting).
|
||||||
|
on := &App{opSet: true, opLat: 48.0, opLon: 2.0}
|
||||||
|
on.bandOpen.on.Store(true)
|
||||||
|
on.detectBandOpening(spot())
|
||||||
|
if on.bandOpen.det == nil {
|
||||||
|
t.Error("the detector did not run with the watch switched on")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switching the watch off must put the badges out. They fade on a timer fed by
|
||||||
|
// spots the detector no longer looks at, so left alone they would stay lit
|
||||||
|
// until the next restart.
|
||||||
|
func TestClearBandOpeningsPutsTheBadgesOut(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
a.bandOpen.live = map[string]bandopen.Opening{"6m": {Band: "6m", Calls: 9}}
|
||||||
|
a.bandOpen.aliveUntil = map[string]time.Time{"6m": time.Now().Add(time.Hour)}
|
||||||
|
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
|
||||||
|
a.bandOpen.last = []bandopen.Opening{{Band: "6m", Calls: 9}}
|
||||||
|
|
||||||
|
a.clearBandOpenings()
|
||||||
|
|
||||||
|
if got := a.GetLiveOpenings(); len(got) != 0 {
|
||||||
|
t.Errorf("a badge stayed lit after the watch was switched off: %v", got)
|
||||||
|
}
|
||||||
|
if a.bandOpen.det != nil {
|
||||||
|
t.Error("the accumulated spot window survived — switching back on would start from a stale burst")
|
||||||
|
}
|
||||||
|
// The history is NOT cleared: those openings really happened.
|
||||||
|
if len(a.GetBandOpenings()) != 1 {
|
||||||
|
t.Error("the remembered openings were thrown away")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unticking a band in Settings must actually stop its announcements.
|
||||||
|
//
|
||||||
|
// Nothing checked the operator's selection on either feed path: bandopen.Watched
|
||||||
|
// only says which bands the detector is CAPABLE of. So a station with just 6 m
|
||||||
|
// ticked still got 10 m and 2 m badges, from the cluster path and — once grid
|
||||||
|
// chasing widened the subscription to every band — from PSK Reporter too.
|
||||||
|
func TestBandOpenHonoursTheSelectedBands(t *testing.T) {
|
||||||
|
a := &App{opSet: true, opLat: 48, opLon: 2}
|
||||||
|
a.bandOpen.on.Store(true)
|
||||||
|
a.setBandOpenBands([]string{"6m"})
|
||||||
|
|
||||||
|
if !a.bandOpenWanted("6m") {
|
||||||
|
t.Error("6m is ticked and was refused")
|
||||||
|
}
|
||||||
|
for _, b := range []string{"10m", "2m", "4m"} {
|
||||||
|
if a.bandOpenWanted(b) {
|
||||||
|
t.Errorf("%s is not ticked and was accepted", b)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A band the detector cannot watch at all stays out whatever is stored.
|
||||||
|
if a.bandOpenWanted("20m") {
|
||||||
|
t.Error("20m is not a watched band and was accepted")
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the cluster path must obey it too.
|
||||||
|
a.detectBandOpening(cluster.Spot{
|
||||||
|
DXCall: "K1ABC", Band: "10m", DistanceKm: 6000, ShortPath: 280, ReceivedAt: time.Now(),
|
||||||
|
})
|
||||||
|
if a.bandOpen.det != nil {
|
||||||
|
t.Error("a spot on an unticked band reached the detector")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unticking a band puts its badge out. They fade on a timer fed by spots the
|
||||||
|
// detector no longer looks at, so it would otherwise stay lit until a restart.
|
||||||
|
func TestUntickingABandClearsItsBadge(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
a.bandOpen.live = map[string]bandopen.Opening{
|
||||||
|
"6m": {Band: "6m", Calls: 9},
|
||||||
|
"10m": {Band: "10m", Calls: 5},
|
||||||
|
}
|
||||||
|
a.bandOpen.aliveUntil = map[string]time.Time{
|
||||||
|
"6m": time.Now().Add(time.Hour),
|
||||||
|
"10m": time.Now().Add(time.Hour),
|
||||||
|
}
|
||||||
|
a.setBandOpenBands([]string{"6m"})
|
||||||
|
|
||||||
|
live := a.GetLiveOpenings()
|
||||||
|
if len(live) != 1 || live[0].Band != "6m" {
|
||||||
|
t.Errorf("live openings = %v, want only 6m", live)
|
||||||
|
}
|
||||||
|
}
|
||||||
-18902
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,35 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A bulk-editable field passes through THREE tables: the field list in the UI,
|
||||||
|
// bulkFieldColumns here, and bulkEditableCols in internal/qso. Mode and RST were
|
||||||
|
// added to the first and the third and not the second, so the dialog offered
|
||||||
|
// them and the save failed with "unknown field" — reported from the field.
|
||||||
|
//
|
||||||
|
// Nothing warns about that: each table is valid on its own. This is the check.
|
||||||
|
func TestEveryMappedBulkFieldIsWhitelisted(t *testing.T) {
|
||||||
|
for id, col := range bulkFieldColumns {
|
||||||
|
if !qso.BulkEditable(col) {
|
||||||
|
t.Errorf("bulk field %q maps to column %q, which internal/qso refuses to write", id, col)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the reverse: a column the qso layer allows but nothing maps to is dead
|
||||||
|
// weight — it looks supported from the inside and cannot be reached from outside.
|
||||||
|
func TestNoUnreachableBulkColumn(t *testing.T) {
|
||||||
|
mapped := map[string]bool{}
|
||||||
|
for _, col := range bulkFieldColumns {
|
||||||
|
mapped[col] = true
|
||||||
|
}
|
||||||
|
for _, col := range qso.BulkEditableColumns() {
|
||||||
|
if !mapped[col] {
|
||||||
|
t.Errorf("column %q is bulk-writable but no field maps to it — unreachable", col)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+222
@@ -1,4 +1,226 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.25.1",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Amplifiers: tick the ones sharing a combiner and ON, OFF and OPERATE act on all of them at once. Each keeps its own meters.",
|
||||||
|
"Shared CAT: JTDX and WSJT-X no longer get an error for turning split off or setting the transmit mode — which made JTDX abandon a transmission — and the wire trace now logs every exchange.",
|
||||||
|
"QSL designer: a card design can be copied from another profile, pictures included, and duplicating a profile now carries its designs’ pictures too instead of leaving cards that cannot be printed.",
|
||||||
|
"Appearance: new Sahara theme, warm sand tones for long sessions in daylight.",
|
||||||
|
"US counties: Connecticut returned the census planning regions, and San Francisco, Doña Ana, Baltimore city and several Alaska boroughs matched nothing at all. The cluster now shows the same county as the Info panel. Re-download the county database.",
|
||||||
|
"QSL: the manager (QSL_VIA) and the sending method (QSL_SENT_VIA / QSL_RCVD_VIA) are separate fields at last, as ADIF defines them. Imports keep both, exports write both, and a log where they were mixed is offered a correction at startup.",
|
||||||
|
"WinKeyer: the opening handshake follows K1EL’s own sequence (RTS off, parser resync, echo test), which wakes keyers that stayed silent, and a port where nothing answers now says so instead of showing “connected”. A keyer that reboots when the port opens — K3NG and other Arduino builds — is waited out and remembered, so it opens directly next time."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Amplificateurs : cochez ceux qui partagent un combineur et ON, OFF et OPERATE agissent sur tous à la fois. Chacun garde ses propres mesures.",
|
||||||
|
"CAT partagé : JTDX et WSJT-X ne reçoivent plus d’erreur en coupant le split ou en réglant le mode d’émission — ce qui faisait abandonner une transmission à JTDX — et la trace consigne désormais chaque échange.",
|
||||||
|
"Concepteur QSL : un design peut être copié depuis un autre profil, images comprises, et dupliquer un profil emporte aussi les images de ses designs au lieu de laisser des cartes impossibles à imprimer.",
|
||||||
|
"Apparence : nouveau thème Sahara, tons sable chauds pour les longues sessions en plein jour.",
|
||||||
|
"Comtés US : le Connecticut renvoyait les planning regions du recensement, et San Francisco, Doña Ana, Baltimore city et plusieurs districts d’Alaska ne correspondaient à rien. Le cluster affiche maintenant le même comté que le panneau Info. Rechargez la base des comtés.",
|
||||||
|
"QSL : le manager (QSL_VIA) et le mode d’envoi (QSL_SENT_VIA / QSL_RCVD_VIA) sont enfin deux champs distincts, comme le veut l’ADIF. Les imports gardent les deux, les exports les écrivent, et un log où ils étaient mélangés se voit proposer une correction au démarrage.",
|
||||||
|
"WinKeyer : la séquence d’ouverture suit celle de K1EL (RTS bas, resynchronisation, test d’écho), ce qui réveille les manipulateurs muets, et un port où rien ne répond le dit au lieu d’afficher « connecté ». Un manipulateur qui redémarre à l’ouverture du port — K3NG et autres montages Arduino — est attendu puis mémorisé, pour s’ouvrir directement ensuite."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.0",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Cluster: \"Hide worked\" no longer hides a spot that is a new prefix, county, grid or park in an entity already worked.",
|
||||||
|
"DX Cluster: a spot lifetime can be set — 5, 10, 15 minutes or your own value — after which spots leave the list and the band maps.",
|
||||||
|
"Call lookup: QRZ.com now fills Name with the first name only, and optionally with the operator nickname instead.",
|
||||||
|
"Entry form: a narrower left column, State beside the locator, and a new line with County, CQ, ITU and DXCC.",
|
||||||
|
"Station Control: the short and long path headings are repeated under the compass, at a readable size and clickable.",
|
||||||
|
"Compact mode: the window now fits the entry strip instead of leaving a band of empty space below it.",
|
||||||
|
"HRDLog: an ON AIR option publishes your live frequency, mode and rig on hrdlog.net.",
|
||||||
|
"ADIF: the county is exported as STATE,COUNTY as the standard requires, and a county imported that way now fills the state too.",
|
||||||
|
"A /MM or /AM callsign no longer resolves to a country — RI1FJL/MM read as Franz Josef Land while the expedition was still sailing there."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cluster : « Masquer les contactés » ne masque plus un spot qui est un nouveau préfixe, comté, carré ou parc dans une contrée déjà faite.",
|
||||||
|
"Cluster DX : on peut fixer une durée de vie des spots — 5, 10, 15 minutes ou une valeur libre — au-delà de laquelle ils quittent la liste et les band maps.",
|
||||||
|
"Recherche d indicatif : QRZ.com remplit désormais Nom avec le seul prénom, et au choix avec le surnom de l opérateur.",
|
||||||
|
"Saisie : colonne de gauche plus étroite, État à côté du locator, et une nouvelle ligne Comté, CQ, ITU et DXCC.",
|
||||||
|
"Contrôle station : les azimuts court et long chemin sont repris sous la boussole, lisibles et cliquables.",
|
||||||
|
"Mode compact : la fenêtre épouse la bande de saisie au lieu de laisser une bande vide en dessous.",
|
||||||
|
"HRDLog : une option ON AIR publie ta fréquence, ton mode et ta radio en direct sur hrdlog.net.",
|
||||||
|
"ADIF : le comté est exporté sous la forme ÉTAT,COMTÉ comme l exige le standard, et un comté importé ainsi remplit aussi l état.",
|
||||||
|
"Un indicatif en /MM ou /AM ne se résout plus en pays — RI1FJL/MM affichait Franz Josef Land alors que l expédition faisait encore route."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.9",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Appearance: row colouring now defaults to a left stripe, with a filled row and its strength offered as choices.",
|
||||||
|
"The band map now follows the cluster filters — LoTW only, spotter continent, hide worked, status and mode chips.",
|
||||||
|
"Band map: stations that upload to LoTW now carry the same L badge as the cluster list, switchable in Appearance.",
|
||||||
|
"LoTW: contacts TQSL leaves out — already uploaded, or outside the certificate date range — are no longer reported as uploaded.",
|
||||||
|
"FT8: a contact is logged with the grid the station actually sent, not the home square from QRZ — expeditions were logged in the wrong place.",
|
||||||
|
"SPE amplifier: switching it off is shown at once, instead of needing a second press of OFF.",
|
||||||
|
"Appearance: row colouring is now Worked / Confirmed / QSL sent / To be sent, each scoped to the channels you pick — paper, LoTW, eQSL, QRZ.com."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Apparence : la coloration des lignes se fait par défaut sur une barre à gauche, la ligne remplie et son intensité restant proposées.",
|
||||||
|
"La band map suit désormais les filtres du cluster — LoTW seulement, continent du spotter, masquer les contactés, statuts et modes.",
|
||||||
|
"Band map : les stations qui utilisent LoTW portent le même badge L que la liste du cluster, activable dans Apparence.",
|
||||||
|
"LoTW : les contacts que TQSL écarte — déjà envoyés, ou hors de la plage de dates du certificat — ne sont plus annoncés comme envoyés.",
|
||||||
|
"FT8 : un contact est enregistré avec le locator réellement émis par la station, et non le carré du domicile depuis QRZ — les expéditions étaient logguées au mauvais endroit.",
|
||||||
|
"Amplificateur SPE : l extinction s affiche immédiatement, au lieu de demander un second appui sur OFF.",
|
||||||
|
"Apparence : la coloration des lignes devient Contacté / Confirmé / QSL envoyée / À envoyer, chacune limitée aux canaux choisis — papier, LoTW, eQSL, QRZ.com."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.8",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Cluster: the grid cache now holds 100,000 callsigns and rotates instead of emptying itself, so locators stop vanishing from the list.",
|
||||||
|
"New option \"Chase new grids\": locators learnt from your decodes and from PSK Reporter are kept in their own database, with their source.",
|
||||||
|
"Band openings: the PSK Reporter feed is now filtered at the broker, which cuts it from about 83 messages a second to under two.",
|
||||||
|
"Band openings: unticking a band now actually stops its announcements, and puts its badge out.",
|
||||||
|
"Callsign lookup: the website, postal code and HamQTH profile picture are now read — the QSO web column was never filled by any lookup.",
|
||||||
|
"New selectable column \"QSO number\": position in the log, 1 for the oldest contact.",
|
||||||
|
"New Appearance settings: colour whole log rows by QSL status, with your own colours from a palette.",
|
||||||
|
"The QSO number was missing on contacts logged from WSJT-X — that path bypassed the numbering."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cluster : le cache de locators garde 100 000 indicatifs et tourne au lieu de se vider, les locators ne disparaissent donc plus de la liste.",
|
||||||
|
"Nouvelle option « Chasse aux nouveaux carrés » : les locators appris de tes décodes et de PSK Reporter sont conservés dans leur propre base, avec leur source.",
|
||||||
|
"Ouvertures de bande : le flux PSK Reporter est désormais filtré chez le broker, ce qui le fait passer d environ 83 messages par seconde à moins de deux.",
|
||||||
|
"Ouvertures de bande : décocher une bande arrête réellement ses annonces et éteint son badge.",
|
||||||
|
"Recherche d indicatif : le site web, le code postal et la photo de profil HamQTH sont désormais lus — la colonne web du QSO n était jamais remplie.",
|
||||||
|
"Nouvelle colonne sélectionnable « Numéro de QSO » : position dans le log, 1 pour le contact le plus ancien.",
|
||||||
|
"Nouveaux réglages Apparence : colorer les lignes entières du log selon le statut QSL, avec tes couleurs choisies dans une palette.",
|
||||||
|
"Le numéro de QSO manquait sur les contacts enregistrés depuis WSJT-X — ce chemin contournait la numérotation."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.7",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"QSOs logged from WSJT-X now carry the space weather and the distance, like hand-logged ones.",
|
||||||
|
"Band openings: EME contacts are no longer mistaken for an opening. Each band now has the longest path the atmosphere can carry.",
|
||||||
|
"Kenwood: WSJT-X \"Fake It\" no longer leaves the dial on the transmit frequency.",
|
||||||
|
"PowerGenius XL: the Station Control card now shows power, current, SWR and temperature without a FlexRadio.",
|
||||||
|
"Motorized antennas: tracking now offers three modes — every frequency change, past a step, or band change only.",
|
||||||
|
"Motorized antennas: each covered band now has its own tune frequency, set in Settings.",
|
||||||
|
"Awards: a single award can now be exported on its own.",
|
||||||
|
"Awards: each reference now has its own validity window, so a reference that ceased to exist stops counting for later QSOs.",
|
||||||
|
"Band openings: the watch switch now governs the detection itself, not just the extra data sources."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Les QSO enregistrés depuis WSJT-X portent désormais la météo spatiale et la distance, comme ceux saisis à la main.",
|
||||||
|
"Ouvertures de bande : les contacts EME ne sont plus pris pour une ouverture. Chaque bande a désormais la distance maximale que l atmosphère peut porter.",
|
||||||
|
"Kenwood : le « Fake It » de WSJT-X ne laisse plus le VFO sur la fréquence d émission.",
|
||||||
|
"PowerGenius XL : la carte du Contrôle station affiche puissance, courant, ROS et température sans FlexRadio.",
|
||||||
|
"Antennes motorisées : le suivi propose trois modes — à chaque changement de fréquence, au-delà d un pas, ou au changement de bande.",
|
||||||
|
"Antennes motorisées : chaque bande couverte a désormais sa propre fréquence d accord, réglable dans les Réglages.",
|
||||||
|
"Diplômes : un diplôme peut désormais être exporté seul.",
|
||||||
|
"Diplômes : chaque référence a désormais sa fenêtre de validité, une référence disparue cesse donc de compter pour les QSO suivants.",
|
||||||
|
"Ouvertures de bande : l interrupteur de la veille gouverne désormais la détection elle-même, plus seulement les sources de données."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.6",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Bulk edit can now set mode, submode and RST. They were excluded as per-QSO fields, which missed the point: bulk edit is for repairing a batch — an import that mapped every contact to SSB, an ADIF with no mode at all — and refusing meant editing a hundred rows one at a time. Setting the mode clears the submode, since one left over from the old mode contradicts the new one. Band stays with frequency, which already sets the two together.",
|
||||||
|
"Web publishing: the page now widens to fit the table. It was capped at a comfortable reading width, so with more than about eight columns the rest sat behind a scrollbar on a screen wide enough to show them all — and Windows hides that scrollbar until something moves, which made a table that scrolls look like a table missing columns. Columns also take the width their contents need instead of being squeezed to fit first.",
|
||||||
|
"Every QSO now carries its distance. Nothing ever recorded one, so the field went out empty in every ADIF export and left the Distance column blank on a published page. It is computed from the two locators when a contact is logged and when an ADIF is imported, and a one-time pass fills in the QSOs already in your log the first time this version runs — in the background, without asking. A distance the imported file supplied is always kept.",
|
||||||
|
"RDA: 1015 districts were filed under the wrong DXCC entity. Every reference sat on European Russia; 991 belong to Asiatic Russia and the 24 KA- districts to Kaliningrad, which is a separate entity altogether. Corrected against the reference list, and Kaliningrad added to the award filter so those 24 can be claimed at all.",
|
||||||
|
"QSO filter: asking a field to equal nothing now finds the empty ones. SQL answers that question with nothing at all — a missing value never equals an empty one — so the filter looked broken rather than wrong. Empty on a numeric field also covers zero as well as missing, which SQLite and MySQL disagreed about.",
|
||||||
|
"Callsign lookup: a /QRP call now returns its locator. The lookup falls back to the home callsign when the slashed form is not registered, and then cleared the location — right for /P and /M, where the operator is somewhere other than their registered address, and wrong for /QRP, which says something about power and nothing about place. The grid came back empty while the same call without the suffix answered perfectly."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"L édition groupée sait enfin régler le mode, le sous-mode et le RST. Ils étaient exclus comme champs propres à chaque QSO, ce qui manquait l essentiel : l édition groupée sert à RÉPARER un lot — un import qui a tout mis en SSB, un ADIF sans aucun mode — et refuser obligeait à corriger cent lignes une par une. Régler le mode efface le sous-mode, celui de l ancien mode contredisant le nouveau. La bande reste avec la fréquence, qui pose déjà les deux ensemble.",
|
||||||
|
"Publication web : la page s élargit désormais à la taille du tableau. Elle était bridée à une largeur de lecture confortable, donc au-delà de huit colonnes environ le reste passait derrière une barre de défilement sur un écran assez large pour tout montrer — et Windows masque cette barre tant que rien ne bouge, si bien qu un tableau qui défile ressemblait à un tableau amputé. Les colonnes prennent aussi la largeur qu il leur faut au lieu d être comprimées d abord.",
|
||||||
|
"Chaque QSO porte désormais sa distance. Rien ne l enregistrait, elle partait donc vide dans chaque export ADIF et laissait la colonne Distance blanche sur une page publiée. Elle est calculée depuis les deux locators à l enregistrement d un contact et à l import d un ADIF, et une passe unique complète les QSO déjà présents au premier lancement de cette version — en tâche de fond, sans rien demander. Une distance fournie par le fichier importé est toujours conservée.",
|
||||||
|
"RDA : 1015 districts étaient rangés sous la mauvaise entité DXCC. Toutes les références étaient sur la Russie européenne ; 991 relèvent de la Russie asiatique et les 24 districts KA- de Kaliningrad, qui est une entité à part entière. Corrigé d après la liste de référence, et Kaliningrad ajouté au filtre de l award pour que ces 24 puissent être revendiqués.",
|
||||||
|
"Filtre QSO : demander à un champ d être égal à rien trouve désormais les vides. SQL répond à cette question par rien du tout — une valeur absente n est jamais égale à une valeur vide — et le filtre paraissait cassé plutôt que mal posé. Vide sur un champ numérique couvre aussi le zéro autant que l absence, ce sur quoi SQLite et MySQL n étaient pas d accord.",
|
||||||
|
"Recherche d indicatif : un indicatif en /QRP rend enfin son locator. La recherche se rabat sur l indicatif de base quand la forme avec barre n est pas enregistrée, puis effaçait la localisation — ce qui est juste pour /P et /M, où l opérateur n est pas à son adresse déclarée, et faux pour /QRP, qui parle de puissance et pas de lieu. Le locator revenait vide alors que le même indicatif sans le suffixe répondait parfaitement."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.5",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Digital decodes: a station's grid square could be logged as its callsign when the message text was unusual. A grid in the callsign position is now refused.",
|
||||||
|
"CW over CAT now works on a Kenwood. The KY command was sent in Elecraft's variable-length form; a Kenwood needs exactly 24 characters, so every message was refused.",
|
||||||
|
"Shared CAT is steadier and now diagnoses itself. It survives a rig answering \"busy\" just after transmit instead of dropping the link, stops repeating a PTT state the client never changed, and logs a plain explanation when another program has taken its port or when a client is set to a rig model instead of Hamlib NET rigctl. It also answers the lock-mode and stop-morse commands some clients send around every transmit, instead of refusing them.",
|
||||||
|
"Web publishing now offers every field a QSO carries, awards included — 123 instead of 23 — from a searchable dropdown, with the chosen columns listed above it in publication order. Choose carefully: the page is public and the list includes addresses and e-mail.",
|
||||||
|
"Band-opening detection now works on the bands it was meant for. Switching on \"Watch for band openings\" (Settings › DX Cluster) subscribes to the PSK Reporter feed and adds the two RBN nodes it needs — it was reading a handful of VHF cluster spots while thousands of stations were reporting. It watches 10, 6, 4 and 2 m, counts only reports collected within 300 km of you so an opening means an opening HERE, no longer throws away paths beyond 2400 km, and looks for the busiest direction instead of demanding that every station heard sit in one sector. An opening under way shows as a blinking badge beside the clock the moment it is found — band, direction and typical distance, with a mark when it is unusual for the season — and stays until the band goes quiet, and the direction it names is right — a sector crossing north used to be announced as its opposite.",
|
||||||
|
"Test connection now actually tests. Club Log checked that the three fields were not empty and reported success without contacting anyone, so a wrong password looked exactly like a right one; it now signs in for real, through the read-only endpoint so a test can never add a record. LoTW reports its two credentials separately: TQSL signs uploads and never uses the website password, so a wrong one used to break nothing until the day confirmations were downloaded.",
|
||||||
|
"The Ultrabeam / SteppIR widget in Station Control can now drive the antenna, not just describe it: a button per configured band tunes it there, up and down move it 25 kHz at a time, and tracking can be switched on or off with its 25 / 50 / 100 kHz threshold beside it. The band you are on lights up, and the commanded frequency is shown in the header.",
|
||||||
|
"The QSO filter can express a real question. Every condition was joined by one global AND or OR, so \"2 m or 70 cm, in FT8, since January\" had no form: AND killed the two bands, OR let every FT8 QSO through. Two operators — is one of / is none of — take a comma-separated list, so the OR sits inside one condition and the rest keeps ANDing.",
|
||||||
|
"Split works properly on a Kenwood. Split Operating: Rig in WSJT-X and JTDX did nothing at all through the shared CAT — OpsLog answered \"done\" to both split commands and left the radio on the receive frequency, so on a pileup you transmitted straight onto the DX while the software showed exactly what you had asked for. A radio whose backend cannot set split now refuses, so WSJT-X says so and you can switch to Fake It. And the two frequencies no longer swap the moment you key up: the rig reports the VFO in use, which is the receive one on receive and the transmit one on transmit, and that decided which frequency a split QSO was logged on."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Décodes digitaux : le carré locator d une station pouvait être enregistré comme son indicatif quand le texte du message sortait de l ordinaire. Un grid à la place de l indicatif est maintenant refusé.",
|
||||||
|
"Le CW par CAT fonctionne sur Kenwood. La commande KY partait sous la forme Elecraft à longueur libre ; un Kenwood exige exactement 24 caractères, donc chaque message était refusé.",
|
||||||
|
"Le CAT partagé est plus solide et se diagnostique tout seul. Il survit à un rig qui répond « occupé » juste après une émission au lieu de lâcher le lien, cesse de répéter un état PTT que le client n a pas changé, et écrit une explication claire quand un autre programme lui a pris son port ou qu un client est réglé sur un modèle de rig au lieu de Hamlib NET rigctl. Il répond aussi aux commandes de verrouillage et d arrêt du morse que certains logiciels envoient à chaque émission, au lieu de les refuser.",
|
||||||
|
"La publication web propose désormais tous les champs d un QSO, awards compris — 123 au lieu de 23 — depuis une liste déroulante cherchable, les colonnes choisies étant listées au-dessus dans l ordre de publication. À choisir avec soin : la page est publique et la liste contient adresses et e-mails.",
|
||||||
|
"La détection d ouverture de bande fonctionne enfin sur les bandes visées. Activer « Surveiller les ouvertures de bande » (Paramètres › Cluster DX) souscrit au flux PSK Reporter et ajoute les deux nœuds RBN nécessaires — elle lisait quelques spots VHF du cluster alors que des milliers de stations rapportaient. Elle surveille le 10, 6, 4 et 2 m, ne retient que les reports collectés à moins de 300 km de toi pour qu une ouverture veuille dire une ouverture ICI, ne jette plus les chemins au-delà de 2400 km, et cherche la direction la plus dense au lieu d exiger que toutes les stations entendues soient dans un même secteur. Une ouverture en cours s affiche en pastille clignotante à côté de l heure dès qu elle est détectée — bande, direction et distance typique, avec une marque si elle est inhabituelle pour la saison — et y reste jusqu à ce que la bande se taise, et la direction annoncée est juste — un secteur traversant le nord était auparavant annoncé à l opposé.",
|
||||||
|
"Le bouton Tester la connexion teste vraiment. Club Log vérifiait que les trois champs n étaient pas vides et annonçait la réussite sans contacter personne : un mauvais mot de passe ressemblait exactement à un bon. Il s authentifie maintenant pour de vrai, via le point d accès en lecture seule pour qu un test ne puisse jamais ajouter un enregistrement. LoTW annonce ses deux identifiants séparément : TQSL signe les envois et n utilise jamais le mot de passe du site, donc un mauvais ne cassait rien jusqu au jour du téléchargement des confirmations.",
|
||||||
|
"Le widget Ultrabeam / SteppIR de Station Control pilote enfin l antenne au lieu de seulement la décrire : un bouton par bande configurée l accorde dessus, haut et bas la déplacent par pas de 25 kHz, et le suivi s active ou se coupe avec son seuil de 25 / 50 / 100 kHz à côté. La bande courante s allume, et la fréquence commandée s affiche dans l en-tête.",
|
||||||
|
"Le filtre des QSO sait exprimer une vraie question. Toutes les conditions étaient jointes par un seul ET ou OU global, donc « 2 m ou 70 cm, en FT8, depuis janvier » n avait aucune forme : le ET tuait les deux bandes, le OU laissait passer tous les QSO FT8. Deux opérateurs — est parmi / n est pas parmi — acceptent une liste séparée par des virgules, le OU tient donc dans une seule condition et le reste continue de se combiner en ET.",
|
||||||
|
"Le split fonctionne correctement sur Kenwood. Split Operating: Rig dans WSJT-X et JTDX ne faisait rien du tout via le CAT partagé — OpsLog répondait « fait » aux deux commandes et laissait la radio sur la fréquence de réception, donc sur un pileup tu émettais en plein sur le DX pendant que le logiciel affichait exactement ce que tu avais demandé. Une radio dont le backend ne sait pas régler le split refuse désormais, WSJT-X le dit et tu peux passer en Fake It. Et les deux fréquences ne s inversent plus dès le passage en émission : le rig annonce le VFO en service, celui de réception à l écoute et celui d émission en émission, ce qui décidait sur quelle fréquence un QSO en split était enregistré."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.4",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"DX cluster: an L badge next to a callsign marks a station that uploads to LoTW, with a matching LoTW users only filter, and a Spotter continent filter narrows the list by where the spot came FROM — a JA report on 20 m tells a European little about their own path. The filter panel has been tidied along one rule: a switch is a behaviour you turn on or off, chips pick any number from a set. Nothing appears in both shapes any more, the Lock buttons sit in the heading of the section they lock, every section can be cleared the same way, and the whole panel is finally translated.",
|
||||||
|
"DX cluster: the Spotter continent filter now actually matches. RBN skimmers report as VU2OY-# and cluster nodes as DL1ABC-2, and the suffix was passed straight to the prefix lookup, so every spot came back with no continent and the filter silently selected nothing.",
|
||||||
|
"A spot now stops being NEW the moment you log it. Logging announced the QSO but never dropped the cluster worked-index snapshot, so the refresh that follows re-read the answer computed BEFORE the contact — a station stayed yellow on the band map and in the cluster with the QSO plainly in the log, until something else happened to rebuild the index.",
|
||||||
|
"Station information gains an IOTA field (ADIF MY_IOTA, e.g. EU-005), stamped on every QSO like the SOTA and POTA references beside it. The QSO table has carried the field since the first release and both ADIF import and export already handled it — only the station profile could not supply it, so an island activation meant typing the reference on every contact.",
|
||||||
|
"PowerGenius XL: fixed the amplifier link dropping and reconnecting every few seconds, and the stall while transmitting. The amp pushes status frames on the same socket it answers commands on, and it pushes them constantly once in OPERATE; OpsLog read one line per command and took whatever arrived first as its answer, so the stream slipped permanently one reply behind until a command timed out and the connection was dropped. Replies are now matched to the command that asked for them. Only ever visible over a remote link with the amplifier in OPERATE.",
|
||||||
|
"No colour on worked stations now does only that: it removes the blue already-worked mark and leaves everything else alone. It used to blank the spot status as well, and the status is what dims a quiet row — so turning the option on made every grey row bright white, which is the opposite of what it is for.",
|
||||||
|
"Grid squares in the cluster. Every CQ decoded over the WSJT-X UDP link carries the sender grid, and OpsLog now keeps it: a Grid column shows the square and NEW GRID flags one never worked, as a badge, a filled cell and a filter of its own. Whether a grid counts as new follows the group digital modes setting — with it on, a square worked on FT8 is no longer new on FT4; with it off the two are separate. Only stations your own receiver decodes have a grid: a cluster line carries the spotter grid at best, never the DX one. Turn the column on in Columns."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cluster DX : un badge L à côté de l indicatif signale une station qui utilise LoTW, avec le filtre Utilisateurs LoTW seulement qui va avec, et un filtre Continent du spotter restreint selon l origine du spot — un report JA sur 20 m dit peu de chose à un Européen sur son propre chemin. Le panneau de filtres a été remis d aplomb selon une seule règle : un interrupteur est un comportement qu on active ou non, les pastilles choisissent dans un ensemble. Plus rien n existe sous les deux formes, les boutons de verrouillage sont dans le titre de la section qu ils verrouillent, chaque section s efface de la même façon, et le panneau est enfin traduit.",
|
||||||
|
"Cluster DX : le filtre Continent du spotter fonctionne enfin. Les skimmers RBN s annoncent en VU2OY-# et les nœuds cluster en DL1ABC-2, et ce suffixe partait tel quel dans la recherche de préfixe — tous les spots revenaient sans continent et le filtre ne sélectionnait rien.",
|
||||||
|
"Un spot cesse enfin d être NOUVEAU dès que tu l enregistres. La journalisation annonçait le QSO mais ne vidait jamais l instantané de l index des contacts, donc le rafraîchissement qui suit relisait la réponse calculée AVANT le contact — une station restait jaune sur le bandmap et dans le cluster alors que le QSO était bien au log, jusqu à ce qu autre chose reconstruise l index.",
|
||||||
|
"Les informations station gagnent un champ IOTA (MY_IOTA en ADIF, par exemple EU-005), estampillé sur chaque QSO comme les références SOTA et POTA à côté. La table des QSO portait le champ depuis la première version et l import comme l export ADIF le géraient déjà — seul le profil station ne savait pas le fournir, donc une activation d île obligeait à retaper la référence à chaque contact.",
|
||||||
|
"PowerGenius XL : corrigé le lien avec l ampli qui tombait et se reconnectait toutes les quelques secondes, et le blocage en émission. L ampli pousse des trames d état sur la socket même où il répond aux commandes, et il en pousse en permanence dès qu il est en OPERATE ; OpsLog lisait une ligne par commande et prenait la première arrivée pour sa réponse, donc le flux glissait définitivement d une réponse de retard jusqu à expiration et fermeture du lien. Les réponses sont désormais appariées à la commande qui les a demandées. Visible uniquement en liaison distante avec l ampli en OPERATE.",
|
||||||
|
"Aucune couleur sur les stations déjà contactées ne fait plus que ça : la marque bleue disparaît, le reste ne bouge pas. L option vidait aussi le statut du spot, or c est le statut qui estompe une ligne sans intérêt — l activer rendait donc toutes les lignes grises blanches et éclatantes, soit l inverse du but recherché.",
|
||||||
|
"Les carrés locator dans le cluster. Chaque CQ décodé sur le lien UDP WSJT-X porte le grid de l émetteur, et OpsLog le conserve désormais : une colonne Grid affiche le carré et NOUV GRID signale celui jamais contacté, en badge, en cellule remplie et avec son propre filtre. Ce qui compte comme nouveau suit le réglage de regroupement des modes digitaux — activé, un carré fait en FT8 n est plus neuf en FT4 ; désactivé, les deux sont distincts. Seules les stations décodées par ton propre récepteur ont un grid : une ligne de cluster porte le grid du spotter au mieux, jamais celui du DX. Colonne à activer dans Colonnes."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Web publishing: OpsLog can now write your log to a file for a website — a standalone HTML page (sortable, dark/light, no external request of any kind) or a CSV. You pick the columns and how many QSOs, it refreshes when you log and, if you want, on a timer, and it can upload the result by FTP or FTPS. The file is always written locally first, so a network failure leaves a good file on disk instead of a truncated one on the server. Settings → Web publishing.",
|
||||||
|
"Icom console: an IC-9700 gets the bands it actually has. The band row was hardwired to 160–6 m, so the one radio in the range with no HF at all showed ten dead buttons and none of 2 m, 70 cm or 23 cm. The row now follows the model, as the attenuator steps already did — an IC-705 gains 2 m and 70 cm, an IC-9100 those plus 23 cm.",
|
||||||
|
"Maps: the tiles are back. OpenStreetMap blocked OpsLog on its volunteer-run tile servers and every map filled with \"Access blocked\" squares. Their policy requires an application to identify itself with its own User-Agent on each request — something a program drawing maps inside a web view cannot do, the browser sets that header itself. So the two layers that still used those servers, the Street basemap and the locator map, have moved to services whose terms do cover a distributed application: Esri for Street, Carto for the locator map. OpenStreetMap is still credited — Carto's tiles are built from its data — and the locator map now throttles its tile requests like the world map already did.",
|
||||||
|
"Band map: a station you have just worked stops showing as NEW. After each QSO the spot colours are refreshed, but only when the DX-cluster list was on screen — the band map was left out, so working a station with the usual layout (Recent QSOs on the left, band map on the right) left its pill orange until you happened to open the cluster tab. The band map, docked or in its own tab, now counts as on screen like the cluster does.",
|
||||||
|
"Band map: new POTA, new county and already-worked callsign are shown at last. The band map only ever coloured the entity status — new DXCC, new band, new slot, worked — and ignored the other three markers, even though it was already receiving them: a new park on an entity you have worked looked like any other worked spot. They now appear on the pill's left strip, in the same colours the DX-cluster list uses, so a fact is not blue in one panel and green in the next. They stack rather than replace: a worked entity that is also a new park shows both, the way the cluster list already spells them out side by side. A new county is now violet instead of sharing green with a new park — in BOTH panels, since the two would otherwise disagree; the marker colours moved to one shared table, which is also what a per-marker colour setting will drive."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Publication web : OpsLog peut désormais écrire ton journal dans un fichier destiné à un site — une page HTML autonome (triable, claire ou sombre, sans aucune requête externe) ou un CSV. Tu choisis les colonnes et le nombre de QSO, il se rafraîchit à chaque enregistrement et, si tu veux, périodiquement, et il peut envoyer le résultat par FTP ou FTPS. Le fichier est toujours écrit en local d abord : une panne réseau laisse donc un bon fichier sur le disque plutôt qu un fichier tronqué sur le serveur. Réglages → Publication web.",
|
||||||
|
"Console Icom : un IC-9700 reçoit enfin les bandes qu il possède. La rangée de bandes était figée sur 160–6 m, si bien que la seule radio de la gamme sans aucune HF affichait dix boutons morts et aucune de ses bandes 2 m, 70 cm et 23 cm. La rangée suit maintenant le modèle, comme le faisaient déjà les pas d atténuateur — un IC-705 gagne le 2 m et le 70 cm, un IC-9100 ceux-là plus le 23 cm.",
|
||||||
|
"Cartes : les tuiles sont de retour. OpenStreetMap a bloqué OpsLog sur ses serveurs de tuiles bénévoles et toutes les cartes se sont remplies de carrés « Access blocked ». Leur politique exige qu'une application s'identifie par son propre User-Agent à chaque requête — ce qu'un programme qui dessine ses cartes dans une vue web ne peut pas faire, c'est le navigateur qui pose cet en-tête. Les deux couches qui utilisaient encore ces serveurs, le fond Street et la carte des locators, passent donc sur des services dont les conditions couvrent une application distribuée : Esri pour Street, Carto pour les locators. OpenStreetMap reste crédité — les tuiles Carto sont construites à partir de ses données — et la carte des locators limite désormais son débit de requêtes comme le faisait déjà la carte du monde.",
|
||||||
|
"Band map : une station que tu viens de contacter cesse d'apparaître en NEW. Après chaque QSO, les couleurs des spots sont rafraîchies, mais seulement quand la liste du cluster DX était à l'écran — la band map avait été oubliée. Contacter une station dans la disposition habituelle (QSO récents à gauche, band map à droite) laissait donc sa pastille en orange jusqu'à ce qu'on ouvre l'onglet cluster. La band map, ancrée ou dans son onglet, compte désormais comme visible au même titre que le cluster.",
|
||||||
|
"Band map : nouveau POTA, nouveau comté et indicatif déjà contacté sont enfin visibles. La band map ne colorait que le statut d'entité — nouveau DXCC, nouvelle bande, nouveau créneau, contacté — et ignorait les trois autres marqueurs alors qu'elle les recevait déjà : un nouveau parc sur une entité déjà travaillée ressemblait à n'importe quel spot contacté. Ils apparaissent désormais sur la bande latérale de la pastille, dans les couleurs de la liste du cluster DX, pour qu'un même fait ne soit pas bleu dans un panneau et vert dans l'autre. Ils s'empilent au lieu de se remplacer : une entité contactée qui est aussi un nouveau parc affiche les deux, comme la liste du cluster les énumère déjà côte à côte. Un nouveau comté passe en violet au lieu de partager le vert avec un nouveau parc — dans les DEUX panneaux, sinon ils se contrediraient ; les couleurs des marqueurs sont désormais dans une table unique, celle-là même que pilotera l'option de couleur à venir."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.24.1",
|
"version": "0.24.1",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
"unicode/utf8"
|
||||||
|
|
||||||
"hamlog/internal/award"
|
"hamlog/internal/award"
|
||||||
)
|
)
|
||||||
@@ -58,6 +59,15 @@ func main() {
|
|||||||
sc.Scan() // header
|
sc.Scan() // header
|
||||||
for sc.Scan() {
|
for sc.Scan() {
|
||||||
line := sc.Text()
|
line := sc.Text()
|
||||||
|
// The FIPS CSV is not reliably UTF-8, and the one county whose name is
|
||||||
|
// not ASCII (Doña Ana, NM) came through mangled once already — it landed
|
||||||
|
// in the reference as "NM/DO̱AANA", a code no log could ever match,
|
||||||
|
// silently costing that county for every operator. Refuse the row rather
|
||||||
|
// than emit a broken one.
|
||||||
|
if !utf8.ValidString(line) {
|
||||||
|
fmt.Fprintf(os.Stderr, "cntygen: skipping non-UTF-8 line: %q\n", line)
|
||||||
|
continue
|
||||||
|
}
|
||||||
parts := strings.SplitN(line, ",", 3)
|
parts := strings.SplitN(line, ",", 3)
|
||||||
if len(parts) < 3 {
|
if len(parts) < 3 {
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -0,0 +1,203 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// One-shot generator: emits internal/uls/ctcounty_gen.go, the Connecticut
|
||||||
|
// ZIP → legal county table. Not part of the build.
|
||||||
|
//
|
||||||
|
// Why it has to exist
|
||||||
|
// -------------------
|
||||||
|
// internal/uls resolves a US callsign to a county through GeoNames' ZIP table.
|
||||||
|
// The Census replaced Connecticut's eight counties with nine PLANNING REGIONS
|
||||||
|
// as county-equivalents in 2022, and GeoNames followed: 418 of Connecticut's
|
||||||
|
// 429 ZIPs now report "Capitol Region", "Lower Connecticut River Valley" and
|
||||||
|
// so on. CQ's USA-CA award did not follow, callbooks did not follow, and no
|
||||||
|
// operator's log did either — so every Connecticut station resolved to a name
|
||||||
|
// nothing could match, showed as a new county for ever, and counted for no
|
||||||
|
// award. Roughly 15 000 US callsigns.
|
||||||
|
//
|
||||||
|
// A planning region is NOT a renamed county — it is built from towns drawn
|
||||||
|
// from several different counties — so there is no name-to-name mapping to be
|
||||||
|
// had. The ZIP is the only handle, hence this table.
|
||||||
|
//
|
||||||
|
// Sources (both public, both free)
|
||||||
|
// --------------------------------
|
||||||
|
// geonames US.txt from https://download.geonames.org/export/zip/US.zip
|
||||||
|
// — the ZIP list itself, and each ZIP's centroid.
|
||||||
|
// crosswalk https://www2.census.gov/geo/docs/maps-data/data/rel2020/
|
||||||
|
// zcta520/tab20_zcta520_county20_natl.txt
|
||||||
|
// — the 2020 ZCTA↔county relationship file, which predates the
|
||||||
|
// change and therefore still carries the eight real counties.
|
||||||
|
//
|
||||||
|
// The crosswalk covers 278 of the 418 affected ZIPs. The rest are PO-box-only
|
||||||
|
// ZIPs, which have no ZCTA at all; each is given the county of the nearest
|
||||||
|
// resolved ZIP centroid. That is sound here because a PO-box ZIP sits inside
|
||||||
|
// the town it serves, and Connecticut's counties are tens of kilometres across
|
||||||
|
// — the fallback can only err on a ZIP that straddles a county line, which the
|
||||||
|
// ZIP-to-county approach is already documented as accepting (~98%).
|
||||||
|
//
|
||||||
|
// Usage:
|
||||||
|
//
|
||||||
|
// go run ./cmd/ctzipgen US.txt tab20_zcta520_county20_natl.txt > internal/uls/ctcounty_gen.go
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"os"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type zipPt struct {
|
||||||
|
zip string
|
||||||
|
lat, lon float64
|
||||||
|
county string // from the crosswalk, "" if the ZIP has no ZCTA
|
||||||
|
geoName string // what GeoNames says today
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
if len(os.Args) < 3 {
|
||||||
|
fmt.Fprintln(os.Stderr, "usage: ctzipgen US.txt tab20_zcta520_county20_natl.txt")
|
||||||
|
os.Exit(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. Every Connecticut ZIP, with its centroid, from GeoNames.
|
||||||
|
var pts []*zipPt
|
||||||
|
byZip := map[string]*zipPt{}
|
||||||
|
f, err := os.Open(os.Args[1])
|
||||||
|
must(err)
|
||||||
|
sc := bufio.NewScanner(f)
|
||||||
|
sc.Buffer(make([]byte, 0, 64*1024), 256*1024)
|
||||||
|
for sc.Scan() {
|
||||||
|
c := strings.Split(sc.Text(), "\t")
|
||||||
|
if len(c) < 11 || strings.ToUpper(strings.TrimSpace(c[4])) != "CT" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
z := strings.TrimSpace(c[1])
|
||||||
|
if z == "" || byZip[z] != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
p := &zipPt{zip: z, lat: atof(c[9]), lon: atof(c[10]), geoName: strings.TrimSpace(c[5])}
|
||||||
|
byZip[z] = p
|
||||||
|
pts = append(pts, p)
|
||||||
|
}
|
||||||
|
must(sc.Err())
|
||||||
|
f.Close()
|
||||||
|
|
||||||
|
// 2. The 2020 county for each ZCTA. A ZCTA can straddle a county line, so
|
||||||
|
// keep the county holding the largest share of its land area.
|
||||||
|
best := map[string]float64{}
|
||||||
|
f2, err := os.Open(os.Args[2])
|
||||||
|
must(err)
|
||||||
|
sc2 := bufio.NewScanner(f2)
|
||||||
|
sc2.Buffer(make([]byte, 0, 64*1024), 1<<20)
|
||||||
|
sc2.Scan() // header
|
||||||
|
for sc2.Scan() {
|
||||||
|
c := strings.Split(sc2.Text(), "|")
|
||||||
|
if len(c) < 18 || !strings.HasPrefix(c[9], "09") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
p := byZip[strings.TrimSpace(c[1])]
|
||||||
|
if p == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
area := atof(c[16])
|
||||||
|
if p.county != "" && area <= best[p.zip] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
best[p.zip] = area
|
||||||
|
p.county = strings.TrimSuffix(strings.TrimSpace(c[10]), " County")
|
||||||
|
}
|
||||||
|
must(sc2.Err())
|
||||||
|
f2.Close()
|
||||||
|
|
||||||
|
// 3. Fill the PO-box-only ZIPs from the nearest ZIP the crosswalk resolved.
|
||||||
|
var anchors []*zipPt
|
||||||
|
for _, p := range pts {
|
||||||
|
if p.county != "" {
|
||||||
|
anchors = append(anchors, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(anchors) == 0 {
|
||||||
|
fmt.Fprintln(os.Stderr, "ctzipgen: crosswalk resolved nothing — wrong file?")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
filled := 0
|
||||||
|
for _, p := range pts {
|
||||||
|
if p.county != "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
nearest, bestD := "", math.MaxFloat64
|
||||||
|
for _, a := range anchors {
|
||||||
|
if d := haversine(p.lat, p.lon, a.lat, a.lon); d < bestD {
|
||||||
|
bestD, nearest = d, a.county
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.county = nearest
|
||||||
|
filled++
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Self-check: the ZIPs GeoNames still labels with a real county must
|
||||||
|
// agree with what we derived, or the derivation is wrong.
|
||||||
|
real := map[string]bool{
|
||||||
|
"Fairfield": true, "Hartford": true, "Litchfield": true, "Middlesex": true,
|
||||||
|
"New Haven": true, "New London": true, "Tolland": true, "Windham": true,
|
||||||
|
}
|
||||||
|
checked, bad := 0, 0
|
||||||
|
for _, p := range pts {
|
||||||
|
if !real[p.geoName] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
checked++
|
||||||
|
if p.geoName != p.county {
|
||||||
|
bad++
|
||||||
|
fmt.Fprintf(os.Stderr, "MISMATCH %s: geonames %q, derived %q\n", p.zip, p.geoName, p.county)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fmt.Fprintf(os.Stderr, "ctzipgen: %d zips, %d from crosswalk, %d by nearest; cross-check %d/%d agree\n",
|
||||||
|
len(pts), len(pts)-filled, filled, checked-bad, checked)
|
||||||
|
if bad > 0 {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Slice(pts, func(i, j int) bool { return pts[i].zip < pts[j].zip })
|
||||||
|
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("// Code generated by cmd/ctzipgen. DO NOT EDIT.\n\n")
|
||||||
|
b.WriteString("package uls\n\n")
|
||||||
|
b.WriteString("// ctCounty maps a Connecticut ZIP to its legal county.\n")
|
||||||
|
b.WriteString("//\n")
|
||||||
|
b.WriteString("// GeoNames reports Connecticut's 2022 planning regions instead, which no\n")
|
||||||
|
b.WriteString("// award, callbook or log uses. See cmd/ctzipgen for how this was built and\n")
|
||||||
|
b.WriteString("// why a name-to-name mapping cannot work.\n")
|
||||||
|
fmt.Fprintf(&b, "var ctCounty = map[string]string{\n")
|
||||||
|
for _, p := range pts {
|
||||||
|
fmt.Fprintf(&b, "\t%q: %q,\n", p.zip, p.county)
|
||||||
|
}
|
||||||
|
b.WriteString("}\n")
|
||||||
|
fmt.Print(b.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
func atof(s string) float64 {
|
||||||
|
v, _ := strconv.ParseFloat(strings.TrimSpace(s), 64)
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
// haversine returns the great-circle distance in km. Connecticut is small
|
||||||
|
// enough that a flat approximation would do, but this costs nothing and cannot
|
||||||
|
// be wrong near the state's edges.
|
||||||
|
func haversine(lat1, lon1, lat2, lon2 float64) float64 {
|
||||||
|
const r = 6371.0
|
||||||
|
dLat := (lat2 - lat1) * math.Pi / 180
|
||||||
|
dLon := (lon2 - lon1) * math.Pi / 180
|
||||||
|
a := math.Sin(dLat/2)*math.Sin(dLat/2) +
|
||||||
|
math.Cos(lat1*math.Pi/180)*math.Cos(lat2*math.Pi/180)*math.Sin(dLon/2)*math.Sin(dLon/2)
|
||||||
|
return 2 * r * math.Asin(math.Sqrt(a))
|
||||||
|
}
|
||||||
|
|
||||||
|
func must(err error) {
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintln(os.Stderr, "ctzipgen:", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestCopyDirContentsCreatesDestination pins the bug that broke copying a QSL
|
||||||
|
// design between profiles.
|
||||||
|
//
|
||||||
|
// copyDirContents wrote straight into dst without creating it, so the first
|
||||||
|
// os.Create failed with ENOENT. The caller was written as "ignore
|
||||||
|
// os.IsNotExist", meaning "the source has no assets, that is fine" — and ENOENT
|
||||||
|
// from the failed write matched it exactly. Nothing was copied, no error was
|
||||||
|
// reported, and the operator saw "copied design is incomplete: hero photo file
|
||||||
|
// … not found" from the validation two lines later.
|
||||||
|
func TestCopyDirContentsCreatesDestination(t *testing.T) {
|
||||||
|
base := t.TempDir()
|
||||||
|
src := filepath.Join(base, "src")
|
||||||
|
if err := os.MkdirAll(filepath.Join(src, "sub"), 0o755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(filepath.Join(src, "img_25c06bda.jpg"), []byte("hero"), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(filepath.Join(src, "sub", "back.png"), []byte("back"), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// dst does not exist — the case of every first copy.
|
||||||
|
dst := filepath.Join(base, "dst")
|
||||||
|
if err := copyDirContents(src, dst); err != nil {
|
||||||
|
t.Fatalf("copyDirContents: %v", err)
|
||||||
|
}
|
||||||
|
for name, want := range map[string]string{
|
||||||
|
"img_25c06bda.jpg": "hero",
|
||||||
|
"sub/back.png": "back",
|
||||||
|
} {
|
||||||
|
got, err := os.ReadFile(filepath.Join(dst, filepath.FromSlash(name)))
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("%s: %v", name, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if string(got) != want {
|
||||||
|
t.Errorf("%s = %q, want %q", name, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A missing SOURCE is still an error from copyDirContents itself — it is the
|
||||||
|
// caller that decides whether a design with no pictures is acceptable, and it
|
||||||
|
// can only decide that if this does not quietly succeed.
|
||||||
|
func TestCopyDirContentsMissingSource(t *testing.T) {
|
||||||
|
base := t.TempDir()
|
||||||
|
if err := copyDirContents(filepath.Join(base, "nope"), filepath.Join(base, "dst")); err == nil {
|
||||||
|
t.Fatal("copying a missing source returned no error")
|
||||||
|
} else if !os.IsNotExist(err) {
|
||||||
|
t.Fatalf("want a not-exist error, got %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/gridcache"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The grid cache used to drop EVERYTHING at its ceiling. That was survivable
|
||||||
|
// while the only feed was this station's own decodes, which never reached it.
|
||||||
|
// Fed by anything larger it is a cliff: every locator in the cluster list
|
||||||
|
// disappears at once, periodically, and the operator sees the column empty
|
||||||
|
// itself for no reason.
|
||||||
|
//
|
||||||
|
// Rotation keeps the previous generation, so a full cache costs the older half
|
||||||
|
// and nothing more.
|
||||||
|
func TestDecodeGridRotationKeepsThePreviousGeneration(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
|
||||||
|
// Fill exactly one generation.
|
||||||
|
for i := 0; i < decodeGridsCap; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("CALL%06d", i), "JN36", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||||
|
t.Fatalf("first entry lost before any rotation: %q", got)
|
||||||
|
}
|
||||||
|
if a.decodeGridsOld != nil {
|
||||||
|
t.Fatal("rotated early — the cap is the ceiling of ONE generation")
|
||||||
|
}
|
||||||
|
|
||||||
|
// One more entry rotates.
|
||||||
|
a.rememberDecodeGrid("NEWCALL", "IO91", gridcache.SourceDecode)
|
||||||
|
if a.decodeGridsOld == nil {
|
||||||
|
t.Fatal("did not rotate at the cap")
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("NEWCALL"); got != "IO91" {
|
||||||
|
t.Errorf("the entry that caused the rotation was lost: %q", got)
|
||||||
|
}
|
||||||
|
// The whole previous generation is still readable — this is the point.
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||||
|
t.Errorf("a locator from the previous generation was dropped: %q — that is the cliff again", got)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL099999"); got != "JN36" {
|
||||||
|
t.Errorf("previous generation incomplete: %q", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A second rotation is what finally retires the oldest half.
|
||||||
|
for i := 0; i < decodeGridsCap; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("SECOND%06d", i), "KP20", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "" {
|
||||||
|
t.Errorf("the cache is unbounded: %q survived two rotations", got)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("NEWCALL"); got != "IO91" {
|
||||||
|
t.Errorf("an entry one generation old was retired too early: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Callsigns are normalised on the way in AND on the way out, or a spot for
|
||||||
|
// "f4bpo" would miss a grid learnt as "F4BPO".
|
||||||
|
func TestDecodeGridCaseAndBlanks(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
a.rememberDecodeGrid(" f4bpo ", "JN36", gridcache.SourceDecode)
|
||||||
|
if got := a.lookupDecodeGrid("F4BPO"); got != "JN36" {
|
||||||
|
t.Errorf("lookup of the upper-case form failed: %q", got)
|
||||||
|
}
|
||||||
|
a.rememberDecodeGrid("", "JN36", gridcache.SourceDecode)
|
||||||
|
a.rememberDecodeGrid("K1ABC", "", gridcache.SourceDecode)
|
||||||
|
if got := a.lookupDecodeGrid("K1ABC"); got != "" {
|
||||||
|
t.Errorf("stored an empty grid: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The write path runs on the decode goroutine while the cluster status builder
|
||||||
|
// reads. Rotation swaps the map headers, so an unguarded read is a data race
|
||||||
|
// rather than a stale value.
|
||||||
|
//
|
||||||
|
// This build is CGO-free, so -race is not available here; the test exercises the
|
||||||
|
// interleaving and would fault on a concurrent map access even without it.
|
||||||
|
func TestDecodeGridConcurrentAccess(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(2)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 20000; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("W%05d", i), "FN31", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 20000; i++ {
|
||||||
|
_ = a.lookupDecodeGrid(fmt.Sprintf("W%05d", i))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only a CHANGE may reach the write batch.
|
||||||
|
//
|
||||||
|
// The feeds repeat themselves — the same station is reported by dozens of
|
||||||
|
// receivers a minute — so queueing every report would put the whole stream in
|
||||||
|
// the batch instead of the news in it, and turn a cache into a write amplifier.
|
||||||
|
func TestOnlyChangesAreQueued(t *testing.T) {
|
||||||
|
st, err := gridcache.Open(filepath.Join(t.TempDir(), "grids.db"), nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer st.Close()
|
||||||
|
a := &App{gridStore: st}
|
||||||
|
|
||||||
|
a.rememberDecodeGrid("F4BPO", "JN36", gridcache.SourceDecode)
|
||||||
|
if n := st.Pending(); n != 1 {
|
||||||
|
t.Fatalf("a new locator queued %d writes, want 1", n)
|
||||||
|
}
|
||||||
|
if err := st.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The same report, a hundred times over, is not news.
|
||||||
|
for i := 0; i < 100; i++ {
|
||||||
|
a.rememberDecodeGrid("F4BPO", "JN36", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if n := st.Pending(); n != 0 {
|
||||||
|
t.Errorf("unchanged reports queued %d writes — the batch would carry the whole feed", n)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A station that moved is.
|
||||||
|
a.rememberDecodeGrid("F4BPO", "KP30", gridcache.SourceDecode)
|
||||||
|
if n := st.Pending(); n != 1 {
|
||||||
|
t.Errorf("a changed locator queued %d writes, want 1", n)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("F4BPO"); got != "KP30" {
|
||||||
|
t.Errorf("the map kept the old locator: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rotation must be OFF while a store is attached: it would discard callsigns the
|
||||||
|
// database still holds, and the lookup would then miss something we know.
|
||||||
|
func TestNoRotationWhilePersisting(t *testing.T) {
|
||||||
|
st, err := gridcache.Open(filepath.Join(t.TempDir(), "grids.db"), nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer st.Close()
|
||||||
|
a := &App{gridStore: st}
|
||||||
|
|
||||||
|
for i := 0; i < decodeGridsCap+10; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("CALL%06d", i), "JN36", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if a.decodeGridsOld != nil {
|
||||||
|
t.Error("rotated while a store was attached — locators the database holds would go missing")
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||||
|
t.Errorf("the first entry was dropped: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
+493
-112
@@ -16,7 +16,7 @@ import {
|
|||||||
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
|
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
|
||||||
SMTPConfigured, SendLogToDeveloper,
|
SMTPConfigured, SendLogToDeveloper,
|
||||||
WorkedBefore,
|
WorkedBefore,
|
||||||
SetCompactMode,
|
SetCompactMode, SetCompactHeight,
|
||||||
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
|
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
|
||||||
GetSecretStatus, UnlockSecrets,
|
GetSecretStatus, UnlockSecrets,
|
||||||
RefreshCtyDat, DownloadAllReferenceLists,
|
RefreshCtyDat, DownloadAllReferenceLists,
|
||||||
@@ -51,6 +51,8 @@ import {
|
|||||||
ReportLiveActivity, LiveLastQSOAgeSec,
|
ReportLiveActivity, LiveLastQSOAgeSec,
|
||||||
GetAmpStatuses, AmpOperate,
|
GetAmpStatuses, AmpOperate,
|
||||||
GetFlexState, FlexAmpOperate,
|
GetFlexState, FlexAmpOperate,
|
||||||
|
GetPSKReporterStatus, GetLiveOpenings,
|
||||||
|
QSLViaRepairStatus, RepairQSLVia, DismissQSLViaRepair,
|
||||||
} from '../wailsjs/go/main/App';
|
} from '../wailsjs/go/main/App';
|
||||||
import { Combobox } from '@/components/ui/combobox';
|
import { Combobox } from '@/components/ui/combobox';
|
||||||
import { applyAwardRefs } from '@/lib/awardRefs';
|
import { applyAwardRefs } from '@/lib/awardRefs';
|
||||||
@@ -89,6 +91,8 @@ 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, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||||
|
import { GetRowColors, GetSpotTTLMinutes, IsNewUSCounty } from '../wailsjs/go/main/App';
|
||||||
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';
|
||||||
@@ -526,6 +530,28 @@ export default function App() {
|
|||||||
setCompact(next);
|
setCompact(next);
|
||||||
SetCompactMode(next);
|
SetCompactMode(next);
|
||||||
}
|
}
|
||||||
|
// Fit the compact window to what was actually rendered.
|
||||||
|
//
|
||||||
|
// The height was a constant "tuned so the compact entry strip fits in a single
|
||||||
|
// row". A constant tuned against a layout stops being true the moment the
|
||||||
|
// layout changes, and this one outlived a strip that had since lost a row —
|
||||||
|
// leaving a band of empty window under the fields. Measure instead.
|
||||||
|
const compactRootRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!compact) return;
|
||||||
|
const fit = () => {
|
||||||
|
const el = compactRootRef.current;
|
||||||
|
if (!el) return;
|
||||||
|
// Rounded, so a sub-pixel reflow cannot start a resize loop.
|
||||||
|
// + the compact topbar, which is a fixed h-8 (32px), + a couple of pixels
|
||||||
|
// for the border so the strip is never clipped by one row of anti-aliasing.
|
||||||
|
SetCompactHeight(Math.round(el.getBoundingClientRect().height) + 32 + 2);
|
||||||
|
};
|
||||||
|
const id = window.setTimeout(fit, 60); // let the strip paint first
|
||||||
|
const ro = new ResizeObserver(fit);
|
||||||
|
if (compactRootRef.current) ro.observe(compactRootRef.current);
|
||||||
|
return () => { window.clearTimeout(id); ro.disconnect(); };
|
||||||
|
}, [compact]);
|
||||||
|
|
||||||
// CAT — receives live rig state via Wails events.
|
// CAT — receives live rig state via Wails events.
|
||||||
const [catState, setCatState] = useState<CATState>({ enabled: false, connected: false } as any);
|
const [catState, setCatState] = useState<CATState>({ enabled: false, connected: false } as any);
|
||||||
@@ -1484,7 +1510,22 @@ 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' | 'new-grid';
|
||||||
|
// 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.
|
||||||
|
// LoTW-only, and the spotter's continent. Both narrow the list by a property
|
||||||
|
// of the station rather than by what the spot is worth, which is why they sit
|
||||||
|
// beside Hide worked and not among the status chips.
|
||||||
|
const [clusterLotwOnly, setClusterLotwOnly] = useState(() => localStorage.getItem('opslog.clusterLotwOnly') === '1');
|
||||||
|
const [clusterSpotterConts, setClusterSpotterConts] = useState<Set<string>>(() => lsSet<string>('opslog.clusterSpotterCont'));
|
||||||
|
// Read through lib/spotDisplay, not straight from localStorage: while the two
|
||||||
|
// options are withdrawn it answers false, so the cluster list cannot end up
|
||||||
|
// applying an option the operator can no longer see or switch off.
|
||||||
|
const [clusterMuteWorked, setClusterMuteWorked] = useState(() => readSpotDisplayOptions().muteWorked);
|
||||||
|
const [clusterSlotHighlight, setClusterSlotHighlight] = useState(() => readSpotDisplayOptions().slotHighlight);
|
||||||
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).
|
||||||
@@ -1503,11 +1544,13 @@ export default function App() {
|
|||||||
writeUiPref('opslog.clusterLockBand', clusterLockBand ? '1' : '0');
|
writeUiPref('opslog.clusterLockBand', clusterLockBand ? '1' : '0');
|
||||||
writeUiPref('opslog.clusterLockMode', clusterLockMode ? '1' : '0');
|
writeUiPref('opslog.clusterLockMode', clusterLockMode ? '1' : '0');
|
||||||
writeUiPref('opslog.clusterStatusFilter', JSON.stringify([...clusterStatusFilter]));
|
writeUiPref('opslog.clusterStatusFilter', JSON.stringify([...clusterStatusFilter]));
|
||||||
|
writeUiPref('opslog.clusterSpotterCont', JSON.stringify([...clusterSpotterConts]));
|
||||||
writeUiPref('opslog.clusterModeFilter', JSON.stringify([...clusterModeFilter]));
|
writeUiPref('opslog.clusterModeFilter', JSON.stringify([...clusterModeFilter]));
|
||||||
writeUiPref('opslog.clusterSearch', clusterSearch);
|
writeUiPref('opslog.clusterSearch', clusterSearch);
|
||||||
writeUiPref('opslog.clusterHideWorked', clusterHideWorked ? '1' : '0');
|
writeUiPref('opslog.clusterHideWorked', clusterHideWorked ? '1' : '0');
|
||||||
}, [clusterFilterSource, clusterGroup, clusterBands, clusterLockBand, clusterLockMode,
|
}, [clusterFilterSource, clusterGroup, clusterBands, clusterLockBand, clusterLockMode,
|
||||||
clusterStatusFilter, clusterModeFilter, clusterSearch, clusterHideWorked]);
|
clusterStatusFilter, clusterModeFilter, clusterSearch, clusterHideWorked,
|
||||||
|
clusterLotwOnly, clusterSpotterConts]);
|
||||||
// Bands shown side-by-side in the Band Map tab (portable).
|
// Bands shown side-by-side in the Band Map tab (portable).
|
||||||
const [bandMapBands, setBandMapBands] = useState<string[]>(() => {
|
const [bandMapBands, setBandMapBands] = useState<string[]>(() => {
|
||||||
try { const v = JSON.parse(localStorage.getItem('opslog.bandMapBands') || '[]'); return Array.isArray(v) ? v : []; }
|
try { const v = JSON.parse(localStorage.getItem('opslog.bandMapBands') || '[]'); return Array.isArray(v) ? v : []; }
|
||||||
@@ -1580,7 +1623,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; lotw?: boolean; spotter_continent?: string; grid?: string; new_grid?: boolean; 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);
|
||||||
@@ -1613,13 +1659,13 @@ export default function App() {
|
|||||||
const refreshSpotStatuses = useCallback(async () => {
|
const refreshSpotStatuses = useCallback(async () => {
|
||||||
const cur = spotsRef.current;
|
const cur = spotsRef.current;
|
||||||
if (!cur.length) return;
|
if (!cur.length) return;
|
||||||
const queries: { call: string; band: string; mode: string; pota_ref: string }[] = [];
|
const queries: { call: string; band: string; mode: string; pota_ref: string; spotter: string }[] = [];
|
||||||
const seen = new Set<string>();
|
const seen = new Set<string>();
|
||||||
for (const s of cur) {
|
for (const s of cur) {
|
||||||
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);
|
||||||
if (seen.has(k)) continue;
|
if (seen.has(k)) continue;
|
||||||
seen.add(k);
|
seen.add(k);
|
||||||
queries.push({ call: s.dx_call, band: s.band ?? '', mode: inferSpotMode(s.comment ?? '', s.freq_hz), pota_ref: (s as any).pota_ref ?? '' });
|
queries.push({ call: s.dx_call, band: s.band ?? '', mode: inferSpotMode(s.comment ?? '', s.freq_hz), pota_ref: (s as any).pota_ref ?? '', spotter: s.spotter ?? '' });
|
||||||
}
|
}
|
||||||
if (!queries.length) return;
|
if (!queries.length) return;
|
||||||
try {
|
try {
|
||||||
@@ -1630,7 +1676,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, lotw: !!(r as any).lotw, spotter_continent: (r as any).spotter_continent, grid: (r as any).grid, new_grid: !!(r as any).new_grid, 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,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1640,23 +1686,30 @@ export default function App() {
|
|||||||
}, []);
|
}, []);
|
||||||
// After a QSO is logged, refresh the shown spots so a call/entity/POTA/prefix/
|
// After a QSO is logged, refresh the shown spots so a call/entity/POTA/prefix/
|
||||||
// slot just worked drops its NEW badge — WITHOUT blanking the others (see the
|
// slot just worked drops its NEW badge — WITHOUT blanking the others (see the
|
||||||
// merge above). Kept cheap: only while the cluster is on screen (a log while
|
// merge above). Kept cheap: only while something that DRAWS a spot status is on
|
||||||
// hidden marks it dirty and refreshes ONCE on next open), and debounced so a
|
// screen (a log while hidden marks it dirty and refreshes ONCE on the next
|
||||||
// fast run coalesces instead of re-scanning per QSO.
|
// open), and debounced so a fast run coalesces instead of re-scanning per QSO.
|
||||||
const clusterVisibleRef = useRef(false);
|
//
|
||||||
|
// "Something" means the band map as much as the cluster list. The test used to
|
||||||
|
// name only the cluster, so working a station while the docked band map was up
|
||||||
|
// — the ordinary layout: Recent QSOs on the left, band map on the right — left
|
||||||
|
// its pill NEW until the cluster tab happened to be opened. Reported on an E51
|
||||||
|
// that stayed orange after the QSO was in the log.
|
||||||
|
const spotsVisibleRef = useRef(false);
|
||||||
const spotsDirtyRef = useRef(false);
|
const spotsDirtyRef = useRef(false);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const vis = mainPaneLeft === 'cluster' || mainPaneRight === 'cluster' || activeTab === 'cluster';
|
const vis = mainPaneLeft === 'cluster' || mainPaneRight === 'cluster'
|
||||||
if (vis && !clusterVisibleRef.current && spotsDirtyRef.current) {
|
|| activeTab === 'cluster' || activeTab === 'bandmap' || showBandMap;
|
||||||
|
if (vis && !spotsVisibleRef.current && spotsDirtyRef.current) {
|
||||||
spotsDirtyRef.current = false;
|
spotsDirtyRef.current = false;
|
||||||
void refreshSpotStatuses();
|
void refreshSpotStatuses();
|
||||||
}
|
}
|
||||||
clusterVisibleRef.current = vis;
|
spotsVisibleRef.current = vis;
|
||||||
}, [mainPaneLeft, mainPaneRight, activeTab, refreshSpotStatuses]);
|
}, [mainPaneLeft, mainPaneRight, activeTab, showBandMap, refreshSpotStatuses]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let t: number | undefined;
|
let t: number | undefined;
|
||||||
const off = EventsOn('qso:logged', () => {
|
const off = EventsOn('qso:logged', () => {
|
||||||
if (!clusterVisibleRef.current) { spotsDirtyRef.current = true; return; }
|
if (!spotsVisibleRef.current) { spotsDirtyRef.current = true; return; }
|
||||||
if (t) window.clearTimeout(t);
|
if (t) window.clearTimeout(t);
|
||||||
t = window.setTimeout(() => void refreshSpotStatuses(), 2000);
|
t = window.setTimeout(() => void refreshSpotStatuses(), 2000);
|
||||||
});
|
});
|
||||||
@@ -1684,6 +1737,27 @@ export default function App() {
|
|||||||
const [showSettings, setShowSettings] = useState(false);
|
const [showSettings, setShowSettings] = useState(false);
|
||||||
// Re-read the "beam on map" toggle when Preferences closes (it's edited there).
|
// Re-read the "beam on map" toggle when Preferences closes (it's edited there).
|
||||||
useEffect(() => { if (!showSettings) setShowBeamOnMap(localStorage.getItem('opslog.showBeamOnMap') !== '0'); }, [showSettings]);
|
useEffect(() => { if (!showSettings) setShowBeamOnMap(localStorage.getItem('opslog.showBeamOnMap') !== '0'); }, [showSettings]);
|
||||||
|
// Openings under way, for the blinking status-bar badge. Polled rather than
|
||||||
|
// event-driven: the badge also has to go OUT when a band goes quiet, and
|
||||||
|
// nothing emits an event for something that stopped happening.
|
||||||
|
const [liveOpenings, setLiveOpenings] = useState<any[]>([]);
|
||||||
|
useEffect(() => {
|
||||||
|
const load = () => { GetLiveOpenings().then((v: any) => setLiveOpenings(v ?? [])).catch(() => {}); };
|
||||||
|
load();
|
||||||
|
const t = window.setInterval(load, 20000);
|
||||||
|
return () => window.clearInterval(t);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// PSK Reporter feed, for the status-bar chip. Polled slowly: the chip only
|
||||||
|
// says up or down, and the count behind it is a tooltip.
|
||||||
|
const [pskr, setPskr] = useState<any>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
const load = () => { GetPSKReporterStatus().then(setPskr).catch(() => {}); };
|
||||||
|
load();
|
||||||
|
const t = window.setInterval(load, 10000);
|
||||||
|
return () => window.clearInterval(t);
|
||||||
|
}, []);
|
||||||
|
|
||||||
// "ON AIR" status-bar badge: mirrors the multi-op live status this operator
|
// "ON AIR" status-bar badge: mirrors the multi-op live status this operator
|
||||||
// publishes — online (blinking) when a QSO was logged in the last 5 min, else
|
// publishes — online (blinking) when a QSO was logged in the last 5 min, else
|
||||||
// offline. Publishing is always on for a shared MySQL logbook (no user toggle:
|
// offline. Publishing is always on for a shared MySQL logbook (no user toggle:
|
||||||
@@ -1720,6 +1794,20 @@ export default function App() {
|
|||||||
// close so the next plain "Preferences" launch reverts to default.
|
// close so the next plain "Preferences" launch reverts to default.
|
||||||
const [settingsSection, setSettingsSection] = useState<string | undefined>(undefined);
|
const [settingsSection, setSettingsSection] = useState<string | undefined>(undefined);
|
||||||
const [showDeleteAll, setShowDeleteAll] = useState(false);
|
const [showDeleteAll, setShowDeleteAll] = useState(false);
|
||||||
|
// How many QSOs hold a QSL routing word where the manager belongs — null when
|
||||||
|
// there is nothing to offer, or the operator has already answered. Asked once
|
||||||
|
// per log, a moment after startup so it does not race the first paint.
|
||||||
|
const [qslViaRepair, setQslViaRepair] = useState<number | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const id = window.setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
const s: any = await QSLViaRepairStatus();
|
||||||
|
if (alive && !s?.asked && (s?.affected ?? 0) > 0) setQslViaRepair(s.affected);
|
||||||
|
} catch { /* a log we cannot query yet will be offered next start */ }
|
||||||
|
}, 4000);
|
||||||
|
return () => { alive = false; window.clearTimeout(id); };
|
||||||
|
}, []);
|
||||||
const [showAbout, setShowAbout] = useState(false);
|
const [showAbout, setShowAbout] = useState(false);
|
||||||
// "What's new": the changelog for the version(s) since the operator last ran,
|
// "What's new": the changelog for the version(s) since the operator last ran,
|
||||||
// shown once on the first launch after an update (EN/FR per the UI language).
|
// shown once on the first launch after an update (EN/FR per the UI language).
|
||||||
@@ -1873,6 +1961,35 @@ export default function App() {
|
|||||||
// change). The grid reads them straight from the row — no per-page backend
|
// change). The grid reads them straight from the row — no per-page backend
|
||||||
// recompute — so here we just parse the stored JSON string into the code→ref
|
// recompute — so here we just parse the stored JSON string into the code→ref
|
||||||
// object the award columns expect (keys are already upper-case).
|
// object the award columns expect (keys are already upper-case).
|
||||||
|
// Row colouring by QSL status (Settings → Appearance). Reloaded when the
|
||||||
|
// settings dialog closes, which is the only place it changes.
|
||||||
|
const [rowColors, setRowColors] = useState<any>(null);
|
||||||
|
useEffect(() => { GetRowColors().then(setRowColors).catch(() => {}); }, [showSettings]);
|
||||||
|
// Spot lifetime (Settings → DX Cluster). Spots are actually REMOVED rather
|
||||||
|
// than filtered at render: the cluster list, every band map and the counts all
|
||||||
|
// read the same array, so pruning it once is what makes the setting mean the
|
||||||
|
// same thing everywhere — and it gives the memory back.
|
||||||
|
const [spotTTLMin, setSpotTTLMin] = useState(0);
|
||||||
|
useEffect(() => { GetSpotTTLMinutes().then(setSpotTTLMin).catch(() => {}); }, [showSettings]);
|
||||||
|
useEffect(() => {
|
||||||
|
if (spotTTLMin <= 0) return; // 0 = keep until the count cap pushes them out
|
||||||
|
const sweep = () => {
|
||||||
|
const cutoff = Date.now() - spotTTLMin * 60_000;
|
||||||
|
setSpots((arr) => {
|
||||||
|
const kept = arr.filter((sp) => {
|
||||||
|
const t = Date.parse((sp as any).received_at ?? '');
|
||||||
|
return isNaN(t) || t >= cutoff; // an unparseable stamp is never a reason to drop a spot
|
||||||
|
});
|
||||||
|
return kept.length === arr.length ? arr : kept;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
sweep();
|
||||||
|
// Half a minute: fine enough that a 5-minute setting is honoured closely,
|
||||||
|
// coarse enough to be invisible next to the spot stream itself.
|
||||||
|
const id = window.setInterval(sweep, 30_000);
|
||||||
|
return () => window.clearInterval(id);
|
||||||
|
}, [spotTTLMin]);
|
||||||
|
|
||||||
const qsosWithAwards = useMemo(
|
const qsosWithAwards = useMemo(
|
||||||
() => (qsos as any[]).map((q) => ({ ...q, award_refs: parseAwardRefs(q.award_refs) })),
|
() => (qsos as any[]).map((q) => ({ ...q, award_refs: parseAwardRefs(q.award_refs) })),
|
||||||
[qsos],
|
[qsos],
|
||||||
@@ -1908,7 +2025,7 @@ export default function App() {
|
|||||||
// === Station ===
|
// === Station ===
|
||||||
const [station, setStation] = useState<StationSettings>({
|
const [station, setStation] = useState<StationSettings>({
|
||||||
callsign: '', operator: '',
|
callsign: '', operator: '',
|
||||||
my_grid: '', my_country: '', my_sota_ref: '', my_pota_ref: '',
|
my_grid: '', my_country: '', my_sota_ref: '', my_pota_ref: '', my_iota: '',
|
||||||
});
|
});
|
||||||
const [showFirstRun, setShowFirstRun] = useState(false);
|
const [showFirstRun, setShowFirstRun] = useState(false);
|
||||||
myCallRef.current = (station.callsign || '').toUpperCase();
|
myCallRef.current = (station.callsign || '').toUpperCase();
|
||||||
@@ -2070,6 +2187,28 @@ 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;
|
||||||
|
// The badge appears on the EVENT, not on the next poll. It used to wait for
|
||||||
|
// one, so the announcement and the badge were up to twenty seconds apart and
|
||||||
|
// read as two unrelated things happening to mention the same band.
|
||||||
|
//
|
||||||
|
// No toast any more: the badge says the same thing and does not vanish after
|
||||||
|
// five seconds. An operator who was tuning when the toast passed had no way
|
||||||
|
// back to it, which is exactly what the badge was built to fix — keeping
|
||||||
|
// both meant announcing an opening twice and still losing it once.
|
||||||
|
setLiveOpenings((cur) => [...cur.filter((x: any) => x.band !== o.band), o]);
|
||||||
|
});
|
||||||
|
return () => { off(); };
|
||||||
|
}, []);
|
||||||
|
|
||||||
// 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(() => {
|
||||||
@@ -2682,7 +2821,7 @@ export default function App() {
|
|||||||
// Resolve unknown statuses before the rows go in.
|
// Resolve unknown statuses before the rows go in.
|
||||||
try {
|
try {
|
||||||
const known = spotStatusRef.current;
|
const known = spotStatusRef.current;
|
||||||
const unknown: { call: string; band: string; mode: string; pota_ref: string }[] = [];
|
const unknown: { call: string; band: string; mode: string; pota_ref: string; spotter: string }[] = [];
|
||||||
const seen = new Set<string>();
|
const seen = new Set<string>();
|
||||||
for (const s of batch) {
|
for (const s of batch) {
|
||||||
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);
|
||||||
@@ -2692,6 +2831,7 @@ export default function App() {
|
|||||||
call: s.dx_call, band: s.band ?? '',
|
call: s.dx_call, band: s.band ?? '',
|
||||||
mode: inferSpotMode(s.comment ?? '', s.freq_hz),
|
mode: inferSpotMode(s.comment ?? '', s.freq_hz),
|
||||||
pota_ref: (s as any).pota_ref ?? '',
|
pota_ref: (s as any).pota_ref ?? '',
|
||||||
|
spotter: s.spotter ?? '',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (unknown.length > 0) {
|
if (unknown.length > 0) {
|
||||||
@@ -2705,7 +2845,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, lotw: !!(r as any).lotw, spotter_continent: (r as any).spotter_continent, grid: (r as any).grid, new_grid: !!(r as any).new_grid, 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,
|
||||||
@@ -3151,14 +3292,14 @@ export default function App() {
|
|||||||
// "new-slot" because the lookup key carried mode="".
|
// "new-slot" because the lookup key carried mode="".
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const t = window.setTimeout(async () => {
|
const t = window.setTimeout(async () => {
|
||||||
const unknown: { call: string; band: string; mode: string; pota_ref: string }[] = [];
|
const unknown: { call: string; band: string; mode: string; pota_ref: string; spotter: string }[] = [];
|
||||||
const seen = new Set<string>();
|
const seen = new Set<string>();
|
||||||
for (const s of spots) {
|
for (const s of spots) {
|
||||||
const mode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
const mode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
||||||
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);
|
||||||
if (seen.has(k) || spotStatus[k]) continue;
|
if (seen.has(k) || spotStatus[k]) continue;
|
||||||
seen.add(k);
|
seen.add(k);
|
||||||
unknown.push({ call: s.dx_call, band: s.band ?? '', mode, pota_ref: (s as any).pota_ref ?? '' });
|
unknown.push({ call: s.dx_call, band: s.band ?? '', mode, pota_ref: (s as any).pota_ref ?? '', spotter: s.spotter ?? '' });
|
||||||
}
|
}
|
||||||
if (unknown.length === 0) return;
|
if (unknown.length === 0) return;
|
||||||
try {
|
try {
|
||||||
@@ -3172,7 +3313,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, lotw: !!(r as any).lotw, spotter_continent: (r as any).spotter_continent, grid: (r as any).grid, new_grid: !!(r as any).new_grid, 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,
|
||||||
@@ -3228,7 +3370,7 @@ export default function App() {
|
|||||||
sat_name: details.sat_name, sat_mode: details.sat_mode,
|
sat_name: details.sat_name, sat_mode: details.sat_mode,
|
||||||
contest_id: details.contest_id,
|
contest_id: details.contest_id,
|
||||||
srx: srxE.num, stx: stxE.num, srx_string: srxE.str, stx_string: stxE.str,
|
srx: srxE.num, stx: stxE.num, srx_string: srxE.str, stx_string: stxE.str,
|
||||||
email: details.email,
|
email: details.email, web: details.web,
|
||||||
};
|
};
|
||||||
applyAwardRefs(payload, details.award_refs ?? '', awardFieldRef.current);
|
applyAwardRefs(payload, details.award_refs ?? '', awardFieldRef.current);
|
||||||
// Contest mode overrides the exchange fields: CONTEST_ID, the sent
|
// Contest mode overrides the exchange fields: CONTEST_ID, the sent
|
||||||
@@ -3591,6 +3733,7 @@ export default function App() {
|
|||||||
ituz: d.ituz ?? (last.ituz || undefined),
|
ituz: d.ituz ?? (last.ituz || undefined),
|
||||||
cont: d.cont || last.cont || '',
|
cont: d.cont || last.cont || '',
|
||||||
email: d.email || last.email || '',
|
email: d.email || last.email || '',
|
||||||
|
web: d.web || last.web || '',
|
||||||
qsl_via: d.qsl_via || last.qsl_via || '',
|
qsl_via: d.qsl_via || last.qsl_via || '',
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@@ -3653,6 +3796,7 @@ export default function App() {
|
|||||||
ituz: d.ituz ?? (r.ituz || undefined),
|
ituz: d.ituz ?? (r.ituz || undefined),
|
||||||
cont: d.cont || (r.cont ?? ''),
|
cont: d.cont || (r.cont ?? ''),
|
||||||
email: d.email || (r.email ?? ''),
|
email: d.email || (r.email ?? ''),
|
||||||
|
web: d.web || (r.web ?? ''),
|
||||||
qsl_via: d.qsl_via || (r.qsl_via ?? ''),
|
qsl_via: d.qsl_via || (r.qsl_via ?? ''),
|
||||||
}));
|
}));
|
||||||
// Backfill anything the provider didn't supply from the last time we worked
|
// Backfill anything the provider didn't supply from the last time we worked
|
||||||
@@ -4332,6 +4476,67 @@ export default function App() {
|
|||||||
onBlur={() => setQth(titleCase)} />
|
onBlur={() => setQth(titleCase)} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
// State sits between QTH and the locator: it is part of the same "where is
|
||||||
|
// this station" reading, and it is what several awards key off (WAS, the US
|
||||||
|
// county work). Narrow — it holds two or three characters.
|
||||||
|
const stateBlock = (
|
||||||
|
<div className="flex flex-col w-[70px] shrink-0"><Label className="mb-1 h-3.5">{t('field.state')}</Label>
|
||||||
|
<Input value={details.state ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, state: e.target.value.toUpperCase() }))} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
// County beside State: the lookup fills QTH, State, County and the locator
|
||||||
|
// together, and they are read together. Wider than State because a county name
|
||||||
|
// is a name — "St. Tammany Parish", not a code.
|
||||||
|
// The row Comment/Note freed by moving onto one line: county, zones and the
|
||||||
|
// ADIF entity number. All four are filled by the lookup and were previously
|
||||||
|
// only visible after opening a tab — which is the wrong place for values an
|
||||||
|
// operator wants to SEE are right before pressing Log.
|
||||||
|
//
|
||||||
|
// A numeric field stores undefined when cleared, not 0: zero is a real DXCC
|
||||||
|
// number for "no entity" and a real answer for a zone, so an empty box must
|
||||||
|
// stay empty rather than assert something.
|
||||||
|
// NEW badge on the county — the same answer the Details tab gives, moved to
|
||||||
|
// where the county is now typed. Debounced: this field is typed into as well
|
||||||
|
// as filled by the lookup, and the check hits the database.
|
||||||
|
const [entryNewCounty, setEntryNewCounty] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
const cnty = (details.cnty ?? '').trim();
|
||||||
|
if (!cnty) { setEntryNewCounty(false); return; }
|
||||||
|
let alive = true;
|
||||||
|
const id = window.setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
const isNew = await IsNewUSCounty(details.state ?? '', cnty);
|
||||||
|
if (alive) setEntryNewCounty(!!isNew);
|
||||||
|
} catch { if (alive) setEntryNewCounty(false); }
|
||||||
|
}, 300);
|
||||||
|
return () => { alive = false; window.clearTimeout(id); };
|
||||||
|
}, [details.state, details.cnty]);
|
||||||
|
|
||||||
|
const num = (v: string): number | undefined => {
|
||||||
|
const s = v.replace(/[^0-9]/g, '');
|
||||||
|
return s === '' ? undefined : parseInt(s, 10);
|
||||||
|
};
|
||||||
|
const geoDetailRow = (
|
||||||
|
<div className="flex gap-4 items-end">
|
||||||
|
<div className="flex flex-col flex-1 min-w-0"><Label className="mb-1 h-3.5">{t('field.cnty')}</Label>
|
||||||
|
<Input value={details.cnty ?? ''}
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, cnty: e.target.value }))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.cqz')}</Label>
|
||||||
|
<Input value={details.cqz ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, cqz: num(e.target.value) }))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.ituz')}</Label>
|
||||||
|
<Input value={details.ituz ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, ituz: num(e.target.value) }))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col w-[72px] shrink-0"><Label className="mb-1 h-3.5">{t('field.dxcc')}</Label>
|
||||||
|
<Input value={details.dxcc ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, dxcc: num(e.target.value) }))} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
const gridBlock = (
|
const gridBlock = (
|
||||||
<div className="flex flex-col w-[76px] shrink-0"><Label className="mb-1 h-3.5">{t('field.grid')}</Label>
|
<div className="flex flex-col w-[76px] shrink-0"><Label className="mb-1 h-3.5">{t('field.grid')}</Label>
|
||||||
<Input value={grid} placeholder="JN05" className="font-mono" onChange={(e) => { setGrid(e.target.value); markEdited('grid'); }} />
|
<Input value={grid} placeholder="JN05" className="font-mono" onChange={(e) => { setGrid(e.target.value); markEdited('grid'); }} />
|
||||||
@@ -4635,12 +4840,21 @@ export default function App() {
|
|||||||
// Cluster spots after every active filter (band / mode / status / search /
|
// Cluster spots after every active filter (band / mode / status / search /
|
||||||
// hide-worked / group). Shared by the Cluster tab and the Main-view cluster
|
// hide-worked / group). Shared by the Cluster tab and the Main-view cluster
|
||||||
// pane so both show exactly the same list.
|
// pane so both show exactly the same list.
|
||||||
const clusterRenderedRows = useMemo(() => {
|
// Everything the operator has said about WHICH STATIONS they care about —
|
||||||
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
// LoTW only, the spotter's continent, hide worked, the status and mode chips,
|
||||||
|
// the search box, the source node.
|
||||||
|
//
|
||||||
|
// Shared with the band map, which used to receive the raw stream filtered by
|
||||||
|
// band alone: switching on "LoTW users only" changed the cluster list and left
|
||||||
|
// the panadapter showing everyone. Two views of one spot stream disagreeing
|
||||||
|
// about the same spot is the fault lib/spotDisplay already exists to prevent.
|
||||||
|
//
|
||||||
|
// The BAND filter is deliberately not in here: a band map's band IS its
|
||||||
|
// filter, and applying the cluster's would empty every map but one.
|
||||||
|
const spotPassesStationFilters = useCallback((s: ClusterSpot): boolean => {
|
||||||
const search = clusterSearch.trim().toUpperCase();
|
const search = clusterSearch.trim().toUpperCase();
|
||||||
const list = spots.filter((s) => {
|
{
|
||||||
if (clusterFilterSource && s.source_id !== clusterFilterSource) return false;
|
if (clusterFilterSource && s.source_id !== clusterFilterSource) return false;
|
||||||
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
|
||||||
if (search && !s.dx_call.includes(search)) return false;
|
if (search && !s.dx_call.includes(search)) return false;
|
||||||
if (clusterLockMode) {
|
if (clusterLockMode) {
|
||||||
const spotMode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
const spotMode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
||||||
@@ -4652,7 +4866,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
|
||||||
@@ -4665,16 +4882,48 @@ export default function App() {
|
|||||||
|| (!!e?.worked_call && clusterStatusFilter.has('worked'))
|
|| (!!e?.worked_call && clusterStatusFilter.has('worked'))
|
||||||
|| (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
|
|| (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
|
||||||
|| (!!e?.new_county && clusterStatusFilter.has('new-county'))
|
|| (!!e?.new_county && clusterStatusFilter.has('new-county'))
|
||||||
|| (!!e?.new_pfx && clusterStatusFilter.has('new-pfx'));
|
|| (!!e?.new_pfx && clusterStatusFilter.has('new-pfx'))
|
||||||
|
|| (!!e?.new_grid && clusterStatusFilter.has('new-grid'));
|
||||||
if (!matches) return false;
|
if (!matches) return false;
|
||||||
}
|
}
|
||||||
|
// LoTW only, and the spotter's continent. Both are properties of the
|
||||||
|
// station rather than judgements about the spot, so they AND with the
|
||||||
|
// status chips instead of joining that OR: "a new band, and from Europe".
|
||||||
|
if (clusterLotwOnly || clusterSpotterConts.size > 0) {
|
||||||
|
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||||
|
const e = spotStatus[k];
|
||||||
|
// An unresolved spot is not filtered out. The status arrives a moment
|
||||||
|
// after the row does, and dropping it meanwhile made the list flicker.
|
||||||
|
if (e) {
|
||||||
|
if (clusterLotwOnly && !e.lotw) return false;
|
||||||
|
if (clusterSpotterConts.size > 0 && e.spotter_continent && !clusterSpotterConts.has(e.spotter_continent)) return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (clusterHideWorked) {
|
if (clusterHideWorked) {
|
||||||
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];
|
const e = spotStatus[k];
|
||||||
if (!e) return false;
|
if (!e) return false;
|
||||||
if (e.worked_call || e.status === 'worked') return false;
|
// A spot that is NEW for something is not "worked", whatever the entity
|
||||||
|
// says. The extra markers are orthogonal to the entity status — the same
|
||||||
|
// rule the band map already states — so a new prefix, county, grid or
|
||||||
|
// park in an entity worked years ago is exactly what an operator is
|
||||||
|
// hunting, and hiding it is the opposite of what was asked.
|
||||||
|
//
|
||||||
|
// Reported on BH2SWB and 4X9AA: both flagged NEW PFX, neither ever
|
||||||
|
// worked, both vanished the moment "hide worked" went on.
|
||||||
|
const isNew = !!(e.new_pota || e.new_county || e.new_pfx || e.new_grid);
|
||||||
|
if (!isNew && (e.worked_call || e.status === 'worked')) return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
|
}, [clusterFilterSource, clusterSearch, clusterLockMode, mode, clusterModeFilter,
|
||||||
|
clusterStatusFilter, spotStatus, clusterLotwOnly, clusterSpotterConts, clusterHideWorked]);
|
||||||
|
|
||||||
|
const clusterRenderedRows = useMemo(() => {
|
||||||
|
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
||||||
|
const list = spots.filter((s) => {
|
||||||
|
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
||||||
|
return spotPassesStationFilters(s);
|
||||||
});
|
});
|
||||||
let rendered = list as (ClusterSpot & { repeats?: number })[];
|
let rendered = list as (ClusterSpot & { repeats?: number })[];
|
||||||
if (clusterGroup) {
|
if (clusterGroup) {
|
||||||
@@ -4694,11 +4943,46 @@ export default function App() {
|
|||||||
// The Log4OM-style cluster filter sidebar (callsign search, hide-worked,
|
// The Log4OM-style cluster filter sidebar (callsign search, hide-worked,
|
||||||
// group, band/mode/status/source). Rendered both in the Cluster tab and the
|
// group, band/mode/status/source). Rendered both in the Cluster tab and the
|
||||||
// Main-view cluster pane; toggled by clusterShowFilters.
|
// Main-view cluster pane; toggled by clusterShowFilters.
|
||||||
|
// One rule for the whole panel, because two shapes for the same kind of choice
|
||||||
|
// is what made it unreadable:
|
||||||
|
//
|
||||||
|
// SWITCH — a behaviour that is on or off (hide worked, group duplicates).
|
||||||
|
// CHIPS — pick any number from a set; none picked means all (status, mode,
|
||||||
|
// continent). Selected is solid, unselected is the same chip faded,
|
||||||
|
// so the palette teaches the colour code even while switched off.
|
||||||
|
//
|
||||||
|
// Nothing appears in both shapes. A control that exists twice is not more
|
||||||
|
// discoverable, it is one control the operator has to recognise twice.
|
||||||
|
const fSection = (label: string, children: any, right?: any) => (
|
||||||
|
<div>
|
||||||
|
<div className="flex items-center justify-between mb-1 min-h-[16px]">
|
||||||
|
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">{label}</span>
|
||||||
|
{right}
|
||||||
|
</div>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
const fSwitch = (label: string, on: boolean, set: (v: boolean) => void) => (
|
||||||
|
<label className="flex items-center gap-2 cursor-pointer rounded px-1 py-1 -mx-1 hover:bg-accent/40">
|
||||||
|
<Checkbox checked={on} onCheckedChange={(c) => set(!!c)} />
|
||||||
|
<span className="leading-none">{label}</span>
|
||||||
|
</label>
|
||||||
|
);
|
||||||
|
|
||||||
|
const F_CHIP = 'px-1.5 py-[3px] rounded-md border text-[10px] font-bold tracking-wider transition-opacity';
|
||||||
|
const fChip = (key: string, label: string, cls: string, on: boolean, toggle: () => void) => (
|
||||||
|
<button key={key} type="button" onClick={toggle}
|
||||||
|
className={cn(F_CHIP, on ? cls : `${cls} opacity-40 hover:opacity-80`)}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
|
||||||
const renderClusterFilters = () => (
|
const renderClusterFilters = () => (
|
||||||
<div className="w-56 shrink-0 border-l border-border/60 flex flex-col min-h-0 bg-muted/10">
|
<div className="w-56 shrink-0 border-l border-border/60 flex flex-col min-h-0 bg-muted/10">
|
||||||
<div className="px-2.5 py-2 border-b border-border/60 flex items-center justify-between">
|
<div className="px-2.5 py-2 border-b border-border/60 flex items-center justify-between">
|
||||||
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">Filters</span>
|
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">{t('clu.filters')}</span>
|
||||||
<button type="button" onClick={toggleClusterFilters} title="Hide filters"
|
<button type="button" onClick={toggleClusterFilters} title={t('clu.hideFilters')}
|
||||||
className="text-muted-foreground hover:text-foreground">
|
className="text-muted-foreground hover:text-foreground">
|
||||||
<X className="size-3.5" />
|
<X className="size-3.5" />
|
||||||
</button>
|
</button>
|
||||||
@@ -4707,42 +4991,51 @@ export default function App() {
|
|||||||
{/* Callsign search */}
|
{/* Callsign search */}
|
||||||
<Input
|
<Input
|
||||||
className="h-7 text-xs font-mono uppercase"
|
className="h-7 text-xs font-mono uppercase"
|
||||||
placeholder="Search call…"
|
placeholder={t('clu.searchCall')}
|
||||||
value={clusterSearch}
|
value={clusterSearch}
|
||||||
onChange={(e) => setClusterSearch(e.target.value.toUpperCase())}
|
onChange={(e) => setClusterSearch(e.target.value.toUpperCase())}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{/* Toggles */}
|
{/* Behaviours: each is on or off, and none of them narrows by a property
|
||||||
<div className="space-y-1.5">
|
of the station. The last two also drive the band map, via
|
||||||
<label className="flex items-center gap-1.5 cursor-pointer">
|
lib/spotDisplay — they live here rather than in Preferences because
|
||||||
<Checkbox checked={clusterHideWorked} onCheckedChange={(c) => setClusterHideWorked(!!c)} />
|
they are changed while working a run. */}
|
||||||
Hide worked
|
<div className="space-y-0.5">
|
||||||
</label>
|
{fSwitch(t('clu.hideWorked'), clusterHideWorked, setClusterHideWorked)}
|
||||||
<label className="flex items-center gap-1.5 cursor-pointer">
|
{fSwitch(t('clu.groupDup'), clusterGroup, setClusterGroup)}
|
||||||
<Checkbox checked={clusterGroup} onCheckedChange={(c) => setClusterGroup(!!c)} />
|
{/* The two display options are withdrawn for now — the flag is in
|
||||||
Group duplicates
|
lib/spotDisplay, and it also forces them off for the band map, so
|
||||||
</label>
|
there is one place to flip when they come back. */}
|
||||||
|
{SPOT_DISPLAY_OPTIONS_EXPOSED && fSwitch(t('clu.muteWorkedShort'), clusterMuteWorked, (v) => { setClusterMuteWorked(v); writeUiPref('opslog.clusterMuteWorked', v ? '1' : '0'); })}
|
||||||
|
{SPOT_DISPLAY_OPTIONS_EXPOSED && fSwitch(t('clu.slotHighlightShort'), clusterSlotHighlight, (v) => { setClusterSlotHighlight(v); writeUiPref('opslog.clusterSlotHighlight', v ? '1' : '0'); })}
|
||||||
|
{fSwitch(t('clu.lotwOnly'), clusterLotwOnly, (v) => { setClusterLotwOnly(v); writeUiPref('opslog.clusterLotwOnly', v ? '1' : '0'); })}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Band filter — multi-select listbox */}
|
{/* The SPOTTER's continent, not the DX's: this asks whether anyone near
|
||||||
<div>
|
you is hearing the band at all. Chips rather than a dropdown — seven
|
||||||
<div className="flex items-center justify-between mb-1">
|
two-letter codes fit on two lines, they read as a set the way Status
|
||||||
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">Bands</span>
|
and Mode do, and several can be picked at once, which "EU or NA" needs
|
||||||
<div className="flex items-center gap-2">
|
and a dropdown cannot express. */}
|
||||||
<button
|
{fSection(t('clu.spotterCont'),
|
||||||
type="button"
|
<div className="flex flex-wrap gap-1">
|
||||||
onClick={() => setClusterLockBand((v) => !v)}
|
{['AF', 'AN', 'AS', 'EU', 'NA', 'OC', 'SA'].map((c) => fChip(
|
||||||
className={cn('inline-flex items-center gap-0.5 text-[10px] px-1 py-0.5 rounded border',
|
c, c, 'bg-muted text-foreground border-border',
|
||||||
clusterLockBand ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
clusterSpotterConts.has(c),
|
||||||
title="Lock to the entry strip's current band"
|
() => setClusterSpotterConts((cur) => {
|
||||||
>
|
const n = new Set(cur);
|
||||||
{clusterLockBand ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} {band}
|
if (n.has(c)) n.delete(c); else n.add(c);
|
||||||
</button>
|
return n;
|
||||||
{clusterBands.size > 0 && (
|
}),
|
||||||
<button type="button" onClick={() => setClusterBands(new Set())} className="text-[10px] text-muted-foreground hover:text-foreground underline">clear</button>
|
))}
|
||||||
|
</div>,
|
||||||
|
clusterSpotterConts.size > 0 ? (
|
||||||
|
<button type="button" onClick={() => setClusterSpotterConts(new Set())}
|
||||||
|
className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.clear')}</button>
|
||||||
|
) : undefined,
|
||||||
)}
|
)}
|
||||||
</div>
|
|
||||||
</div>
|
{/* Band filter — multi-select listbox */}
|
||||||
|
{fSection(t('clu.bands'),
|
||||||
<div className={cn('rounded border border-border max-h-36 overflow-auto bg-background', clusterLockBand && 'opacity-40 pointer-events-none')}>
|
<div className={cn('rounded border border-border max-h-36 overflow-auto bg-background', clusterLockBand && 'opacity-40 pointer-events-none')}>
|
||||||
{bands.map((b) => {
|
{bands.map((b) => {
|
||||||
const on = clusterBands.has(b);
|
const on = clusterBands.has(b);
|
||||||
@@ -4758,83 +5051,82 @@ export default function App() {
|
|||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>,
|
||||||
</div>
|
<div className="flex items-center gap-2">
|
||||||
|
|
||||||
{/* Mode lock */}
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setClusterLockMode((v) => !v)}
|
onClick={() => setClusterLockBand((v) => !v)}
|
||||||
className={cn('inline-flex items-center gap-1 px-1.5 py-0.5 rounded border text-[10px]',
|
className={cn('inline-flex items-center gap-0.5 text-[10px] px-1 py-0.5 rounded border',
|
||||||
clusterLockMode ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
clusterLockBand ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
||||||
title="Only show spots whose mode matches the entry strip"
|
title={t('clu.lockBandTitle')}
|
||||||
>
|
>
|
||||||
{clusterLockMode ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} Lock mode ({mode})
|
{clusterLockBand ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} {band}
|
||||||
</button>
|
</button>
|
||||||
|
{clusterBands.size > 0 && (
|
||||||
|
<button type="button" onClick={() => setClusterBands(new Set())} className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.clear')}</button>
|
||||||
|
)}
|
||||||
|
</div>,
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Status filter */}
|
{/* Status filter */}
|
||||||
<div>
|
{fSection(t('clu.status'),
|
||||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Status</div>
|
|
||||||
<div className="flex flex-wrap gap-1">
|
<div className="flex flex-wrap gap-1">
|
||||||
{([
|
{([
|
||||||
{ k: 'new' as SpotFilterKey, label: 'NEW', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' },
|
{ k: 'new' as SpotFilterKey, label: 'NEW', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' },
|
||||||
{ 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' },
|
||||||
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||||
{ k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
{ k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
|
// Only ever set for a station this receiver decoded over the UDP link.
|
||||||
|
{ k: 'new-grid' as SpotFilterKey, label: 'NEW GRID', cls: 'bg-muted text-foreground border-border' },
|
||||||
// Blue, like the already-worked call in the grid. Selecting it keeps
|
// Blue, like the already-worked call in the grid. Selecting it keeps
|
||||||
// worked spots; the separate "Hide worked" checkbox drops them — they
|
// worked spots; the separate "Hide worked" checkbox drops them — they
|
||||||
// are opposite controls, so don't use both at once.
|
// are opposite controls, so don't use both at once.
|
||||||
{ k: 'worked' as SpotFilterKey, label: 'WORKED', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
{ k: 'worked' as SpotFilterKey, label: 'WORKED', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||||
]).map((s) => {
|
]).map((s) => fChip(s.k, s.label, s.cls, clusterStatusFilter.has(s.k),
|
||||||
const on = clusterStatusFilter.has(s.k);
|
() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })))}
|
||||||
return (
|
</div>,
|
||||||
<button key={s.k} type="button"
|
clusterStatusFilter.size > 0 ? (
|
||||||
onClick={() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })}
|
<button type="button" onClick={() => setClusterStatusFilter(new Set())}
|
||||||
className={cn('px-1.5 py-0.5 rounded border text-[10px] font-bold tracking-wider transition-opacity', on ? s.cls : `${s.cls} opacity-40 hover:opacity-100`)}>
|
className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.clear')}</button>
|
||||||
{s.label}
|
) : undefined,
|
||||||
</button>
|
)}
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Mode filter */}
|
{/* Mode filter */}
|
||||||
<div>
|
{fSection(t('clu.mode'),
|
||||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Mode</div>
|
|
||||||
<div className="flex flex-wrap gap-1">
|
<div className="flex flex-wrap gap-1">
|
||||||
{([
|
{([
|
||||||
{ k: 'SSB' as SpotModeCat, label: 'SSB', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
{ k: 'SSB' as SpotModeCat, label: 'SSB', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||||
{ k: 'CW' as SpotModeCat, label: 'CW', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
{ k: 'CW' as SpotModeCat, label: 'CW', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||||
{ k: 'DATA' as SpotModeCat, label: 'DATA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
{ k: 'DATA' as SpotModeCat, label: 'DATA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||||
]).map((s) => {
|
]).map((s) => fChip(s.k, s.label, s.cls, clusterModeFilter.has(s.k),
|
||||||
const on = clusterModeFilter.has(s.k);
|
() => setClusterModeFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })))}
|
||||||
return (
|
</div>,
|
||||||
<button key={s.k} type="button"
|
<button type="button" onClick={() => setClusterLockMode((v) => !v)}
|
||||||
onClick={() => setClusterModeFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })}
|
className={cn('inline-flex items-center gap-0.5 text-[10px] px-1 py-0.5 rounded border',
|
||||||
className={cn('px-1.5 py-0.5 rounded border text-[10px] font-bold tracking-wider transition-opacity', on ? s.cls : `${s.cls} opacity-40 hover:opacity-100`)}>
|
clusterLockMode ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
||||||
{s.label}
|
title={t('clu.lockModeTitle')}>
|
||||||
</button>
|
{clusterLockMode ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} {mode}
|
||||||
);
|
</button>,
|
||||||
})}
|
)}
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Source */}
|
{/* Source */}
|
||||||
<div>
|
{fSection(t('clu.source'),
|
||||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Source</div>
|
|
||||||
<Select value={String(clusterFilterSource || '_')} onValueChange={(v) => setClusterFilterSource(v === '_' ? '' : parseInt(v, 10))}>
|
<Select value={String(clusterFilterSource || '_')} onValueChange={(v) => setClusterFilterSource(v === '_' ? '' : parseInt(v, 10))}>
|
||||||
<SelectTrigger className="w-full h-7 text-xs"><SelectValue placeholder="All sources" /></SelectTrigger>
|
<SelectTrigger className="w-full h-7 text-xs"><SelectValue placeholder={t('clu.allSources')} /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="_">All sources</SelectItem>
|
<SelectItem value="_">{t('clu.allSources')}</SelectItem>
|
||||||
{clusterServers.map((s) => <SelectItem key={s.id} value={String(s.id)}>{s.name}</SelectItem>)}
|
{clusterServers.map((s) => <SelectItem key={s.id} value={String(s.id)}>{s.name}</SelectItem>)}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>,
|
||||||
</div>
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -4933,6 +5225,7 @@ export default function App() {
|
|||||||
// rewrote the other's widths.
|
// rewrote the other's widths.
|
||||||
storageKey="mainpane"
|
storageKey="mainpane"
|
||||||
rows={qsosWithAwards as any}
|
rows={qsosWithAwards as any}
|
||||||
|
rowColors={rowColors}
|
||||||
myGrid={station.my_grid}
|
myGrid={station.my_grid}
|
||||||
total={total}
|
total={total}
|
||||||
awardCols={awardCols}
|
awardCols={awardCols}
|
||||||
@@ -5636,7 +5929,7 @@ export default function App() {
|
|||||||
Enter from any <input> inside the strip logs the QSO. Radix Selects
|
Enter from any <input> inside the strip logs the QSO. Radix Selects
|
||||||
render as <button> elements and are ignored by this handler — they
|
render as <button> elements and are ignored by this handler — they
|
||||||
keep their own keyboard behaviour. */}
|
keep their own keyboard behaviour. */}
|
||||||
<div className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
|
<div ref={compactRootRef} className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
|
||||||
<section
|
<section
|
||||||
className={cn('bg-card shadow-sm border-border',
|
className={cn('bg-card shadow-sm border-border',
|
||||||
compact
|
compact
|
||||||
@@ -5691,25 +5984,30 @@ export default function App() {
|
|||||||
to be pushed outside the entry panel and clipped. Wrapping drops
|
to be pushed outside the entry panel and clipped. Wrapping drops
|
||||||
it to its own line instead, which stays readable. */}
|
it to its own line instead, which stays readable. */}
|
||||||
<div className="flex gap-4 items-end flex-wrap">
|
<div className="flex gap-4 items-end flex-wrap">
|
||||||
<div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
|
<div className="flex flex-col w-[230px] shrink-0"><Label className="mb-1 h-3.5">{t('field.name')}</Label>
|
||||||
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
|
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
|
||||||
onBlur={() => setName(titleCase)} />
|
onBlur={() => setName(titleCase)} />
|
||||||
</div>
|
</div>
|
||||||
{qthBlock}
|
{qthBlock}
|
||||||
|
{stateBlock}
|
||||||
{gridBlock}
|
{gridBlock}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Row 3: tight left detail column (Band/Mode/Country) and
|
{/* Row 3: tight left detail column (Band/Mode/Country) and
|
||||||
single-line Comment/Note on the right. */}
|
Comment/Note SIDE BY SIDE on the right — one line each was a lot
|
||||||
|
of vertical space for two fields that are usually short. */}
|
||||||
<div className="flex gap-4 items-start">
|
<div className="flex gap-4 items-start">
|
||||||
<div className="flex flex-col gap-1.5 w-[300px] shrink-0">
|
<div className="flex flex-col gap-1.5 w-[230px] shrink-0">
|
||||||
{bandRow}
|
{bandRow}
|
||||||
{modeRow}
|
{modeRow}
|
||||||
{countryRow}
|
{countryRow}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
|
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
|
||||||
{commentLine}
|
{geoDetailRow}
|
||||||
{noteLine}
|
<div className="flex gap-4">
|
||||||
|
<div className="flex-1 min-w-0">{commentLine}</div>
|
||||||
|
<div className="flex-1 min-w-0">{noteLine}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -6216,6 +6514,7 @@ export default function App() {
|
|||||||
<RecentQSOsGrid
|
<RecentQSOsGrid
|
||||||
key={`rqg2-${activeProfileId ?? 'x'}`}
|
key={`rqg2-${activeProfileId ?? 'x'}`}
|
||||||
rows={qsosWithAwards as any}
|
rows={qsosWithAwards as any}
|
||||||
|
rowColors={rowColors}
|
||||||
myGrid={station.my_grid}
|
myGrid={station.my_grid}
|
||||||
total={total}
|
total={total}
|
||||||
awardCols={awardCols}
|
awardCols={awardCols}
|
||||||
@@ -6631,13 +6930,14 @@ export default function App() {
|
|||||||
</div>
|
</div>
|
||||||
<BandMap
|
<BandMap
|
||||||
band={b}
|
band={b}
|
||||||
spots={spots.filter((s) => s.band === b)}
|
spots={spots.filter((s) => s.band === b && spotPassesStationFilters(s))}
|
||||||
spotStatus={spotStatus}
|
spotStatus={spotStatus}
|
||||||
currentFreqHz={band === b && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
currentFreqHz={band === b && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||||
onSpotClick={handleSpotClick}
|
onSpotClick={handleSpotClick}
|
||||||
onClose={() => toggleBandMapBand(b)}
|
onClose={() => toggleBandMapBand(b)}
|
||||||
hideDigital={bandMapHideFt}
|
hideDigital={bandMapHideFt}
|
||||||
fitToBand={bandMapFit}
|
fitToBand={bandMapFit}
|
||||||
|
showLotw={!!rowColors?.bandmap_lotw}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
@@ -6667,11 +6967,12 @@ export default function App() {
|
|||||||
side={bandMapSide}
|
side={bandMapSide}
|
||||||
onToggleSide={toggleBandMapSide}
|
onToggleSide={toggleBandMapSide}
|
||||||
band={band}
|
band={band}
|
||||||
spots={spots.filter((s) => s.band === band)}
|
spots={spots.filter((s) => s.band === band && spotPassesStationFilters(s))}
|
||||||
spotStatus={spotStatus}
|
spotStatus={spotStatus}
|
||||||
currentFreqHz={band && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
currentFreqHz={band && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||||
onSpotClick={handleSpotClick}
|
onSpotClick={handleSpotClick}
|
||||||
onClose={() => setBandMapShown(false)}
|
onClose={() => setBandMapShown(false)}
|
||||||
|
showLotw={!!rowColors?.bandmap_lotw}
|
||||||
keyNav
|
keyNav
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -6752,6 +7053,26 @@ export default function App() {
|
|||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
{/* PSK Reporter, next to the hardware chips because it is the same
|
||||||
|
kind of fact: a link that is either up or it is not. Shown ONLY
|
||||||
|
when the opening watch is on — a permanently grey chip for a
|
||||||
|
feature nobody enabled is clutter, and the bar is 28 px.
|
||||||
|
|
||||||
|
The decode count is in the tooltip rather than the chip: it moves
|
||||||
|
several times a second on an open band, and a number flickering in
|
||||||
|
the corner of the eye is not information, it is a distraction. */}
|
||||||
|
{pskr?.running && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
title={t('pskr.tip', { n: pskr.received ?? 0, bands: (pskr.bands ?? []).join(' ') })}
|
||||||
|
onClick={() => { setSettingsSection('cluster'); setShowSettings(true); }}
|
||||||
|
className="inline-flex items-center gap-1.5 px-2 h-5 rounded border text-[11px] transition-colors border-border hover:bg-muted cursor-pointer shrink-0"
|
||||||
|
>
|
||||||
|
<span className={cn('size-2 rounded-full',
|
||||||
|
(pskr.received ?? 0) > 0 ? 'bg-success' : 'bg-warning')} />
|
||||||
|
MQTT
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{/* ON AIR badge: "did I log a QSO in the last 5 min" — meaningful on ANY
|
{/* ON AIR badge: "did I log a QSO in the last 5 min" — meaningful on ANY
|
||||||
logbook backend (only the live_status PUBLISHING is MySQL-specific),
|
logbook backend (only the live_status PUBLISHING is MySQL-specific),
|
||||||
so it is always shown. Gating it on MySQL made it vanish for
|
so it is always shown. Gating it on MySQL made it vanish for
|
||||||
@@ -6809,6 +7130,45 @@ export default function App() {
|
|||||||
{/* UTC clock — moved out of the header, where it competed with the
|
{/* UTC clock — moved out of the header, where it competed with the
|
||||||
frequency for the eye. It belongs with the other passive
|
frequency for the eye. It belongs with the other passive
|
||||||
indicators. */}
|
indicators. */}
|
||||||
|
{/* Openings under way. Right-hand end, before the clock, because it is
|
||||||
|
a state of the world rather than a state of this station — the
|
||||||
|
same side as the time and the logbook.
|
||||||
|
|
||||||
|
It BLINKS and it stays. The toast that announces an opening is
|
||||||
|
gone in seconds, and an operator who was tuning at that moment
|
||||||
|
had no way back to it; a band opening lasts hours and deserves
|
||||||
|
something that lasts with it. It goes out by itself when the
|
||||||
|
spots stop arriving. */}
|
||||||
|
{liveOpenings.map((o: any) => (
|
||||||
|
<button
|
||||||
|
key={o.band}
|
||||||
|
type="button"
|
||||||
|
onClick={() => { setActiveTab('bandmap'); }}
|
||||||
|
title={t('bo.liveTip', {
|
||||||
|
band: String(o.band).toUpperCase(), n: o.calls, km: o.median_km,
|
||||||
|
sector: `${o.compass ?? ''} ${o.bearing_min}–${o.bearing_max}°`,
|
||||||
|
season: o.in_season ? '' : ' — ' + t('bmp.openUnusual'),
|
||||||
|
})}
|
||||||
|
className="inline-flex items-center gap-1.5 rounded-md border px-2 py-0.5 text-[11px] font-bold uppercase tracking-wider shrink-0
|
||||||
|
border-warning-border bg-warning-muted text-warning-muted-foreground hover:bg-warning-muted/70 animate-pulse"
|
||||||
|
>
|
||||||
|
<Radio className="size-3 shrink-0" />
|
||||||
|
{/* The three facts that decide whether to act: which band, which
|
||||||
|
way to point, how far it reaches. They were in a tooltip
|
||||||
|
nobody hovers, which made the badge an alarm with no content —
|
||||||
|
it said something was happening and refused to say what. */}
|
||||||
|
<span>{String(o.band).toUpperCase()}</span>
|
||||||
|
<span className="font-mono">{o.compass}</span>
|
||||||
|
{/* Plain kilometres. An earlier attempt abbreviated 1500 to
|
||||||
|
"1.5k" and then appended the unit, giving "1.5kkm" — and even
|
||||||
|
written correctly, "1.5k km" makes a reader do arithmetic to
|
||||||
|
recover a number that was four characters long to begin with. */}
|
||||||
|
<span className="font-mono opacity-80">{o.median_km} km</span>
|
||||||
|
{/* Out of season is the one an operator must not learn last, so it
|
||||||
|
earns a mark on the badge rather than a line in the tooltip. */}
|
||||||
|
{!o.in_season && <span className="opacity-90">!</span>}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
<span className="inline-flex items-center gap-1 font-mono text-[11px] text-muted-foreground shrink-0" title="UTC">
|
<span className="inline-flex items-center gap-1 font-mono text-[11px] text-muted-foreground shrink-0" title="UTC">
|
||||||
<Clock className="size-3" />
|
<Clock className="size-3" />
|
||||||
{utcNow}<span className="text-[9px]">Z</span>
|
{utcNow}<span className="text-[9px]">Z</span>
|
||||||
@@ -6930,6 +7290,27 @@ export default function App() {
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})()}
|
})()}
|
||||||
|
{/* One-time offer to move QSL routing words out of the manager field.
|
||||||
|
Shown with a count and never acted on without an answer: it rewrites
|
||||||
|
what the operator sees in their own log. Either answer is final —
|
||||||
|
asking again after a "no" would be a nag. */}
|
||||||
|
{qslViaRepair !== null && (
|
||||||
|
<ConfirmDialog
|
||||||
|
title={t('qslvia.title')}
|
||||||
|
message={t('qslvia.body', { n: qslViaRepair.toLocaleString() })}
|
||||||
|
confirmLabel={t('qslvia.confirm')}
|
||||||
|
cancelLabel={t('qslvia.cancel')}
|
||||||
|
onConfirm={async () => {
|
||||||
|
const n = qslViaRepair;
|
||||||
|
setQslViaRepair(null);
|
||||||
|
try {
|
||||||
|
const r: any = await RepairQSLVia();
|
||||||
|
showToast(t('qslvia.done', { n: (r?.moved ?? n).toLocaleString() }));
|
||||||
|
} catch { /* the log keeps the reason; nothing to undo */ }
|
||||||
|
}}
|
||||||
|
onCancel={() => { setQslViaRepair(null); DismissQSLViaRepair().catch(() => {}); }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{showDeleteAll && (
|
{showDeleteAll && (
|
||||||
<ConfirmDialog
|
<ConfirmDialog
|
||||||
title="Delete ALL QSOs?"
|
title="Delete ALL QSOs?"
|
||||||
|
|||||||
@@ -174,6 +174,45 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
const operate = viaFlex ? !!flex?.amp_operate : !!pg.operate;
|
const operate = viaFlex ? !!flex?.amp_operate : !!pg.operate;
|
||||||
const connected = !!pg.connected || viaFlex;
|
const connected = !!pg.connected || viaFlex;
|
||||||
const fault = flex?.amp_fault;
|
const fault = flex?.amp_fault;
|
||||||
|
|
||||||
|
// Meters built from the amplifier's own GSCP status frame, for when the radio
|
||||||
|
// is not feeding a meter stream.
|
||||||
|
//
|
||||||
|
// Whether there is power is the amp's state field; how much is the plain
|
||||||
|
// forward figure. NOT "peakfwd" — that is a latched maximum which is never
|
||||||
|
// reset and survives in the last-known status after the amp disconnects, so it
|
||||||
|
// once claimed 1350 W from an old transmission while 10 W was going out. Same
|
||||||
|
// reason peak_id is left alone. Both readings are gated on transmit so they
|
||||||
|
// fall back to zero between overs instead of freezing on the last one.
|
||||||
|
const pgxlMeters = () => {
|
||||||
|
if (!pg.connected) return null;
|
||||||
|
const txing = typeof flex?.transmitting === 'boolean' ? flex.transmitting : /TRANSMIT/i.test(pg.state || '');
|
||||||
|
const fwdW = peakHold('pgfwd', txing ? Number(pg.fwd_w) || 0 : 0);
|
||||||
|
const idA = peakHold('pgid', txing ? Number(pg.id) || 0 : 0);
|
||||||
|
const swr = peakHold('pgswr', txing ? Number(pg.vswr) || 0 : 0);
|
||||||
|
const tempC = Number(pg.temperature) || 0;
|
||||||
|
// Two columns, not four. The card sits beside a tall neighbour in Station
|
||||||
|
// Control, so a single row of four leaves the height empty and squeezes each
|
||||||
|
// bar into a quarter width — two rows of two use the room that is already
|
||||||
|
// there and give every bar twice the resolution.
|
||||||
|
return (
|
||||||
|
<div className="grid grid-cols-2 gap-2 mt-2 pt-2 border-t border-border/50">
|
||||||
|
<MeterBar label={t('flxp.outputPower')} value={fwdW} unit="W" lo={0} hi={2000}
|
||||||
|
display={`${Math.round(fwdW)} W`}
|
||||||
|
segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
|
||||||
|
<MeterBar label={t('ampw.id')} value={idA} lo={0} hi={25} display={`${idA.toFixed(1)} A`} accent="#16a34a" />
|
||||||
|
{/* Below 1:1 the reading is meaningless, so an idle amp shows a flat bar
|
||||||
|
rather than a zero that looks like a perfect match. */}
|
||||||
|
<MeterBar label={t('ampw.swr')} value={swr >= 1 ? swr : 1} lo={1} hi={3}
|
||||||
|
display={swr >= 1 ? swr.toFixed(1) : '—'}
|
||||||
|
segColor={(f) => (f > 0.75 ? '#dc2626' : f > 0.4 ? '#f59e0b' : '#16a34a')} />
|
||||||
|
<MeterBar label={t('ampw.temp')} value={tempC} unit="°C" lo={0} hi={100}
|
||||||
|
display={tempC > 0 ? `${Math.round(tempC)} °C` : '—'}
|
||||||
|
segColor={(f) => (f > 0.8 ? '#dc2626' : f > 0.6 ? '#f59e0b' : '#ea580c')} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')}${flex?.amp_model ? ' · ' + flex.amp_model : (pg.model ? ' · ' + pg.model : '')} · ${amp.name}`} accent="#ea580c">
|
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')}${flex?.amp_model ? ' · ' + flex.amp_model : (pg.model ? ' · ' + pg.model : '')} · ${amp.name}`} accent="#ea580c">
|
||||||
<div className="flex items-center gap-3 flex-wrap">
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
@@ -204,13 +243,20 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">{t('flxp.fault')}: {fault}</span>
|
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">{t('flxp.fault')}: {fault}</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{/* Amplifier meters (FWD / ID / TEMP …) from the FlexRadio UDP stream. */}
|
{/* Amplifier meters (FWD / ID / TEMP …).
|
||||||
{viaFlex && (() => {
|
The FlexRadio UDP stream is the preferred source — it is fast and reads
|
||||||
|
the same as SmartSDR. When there is no Flex, or it is not streaming,
|
||||||
|
the amplifier's OWN link carries the same figures; falling back to them
|
||||||
|
is what the docked widget already does. Without that fallback this card
|
||||||
|
showed an operator on a Kenwood nothing but OPERATE and the fan mode,
|
||||||
|
while the amplifier was reporting power, current and temperature all
|
||||||
|
along. */}
|
||||||
|
{(() => {
|
||||||
const meters = (flex?.meters as any[]) || [];
|
const meters = (flex?.meters as any[]) || [];
|
||||||
const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
|
const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
|
||||||
const amps = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
|
const amps = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
|
||||||
&& !/^(RL|DRV)$/i.test((m.name || '').trim()));
|
&& !/^(RL|DRV)$/i.test((m.name || '').trim()));
|
||||||
if (amps.length === 0) return null;
|
if (!viaFlex || amps.length === 0) return pgxlMeters();
|
||||||
// Power comes from the radio's meter stream and nothing else. The
|
// Power comes from the radio's meter stream and nothing else. The
|
||||||
// amplifier also reports a "peakfwd", and using it was a mistake twice
|
// amplifier also reports a "peakfwd", and using it was a mistake twice
|
||||||
// over: it is a latched maximum that is never reset, and it survives in
|
// over: it is a latched maximum that is never reset, and it survives in
|
||||||
|
|||||||
@@ -0,0 +1,153 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { GetRowColors, SaveRowColors } from '../../wailsjs/go/main/App';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import type { RowColorSettings } from '@/lib/rowColors';
|
||||||
|
|
||||||
|
// A fixed palette plus a free picker. Muted values on purpose: they are
|
||||||
|
// composited at low opacity over a dark grid, where a saturated colour reads as
|
||||||
|
// an error state rather than a status.
|
||||||
|
const PALETTE = [
|
||||||
|
'#16a34a', '#0ea5e9', '#f59e0b', '#a855f7',
|
||||||
|
'#dc2626', '#14b8a6', '#eab308', '#ec4899',
|
||||||
|
'#64748b', '#84cc16', '#6366f1', '#f97316',
|
||||||
|
];
|
||||||
|
|
||||||
|
// The rule ids the backend orders; the labels live here so a translation never
|
||||||
|
// travels through the settings row.
|
||||||
|
const LABELS: Record<string, string> = {
|
||||||
|
to_send: 'appr.ruleToSend',
|
||||||
|
confirmed: 'appr.ruleConfirmed',
|
||||||
|
sent: 'appr.ruleSent',
|
||||||
|
worked: 'appr.ruleWorked',
|
||||||
|
};
|
||||||
|
|
||||||
|
// The channels a rule can be scoped to. "worked" is the catch-all — it means
|
||||||
|
// nothing on ANY channel — so narrowing it would say nothing.
|
||||||
|
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||||
|
const CHANNEL_LABELS: Record<string, string> = {
|
||||||
|
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
||||||
|
};
|
||||||
|
|
||||||
|
export function AppearancePanel() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [cfg, setCfg] = useState<RowColorSettings | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try { setCfg((await GetRowColors()) as any); } catch { /* defaults on the backend */ }
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const save = (next: RowColorSettings) => {
|
||||||
|
setCfg(next);
|
||||||
|
SaveRowColors(next as any).catch(() => {});
|
||||||
|
};
|
||||||
|
const patchRule = (id: string, patch: Partial<{ color: string; enabled: boolean; channels: string[] }>) => {
|
||||||
|
if (!cfg) return;
|
||||||
|
save({ ...cfg, rules: cfg.rules.map((r) => (r.id === id ? { ...r, ...patch } : r)) });
|
||||||
|
};
|
||||||
|
|
||||||
|
// The rule card shows the row exactly as the grid will draw it, so the choice
|
||||||
|
// is made by looking rather than by imagining.
|
||||||
|
const preview = (color: string): Record<string, string> => {
|
||||||
|
const st = cfg?.style ?? 'bar';
|
||||||
|
const pct = cfg?.intensity ?? 12;
|
||||||
|
const out: Record<string, string> = {};
|
||||||
|
if (st === 'tint' || st === 'both') out.backgroundColor = `color-mix(in srgb, ${color} ${pct}%, transparent)`;
|
||||||
|
if (st === 'bar' || st === 'both') out.boxShadow = `inset 3px 0 0 ${color}`;
|
||||||
|
return out;
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!cfg) return <div className="p-1 text-sm text-muted-foreground">…</div>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={!!cfg.bandmap_lotw} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => save({ ...cfg, bandmap_lotw: !!c } as any)} />
|
||||||
|
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
||||||
|
<span>{t('appr.enable')} <span className="text-xs text-muted-foreground">{t('appr.enableHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{cfg.enabled && (
|
||||||
|
<div className="space-y-3">
|
||||||
|
{/* Style first: it decides whether the colours below are a signal or a
|
||||||
|
wallpaper, which matters more than which hue they are. */}
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<span className="text-sm">{t('appr.style')}</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||||
|
{(['bar', 'tint', 'both'] as const).map((v) => (
|
||||||
|
<button key={v} type="button" onClick={() => save({ ...cfg, style: v })}
|
||||||
|
className={cn('px-3 py-1.5 font-medium', (cfg.style ?? 'bar') === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||||
|
{t('appr.style' + v[0].toUpperCase() + v.slice(1))}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{(cfg.style ?? 'bar') !== 'bar' && (
|
||||||
|
<label className="flex items-center gap-2 text-sm">
|
||||||
|
{t('appr.intensity')}
|
||||||
|
<input type="range" min={5} max={45} step={1} value={cfg.intensity ?? 12}
|
||||||
|
onChange={(e) => save({ ...cfg, intensity: parseInt(e.target.value, 10) })}
|
||||||
|
className="w-32 accent-[var(--primary)]" />
|
||||||
|
<span className="font-mono text-xs text-muted-foreground w-8">{cfg.intensity ?? 12}%</span>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{/* Order matters and is shown: a contact is usually several of these at
|
||||||
|
once, and the first match wins. */}
|
||||||
|
<p className="text-xs text-muted-foreground">{t('appr.orderHint')}</p>
|
||||||
|
{cfg.rules.map((r, i) => (
|
||||||
|
<div key={r.id} className="rounded-lg border border-border/60 p-2.5 space-y-2"
|
||||||
|
style={r.enabled ? preview(r.color) : undefined}>
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={r.enabled} onCheckedChange={(c) => patchRule(r.id, { enabled: !!c })} />
|
||||||
|
<span className="font-mono text-xs text-muted-foreground">{i + 1}.</span>
|
||||||
|
<span className="font-medium">{t(LABELS[r.id] ?? r.id)}</span>
|
||||||
|
</label>
|
||||||
|
{/* Which channels this category looks at. None ticked = all of
|
||||||
|
them, which is what an unnarrowed rule should mean. */}
|
||||||
|
{r.enabled && r.id !== 'worked' && (
|
||||||
|
<div className="flex items-center gap-3 flex-wrap pl-6 text-xs">
|
||||||
|
{CHANNELS.map((c) => {
|
||||||
|
const on = !r.channels?.length || r.channels.includes(c);
|
||||||
|
return (
|
||||||
|
<label key={c} className="flex items-center gap-1.5 cursor-pointer">
|
||||||
|
<Checkbox checked={on} onCheckedChange={(v) => {
|
||||||
|
const cur = r.channels?.length ? r.channels : [...CHANNELS];
|
||||||
|
const next = v ? [...new Set([...cur, c])] : cur.filter((x) => x !== c);
|
||||||
|
patchRule(r.id, { channels: next });
|
||||||
|
}} />
|
||||||
|
{CHANNEL_LABELS[c]?.startsWith('appr.') ? t(CHANNEL_LABELS[c]) : CHANNEL_LABELS[c]}
|
||||||
|
</label>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{r.enabled && (
|
||||||
|
<div className="flex items-center gap-1.5 flex-wrap pl-6">
|
||||||
|
{PALETTE.map((c) => (
|
||||||
|
<button key={c} type="button" title={c}
|
||||||
|
onClick={() => patchRule(r.id, { color: c })}
|
||||||
|
className={cn('size-6 rounded-md border-2 transition-transform hover:scale-110',
|
||||||
|
r.color.toLowerCase() === c ? 'border-foreground' : 'border-transparent')}
|
||||||
|
style={{ backgroundColor: c }} />
|
||||||
|
))}
|
||||||
|
<input type="color" value={r.color} title={t('appr.custom')}
|
||||||
|
onChange={(e) => patchRule(r.id, { color: e.target.value })}
|
||||||
|
className="size-6 rounded-md border border-border bg-transparent p-0 cursor-pointer" />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
import { Plus, Trash2, RotateCcw, Save, Download, Upload, Loader2, Search, FolderOpen, ArrowUpCircle } from 'lucide-react';
|
import { Plus, Trash2, RotateCcw, Save, Download, Upload, Loader2, Search, FolderOpen, ArrowUpCircle, Share2 } from 'lucide-react';
|
||||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
@@ -19,7 +19,7 @@ import {
|
|||||||
ListCountries, DXCCForCountry, DXCCName,
|
ListCountries, DXCCForCountry, DXCCName,
|
||||||
PopulateBuiltinReferences, HasBuiltinReferences,
|
PopulateBuiltinReferences, HasBuiltinReferences,
|
||||||
ExportAwards, ImportAwards, InspectAwardImport, ApplyAwardImport, GetCatalogCodes, OpenAwardsFolder,
|
ExportAwards, ImportAwards, InspectAwardImport, ApplyAwardImport, GetCatalogCodes, OpenAwardsFolder,
|
||||||
ExportAwardForCatalog,
|
ExportAwardForCatalog, ExportAward,
|
||||||
GetAwardUpdates, ApplyAwardUpdate, DismissAwardUpdate, ExplainAward,
|
GetAwardUpdates, ApplyAwardUpdate, DismissAwardUpdate, ExplainAward,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
|
|
||||||
@@ -97,6 +97,13 @@ function Chips({ all, value, onToggle }: { all: string[]; value: string[]; onTog
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Awards use a far-future date as "no end" (RDA carries 9999-12-31). Printing it
|
||||||
|
// back at the operator reads like a real deadline, so show it as open-ended.
|
||||||
|
function openEnded(d?: string): string {
|
||||||
|
if (!d) return '—';
|
||||||
|
return /^9\d{3}-/.test(d) ? '—' : d;
|
||||||
|
}
|
||||||
|
|
||||||
function Field2({ label, children }: { label: string; children: React.ReactNode }) {
|
function Field2({ label, children }: { label: string; children: React.ReactNode }) {
|
||||||
return (
|
return (
|
||||||
<div className="grid grid-cols-[120px_1fr] items-center gap-2">
|
<div className="grid grid-cols-[120px_1fr] items-center gap-2">
|
||||||
@@ -307,6 +314,23 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
if (p) setErr(t('awed.exportedTo', { path: p }));
|
if (p) setErr(t('awed.exportedTo', { path: p }));
|
||||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
|
// Export the SELECTED award on its own — the unit you actually share. The
|
||||||
|
// bundle above is a backup: sending it to someone hands over your whole
|
||||||
|
// catalogue when they asked for one award.
|
||||||
|
//
|
||||||
|
// Distinct from the catalog publish below, which is for shipping an award INTO
|
||||||
|
// OpsLog: that one stamps a version and clears user_edited. This one is a plain
|
||||||
|
// share and leaves both alone, so the recipient's copy is correctly marked as
|
||||||
|
// someone else's work rather than as a pristine built-in.
|
||||||
|
async function exportOne() {
|
||||||
|
setErr('');
|
||||||
|
if (!cur) return;
|
||||||
|
try {
|
||||||
|
const code = cur.code.trim().toUpperCase();
|
||||||
|
const p = await ExportAward(code);
|
||||||
|
if (p) setErr(t('awed.exportedOneTo', { code, path: p }));
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
// Export the SELECTED award as a catalog-ready JSON, stamped with a version, to
|
// Export the SELECTED award as a catalog-ready JSON, stamped with a version, to
|
||||||
// paste over internal/award/catalog/<code>.json. A new release then ships it to
|
// paste over internal/award/catalog/<code>.json. A new release then ships it to
|
||||||
// the whole team (unedited copies auto-upgrade; edited ones are offered it).
|
// the whole team (unedited copies auto-upgrade; edited ones are offered it).
|
||||||
@@ -761,6 +785,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
<TabsContent value="refs" className="mt-0">
|
<TabsContent value="refs" className="mt-0">
|
||||||
<ReferencesPanel
|
<ReferencesPanel
|
||||||
code={cur.code.trim().toUpperCase()} presets={presets} meta={meta[cur.code.toUpperCase()]}
|
code={cur.code.trim().toUpperCase()} presets={presets} meta={meta[cur.code.toUpperCase()]}
|
||||||
|
awardValidFrom={cur.valid_from} awardValidTo={cur.valid_to}
|
||||||
onUpdateOnline={() => updateList(cur.code.toUpperCase())} updating={updating === cur.code.toUpperCase()}
|
onUpdateOnline={() => updateList(cur.code.toUpperCase())} updating={updating === cur.code.toUpperCase()}
|
||||||
onChanged={loadMeta} setErr={setErr}
|
onChanged={loadMeta} setErr={setErr}
|
||||||
/>
|
/>
|
||||||
@@ -780,6 +805,14 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
<Button variant="outline" onClick={exportAwards} title={t('awed.exportTitle')}>
|
<Button variant="outline" onClick={exportAwards} title={t('awed.exportTitle')}>
|
||||||
<Download className="size-3.5 mr-1" /> {t('awed.export')}
|
<Download className="size-3.5 mr-1" /> {t('awed.export')}
|
||||||
</Button>
|
</Button>
|
||||||
|
{/* Share just the selected one. Sitting next to the whole-catalogue
|
||||||
|
export because that is where an operator looks for it, and labelled
|
||||||
|
with the code so the two are never confused at a glance. */}
|
||||||
|
{cur && (
|
||||||
|
<Button variant="outline" onClick={exportOne} title={t('awed.exportOneTitle')}>
|
||||||
|
<Share2 className="size-3.5 mr-1" /> {t('awed.exportOne', { code: cur.code.trim().toUpperCase() })}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
<Button variant="outline" onClick={importAwards} title={t('awed.importTitle')}>
|
<Button variant="outline" onClick={importAwards} title={t('awed.importTitle')}>
|
||||||
<Upload className="size-3.5 mr-1" /> {t('awed.import')}
|
<Upload className="size-3.5 mr-1" /> {t('awed.import')}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -874,8 +907,8 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
// ReferencesPanel — manage the reference list of one award: search/list on the
|
// ReferencesPanel — manage the reference list of one award: search/list on the
|
||||||
// left, a per-reference editor on the right, plus bulk paste/CSV, presets and
|
// left, a per-reference editor on the right, plus bulk paste/CSV, presets and
|
||||||
// the online updater (POTA/SOTA/WWFF).
|
// the online updater (POTA/SOTA/WWFF).
|
||||||
function ReferencesPanel({ code, presets, meta, onUpdateOnline, updating, onChanged, setErr }: {
|
function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, onUpdateOnline, updating, onChanged, setErr }: {
|
||||||
code: string; presets: Preset[]; meta?: RefMeta;
|
code: string; presets: Preset[]; meta?: RefMeta; awardValidFrom?: string; awardValidTo?: string;
|
||||||
onUpdateOnline: () => void; updating: boolean; onChanged: () => void; setErr: (s: string) => void;
|
onUpdateOnline: () => void; updating: boolean; onChanged: () => void; setErr: (s: string) => void;
|
||||||
}) {
|
}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
@@ -1031,6 +1064,26 @@ function ReferencesPanel({ code, presets, meta, onUpdateOnline, updating, onChan
|
|||||||
third-party list may carry the values — but they are not offered
|
third-party list may carry the values — but they are not offered
|
||||||
for editing until something actually reads them. */}
|
for editing until something actually reads them. */}
|
||||||
<Field2 label={t('awed.grid')}><Input className="h-8 font-mono" value={sel.gridsquare ?? ''} onChange={(e) => patchSel({ gridsquare: e.target.value })} /></Field2>
|
<Field2 label={t('awed.grid')}><Input className="h-8 font-mono" value={sel.gridsquare ?? ''} onChange={(e) => patchSel({ gridsquare: e.target.value })} /></Field2>
|
||||||
|
{/* This reference's own validity window. A reference is not forever:
|
||||||
|
a park is delisted, a district merged. A QSO made while it
|
||||||
|
existed still counts — it was a valid contact on the day — and
|
||||||
|
one made afterwards does not.
|
||||||
|
Left empty the award's own dates govern, which is why they show
|
||||||
|
as the placeholder: the operator can see what "empty" inherits
|
||||||
|
instead of having to remember. */}
|
||||||
|
<Field2 label={t('awed.refValidFrom')}>
|
||||||
|
<Input type="date" className="h-8 w-44" value={sel.valid_from ?? ''}
|
||||||
|
onChange={(e) => patchSel({ valid_from: e.target.value })} />
|
||||||
|
</Field2>
|
||||||
|
<Field2 label={t('awed.refValidTo')}>
|
||||||
|
<Input type="date" className="h-8 w-44" value={sel.valid_to ?? ''}
|
||||||
|
onChange={(e) => patchSel({ valid_to: e.target.value })} />
|
||||||
|
</Field2>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
{(awardValidFrom || awardValidTo)
|
||||||
|
? t('awed.refValidHintAward', { from: openEnded(awardValidFrom), to: openEnded(awardValidTo) })
|
||||||
|
: t('awed.refValidHint')}
|
||||||
|
</p>
|
||||||
<div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveRef(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
|
<div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveRef(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
|||||||
import { cn } from '@/lib/utils';
|
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 { 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
|
||||||
@@ -24,7 +26,46 @@ interface Spot {
|
|||||||
spotter?: string;
|
spotter?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
type SpotStatusEntry = { status: string; country?: string };
|
// The FULL status entry, not the two fields the map used to declare. The extra
|
||||||
|
// markers were already arriving in this object — the local type simply never
|
||||||
|
// mentioned them, so they could not be drawn.
|
||||||
|
type SpotStatusEntry = {
|
||||||
|
status?: string;
|
||||||
|
country?: string;
|
||||||
|
worked_call?: boolean;
|
||||||
|
// worked_slot: this exact callsign already worked on THIS band and mode.
|
||||||
|
worked_slot?: boolean;
|
||||||
|
new_county?: boolean;
|
||||||
|
new_pota?: boolean;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
// Whether the station uploads to LoTW. Not a status — it says nothing about
|
||||||
|
// whether the spot is worth chasing — so it is drawn as a badge, never a colour.
|
||||||
|
lotw?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
||||||
|
// entity AND a new park. The cluster list stacks them as separate badges instead
|
||||||
|
// of letting one replace another, so the map stacks them too — as segments of
|
||||||
|
// the pill's left accent bar, which until now only repeated the pill's own
|
||||||
|
// colour and carried no information of its own.
|
||||||
|
//
|
||||||
|
// Their colours come from lib/spotMarkers, shared with the cluster list: the
|
||||||
|
// same fact must not be violet in one panel and green in the next.
|
||||||
|
// The map shows three of the five. A new PREFIX and a new GRID are left to the
|
||||||
|
// cluster list, which has the width to name them: the
|
||||||
|
// pill is 22 px tall, and a fourth segment turns the strip into a colour code
|
||||||
|
// nobody can read at a glance. Add it here the day the strip earns more room.
|
||||||
|
const BMP_MARKERS = SPOT_MARKERS.filter((m) => m.key !== 'new_pfx' && m.key !== 'new_grid');
|
||||||
|
const markersFor = (e: SpotStatusEntry | undefined) =>
|
||||||
|
activeMarkers(e).filter((m) => m.key !== 'new_pfx' && m.key !== 'new_grid');
|
||||||
|
|
||||||
|
// The legend spells the markers out; the cluster list's badges are abbreviated
|
||||||
|
// ("NEW CTY") because they sit in a narrow cell, and there is room here.
|
||||||
|
const BMP_MARKER_LABEL: Record<string, string> = {
|
||||||
|
new_pota: 'bmp.legendNewPota',
|
||||||
|
new_county: 'bmp.legendNewCounty',
|
||||||
|
worked_call: 'bmp.legendWorkedCall',
|
||||||
|
};
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
band: string;
|
band: string;
|
||||||
@@ -41,6 +82,8 @@ interface Props {
|
|||||||
// globally from the band-map tab toolbar.
|
// globally from the band-map tab toolbar.
|
||||||
hideDigital?: boolean;
|
hideDigital?: boolean;
|
||||||
fitToBand?: boolean;
|
fitToBand?: boolean;
|
||||||
|
// Mark stations that upload to LoTW (Settings → Appearance).
|
||||||
|
showLotw?: boolean;
|
||||||
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
||||||
// frequency (and tune to it). Only the docked Main-view band map sets this, so
|
// frequency (and tune to it). Only the docked Main-view band map sets this, so
|
||||||
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
|
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
|
||||||
@@ -116,12 +159,26 @@ function statusLabel(s: string, t: (k: string) => string): 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');
|
||||||
|
// An empty status means the entity could not be resolved. Nothing else
|
||||||
|
// empties it: the mute option leaves the status alone and takes only the
|
||||||
|
// already-worked-callsign mark.
|
||||||
default: return t('bmp.statusUnresolved');
|
default: return t('bmp.statusUnresolved');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 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): { pill: string; bar: string; line: string; dot: string } {
|
function statusStyle(s: string): { pill: string; bar: string; line: string; dot: string } {
|
||||||
// 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
|
||||||
@@ -140,18 +197,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',
|
||||||
@@ -179,8 +232,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, showLotw = 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
|
||||||
@@ -248,6 +317,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;
|
||||||
}
|
}
|
||||||
@@ -567,12 +637,32 @@ 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)}${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)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||||
>
|
>
|
||||||
{/* Status accent strip on the left */}
|
{/* Left accent strip. With no extra marker it repeats the status
|
||||||
<span className={cn('w-1 shrink-0', style.bar)} aria-hidden />
|
colour, exactly as before; otherwise it splits into one
|
||||||
|
segment per marker, so "worked entity + new park" shows both
|
||||||
|
instead of one hiding the other. */}
|
||||||
|
{(() => {
|
||||||
|
const marks = markersFor(entry);
|
||||||
|
if (marks.length === 0) return <span className={cn('w-1 shrink-0', style.bar)} aria-hidden />;
|
||||||
|
return (
|
||||||
|
<span className="w-1 shrink-0 flex flex-col" aria-hidden>
|
||||||
|
{marks.map((m) => <span key={m.key} className="flex-1" style={{ background: m.colour }} />)}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
})()}
|
||||||
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
||||||
<span>{p.spot.dx_call}</span>
|
<span>{p.spot.dx_call}</span>
|
||||||
|
{/* Same badge the cluster list draws, for the same reason: the
|
||||||
|
muted-blue of a confirmation, never a status colour —
|
||||||
|
whether a station uploads to LoTW says nothing about
|
||||||
|
whether the spot is worth chasing. A glyph rather than a
|
||||||
|
colour also keeps it off the channel the statuses use. */}
|
||||||
|
{showLotw && entry?.lotw && (
|
||||||
|
<span title={t('clu.lotwBadge')} className="text-[9px] font-normal rounded px-1 py-px"
|
||||||
|
style={{ background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)' }}>L</span>
|
||||||
|
)}
|
||||||
{mode && (
|
{mode && (
|
||||||
<span className="text-[9px] font-normal text-current/70 bg-current/10 rounded px-1 py-px">
|
<span className="text-[9px] font-normal text-current/70 bg-current/10 rounded px-1 py-px">
|
||||||
{mode}
|
{mode}
|
||||||
@@ -590,6 +680,11 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
<LegendDot cls="bg-warning" label={t('bmp.legendNewBand')} />
|
<LegendDot cls="bg-warning" label={t('bmp.legendNewBand')} />
|
||||||
<LegendDot cls="bg-caution" label={t('bmp.legendNewSlot')} />
|
<LegendDot cls="bg-caution" label={t('bmp.legendNewSlot')} />
|
||||||
<LegendDot cls="bg-muted-foreground/30" label={t("bmp.legendWorked")} />
|
<LegendDot cls="bg-muted-foreground/30" label={t("bmp.legendWorked")} />
|
||||||
|
{/* The stacked markers, straight from the shared table so the legend
|
||||||
|
cannot drift from what the pills actually draw. */}
|
||||||
|
{BMP_MARKERS.map((m) => (
|
||||||
|
<LegendDot key={m.key} colour={m.colour} label={t(BMP_MARKER_LABEL[m.key])} />
|
||||||
|
))}
|
||||||
{/* Sub-band shading, so the wash behind the pills is never colour-alone. */}
|
{/* Sub-band shading, so the wash behind the pills is never colour-alone. */}
|
||||||
<span className="mx-0.5 opacity-40">|</span>
|
<span className="mx-0.5 opacity-40">|</span>
|
||||||
<LegendDot colour={SEG_CW} label={t("bmp.legendCW")} />
|
<LegendDot colour={SEG_CW} label={t("bmp.legendCW")} />
|
||||||
|
|||||||
@@ -172,8 +172,17 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
() => (lat == null || lon == null ? null : sunTimes(new Date(), lat, lon)),
|
() => (lat == null || lon == null ? null : sunTimes(new Date(), lat, lon)),
|
||||||
[lat, lon],
|
[lat, lon],
|
||||||
);
|
);
|
||||||
|
// Stacked, not side by side. Laid out in a row this cost about 150 px of a
|
||||||
|
// header that has to hold the callsign, the badges and the band grid, and it
|
||||||
|
// was what pushed the whole row onto a second line. Two short times one above
|
||||||
|
// the other take a fraction of that and no extra height: the row is already
|
||||||
|
// taller than one line of text.
|
||||||
|
//
|
||||||
|
// "UTC" moves into the tooltip with them — the times are monospaced and always
|
||||||
|
// UTC everywhere in OpsLog, so the label was spending width to repeat a
|
||||||
|
// convention the operator already lives by.
|
||||||
const sunBlock = sun ? (
|
const sunBlock = sun ? (
|
||||||
<div className="ml-auto flex items-center gap-3 text-xs shrink-0"
|
<div className="ml-auto flex flex-col items-end leading-tight text-xs shrink-0"
|
||||||
title="Sunrise / sunset at the DX station (UTC)">
|
title="Sunrise / sunset at the DX station (UTC)">
|
||||||
{sun.polarDay ? (
|
{sun.polarDay ? (
|
||||||
<span className="font-semibold text-warning">midnight sun</span>
|
<span className="font-semibold text-warning">midnight sun</span>
|
||||||
@@ -182,14 +191,13 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<span className="flex items-center gap-1">
|
<span className="flex items-center gap-1">
|
||||||
<Sunrise className="size-3.5 text-warning" />
|
<Sunrise className="size-3 text-warning" />
|
||||||
<span className="font-mono tabular-nums">{sun.rise || '—'}</span>
|
<span className="font-mono tabular-nums">{sun.rise || '—'}</span>
|
||||||
</span>
|
</span>
|
||||||
<span className="flex items-center gap-1">
|
<span className="flex items-center gap-1">
|
||||||
<Sunset className="size-3.5 text-info" />
|
<Sunset className="size-3 text-info" />
|
||||||
<span className="font-mono tabular-nums">{sun.set || '—'}</span>
|
<span className="font-mono tabular-nums">{sun.set || '—'}</span>
|
||||||
</span>
|
</span>
|
||||||
<span className="text-muted-foreground">UTC</span>
|
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ const FIELDS: FieldDef[] = [
|
|||||||
{ id: 'qsl_rcvd', label: 'bulk.fQslRcvd', group: 'QSL / upload', kind: 'status' },
|
{ id: 'qsl_rcvd', label: 'bulk.fQslRcvd', group: 'QSL / upload', kind: 'status' },
|
||||||
{ id: 'qsl_rcvd_date', label: 'bulk.fQslRcvdDate', group: 'QSL / upload', kind: 'date' },
|
{ id: 'qsl_rcvd_date', label: 'bulk.fQslRcvdDate', group: 'QSL / upload', kind: 'date' },
|
||||||
{ id: 'qsl_via', label: 'bulk.fQslVia', group: 'QSL / upload', kind: 'text' },
|
{ id: 'qsl_via', label: 'bulk.fQslVia', group: 'QSL / upload', kind: 'text' },
|
||||||
|
{ id: 'qsl_sent_via', label: 'bulk.fQslSentVia', group: 'QSL / upload', kind: 'text' },
|
||||||
|
{ id: 'qsl_rcvd_via', label: 'bulk.fQslRcvdVia', group: 'QSL / upload', kind: 'text' },
|
||||||
{ id: 'lotw_sent', label: 'bulk.fLotwSent', group: 'QSL / upload', kind: 'status' },
|
{ id: 'lotw_sent', label: 'bulk.fLotwSent', group: 'QSL / upload', kind: 'status' },
|
||||||
{ id: 'lotw_sent_date', label: 'bulk.fLotwSentDate', group: 'QSL / upload', kind: 'date' },
|
{ id: 'lotw_sent_date', label: 'bulk.fLotwSentDate', group: 'QSL / upload', kind: 'date' },
|
||||||
{ id: 'lotw_rcvd', label: 'bulk.fLotwRcvd', group: 'QSL / upload', kind: 'status' },
|
{ id: 'lotw_rcvd', label: 'bulk.fLotwRcvd', group: 'QSL / upload', kind: 'status' },
|
||||||
@@ -91,6 +93,17 @@ const FIELDS: FieldDef[] = [
|
|||||||
{ id: 'iota', label: 'bulk.fIota', group: 'Contacted station', kind: 'text', upper: true },
|
{ id: 'iota', label: 'bulk.fIota', group: 'Contacted station', kind: 'text', upper: true },
|
||||||
{ id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' },
|
{ id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' },
|
||||||
{ id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' },
|
{ id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' },
|
||||||
|
// The contact itself — repair fields, not description fields. An import that
|
||||||
|
// mapped every QSO to SSB, or an ADIF with no MODE at all, is fixed here
|
||||||
|
// instead of one row at a time.
|
||||||
|
//
|
||||||
|
// Band is deliberately absent: it travels with the frequency below, because a
|
||||||
|
// band contradicting its own frequency is invalid ADIF and every export would
|
||||||
|
// carry the contradiction.
|
||||||
|
{ id: 'mode', label: 'bulk.fMode', group: 'The contact', kind: 'text', upper: true },
|
||||||
|
{ id: 'submode', label: 'bulk.fSubmode', group: 'The contact', kind: 'text', upper: true },
|
||||||
|
{ id: 'rst_sent', label: 'bulk.fRstSent', group: 'The contact', kind: 'text' },
|
||||||
|
{ id: 'rst_rcvd', label: 'bulk.fRstRcvd', group: 'The contact', kind: 'text' },
|
||||||
// Misc
|
// Misc
|
||||||
// Frequency (MHz) — sets freq_hz AND recomputes band. Main use: fixing a batch
|
// Frequency (MHz) — sets freq_hz AND recomputes band. Main use: fixing a batch
|
||||||
// logged on a stale/default frequency after CAT dropped.
|
// logged on a stale/default frequency after CAT dropped.
|
||||||
@@ -110,7 +123,12 @@ const STATUS_VALUES: { v: string; label: string }[] = [
|
|||||||
{ v: '_', label: 'bulk.statusBlank' },
|
{ v: '_', label: 'bulk.statusBlank' },
|
||||||
];
|
];
|
||||||
|
|
||||||
const GROUPS = ['QSL / upload', 'My station', 'Contacted station', 'Contest', 'Propagation', 'Misc'];
|
// Derived from the fields themselves, in the order they are declared.
|
||||||
|
//
|
||||||
|
// This used to be a hand-written list, and a group added to FIELDS but not to it
|
||||||
|
// simply never rendered — the fields existed, passed every check, and could not
|
||||||
|
// be picked. Two lists that must agree, with nothing to make them.
|
||||||
|
const GROUPS = [...new Set(FIELDS.map((f) => f.group))];
|
||||||
// Maps the internal group key → its i18n label key.
|
// Maps the internal group key → its i18n label key.
|
||||||
const GROUP_LABELS: Record<string, string> = {
|
const GROUP_LABELS: Record<string, string> = {
|
||||||
'QSL / upload': 'bulk.groupQsl',
|
'QSL / upload': 'bulk.groupQsl',
|
||||||
@@ -119,6 +137,7 @@ const GROUP_LABELS: Record<string, string> = {
|
|||||||
'Contest': 'bulk.groupContest',
|
'Contest': 'bulk.groupContest',
|
||||||
'Propagation': 'bulk.groupPropagation',
|
'Propagation': 'bulk.groupPropagation',
|
||||||
'Misc': 'bulk.groupMisc',
|
'Misc': 'bulk.groupMisc',
|
||||||
|
'The contact': 'bulk.groupContact',
|
||||||
};
|
};
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
@@ -177,7 +196,7 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
|
|||||||
<SelectContent>
|
<SelectContent>
|
||||||
{GROUPS.map((g) => (
|
{GROUPS.map((g) => (
|
||||||
<div key={g}>
|
<div key={g}>
|
||||||
<div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{t(GROUP_LABELS[g])}</div>
|
<div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{GROUP_LABELS[g] ? t(GROUP_LABELS[g]) : g}</div>
|
||||||
{FIELDS.filter((f) => f.group === g)
|
{FIELDS.filter((f) => f.group === g)
|
||||||
.map((f) => ({ f, txt: t(f.label) }))
|
.map((f) => ({ f, txt: t(f.label) }))
|
||||||
.sort((a, b) => a.txt.localeCompare(b.txt))
|
.sort((a, b) => a.txt.localeCompare(b.txt))
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ import {
|
|||||||
import { Button } from '@/components/ui/button';
|
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 { 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';
|
||||||
|
|
||||||
@@ -51,10 +53,22 @@ 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;
|
||||||
|
// lotw: the DX uploads to LoTW, per ARRL user list. Inert until downloaded.
|
||||||
|
lotw?: boolean;
|
||||||
|
spotter_continent?: string;
|
||||||
|
grid?: string;
|
||||||
|
new_grid?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
@@ -96,26 +110,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.
|
||||||
@@ -134,6 +176,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;
|
||||||
@@ -149,8 +192,8 @@ 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 || s.new_grid);
|
||||||
}
|
}
|
||||||
|
|
||||||
const makeColCatalog = (t: TFn): ColEntry[] => [
|
const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||||
@@ -176,12 +219,27 @@ 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 ?? ''}
|
||||||
|
{/* A single letter rather than a word: the column is 120 px and holds a
|
||||||
|
callsign. It stays the muted-blue of a confirmation, never a status
|
||||||
|
colour — whether a station uploads to LoTW says nothing about
|
||||||
|
whether the spot is worth chasing. */}
|
||||||
|
{s?.lotw ? (
|
||||||
|
<span title={t('clu.lotwBadge')} style={{
|
||||||
|
marginLeft: 4, padding: '0 3px', borderRadius: 3, fontSize: 9, verticalAlign: 'middle',
|
||||||
|
background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)',
|
||||||
|
}}>L</span>
|
||||||
|
) : null}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
},
|
},
|
||||||
tooltipValueGetter: (p: any) => {
|
tooltipValueGetter: (p: any) => {
|
||||||
const s = statusFor(p);
|
const s = statusFor(p);
|
||||||
@@ -203,10 +261,12 @@ 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'));
|
||||||
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
||||||
|
if (s?.new_grid) parts.push(t('clg2.newGrid'));
|
||||||
return parts.join(' ');
|
return parts.join(' ');
|
||||||
},
|
},
|
||||||
cellRenderer: (p: any) => {
|
cellRenderer: (p: any) => {
|
||||||
@@ -218,12 +278,16 @@ 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 });
|
||||||
}
|
}
|
||||||
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: 'var(--success)' });
|
// Colours from lib/spotMarkers — shared with the band map so a marker is
|
||||||
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: 'var(--success)' });
|
// never one colour here and another there.
|
||||||
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: 'var(--caution)' });
|
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: markerColour('new_county') });
|
||||||
|
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: markerColour('new_pota') });
|
||||||
|
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: markerColour('new_pfx') });
|
||||||
|
if (s?.new_grid) parts.push({ text: t('clg2.newGrid'), color: markerColour('new_grid') });
|
||||||
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
||||||
return (
|
return (
|
||||||
<span style={{ whiteSpace: 'nowrap' }}>
|
<span style={{ whiteSpace: 'nowrap' }}>
|
||||||
@@ -240,6 +304,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;
|
||||||
},
|
},
|
||||||
@@ -248,7 +313,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),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -263,8 +330,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),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -277,7 +345,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');
|
||||||
@@ -289,7 +358,37 @@ 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.grid'), colId: 'grid',
|
||||||
|
headerName: t('clg2.c.grid'), width: 70, cellClass: 'font-mono',
|
||||||
|
// Not on the spot: the square a station announced in a CQ that THIS receiver
|
||||||
|
// decoded over the WSJT-X link, so it is filled for the digital watering
|
||||||
|
// hole being monitored and empty everywhere else. A cluster line carries the
|
||||||
|
// spotter's grid at best, never the DX's.
|
||||||
|
valueGetter: (p: any) => statusFor(p)?.grid ?? '',
|
||||||
|
cellStyle: (p: any) => (statusFor(p)?.new_grid ? fillStyle(markerColour('new_grid')) : null) as any,
|
||||||
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
|
tooltipValueGetter: (p: any) => (statusFor(p)?.new_grid ? t('clg2.tipNewGrid') : 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',
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ export interface DetailsState {
|
|||||||
srx_string?: string;
|
srx_string?: string;
|
||||||
stx_string?: string;
|
stx_string?: string;
|
||||||
email: string;
|
email: string;
|
||||||
|
web?: string;
|
||||||
// Award references for the contacted station (set via the Awards tab picker).
|
// Award references for the contacted station (set via the Awards tab picker).
|
||||||
// Semicolon-delimited "AWARD@REF" entries, e.g. "POTA@FR-11553;IOTA@EU-064".
|
// Semicolon-delimited "AWARD@REF" entries, e.g. "POTA@FR-11553;IOTA@EU-064".
|
||||||
// App.tsx maps these back to pota_ref/sota_ref/iota when saving the QSO.
|
// App.tsx maps these back to pota_ref/sota_ref/iota when saving the QSO.
|
||||||
@@ -373,12 +374,16 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
<Input value={details.address} onChange={(e) => onChange({ address: e.target.value })} />
|
<Input value={details.address} onChange={(e) => onChange({ address: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
</div>
|
</div>
|
||||||
<Field label={t('detp.qslMessage')} span={7}>
|
{/* QSL via gets the room, not the message. Width should follow use, and
|
||||||
<Input value={details.qsl_msg} onChange={(e) => onChange({ qsl_msg: e.target.value })} />
|
these two are nowhere near equal: a manager's callsign is filled in
|
||||||
</Field>
|
constantly and a QSL message almost never. The message had 7 columns
|
||||||
<Field label={t('detp.qslVia')} span={5}>
|
of 12 for text most operators never type. */}
|
||||||
|
<Field label={t('detp.qslVia')} span={7}>
|
||||||
<Input value={details.qsl_via} onChange={(e) => onChange({ qsl_via: e.target.value })} />
|
<Input value={details.qsl_via} onChange={(e) => onChange({ qsl_via: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
|
<Field label={t('detp.qslMessage')} span={5}>
|
||||||
|
<Input value={details.qsl_msg} onChange={(e) => onChange({ qsl_msg: e.target.value })} />
|
||||||
|
</Field>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -494,8 +499,14 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
<Field label="STX">
|
<Field label="STX">
|
||||||
<Input value={details.stx_string ?? ''} placeholder={t('detp.sentExchangePh')} onChange={(e) => onChange({ stx_string: e.target.value })} />
|
<Input value={details.stx_string ?? ''} placeholder={t('detp.sentExchangePh')} onChange={(e) => onChange({ stx_string: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
<Field label={t('detp.contactedEmail')} span={3}>
|
{/* No placeholder: a greyed-out sample address in an empty field reads
|
||||||
<Input value={details.email} placeholder="[email protected]" onChange={(e) => onChange({ email: e.target.value })} />
|
as a value the lookup found, and that is exactly the field an
|
||||||
|
operator checks to see whether it found one. */}
|
||||||
|
<Field label={t('detp.contactedEmail')} span={2}>
|
||||||
|
<Input value={details.email} onChange={(e) => onChange({ email: e.target.value })} />
|
||||||
|
</Field>
|
||||||
|
<Field label={t('detp.contactedWeb')}>
|
||||||
|
<Input value={details.web ?? ''} onChange={(e) => onChange({ web: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ import { useI18n } from '@/lib/i18n';
|
|||||||
|
|
||||||
export type FilterOp =
|
export type FilterOp =
|
||||||
| 'eq' | 'ne' | 'gt' | 'lt' | 'ge' | 'le'
|
| 'eq' | 'ne' | 'gt' | 'lt' | 'ge' | 'le'
|
||||||
| 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty';
|
| 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty'
|
||||||
|
| 'in' | 'notin';
|
||||||
|
|
||||||
export interface FilterCondition { field: string; op: FilterOp; value: string }
|
export interface FilterCondition { field: string; op: FilterOp; value: string }
|
||||||
export interface QueryFilter {
|
export interface QueryFilter {
|
||||||
@@ -67,6 +68,8 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
|||||||
{ value: 'qsl_rcvd', label: 'fltb.fQslRcvd', type: 'text' },
|
{ value: 'qsl_rcvd', label: 'fltb.fQslRcvd', type: 'text' },
|
||||||
{ value: 'qsl_rcvd_date', label: 'fltb.fQslRcvdDate', type: 'adifdate' },
|
{ value: 'qsl_rcvd_date', label: 'fltb.fQslRcvdDate', type: 'adifdate' },
|
||||||
{ value: 'qsl_via', label: 'fltb.fQslVia', type: 'text' },
|
{ value: 'qsl_via', label: 'fltb.fQslVia', type: 'text' },
|
||||||
|
{ value: 'qsl_sent_via', label: 'fltb.fQslSentVia', type: 'text' },
|
||||||
|
{ value: 'qsl_rcvd_via', label: 'fltb.fQslRcvdVia', type: 'text' },
|
||||||
{ value: 'lotw_sent', label: 'fltb.fLotwSent', type: 'text' },
|
{ value: 'lotw_sent', label: 'fltb.fLotwSent', type: 'text' },
|
||||||
{ value: 'lotw_sent_date', label: 'fltb.fLotwSentDate', type: 'adifdate' },
|
{ value: 'lotw_sent_date', label: 'fltb.fLotwSentDate', type: 'adifdate' },
|
||||||
{ value: 'lotw_rcvd', label: 'fltb.fLotwRcvd', type: 'text' },
|
{ value: 'lotw_rcvd', label: 'fltb.fLotwRcvd', type: 'text' },
|
||||||
@@ -121,9 +124,15 @@ const OPS: { value: FilterOp; label: string }[] = [
|
|||||||
{ value: 'le', label: 'fltb.opLe' },
|
{ value: 'le', label: 'fltb.opLe' },
|
||||||
{ value: 'empty', label: 'fltb.opEmpty' },
|
{ value: 'empty', label: 'fltb.opEmpty' },
|
||||||
{ value: 'notempty', label: 'fltb.opNotEmpty' },
|
{ value: 'notempty', label: 'fltb.opNotEmpty' },
|
||||||
|
// 'in' is what makes a real question askable. Every condition is joined by ONE
|
||||||
|
// AND or OR, so "2 m or 70 cm, in FT8, since January" had no expression: AND
|
||||||
|
// killed the two bands, OR let every FT8 QSO through. The OR lives inside the
|
||||||
|
// condition instead, and the rest keeps ANDing.
|
||||||
|
{ value: 'in', label: 'fltb.opIn' },
|
||||||
|
{ value: 'notin', label: 'fltb.opNotIn' },
|
||||||
];
|
];
|
||||||
|
|
||||||
const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'empty', 'notempty'];
|
const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'in', 'notin', 'empty', 'notempty'];
|
||||||
const NUM_OPS: FilterOp[] = ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'empty', 'notempty'];
|
const NUM_OPS: FilterOp[] = ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'empty', 'notempty'];
|
||||||
|
|
||||||
function opsFor(field: string): { value: FilterOp; label: string }[] {
|
function opsFor(field: string): { value: FilterOp; label: string }[] {
|
||||||
@@ -257,6 +266,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
)}
|
)}
|
||||||
{conditions.map((c, i) => {
|
{conditions.map((c, i) => {
|
||||||
const needsValue = c.op !== 'empty' && c.op !== 'notempty';
|
const needsValue = c.op !== 'empty' && c.op !== 'notempty';
|
||||||
|
const isList = c.op === 'in' || c.op === 'notin';
|
||||||
const fieldType = FIELDS.find((f) => f.value === c.field)?.type ?? 'text';
|
const fieldType = FIELDS.find((f) => f.value === c.field)?.type ?? 'text';
|
||||||
return (
|
return (
|
||||||
<div key={i} className="flex items-center gap-2">
|
<div key={i} className="flex items-center gap-2">
|
||||||
@@ -281,19 +291,28 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
// An ADIF date is picked with a calendar but STORED as the
|
// An ADIF date is picked with a calendar but STORED as the
|
||||||
// 8-digit form the column holds, so the comparison stays a
|
// 8-digit form the column holds, so the comparison stays a
|
||||||
// plain string one on both sides.
|
// plain string one on both sides.
|
||||||
type={fieldType === 'date' || fieldType === 'adifdate' ? 'date' : fieldType === 'number' ? 'number' : 'text'}
|
// A list is typed by hand, commas and all, so it stays a text
|
||||||
|
// box even on a date or number field: a calendar cannot express
|
||||||
|
// "any one of these".
|
||||||
|
type={isList ? 'text'
|
||||||
|
: fieldType === 'date' || fieldType === 'adifdate' ? 'date'
|
||||||
|
: fieldType === 'number' ? 'number' : 'text'}
|
||||||
className="h-8 flex-1 text-xs"
|
className="h-8 flex-1 text-xs"
|
||||||
disabled={!needsValue}
|
disabled={!needsValue}
|
||||||
placeholder={needsValue ? (fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')) : '—'}
|
placeholder={!needsValue ? '—'
|
||||||
|
: isList ? t('fltb.listPh')
|
||||||
|
: fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')}
|
||||||
// \d, not d: the escape was missing, so the test never matched
|
// \d, not d: the escape was missing, so the test never matched
|
||||||
// an 8-digit ADIF date and the calendar input was handed
|
// an 8-digit ADIF date and the calendar input was handed
|
||||||
// "20260728" — which type=date rejects, showing an empty box
|
// "20260728" — which type=date rejects, showing an empty box
|
||||||
// over a value that was really there.
|
// over a value that was really there.
|
||||||
value={fieldType === 'adifdate' && /^\d{8}$/.test(c.value)
|
// The ADIF reshaping is skipped for a list: it would eat the
|
||||||
|
// commas and leave one unreadable run of digits.
|
||||||
|
value={!isList && fieldType === 'adifdate' && /^\d{8}$/.test(c.value)
|
||||||
? `${c.value.slice(0, 4)}-${c.value.slice(4, 6)}-${c.value.slice(6, 8)}`
|
? `${c.value.slice(0, 4)}-${c.value.slice(4, 6)}-${c.value.slice(6, 8)}`
|
||||||
: c.value}
|
: c.value}
|
||||||
onChange={(e) => setCond(i, {
|
onChange={(e) => setCond(i, {
|
||||||
value: fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value,
|
value: !isList && fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value,
|
||||||
})}
|
})}
|
||||||
onKeyDown={(e) => { if (e.key === 'Enter') apply(); }}
|
onKeyDown={(e) => { if (e.key === 'Enter') apply(); }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -47,12 +47,33 @@ const ZERO: IcomState = {
|
|||||||
|
|
||||||
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
||||||
// the plain SetFrequency command — no band-stacking codes needed. Hz values.
|
// the plain SetFrequency command — no band-stacking codes needed. Hz values.
|
||||||
const BANDS: { l: string; hz: number }[] = [
|
type Band = { l: string; hz: number };
|
||||||
|
|
||||||
|
const HF_BANDS: Band[] = [
|
||||||
{ l: '160', hz: 1_840_000 }, { l: '80', hz: 3_750_000 }, { l: '40', hz: 7_100_000 },
|
{ l: '160', hz: 1_840_000 }, { l: '80', hz: 3_750_000 }, { l: '40', hz: 7_100_000 },
|
||||||
{ l: '30', hz: 10_130_000 }, { l: '20', hz: 14_150_000 }, { l: '17', hz: 18_130_000 },
|
{ l: '30', hz: 10_130_000 }, { l: '20', hz: 14_150_000 }, { l: '17', hz: 18_130_000 },
|
||||||
{ l: '15', hz: 21_250_000 }, { l: '12', hz: 24_950_000 }, { l: '10', hz: 28_400_000 },
|
{ l: '15', hz: 21_250_000 }, { l: '12', hz: 24_950_000 }, { l: '10', hz: 28_400_000 },
|
||||||
{ l: '6', hz: 50_150_000 },
|
|
||||||
];
|
];
|
||||||
|
const B6 = { l: '6', hz: 50_150_000 };
|
||||||
|
const B2 = { l: '2', hz: 144_300_000 }; // SSB calling
|
||||||
|
const B70 = { l: '70cm', hz: 432_200_000 }; // SSB calling
|
||||||
|
const B23 = { l: '23cm', hz: 1_296_200_000 }; // SSB calling
|
||||||
|
|
||||||
|
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
||||||
|
// the plain SetFrequency command — no band-stacking codes needed.
|
||||||
|
//
|
||||||
|
// Which buttons to OFFER depends on the radio, exactly as the attenuator steps
|
||||||
|
// do below. An IC-9700 has no HF at all, yet the console was showing it 160
|
||||||
|
// through 6 and none of the bands it actually covers: ten dead buttons, and no
|
||||||
|
// way to change band from here on the only rig where you would want to.
|
||||||
|
function bandsFor(model?: string): Band[] {
|
||||||
|
const m = (model ?? '').toUpperCase();
|
||||||
|
if (m.includes('9700')) return [B2, B70, B23]; // VHF/UHF/SHF only
|
||||||
|
if (m.includes('705')) return [...HF_BANDS, B6, B2, B70];
|
||||||
|
if (m.includes('9100')) return [...HF_BANDS, B6, B2, B70, B23];
|
||||||
|
// 7300 / 7610 / 7100 / unknown: HF + 6 m, the historical list.
|
||||||
|
return [...HF_BANDS, B6];
|
||||||
|
}
|
||||||
|
|
||||||
// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
|
// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
|
||||||
// SSB by frequency and the rig's data variant for digital modes.
|
// SSB by frequency and the rig's data variant for digital modes.
|
||||||
@@ -85,7 +106,10 @@ function bandOfHz(hz?: number): string {
|
|||||||
['160', 1.8, 2.0], ['80', 3.5, 4.0], ['60', 5.25, 5.45], ['40', 7.0, 7.3],
|
['160', 1.8, 2.0], ['80', 3.5, 4.0], ['60', 5.25, 5.45], ['40', 7.0, 7.3],
|
||||||
['30', 10.1, 10.15], ['20', 14.0, 14.35], ['17', 18.068, 18.168],
|
['30', 10.1, 10.15], ['20', 14.0, 14.35], ['17', 18.068, 18.168],
|
||||||
['15', 21.0, 21.45], ['12', 24.89, 24.99], ['10', 28.0, 29.7],
|
['15', 21.0, 21.45], ['12', 24.89, 24.99], ['10', 28.0, 29.7],
|
||||||
['6', 50.0, 54.0], ['4', 70.0, 70.5], ['2', 144.0, 148.0], ['70', 430.0, 450.0],
|
// Labels must match the band buttons' exactly — this is only used to light
|
||||||
|
// the button for the band the rig is on, and '70' never matched '70cm'.
|
||||||
|
['6', 50.0, 54.0], ['4', 70.0, 70.5], ['2', 144.0, 148.0],
|
||||||
|
['70cm', 430.0, 450.0], ['23cm', 1240.0, 1300.0],
|
||||||
];
|
];
|
||||||
for (const [name, lo, hi] of bands) if (mhz >= lo && mhz <= hi) return name;
|
for (const [name, lo, hi] of bands) if (mhz >= lo && mhz <= hi) return name;
|
||||||
return '';
|
return '';
|
||||||
@@ -749,7 +773,7 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
|||||||
{/* Band buttons + antenna selection. */}
|
{/* Band buttons + antenna selection. */}
|
||||||
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
|
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
|
||||||
<div className="grid grid-cols-5 gap-1.5">
|
<div className="grid grid-cols-5 gap-1.5">
|
||||||
{BANDS.map((b) => {
|
{bandsFor(st.model).map((b) => {
|
||||||
const here = bandOfHz(mainHz) === b.l;
|
const here = bandOfHz(mainHz) === b.l;
|
||||||
return (
|
return (
|
||||||
<button key={b.l} type="button" onClick={() => SetCATFrequency(b.hz).catch(() => {})}
|
<button key={b.l} type="button" onClick={() => SetCATFrequency(b.hz).catch(() => {})}
|
||||||
|
|||||||
@@ -43,9 +43,20 @@ function unwrapLon(ring: [number, number][]): [number, number][] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const CARTO_LIGHT = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png';
|
const CARTO_LIGHT = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png';
|
||||||
const OSM = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
|
||||||
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
||||||
const OSM_ATTR = '© OpenStreetMap contributors';
|
|
||||||
|
// NOT tile.openstreetmap.org. Those are OpenStreetMap's VOLUNTEER-run servers,
|
||||||
|
// and their usage policy does not cover a desktop application handed to an
|
||||||
|
// unbounded number of operators — they blocked OpsLog for it, and every user's
|
||||||
|
// map filled with "Access blocked / 403" tiles at once.
|
||||||
|
//
|
||||||
|
// The replacements are tile services whose terms do cover redistributed apps,
|
||||||
|
// with no API key: Carto (whose tiles are OSM-derived, hence the attribution
|
||||||
|
// still credits OpenStreetMap) and Esri. Anything added here later must be
|
||||||
|
// checked the same way — a free tile URL is not the same thing as a tile URL we
|
||||||
|
// are allowed to ship.
|
||||||
|
const ESRI_STREET = 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
||||||
|
const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, © OpenStreetMap contributors';
|
||||||
|
|
||||||
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||||
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||||
@@ -55,7 +66,7 @@ const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; s
|
|||||||
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
||||||
attr: CARTO_ATTR, subdomains: 'abcd' },
|
attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
street: { label: 'Street', url: OSM, attr: OSM_ATTR },
|
street: { label: 'Street', url: ESRI_STREET, attr: ESRI_STREET_ATTR },
|
||||||
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||||
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
||||||
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
||||||
@@ -416,7 +427,14 @@ export function LocatorMap({ toGrid, toLabel }: LocatorProps) {
|
|||||||
if (locatorRef.current && !locatorMap.current) {
|
if (locatorRef.current && !locatorMap.current) {
|
||||||
const m = L.map(locatorRef.current, { zoomControl: true, attributionControl: true })
|
const m = L.map(locatorRef.current, { zoomControl: true, attributionControl: true })
|
||||||
.setView([20, 0], 2);
|
.setView([20, 0], 2);
|
||||||
L.tileLayer(OSM, { attribution: OSM_ATTR, maxZoom: 19 }).addTo(m);
|
// Same restraint as the world map: fetch on idle, not mid-pan, and keep a
|
||||||
|
// single ring of buffer tiles. Requesting tiles as fast as the pointer
|
||||||
|
// moves is what gets an app blocked, and the next provider is under no
|
||||||
|
// more obligation to tolerate it than the last one was.
|
||||||
|
L.tileLayer(CARTO_LIGHT, {
|
||||||
|
attribution: CARTO_ATTR, subdomains: 'abcd', maxZoom: 19,
|
||||||
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
|
}).addTo(m);
|
||||||
locatorOverlay.current = L.layerGroup().addTo(m);
|
locatorOverlay.current = L.layerGroup().addTo(m);
|
||||||
locatorMap.current = m;
|
locatorMap.current = m;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,9 +57,9 @@ const QSL_STATUSES = [
|
|||||||
// QSL routing methods for the paper-QSL "Via" dropdown (was free text).
|
// QSL routing methods for the paper-QSL "Via" dropdown (was free text).
|
||||||
const QSL_VIA_OPTIONS = [
|
const QSL_VIA_OPTIONS = [
|
||||||
{ v: '_', label: 'qslm.leave' },
|
{ v: '_', label: 'qslm.leave' },
|
||||||
{ v: 'Bureau', label: 'qslm.viaBureau' },
|
{ v: 'B', label: 'qslm.viaBureau' },
|
||||||
{ v: 'Direct', label: 'qslm.viaDirect' },
|
{ v: 'D', label: 'qslm.viaDirect' },
|
||||||
{ v: 'Electronic', label: 'qslm.viaElectronic' },
|
{ v: 'E', label: 'qslm.viaElectronic' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// Maps a service value → its i18n label key (only for services with
|
// Maps a service value → its i18n label key (only for services with
|
||||||
|
|||||||
@@ -57,10 +57,12 @@ type ConfDef = {
|
|||||||
key: string; label: string;
|
key: string; label: string;
|
||||||
sent?: keyof QSOForm; rcvd?: keyof QSOForm;
|
sent?: keyof QSOForm; rcvd?: keyof QSOForm;
|
||||||
sentDate?: keyof QSOForm; rcvdDate?: keyof QSOForm;
|
sentDate?: keyof QSOForm; rcvdDate?: keyof QSOForm;
|
||||||
via?: keyof QSOForm;
|
// How the card travelled, each way (ADIF QSL_SENT_VIA / QSL_RCVD_VIA). Paper
|
||||||
|
// only — the electronic channels below ARE the route.
|
||||||
|
sentVia?: keyof QSOForm; rcvdVia?: keyof QSOForm;
|
||||||
};
|
};
|
||||||
const CONFIRMATIONS: ConfDef[] = [
|
const CONFIRMATIONS: ConfDef[] = [
|
||||||
{ key: 'QSL', label: 'QSL (paper)', sent: 'qsl_sent', rcvd: 'qsl_rcvd', sentDate: 'qsl_sent_date', rcvdDate: 'qsl_rcvd_date', via: 'qsl_via' },
|
{ key: 'QSL', label: 'QSL (paper)', sent: 'qsl_sent', rcvd: 'qsl_rcvd', sentDate: 'qsl_sent_date', rcvdDate: 'qsl_rcvd_date', sentVia: 'qsl_sent_via', rcvdVia: 'qsl_rcvd_via' },
|
||||||
{ key: 'LOTW', label: 'LoTW', sent: 'lotw_sent', rcvd: 'lotw_rcvd', sentDate: 'lotw_sent_date', rcvdDate: 'lotw_rcvd_date' },
|
{ key: 'LOTW', label: 'LoTW', sent: 'lotw_sent', rcvd: 'lotw_rcvd', sentDate: 'lotw_sent_date', rcvdDate: 'lotw_rcvd_date' },
|
||||||
{ key: 'EQSL', label: 'eQSL', sent: 'eqsl_sent', rcvd: 'eqsl_rcvd', sentDate: 'eqsl_sent_date', rcvdDate: 'eqsl_rcvd_date' },
|
{ key: 'EQSL', label: 'eQSL', sent: 'eqsl_sent', rcvd: 'eqsl_rcvd', sentDate: 'eqsl_sent_date', rcvdDate: 'eqsl_rcvd_date' },
|
||||||
{ key: 'QRZCOM', label: 'QRZ.com', sent: 'qrzcom_qso_upload_status' as any, sentDate: 'qrzcom_qso_upload_date' as any, rcvd: 'qrzcom_qso_download_status' as any, rcvdDate: 'qrzcom_qso_download_date' as any },
|
{ key: 'QRZCOM', label: 'QRZ.com', sent: 'qrzcom_qso_upload_status' as any, sentDate: 'qrzcom_qso_upload_date' as any, rcvd: 'qrzcom_qso_download_status' as any, rcvdDate: 'qrzcom_qso_download_date' as any },
|
||||||
@@ -216,6 +218,28 @@ function QslSelect({ value, onChange }: { value?: string; onChange: (v: string)
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The ADIF QSL Via enumeration. M (manager) is import-only in the standard, so
|
||||||
|
// it is not offered here — a file that arrives carrying it keeps it, and this
|
||||||
|
// list is what an operator may choose.
|
||||||
|
const QSL_VIA_CHOICES = [
|
||||||
|
{ value: '_', label: 'qedit.qslDash' },
|
||||||
|
{ value: 'B', label: 'qedit.viaBureau' },
|
||||||
|
{ value: 'D', label: 'qedit.viaDirect' },
|
||||||
|
{ value: 'E', label: 'qedit.viaElectronic' },
|
||||||
|
];
|
||||||
|
|
||||||
|
function QslViaSelect({ value, onChange }: { value?: string; onChange: (v: string) => void }) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
return (
|
||||||
|
<Select value={value || '_'} onValueChange={(v) => onChange(v === '_' ? '' : v)}>
|
||||||
|
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{QSL_VIA_CHOICES.map((s) => <SelectItem key={s.value} value={s.value}>{t(s.label)}</SelectItem>)}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], bands, modes }: Props) {
|
export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], bands, modes }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
// Use the operator's configured band/mode lists (incl. custom ones like 13cm);
|
// Use the operator's configured band/mode lists (incl. custom ones like 13cm);
|
||||||
@@ -633,7 +657,12 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<Label>{t('qedit.qslMsg')}</Label>
|
<Label>{t('qedit.qslMsg')}</Label>
|
||||||
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
||||||
</div>
|
</div>
|
||||||
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
|
{/* The manager, and only the manager — ADIF QSL_VIA. How the
|
||||||
|
card travelled is a separate field, on the QSL Info tab. */}
|
||||||
|
<div>
|
||||||
|
<Label>{t('qedit.qslVia')}</Label>
|
||||||
|
<Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} placeholder={t('qedit.qslViaPlaceholder')} />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
@@ -734,8 +763,14 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
</div>
|
</div>
|
||||||
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={val(def.sentDate)} onChange={(v) => put(def.sentDate, v)} /></div>
|
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={val(def.sentDate)} onChange={(v) => put(def.sentDate, v)} /></div>
|
||||||
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={val(def.rcvdDate)} onChange={(v) => put(def.rcvdDate, v)} disabled={!def.rcvdDate} /></div>
|
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={val(def.rcvdDate)} onChange={(v) => put(def.rcvdDate, v)} disabled={!def.rcvdDate} /></div>
|
||||||
{def.via && (
|
{/* How the card travelled, each way — ADIF's QSL Via
|
||||||
<div className="col-span-2"><Label>{t('qedit.via')}</Label><Input value={val(def.via)} onChange={(e) => put(def.via, e.target.value)} placeholder={t('qedit.viaPlaceholder')} /></div>
|
enumeration. Not the manager: that is a callsign
|
||||||
|
and lives on the Contact's details tab. */}
|
||||||
|
{def.sentVia && (
|
||||||
|
<div><Label>{t('qedit.sentVia')}</Label><QslViaSelect value={val(def.sentVia)} onChange={(v) => put(def.sentVia, v)} /></div>
|
||||||
|
)}
|
||||||
|
{def.rcvdVia && (
|
||||||
|
<div><Label>{t('qedit.rcvdVia')}</Label><QslViaSelect value={val(def.rcvdVia)} onChange={(v) => put(def.rcvdVia, v)} /></div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<p className="text-[11px] text-muted-foreground">
|
<p className="text-[11px] text-muted-foreground">
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import { Checkbox } from '@/components/ui/checkbox';
|
|||||||
import { loadLocal, loadRemote, saveState, seedLocal } from '@/lib/gridPrefs';
|
import { loadLocal, loadRemote, saveState, seedLocal } from '@/lib/gridPrefs';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { gridToLatLon, pathBetweenLatLon } from '@/lib/maidenhead';
|
import { gridToLatLon, pathBetweenLatLon } from '@/lib/maidenhead';
|
||||||
|
import { rowStyleFor, type RowColorSettings } from '@/lib/rowColors';
|
||||||
|
|
||||||
// Register every Community feature once. v32+ requires explicit registration;
|
// Register every Community feature once. v32+ requires explicit registration;
|
||||||
// AllCommunityModule keeps it simple and pulls in sort/filter/resize/reorder/
|
// AllCommunityModule keeps it simple and pulls in sort/filter/resize/reorder/
|
||||||
@@ -80,6 +81,8 @@ type Props = {
|
|||||||
// One column per defined award; the cell shows the reference this QSO counts
|
// One column per defined award; the cell shows the reference this QSO counts
|
||||||
// for (from row.award_refs[CODE], attached by the parent). Hidden by default.
|
// for (from row.award_refs[CODE], attached by the parent). Hidden by default.
|
||||||
awardCols?: { code: string; name: string }[];
|
awardCols?: { code: string; name: string }[];
|
||||||
|
// Whole-row colouring by QSL / LoTW status (Settings → Appearance).
|
||||||
|
rowColors?: RowColorSettings | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
const BASE_COLSTATE_KEY = 'hamlog.qsoColState.v2';
|
const BASE_COLSTATE_KEY = 'hamlog.qsoColState.v2';
|
||||||
@@ -132,6 +135,10 @@ function qsoDistanceKm(d: any, myGrid?: string): number | undefined {
|
|||||||
|
|
||||||
export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
||||||
// ── QSO basics ──
|
// ── QSO basics ──
|
||||||
|
// Position in the log, oldest = 1. Filled by the backend over the WHOLE log,
|
||||||
|
// so it does not change when a filter narrows what is shown.
|
||||||
|
{ group: 'QSO', label: t('rqg.c.number'), colId: 'number', headerName: t('rqg.h.number'), field: 'number' as any, width: 80, type: 'rightAligned', cellClass: 'font-mono',
|
||||||
|
comparator: (a, b) => (a ?? 0) - (b ?? 0) },
|
||||||
{ group: 'QSO', label: t('rqg.c.qso_date'), colId: 'qso_date', headerName: t('rqg.c.qso_date'), field: 'qso_date' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value), sort: 'desc', defaultVisible: true },
|
{ group: 'QSO', label: t('rqg.c.qso_date'), colId: 'qso_date', headerName: t('rqg.c.qso_date'), field: 'qso_date' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value), sort: 'desc', defaultVisible: true },
|
||||||
{ group: 'QSO', label: t('rqg.c.qso_date_off'), colId: 'qso_date_off', headerName: t('rqg.c.qso_date_off'), field: 'qso_date_off' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value) },
|
{ group: 'QSO', label: t('rqg.c.qso_date_off'), colId: 'qso_date_off', headerName: t('rqg.c.qso_date_off'), field: 'qso_date_off' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value) },
|
||||||
{ group: 'QSO', label: t('rqg.c.callsign'), colId: 'callsign', headerName: t('rqg.c.callsign'), field: 'callsign' as any, width: 110, cellClass: 'font-mono font-semibold', defaultVisible: true },
|
{ group: 'QSO', label: t('rqg.c.callsign'), colId: 'callsign', headerName: t('rqg.c.callsign'), field: 'callsign' as any, width: 110, cellClass: 'font-mono font-semibold', defaultVisible: true },
|
||||||
@@ -179,6 +186,8 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
|||||||
{ group: 'QSL', label: t('rqg.c.qsl_sent_date'),colId: 'qsl_sent_date', headerName: t('rqg.h.qsl_sent_date'), field: 'qsl_sent_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
{ group: 'QSL', label: t('rqg.c.qsl_sent_date'),colId: 'qsl_sent_date', headerName: t('rqg.h.qsl_sent_date'), field: 'qsl_sent_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
||||||
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_date'),colId: 'qsl_rcvd_date', headerName: t('rqg.h.qsl_rcvd_date'), field: 'qsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_date'),colId: 'qsl_rcvd_date', headerName: t('rqg.h.qsl_rcvd_date'), field: 'qsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
||||||
{ group: 'QSL', label: t('rqg.c.qsl_via'), colId: 'qsl_via', headerName: t('rqg.c.qsl_via'), field: 'qsl_via' as any, width: 130 },
|
{ group: 'QSL', label: t('rqg.c.qsl_via'), colId: 'qsl_via', headerName: t('rqg.c.qsl_via'), field: 'qsl_via' as any, width: 130 },
|
||||||
|
{ group: 'QSL', label: t('rqg.c.qsl_sent_via'), colId: 'qsl_sent_via', headerName: t('rqg.h.qsl_sent_via'), field: 'qsl_sent_via' as any, width: 110 },
|
||||||
|
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_via'), colId: 'qsl_rcvd_via', headerName: t('rqg.h.qsl_rcvd_via'), field: 'qsl_rcvd_via' as any, width: 110 },
|
||||||
{ group: 'QSL', label: t('rqg.c.qsl_msg'), colId: 'qsl_msg', headerName: t('rqg.c.qsl_msg'), field: 'qsl_msg' as any, width: 200 },
|
{ group: 'QSL', label: t('rqg.c.qsl_msg'), colId: 'qsl_msg', headerName: t('rqg.c.qsl_msg'), field: 'qsl_msg' as any, width: 200 },
|
||||||
{ group: 'QSL', label: t('rqg.c.qslmsg_rcvd'), colId: 'qslmsg_rcvd', headerName: t('rqg.c.qslmsg_rcvd'), field: 'qslmsg_rcvd' as any, width: 200 },
|
{ group: 'QSL', label: t('rqg.c.qslmsg_rcvd'), colId: 'qslmsg_rcvd', headerName: t('rqg.c.qslmsg_rcvd'), field: 'qslmsg_rcvd' as any, width: 200 },
|
||||||
|
|
||||||
@@ -299,7 +308,7 @@ const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
|
|||||||
return rest;
|
return rest;
|
||||||
});
|
});
|
||||||
|
|
||||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
@@ -696,6 +705,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
animateRows={false}
|
animateRows={false}
|
||||||
suppressCellFocus
|
suppressCellFocus
|
||||||
getRowId={(p) => String((p.data as any).id)}
|
getRowId={(p) => String((p.data as any).id)}
|
||||||
|
getRowStyle={(p) => rowStyleFor(p.data, rowColors ?? null)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -128,7 +128,9 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="flex items-center justify-center p-2 min-h-0">
|
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
|
||||||
|
sibling of the <svg> landed beside it. */}
|
||||||
|
<div className="flex flex-col items-center justify-center p-2 min-h-0">
|
||||||
<svg
|
<svg
|
||||||
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
||||||
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
|
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
|
||||||
@@ -188,6 +190,31 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
); })}
|
); })}
|
||||||
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
|
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
|
||||||
</svg>
|
</svg>
|
||||||
|
|
||||||
|
{/* Short and long path to the DX, in figures.
|
||||||
|
The bezel already carries the short path as a red marker, but a
|
||||||
|
marker is a direction, not a number — the same pair sits in the
|
||||||
|
status bar at 10px and operators reported not being able to read it.
|
||||||
|
Here because it belongs to the compass: every place that draws one
|
||||||
|
gets the readout, instead of each caller inventing its own.
|
||||||
|
Clickable when the caller can turn, like the status bar's. */}
|
||||||
|
<div className="flex gap-1.5 mt-2 font-mono w-full">
|
||||||
|
{([['SP', bearing ?? null], ['LP', bearing == null ? null : (bearing + 180) % 360]] as const).map(([lbl, az]) => (
|
||||||
|
<button key={lbl} type="button" disabled={az == null || !onGoto}
|
||||||
|
onClick={() => { if (az != null && onGoto) onGoto(Math.round(az)); }}
|
||||||
|
title={az == null ? '' : `${lbl} ${Math.round(az)}°`}
|
||||||
|
className={
|
||||||
|
'flex-1 rounded-md border py-1 text-xs font-semibold tabular-nums transition-colors ' +
|
||||||
|
(az == null
|
||||||
|
? 'border-border text-muted-foreground/50 cursor-not-allowed'
|
||||||
|
: onGoto
|
||||||
|
? 'border-info-border text-info-muted-foreground hover:bg-info-muted cursor-pointer'
|
||||||
|
: 'border-border text-muted-foreground cursor-default')
|
||||||
|
}>
|
||||||
|
{lbl} {az == null ? '—' : `${Math.round(az)}°`}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ import {
|
|||||||
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
||||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||||
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||||
|
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
import type { profile as profileModels } from '../../wailsjs/go/models';
|
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||||
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||||
@@ -61,6 +62,7 @@ import { EventsOn } from '../../wailsjs/runtime/runtime';
|
|||||||
import {
|
import {
|
||||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
||||||
} from '@/components/ui/dialog';
|
} from '@/components/ui/dialog';
|
||||||
|
import { WebPublishPanel } from '@/components/WebPublishPanel';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
@@ -75,6 +77,7 @@ import { getDateFormat, setDateFormat, type DateFormat } from '@/lib/dateFormat'
|
|||||||
import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
|
import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
|
||||||
import { useTheme, CONCRETE_THEMES, type ThemeChoice } from '@/lib/theme';
|
import { useTheme, CONCRETE_THEMES, type ThemeChoice } from '@/lib/theme';
|
||||||
import { OperatingPanel } from '@/components/OperatingPanel';
|
import { OperatingPanel } from '@/components/OperatingPanel';
|
||||||
|
import { AppearancePanel } from '@/components/AppearancePanel';
|
||||||
import { UDPIntegrationsPanel } from '@/components/UDPIntegrationsPanel';
|
import { UDPIntegrationsPanel } from '@/components/UDPIntegrationsPanel';
|
||||||
|
|
||||||
type LookupSettings = LookupSettingsForm;
|
type LookupSettings = LookupSettingsForm;
|
||||||
@@ -143,7 +146,7 @@ const emptyProfile = (): Profile => ({
|
|||||||
my_grid: '', my_country: '',
|
my_grid: '', my_country: '',
|
||||||
my_state: '', my_cnty: '',
|
my_state: '', my_cnty: '',
|
||||||
my_street: '', my_city: '', my_postal_code: '',
|
my_street: '', my_city: '', my_postal_code: '',
|
||||||
my_sota_ref: '', my_pota_ref: '',
|
my_sota_ref: '', my_pota_ref: '', my_iota: '',
|
||||||
my_rig: '', my_antenna: '',
|
my_rig: '', my_antenna: '',
|
||||||
tx_pwr: undefined,
|
tx_pwr: undefined,
|
||||||
is_active: false,
|
is_active: false,
|
||||||
@@ -174,6 +177,7 @@ interface Props {
|
|||||||
`disabled: true` greys them out and shows the "coming soon" placeholder. */
|
`disabled: true` greys them out and shows the "coming soon" placeholder. */
|
||||||
type SectionId =
|
type SectionId =
|
||||||
| 'general'
|
| 'general'
|
||||||
|
| 'appearance'
|
||||||
| 'email'
|
| 'email'
|
||||||
| 'station'
|
| 'station'
|
||||||
| 'profiles'
|
| 'profiles'
|
||||||
@@ -182,6 +186,7 @@ type SectionId =
|
|||||||
| 'external-services'
|
| 'external-services'
|
||||||
| 'udp'
|
| 'udp'
|
||||||
| 'adifmon'
|
| 'adifmon'
|
||||||
|
| 'webpublish'
|
||||||
| 'lookup'
|
| 'lookup'
|
||||||
| 'lists-bands'
|
| 'lists-bands'
|
||||||
| 'lists-modes'
|
| 'lists-modes'
|
||||||
@@ -263,6 +268,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
{
|
{
|
||||||
kind: 'group', label: t('nav.software'), icon: Cog, defaultOpen: true, children: [
|
kind: 'group', label: t('nav.software'), icon: Cog, defaultOpen: true, children: [
|
||||||
{ kind: 'item', label: t('sec.general'), id: 'general' },
|
{ kind: 'item', label: t('sec.general'), id: 'general' },
|
||||||
|
{ kind: 'item', label: t('sec.appearance'), id: 'appearance' },
|
||||||
{ kind: 'item', label: t('sec.email'), id: 'email' },
|
{ kind: 'item', label: t('sec.email'), id: 'email' },
|
||||||
{ kind: 'item', label: t('sec.lookup'), id: 'lookup' },
|
{ kind: 'item', label: t('sec.lookup'), id: 'lookup' },
|
||||||
{ kind: 'group', label: t('nav.lists'), icon: Database, defaultOpen: true, children: [
|
{ kind: 'group', label: t('nav.lists'), icon: Database, defaultOpen: true, children: [
|
||||||
@@ -272,6 +278,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
||||||
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
||||||
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
|
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
|
||||||
|
{ kind: 'item', label: t('sec.webpublish'), id: 'webpublish' },
|
||||||
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
|
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
|
||||||
{ kind: 'item', label: t('sec.database'), id: 'database' },
|
{ kind: 'item', label: t('sec.database'), id: 'database' },
|
||||||
{ kind: 'item', label: t('sec.autostart'), id: 'autostart' },
|
{ kind: 'item', label: t('sec.autostart'), id: 'autostart' },
|
||||||
@@ -286,9 +293,10 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
// Map section id → i18n key (breadcrumb / placeholders).
|
// Map section id → i18n key (breadcrumb / placeholders).
|
||||||
const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
||||||
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
|
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
|
||||||
'external-services': 'sec.external', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
'external-services': 'sec.external', appearance: 'sec.appearance', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
||||||
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
||||||
adifmon: 'sec.adifmon',
|
adifmon: 'sec.adifmon',
|
||||||
|
webpublish: 'sec.webpublish',
|
||||||
uscounties: 'sec.uscounties',
|
uscounties: 'sec.uscounties',
|
||||||
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
|
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
|
||||||
antgenius: 'sec.antgenius', tunergenius: 'sec.tunergenius', pgxl: 'sec.pgxl', flex: 'sec.flex', audio: 'sec.audio', general: 'sec.general', email: 'sec.email',
|
antgenius: 'sec.antgenius', tunergenius: 'sec.tunergenius', pgxl: 'sec.pgxl', flex: 'sec.flex', audio: 'sec.audio', general: 'sec.general', email: 'sec.email',
|
||||||
@@ -311,6 +319,7 @@ const SECTION_LABELS: Partial<Record<SectionId, string>> = {
|
|||||||
autostart: 'Autostart',
|
autostart: 'Autostart',
|
||||||
udp: 'UDP integrations',
|
udp: 'UDP integrations',
|
||||||
adifmon: 'ADIF monitor',
|
adifmon: 'ADIF monitor',
|
||||||
|
webpublish: 'Web publishing',
|
||||||
awards: 'Awards',
|
awards: 'Awards',
|
||||||
cat: 'CAT interface',
|
cat: 'CAT interface',
|
||||||
rotator: 'Rotator',
|
rotator: 'Rotator',
|
||||||
@@ -403,6 +412,7 @@ const THEME_SWATCH: Record<Exclude<ThemeChoice, 'auto'>, { bg: string; card: str
|
|||||||
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
|
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
|
||||||
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
|
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
|
||||||
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
|
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
|
||||||
|
'sahara': { bg: '#dcceab', card: '#faf6eb', accent: '#a55f14' },
|
||||||
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
|
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
|
||||||
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
|
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
|
||||||
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
|
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
|
||||||
@@ -683,6 +693,13 @@ const RELAY_BANDS = ['160m', '80m', '60m', '40m', '30m', '20m', '17m', '15m', '1
|
|||||||
// Bands a motorized HF/6 m antenna (Ultrabeam / SteppIR) can cover — the follow
|
// Bands a motorized HF/6 m antenna (Ultrabeam / SteppIR) can cover — the follow
|
||||||
// filter is a subset of these. Must match motorBands in app.go, low → high.
|
// filter is a subset of these. Must match motorBands in app.go, low → high.
|
||||||
const MOTOR_BANDS = ['40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'];
|
const MOTOR_BANDS = ['40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'];
|
||||||
|
// Shown as placeholders only — the backend owns these values (motorBands in
|
||||||
|
// app.go) and resolves what a band button actually commands. Duplicated here
|
||||||
|
// purely so an empty box can say what leaving it empty will do.
|
||||||
|
const MOTOR_BAND_DEFAULT_KHZ: Record<string, number> = {
|
||||||
|
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
||||||
|
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
||||||
|
};
|
||||||
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
|
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
|
||||||
|
|
||||||
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
||||||
@@ -1208,6 +1225,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
hamqth_user: '', hamqth_password: '',
|
hamqth_user: '', hamqth_password: '',
|
||||||
primary: '', failsafe: '',
|
primary: '', failsafe: '',
|
||||||
download_images: false,
|
download_images: false,
|
||||||
|
qrz_prefer_nickname: false,
|
||||||
cache_ttl_days: 30,
|
cache_ttl_days: 30,
|
||||||
});
|
});
|
||||||
// Per-provider Test state — keeps the success/error feedback adjacent
|
// Per-provider Test state — keeps the success/error feedback adjacent
|
||||||
@@ -1244,8 +1262,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
|
|
||||||
// Motorized antenna (Ultrabeam TCP or SteppIR TCP/serial) settings.
|
// Motorized antenna (Ultrabeam TCP or SteppIR TCP/serial) settings.
|
||||||
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; tx_inhibit: boolean; bands: string[]; freq_min_mhz: number; freq_max_mhz: number }>({
|
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; track_mode: string; band_freqs: Record<string, number>; tx_inhibit: boolean; bands: string[]; freq_min_mhz: number; freq_max_mhz: number }>({
|
||||||
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, tx_inhibit: false, bands: [], freq_min_mhz: 13, freq_max_mhz: 54,
|
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, track_mode: 'step', band_freqs: {}, tx_inhibit: false, bands: [], freq_min_mhz: 13, freq_max_mhz: 54,
|
||||||
});
|
});
|
||||||
const [ubTesting, setUbTesting] = useState(false);
|
const [ubTesting, setUbTesting] = useState(false);
|
||||||
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
@@ -1257,6 +1275,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// Amplifier list — operators can run SEVERAL amps (even two SPEs combined),
|
// Amplifier list — operators can run SEVERAL amps (even two SPEs combined),
|
||||||
// each with its own connection. Saved as a whole via SaveAmplifiers.
|
// each with its own connection. Saved as a whole via SaveAmplifiers.
|
||||||
const [amps, setAmps] = useState<AmpUI[]>([]);
|
const [amps, setAmps] = useState<AmpUI[]>([]);
|
||||||
|
const [linkedAmps, setLinkedAmps] = useState<string[]>([]);
|
||||||
|
|
||||||
// WinKeyer CW keyer settings + macro editor.
|
// WinKeyer CW keyer settings + macro editor.
|
||||||
type WKMac = { label: string; text: string };
|
type WKMac = { label: string; text: string };
|
||||||
@@ -1425,13 +1444,15 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
tqsl_path: string; station_location: string; key_password: string;
|
tqsl_path: string; station_location: string; key_password: string;
|
||||||
upload_flags: string[]; write_log: boolean;
|
upload_flags: string[]; write_log: boolean;
|
||||||
auto_upload: boolean; upload_mode: string;
|
auto_upload: boolean; upload_mode: string;
|
||||||
|
// HRDLog only: publish the live frequency/mode/rig on hrdlog.net.
|
||||||
|
on_air?: boolean;
|
||||||
};
|
};
|
||||||
type ExternalServices = { qrz: ExtServiceCfg; clublog: ExtServiceCfg; lotw: ExtServiceCfg; hrdlog: ExtServiceCfg; eqsl: ExtServiceCfg; cloudlog: ExtServiceCfg; delete_remote?: boolean };
|
type ExternalServices = { qrz: ExtServiceCfg; clublog: ExtServiceCfg; lotw: ExtServiceCfg; hrdlog: ExtServiceCfg; eqsl: ExtServiceCfg; cloudlog: ExtServiceCfg; delete_remote?: boolean };
|
||||||
const emptyExtCfg = (): ExtServiceCfg => ({
|
const emptyExtCfg = (): ExtServiceCfg => ({
|
||||||
api_key: '', url: '', station_id: '', email: '', username: '', password: '', callsign: '', code: '', qth_nickname: '',
|
api_key: '', url: '', station_id: '', email: '', username: '', password: '', callsign: '', code: '', qth_nickname: '',
|
||||||
force_station_callsign: '', tqsl_path: '', station_location: '', key_password: '',
|
force_station_callsign: '', tqsl_path: '', station_location: '', key_password: '',
|
||||||
upload_flags: ['N', 'R'], write_log: false,
|
upload_flags: ['N', 'R'], write_log: false,
|
||||||
auto_upload: false, upload_mode: 'immediate',
|
auto_upload: false, upload_mode: 'immediate', on_air: false,
|
||||||
});
|
});
|
||||||
const [extSvc, setExtSvc] = useState<ExternalServices>({
|
const [extSvc, setExtSvc] = useState<ExternalServices>({
|
||||||
qrz: emptyExtCfg(), clublog: emptyExtCfg(), lotw: emptyExtCfg(), hrdlog: emptyExtCfg(), eqsl: emptyExtCfg(), cloudlog: emptyExtCfg(), delete_remote: false,
|
qrz: emptyExtCfg(), clublog: emptyExtCfg(), lotw: emptyExtCfg(), hrdlog: emptyExtCfg(), eqsl: emptyExtCfg(), cloudlog: emptyExtCfg(), delete_remote: false,
|
||||||
@@ -1468,7 +1489,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
finally { setScpBusy(false); }
|
finally { setScpBusy(false); }
|
||||||
};
|
};
|
||||||
// US Counties (offline FCC ULS) — download progress arrives via events.
|
// US Counties (offline FCC ULS) — download progress arrives via events.
|
||||||
const [ulsStatus, setUlsStatus] = useState<{ count: number; updated_at?: string }>({ count: 0 });
|
const [ulsStatus, setUlsStatus] = useState<{ count: number; updated_at?: string; needs_refresh?: boolean }>({ count: 0 });
|
||||||
const [ulsBusy, setUlsBusy] = useState(false);
|
const [ulsBusy, setUlsBusy] = useState(false);
|
||||||
const [ulsProgress, setUlsProgress] = useState<{ stage: string; pct: number } | null>(null);
|
const [ulsProgress, setUlsProgress] = useState<{ stage: string; pct: number } | null>(null);
|
||||||
const [ulsMsg, setUlsMsg] = useState<{ ok: boolean; text: string } | null>(null);
|
const [ulsMsg, setUlsMsg] = useState<{ ok: boolean; text: string } | null>(null);
|
||||||
@@ -1535,6 +1556,34 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// blur, not per keystroke, or typing "10" would be rewritten to "5" the moment
|
// blur, not per keystroke, or typing "10" would be rewritten to "5" the moment
|
||||||
// the "1" landed and the field would fight the operator.
|
// the "1" landed and the field would fight the operator.
|
||||||
const SELF_SPOT_MIN_MIN = 5;
|
const SELF_SPOT_MIN_MIN = 5;
|
||||||
|
// Band-opening watch. Saved through the backend rather than as a UI pref: it
|
||||||
|
// has side effects there — adding the RBN nodes, bringing the PSK Reporter
|
||||||
|
// feed up or down — so the write has to go where those live.
|
||||||
|
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
|
||||||
|
const [chaseGrids, setChaseGrids] = useState(false);
|
||||||
|
const [spotTTL, setSpotTTL] = useState(0);
|
||||||
|
const [spotTTLText, setSpotTTLText] = useState('0');
|
||||||
|
const [gridStat, setGridStat] = useState<any>(null);
|
||||||
|
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
||||||
|
const saveBandOpen = async (next: any) => {
|
||||||
|
setBandOpen(next);
|
||||||
|
try { await SaveBandOpenSettings(next); } catch { /* the status line shows the result */ }
|
||||||
|
};
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
|
||||||
|
try { setChaseGrids(await GetChaseNewGrids()); } catch { /* defaults stand */ }
|
||||||
|
try { setLinkedAmps((await GetLinkedAmps()) ?? []); } catch { /* defaults stand */ }
|
||||||
|
try { const n = await GetSpotTTLMinutes(); setSpotTTL(n); setSpotTTLText(String(n)); } catch { /* defaults stand */ }
|
||||||
|
})();
|
||||||
|
// Poll the feed while the panel is open: a live count is the only thing that
|
||||||
|
// distinguishes "connected" from "connected and receiving nothing".
|
||||||
|
const t = window.setInterval(async () => {
|
||||||
|
try { setPskrStatus(await GetPSKReporterStatus()); } catch { /* ignore */ }
|
||||||
|
try { setGridStat(await GetGridCacheStatus()); } catch { /* ignore */ }
|
||||||
|
}, 3000);
|
||||||
|
return () => window.clearInterval(t);
|
||||||
|
}, []);
|
||||||
const [selfSpot, setSelfSpot] = useState({ enabled: false, minutes: SELF_SPOT_MIN_MIN });
|
const [selfSpot, setSelfSpot] = useState({ enabled: false, minutes: SELF_SPOT_MIN_MIN });
|
||||||
const [selfSpotText, setSelfSpotText] = useState(String(SELF_SPOT_MIN_MIN));
|
const [selfSpotText, setSelfSpotText] = useState(String(SELF_SPOT_MIN_MIN));
|
||||||
const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]);
|
const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]);
|
||||||
@@ -1849,6 +1898,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
my_grid: (activeProfile.my_grid ?? '').trim().toUpperCase(),
|
my_grid: (activeProfile.my_grid ?? '').trim().toUpperCase(),
|
||||||
my_sota_ref: (activeProfile.my_sota_ref ?? '').trim().toUpperCase(),
|
my_sota_ref: (activeProfile.my_sota_ref ?? '').trim().toUpperCase(),
|
||||||
my_pota_ref: (activeProfile.my_pota_ref ?? '').trim().toUpperCase(),
|
my_pota_ref: (activeProfile.my_pota_ref ?? '').trim().toUpperCase(),
|
||||||
|
my_iota: (activeProfile.my_iota ?? '').trim().toUpperCase(),
|
||||||
} as any);
|
} as any);
|
||||||
}
|
}
|
||||||
await SaveLookupSettings(lookup as any);
|
await SaveLookupSettings(lookup as any);
|
||||||
@@ -2008,6 +2058,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Label>{t('station.pota')}</Label>
|
<Label>{t('station.pota')}</Label>
|
||||||
<Input className="font-mono uppercase" value={p.my_pota_ref ?? ''} onChange={(e) => updateActive({ my_pota_ref: e.target.value })} placeholder="FF-1234" />
|
<Input className="font-mono uppercase" value={p.my_pota_ref ?? ''} onChange={(e) => updateActive({ my_pota_ref: e.target.value })} placeholder="FF-1234" />
|
||||||
</div>
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('station.iota')}</Label>
|
||||||
|
<Input className="font-mono uppercase" value={p.my_iota ?? ''} onChange={(e) => updateActive({ my_iota: e.target.value })} placeholder="EU-005" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -2264,6 +2318,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
{/* QRZ only. HamQTH's <nick> already fills the Name field with the
|
||||||
|
on-air name, so the same switch there would toggle a behaviour it
|
||||||
|
has no way to turn off. */}
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer mt-3">
|
||||||
|
<Checkbox
|
||||||
|
checked={!!(lookup as any).qrz_prefer_nickname}
|
||||||
|
onCheckedChange={(c) => setLookup((s) => ({ ...s, qrz_prefer_nickname: !!c } as any))}
|
||||||
|
className="mt-0.5"
|
||||||
|
/>
|
||||||
|
<span>
|
||||||
|
{t('lk.qrzNickname')}
|
||||||
|
<span className="block text-xs text-muted-foreground mt-0.5">
|
||||||
|
{t('lk.qrzNicknameHint')}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="mt-6 pt-4 border-t border-border">
|
<div className="mt-6 pt-4 border-t border-border">
|
||||||
@@ -3109,11 +3180,26 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={ultrabeam.follow} onCheckedChange={(c) => setUltrabeam((s) => ({ ...s, follow: !!c }))} />
|
<Checkbox checked={ultrabeam.follow} onCheckedChange={(c) => setUltrabeam((s) => ({ ...s, follow: !!c }))} />
|
||||||
Follow rig frequency (auto-tune the antenna)
|
{t('hw.motorFollow')}
|
||||||
</label>
|
</label>
|
||||||
{ultrabeam.follow && (
|
{ultrabeam.follow && (
|
||||||
<div className="flex items-center gap-3 pl-6">
|
<div className="space-y-2 pl-6">
|
||||||
<Label className="text-sm">Re-tune step</Label>
|
<div className="flex items-center gap-3">
|
||||||
|
<Label className="text-sm">{t('station.trackModeTip')}</Label>
|
||||||
|
<Select value={ultrabeam.track_mode || 'step'} onValueChange={(v) => setUltrabeam((s) => ({ ...s, track_mode: v }))}>
|
||||||
|
<SelectTrigger className="h-8 w-52"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="always">{t('station.trackAlways')}</SelectItem>
|
||||||
|
<SelectItem value="step">{t('station.trackStep')}</SelectItem>
|
||||||
|
<SelectItem value="band">{t('station.trackBand')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
{/* The step is only a question in step mode — the other two modes
|
||||||
|
have nothing to threshold. */}
|
||||||
|
{(ultrabeam.track_mode || 'step') === 'step' && (
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<Label className="text-sm">{t('hw.motorStep')}</Label>
|
||||||
<Select value={String(ultrabeam.step_khz)} onValueChange={(v) => setUltrabeam((s) => ({ ...s, step_khz: parseInt(v, 10) || 50 }))}>
|
<Select value={String(ultrabeam.step_khz)} onValueChange={(v) => setUltrabeam((s) => ({ ...s, step_khz: parseInt(v, 10) || 50 }))}>
|
||||||
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
@@ -3122,32 +3208,68 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<SelectItem value="100">100 kHz</SelectItem>
|
<SelectItem value="100">100 kHz</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
<span className="text-xs text-muted-foreground">re-tune only when the frequency moves this far</span>
|
</div>
|
||||||
|
)}
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
{(ultrabeam.track_mode || 'step') === 'always' ? t('station.trackAlwaysTip')
|
||||||
|
: (ultrabeam.track_mode || 'step') === 'band' ? t('station.trackBandTip')
|
||||||
|
: t('station.trackStepTipMode')}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{(isSteppir || ultrabeam.type === 'ultrabeam') && (
|
{(isSteppir || ultrabeam.type === 'ultrabeam') && (
|
||||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
<Label className="text-sm">{t('hw.motorBands')}</Label>
|
<Label className="text-sm">{t('hw.motorBands')}</Label>
|
||||||
<div className="flex items-center gap-1.5 flex-wrap">
|
{/* Band, and under it the frequency its button tunes to — the
|
||||||
|
layout of the SteppIR controller's own Bands and Frequencies
|
||||||
|
table, which is where operators expect to find this. The box
|
||||||
|
only appears on a selected band: a tune frequency for a band the
|
||||||
|
antenna is not allowed on is a setting with no effect. Left
|
||||||
|
empty it shows the default as placeholder, so the field is
|
||||||
|
self-documenting and clearing it is how you go back. */}
|
||||||
|
<div className="flex items-start gap-1.5 flex-wrap">
|
||||||
{MOTOR_BANDS.map((b) => {
|
{MOTOR_BANDS.map((b) => {
|
||||||
const on = ultrabeam.bands.includes(b);
|
const on = ultrabeam.bands.includes(b);
|
||||||
return (
|
return (
|
||||||
<button key={b} type="button"
|
<div key={b} className="flex flex-col gap-1">
|
||||||
|
<button type="button"
|
||||||
onClick={() => setUltrabeam((s) => ({
|
onClick={() => setUltrabeam((s) => ({
|
||||||
...s,
|
...s,
|
||||||
bands: on ? s.bands.filter((x) => x !== b) : [...s.bands, b],
|
bands: on ? s.bands.filter((x) => x !== b) : [...s.bands, b],
|
||||||
}))}
|
}))}
|
||||||
className={`h-8 min-w-[3rem] rounded-md border px-2 text-sm font-medium transition-colors ${
|
className={`h-8 w-[4.5rem] rounded-md border px-2 text-sm font-medium transition-colors ${
|
||||||
on
|
on
|
||||||
? 'border-primary bg-primary/15 text-primary'
|
? 'border-primary bg-primary/15 text-primary'
|
||||||
: 'border-input bg-background text-muted-foreground hover:bg-muted'
|
: 'border-input bg-background text-muted-foreground hover:bg-muted'
|
||||||
}`}>
|
}`}>
|
||||||
{b}
|
{b}
|
||||||
</button>
|
</button>
|
||||||
|
{on && (
|
||||||
|
<input
|
||||||
|
type="text" inputMode="numeric"
|
||||||
|
value={ultrabeam.band_freqs?.[b] ? String(ultrabeam.band_freqs[b]) : ''}
|
||||||
|
placeholder={String(MOTOR_BAND_DEFAULT_KHZ[b] ?? '')}
|
||||||
|
title={t('hw.motorBandFreqHint')}
|
||||||
|
onChange={(e) => {
|
||||||
|
// Keep only digits, and store nothing for an empty box
|
||||||
|
// so it round-trips to "use the default" rather than
|
||||||
|
// to a zero the backend would have to interpret.
|
||||||
|
const digits = e.target.value.replace(/[^0-9]/g, '');
|
||||||
|
setUltrabeam((s) => {
|
||||||
|
const next = { ...(s.band_freqs || {}) };
|
||||||
|
if (digits === '') delete next[b]; else next[b] = parseInt(digits, 10);
|
||||||
|
return { ...s, band_freqs: next };
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
className="h-7 w-[4.5rem] rounded-md border border-input bg-background px-1.5 text-center text-xs font-mono outline-none focus:border-primary"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('hw.motorBandFreqHint')}</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="border-t border-border/60 pt-3 space-y-1">
|
<div className="border-t border-border/60 pt-3 space-y-1">
|
||||||
@@ -3483,6 +3605,38 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Plus className="size-3.5 mr-1" /> {t('amp.add')}
|
<Plus className="size-3.5 mr-1" /> {t('amp.add')}
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
{/* WHICH amplifiers are coupled, not whether coupling is on.
|
||||||
|
A station can run a combiner pair AND a third amplifier that has
|
||||||
|
nothing to do with it — two SPE on the combiner, a PowerGenius on
|
||||||
|
another antenna — so a single switch would send that third one into
|
||||||
|
OPERATE alongside them. Shown from two amplifiers up. */}
|
||||||
|
{amps.length > 1 && (
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<div className="text-sm">{t('amp.linked')}</div>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('amp.linkedHint')}</p>
|
||||||
|
<div className="flex flex-wrap gap-x-4 gap-y-1.5">
|
||||||
|
{amps.filter((x) => (x.id ?? '') !== '').map((x) => {
|
||||||
|
const on = linkedAmps.includes(x.id!);
|
||||||
|
return (
|
||||||
|
<label key={x.id} className="flex items-center gap-1.5 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={on} onCheckedChange={(c) => {
|
||||||
|
const next = c ? [...linkedAmps, x.id!] : linkedAmps.filter((v) => v !== x.id);
|
||||||
|
setLinkedAmps(next);
|
||||||
|
SetLinkedAmps(next).catch(() => {});
|
||||||
|
}} />
|
||||||
|
{x.name?.trim() || x.type}
|
||||||
|
</label>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
{/* An amplifier saved without an id cannot be a member — say so
|
||||||
|
rather than silently leaving it out of the list. */}
|
||||||
|
{amps.some((x) => (x.id ?? '') === '') && (
|
||||||
|
<p className="text-xs text-muted-foreground">{t('amp.linkedSaveFirst')}</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -4132,6 +4286,95 @@ 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. */}
|
||||||
|
|
||||||
|
{/* Grid chasing. Here rather than in the filter panel because it is set
|
||||||
|
up once: it decides whether locators learnt from decodes are KEPT
|
||||||
|
across restarts, not what the list shows right now. */}
|
||||||
|
{/* Spot lifetime. Applies to the cluster list AND every band map: the
|
||||||
|
spots are removed from the shared list rather than hidden, so the
|
||||||
|
setting cannot mean one thing in one view and another elsewhere. */}
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<span className="text-sm">{t('clu.spotTtl')}</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||||
|
{[0, 5, 10, 15, 30, 60].map((v) => (
|
||||||
|
<button key={v} type="button"
|
||||||
|
onClick={() => { setSpotTTL(v); setSpotTTLText(String(v)); SetSpotTTLMinutes(v).catch(() => {}); }}
|
||||||
|
className={cn('px-2.5 py-1.5 font-medium', spotTTL === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||||
|
{v === 0 ? t('clu.spotTtlNever') : `${v}′`}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{/* Raw text in local state: binding the input straight to the
|
||||||
|
clamped number makes an empty field impossible to type into. */}
|
||||||
|
<Input className="h-8 w-20" value={spotTTLText}
|
||||||
|
onChange={(e) => {
|
||||||
|
const raw = e.target.value.replace(/[^0-9]/g, '');
|
||||||
|
setSpotTTLText(raw);
|
||||||
|
const n = Math.min(720, parseInt(raw, 10) || 0);
|
||||||
|
setSpotTTL(n);
|
||||||
|
SetSpotTTLMinutes(n).catch(() => {});
|
||||||
|
}} />
|
||||||
|
<span className="text-xs text-muted-foreground">{t('clu.spotTtlHint')}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={chaseGrids} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => { setChaseGrids(!!c); SetChaseNewGrids(!!c).catch(() => {}); }} />
|
||||||
|
<span>{t('clu.chaseGrids')} <span className="text-xs text-muted-foreground">{t('clu.chaseGridsHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
{chaseGrids && (
|
||||||
|
<p className="pl-6 text-xs text-muted-foreground">
|
||||||
|
{t('clu.chaseGridsStat', { n: gridStat?.known ?? 0, p: gridStat?.pending ?? 0 })}
|
||||||
|
{pskrStatus?.running ? ` · ${t('bo.feedUp', { n: pskrStatus.received ?? 0 })}` : ''}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Band-opening watch. It lives HERE, with the cluster nodes, because
|
||||||
|
switching it on adds two of them — the operator should see that
|
||||||
|
happen where it happens rather than find nodes they did not add. */}
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={bandOpen.enabled} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => saveBandOpen({ ...bandOpen, enabled: !!c })} />
|
||||||
|
<span>{t('bo.enable')} <span className="text-xs text-muted-foreground">{t('bo.enableHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
{bandOpen.enabled && (
|
||||||
|
<div className="pl-6 space-y-2">
|
||||||
|
<div className="flex flex-wrap gap-1.5">
|
||||||
|
{(bandOpen.available ?? []).map((b: string) => {
|
||||||
|
const on = (bandOpen.bands ?? []).includes(b);
|
||||||
|
return (
|
||||||
|
<button key={b} type="button"
|
||||||
|
onClick={() => saveBandOpen({
|
||||||
|
...bandOpen,
|
||||||
|
bands: on ? bandOpen.bands.filter((x: string) => x !== b) : [...(bandOpen.bands ?? []), b],
|
||||||
|
})}
|
||||||
|
className={cn('px-2 py-0.5 rounded-md border text-[11px] font-bold tracking-wider font-mono',
|
||||||
|
on ? 'bg-primary text-primary-foreground border-primary' : 'text-muted-foreground border-border hover:bg-muted')}>
|
||||||
|
{b}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
{/* A live count, because a feed that is connected but silent looks
|
||||||
|
exactly like one that is broken until a number moves. */}
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
{pskrStatus?.running
|
||||||
|
? t('bo.feedUp', { n: pskrStatus.received ?? 0 })
|
||||||
|
: t('bo.feedDown')}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* 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. */}
|
||||||
@@ -4813,6 +5056,20 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{t('es.autoUpload')}
|
{t('es.autoUpload')}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
{/* ON AIR is a live status, not an upload: it needs the rig
|
||||||
|
readable, not a QSO. Its own switch beside the upload one
|
||||||
|
rather than folded into it. */}
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5"
|
||||||
|
checked={!!(hrdlog as any).on_air}
|
||||||
|
onCheckedChange={(c) => setHrdlog({ on_air: !!c } as any)}
|
||||||
|
/>
|
||||||
|
<span>
|
||||||
|
{t('es.hrdOnAir')}
|
||||||
|
<span className="block text-xs text-muted-foreground mt-0.5">{t('es.hrdOnAirHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
|
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
|
||||||
<Label className="text-sm">{t('es.uploadTiming')}</Label>
|
<Label className="text-sm">{t('es.uploadTiming')}</Label>
|
||||||
<Select
|
<Select
|
||||||
@@ -5976,6 +6233,15 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* A database downloaded by an older OpsLog still holds Connecticut's
|
||||||
|
planning regions instead of its counties. The download date cannot
|
||||||
|
show that, so say it outright. */}
|
||||||
|
{loaded && ulsStatus.needs_refresh && !ulsBusy && (
|
||||||
|
<div className="text-[11px] rounded border border-warning-border bg-warning-muted text-warning-muted-foreground px-2 py-1.5 leading-relaxed">
|
||||||
|
{t('uscty.stale')}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{ulsProgress && (
|
{ulsProgress && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<div className="text-[11px] text-muted-foreground flex justify-between">
|
<div className="text-[11px] text-muted-foreground flex justify-between">
|
||||||
@@ -6010,6 +6276,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// Map sections to their content + icon (for placeholder).
|
// Map sections to their content + icon (for placeholder).
|
||||||
const PANELS: Record<SectionId, () => JSX.Element> = {
|
const PANELS: Record<SectionId, () => JSX.Element> = {
|
||||||
general: GeneralPanel,
|
general: GeneralPanel,
|
||||||
|
appearance: () => <AppearancePanel />,
|
||||||
email: EmailPanel,
|
email: EmailPanel,
|
||||||
station: StationPanel,
|
station: StationPanel,
|
||||||
profiles: ProfilesPanel,
|
profiles: ProfilesPanel,
|
||||||
@@ -6025,6 +6292,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// — useState/useEffect/useI18n — get a proper component context; PANELS[x]()
|
// — useState/useEffect/useI18n — get a proper component context; PANELS[x]()
|
||||||
// is a plain call and hook-holding panels must go through JSX like this.
|
// is a plain call and hook-holding panels must go through JSX like this.
|
||||||
adifmon: () => <ADIFMonitorPanel />,
|
adifmon: () => <ADIFMonitorPanel />,
|
||||||
|
webpublish: () => <WebPublishPanel />,
|
||||||
relayauto: () => <RelayAutoPanel />,
|
relayauto: () => <RelayAutoPanel />,
|
||||||
backup: BackupPanel,
|
backup: BackupPanel,
|
||||||
database: DatabasePanel,
|
database: DatabasePanel,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
|
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||||
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical } from 'lucide-react';
|
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical, ChevronUp, ChevronDown } from 'lucide-react';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
@@ -15,6 +15,7 @@ import {
|
|||||||
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
||||||
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
|
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
|
||||||
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
||||||
|
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
||||||
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
||||||
GetAmpStatuses, GetFlexState,
|
GetAmpStatuses, GetFlexState,
|
||||||
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
||||||
@@ -76,6 +77,8 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
|
|||||||
title={hd.ok ? t('station.online') : t('station.rotatorNoRead')} />
|
title={hd.ok ? t('station.online') : t('station.rotatorNoRead')} />
|
||||||
</div>
|
</div>
|
||||||
<div className="p-3 flex gap-4 items-start">
|
<div className="p-3 flex gap-4 items-start">
|
||||||
|
{/* The SP/LP readout lives INSIDE RotorCompass, so every compass in the
|
||||||
|
app carries it rather than each caller drawing its own. */}
|
||||||
<RotorCompass
|
<RotorCompass
|
||||||
bearing={bearing ?? null}
|
bearing={bearing ?? null}
|
||||||
headings={hd.ok ? [hd.azimuth] : []}
|
headings={hd.ok ? [hd.azimuth] : []}
|
||||||
@@ -115,7 +118,37 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[] };
|
type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[]; follow?: boolean; step_khz?: number; track_mode?: string; bands?: string[]; band_freqs?: Record<string, number> };
|
||||||
|
|
||||||
|
// Where each band button points the antenna.
|
||||||
|
//
|
||||||
|
// Not the arithmetic centre of the band. An antenna is tuned for where people
|
||||||
|
// actually work: 20 m centres on 14175 but nobody lives there, and 10 m spans
|
||||||
|
// 1.7 MHz of which the top half is empty. These are the points that leave the
|
||||||
|
// elements closest to right for the whole band, and one nudge away from the rest.
|
||||||
|
const ANT_BAND_KHZ: Record<string, number> = {
|
||||||
|
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
||||||
|
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
||||||
|
};
|
||||||
|
|
||||||
|
// NUDGE_KHZ is the up/down step. 25 kHz because that is also the finest tracking
|
||||||
|
// threshold: a nudge smaller than the tracking step would be undone by the next
|
||||||
|
// poll while tracking is on.
|
||||||
|
const NUDGE_KHZ = 25;
|
||||||
|
|
||||||
|
// bandOfKHz names the band a frequency sits in, so a band button can light up
|
||||||
|
// when the ANTENNA is already there. Deliberately generous at the edges: the
|
||||||
|
// antenna's reported frequency is where it was commanded, which can sit slightly
|
||||||
|
// outside the allocation.
|
||||||
|
function bandOfKHz(khz: number): string {
|
||||||
|
const edges: [number, number, string][] = [
|
||||||
|
[6900, 7300, '40m'], [10050, 10200, '30m'], [13900, 14400, '20m'],
|
||||||
|
[18000, 18200, '17m'], [20900, 21500, '15m'], [24800, 25000, '12m'],
|
||||||
|
[27900, 29800, '10m'], [49900, 50600, '6m'],
|
||||||
|
];
|
||||||
|
for (const [lo, hi, b] of edges) if (khz >= lo && khz <= hi) return b;
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
// MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the
|
// MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the
|
||||||
// Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam
|
// Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam
|
||||||
@@ -203,6 +236,88 @@ function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () =
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{/* Bands, then a nudge, then tracking — in the order an operator uses
|
||||||
|
them: get to the band, fine-tune inside it, decide whether the
|
||||||
|
antenna should follow the rig from here. */}
|
||||||
|
<div>
|
||||||
|
<div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground mb-1">{t('station.bands')}</div>
|
||||||
|
<div className="grid grid-cols-5 gap-1">
|
||||||
|
{(ant.bands ?? []).map((b: string) => {
|
||||||
|
// Where this band tunes is resolved by the backend — the operator's
|
||||||
|
// per-band choice from Settings, or the default. ANT_BAND_KHZ is only
|
||||||
|
// the floor for a status poll that hasn't landed yet.
|
||||||
|
const khz = ant.band_freqs?.[b] || ANT_BAND_KHZ[b];
|
||||||
|
if (!khz) return null;
|
||||||
|
// "On this band" from the antenna's own frequency, not the rig's:
|
||||||
|
// the widget must show where the ANTENNA is, which is the whole
|
||||||
|
// reason for tuning it by hand.
|
||||||
|
const here = ant.frequency > 0 && bandOfKHz(ant.frequency) === b;
|
||||||
|
return (
|
||||||
|
<button key={b} type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(MotorTuneKHz(khz))}
|
||||||
|
title={`${(khz / 1000).toFixed(3)} MHz`}
|
||||||
|
className={cn('rounded-md border py-1 text-[11px] font-mono font-semibold transition-colors disabled:opacity-40',
|
||||||
|
here ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
|
||||||
|
{b}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<button type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(MotorNudgeKHz(-NUDGE_KHZ))}
|
||||||
|
title={t('station.nudgeDown', { n: NUDGE_KHZ })}
|
||||||
|
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
||||||
|
<ChevronDown className="size-3.5" /> {NUDGE_KHZ}
|
||||||
|
</button>
|
||||||
|
<button type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(MotorNudgeKHz(NUDGE_KHZ))}
|
||||||
|
title={t('station.nudgeUp', { n: NUDGE_KHZ })}
|
||||||
|
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
||||||
|
<ChevronUp className="size-3.5" /> {NUDGE_KHZ}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Tracking. Here rather than only in Settings because it is an operating
|
||||||
|
decision — off to park the antenna, on to resume — not something set
|
||||||
|
up once. Mode and step only show when tracking is on: settings for
|
||||||
|
something switched off are questions the operator cannot act on. And
|
||||||
|
the step only shows in step mode, where it is the one thing it means. */}
|
||||||
|
<div className="space-y-1.5">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button type="button"
|
||||||
|
onClick={() => run(SetMotorFollow(!ant.follow, 0, ''))}
|
||||||
|
className={cn('flex-1 rounded-md border py-1.5 text-xs font-semibold transition-colors',
|
||||||
|
ant.follow ? 'bg-success-muted text-success-muted-foreground border-success-border' : 'border-border hover:bg-muted')}>
|
||||||
|
{ant.follow ? t('station.trackOn') : t('station.trackOff')}
|
||||||
|
</button>
|
||||||
|
{ant.follow && (ant.track_mode || 'step') === 'step' && (
|
||||||
|
<select
|
||||||
|
value={String(ant.step_khz || 50)}
|
||||||
|
onChange={(e) => run(SetMotorFollow(true, parseInt(e.target.value, 10), ''))}
|
||||||
|
className="h-[30px] rounded-md border border-border bg-background px-1 text-xs font-mono"
|
||||||
|
title={t('station.trackStepTip')}
|
||||||
|
>
|
||||||
|
{[25, 50, 100].map((s) => <option key={s} value={s}>{s} kHz</option>)}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{ant.follow && (
|
||||||
|
<select
|
||||||
|
value={ant.track_mode || 'step'}
|
||||||
|
onChange={(e) => run(SetMotorFollow(true, 0, e.target.value))}
|
||||||
|
className="w-full h-[30px] rounded-md border border-border bg-background px-1.5 text-xs"
|
||||||
|
title={t('station.trackModeTip')}
|
||||||
|
>
|
||||||
|
<option value="always" title={t('station.trackAlwaysTip')}>{t('station.trackAlways')}</option>
|
||||||
|
<option value="step" title={t('station.trackStepTipMode')}>{t('station.trackStep')}</option>
|
||||||
|
<option value="band" title={t('station.trackBandTip')}>{t('station.trackBand')}</option>
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
<button type="button" disabled={!ant.connected}
|
<button type="button" disabled={!ant.connected}
|
||||||
onClick={() => run(UltrabeamRetract())}
|
onClick={() => run(UltrabeamRetract())}
|
||||||
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1.5 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1.5 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
||||||
|
|||||||
@@ -0,0 +1,275 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { Upload, FolderOpen, Loader2, ChevronsUpDown } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
GetWebPublishConfig, SaveWebPublishConfig, WebPublishColumns,
|
||||||
|
TestWebPublishFTP, PublishLogNow, GetWebPublishStatus, PickBackupFolder,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
|
||||||
|
import {
|
||||||
|
DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuCheckboxItem,
|
||||||
|
} from '@/components/ui/dropdown-menu';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
type Cfg = {
|
||||||
|
enabled: boolean; format: string; folder: string; file_name: string; title: string;
|
||||||
|
count: number; interval_min: number; columns: string[];
|
||||||
|
ftp_enabled: boolean; ftp_host: string; ftp_port: number; ftp_user: string;
|
||||||
|
ftp_password: string; ftp_tls: boolean; ftp_folder: string; ftp_file_name: string;
|
||||||
|
};
|
||||||
|
type Col = { key: string; header: string; group: string };
|
||||||
|
|
||||||
|
export function WebPublishPanel() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [cfg, setCfg] = useState<Cfg | null>(null);
|
||||||
|
const [cols, setCols] = useState<Col[]>([]);
|
||||||
|
// The catalogue is 123 fields, so the picker is a dropdown with a search box
|
||||||
|
// rather than anything laid out on the page. Chosen columns stay visible above
|
||||||
|
// it, in publication order: after picking eight out of a hundred the question
|
||||||
|
// stops being 'what exists' and becomes 'what did I pick, and how will it print'.
|
||||||
|
const [colSearch, setColSearch] = useState('');
|
||||||
|
const [busy, setBusy] = useState<'' | 'test' | 'publish'>('');
|
||||||
|
const [msg, setMsg] = useState('');
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
// Raw text for the two numeric boxes: bound straight to the number they could
|
||||||
|
// not be cleared, the same trap as the Recent-QSOs Max field.
|
||||||
|
const [countText, setCountText] = useState('');
|
||||||
|
const [everyText, setEveryText] = useState('');
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const [c, k, st] = await Promise.all([GetWebPublishConfig(), WebPublishColumns(), GetWebPublishStatus()]);
|
||||||
|
setCfg(c as any);
|
||||||
|
setCols((k ?? []) as Col[]);
|
||||||
|
setCountText(String((c as any).count ?? 100));
|
||||||
|
setEveryText(String((c as any).interval_min ?? 0));
|
||||||
|
const s: any = st;
|
||||||
|
if (s?.last_err) setErr(s.last_err);
|
||||||
|
else if (s?.last_run) setMsg(t('wpub.lastRun') + ' ' + s.last_run);
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
})();
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (!cfg) return <p className="text-xs text-muted-foreground">…</p>;
|
||||||
|
const set = (p: Partial<Cfg>) => setCfg((c) => (c ? { ...c, ...p } : c));
|
||||||
|
|
||||||
|
// Every control saves immediately: this panel has no Save button of its own,
|
||||||
|
// matching the other "saved instantly" panels.
|
||||||
|
const save = async (next: Cfg) => {
|
||||||
|
setCfg(next);
|
||||||
|
try { await SaveWebPublishConfig(next as any); setErr(''); }
|
||||||
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
};
|
||||||
|
const patch = (p: Partial<Cfg>) => save({ ...cfg, ...p });
|
||||||
|
|
||||||
|
const toggleCol = (key: string) => {
|
||||||
|
const has = cfg.columns?.includes(key);
|
||||||
|
patch({ columns: has ? cfg.columns.filter((c) => c !== key) : [...(cfg.columns ?? []), key] });
|
||||||
|
};
|
||||||
|
|
||||||
|
const run = async (what: 'test' | 'publish') => {
|
||||||
|
setBusy(what); setMsg(''); setErr('');
|
||||||
|
try {
|
||||||
|
const r = what === 'test' ? await TestWebPublishFTP(cfg as any) : await PublishLogNow();
|
||||||
|
setMsg(String(r));
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
finally { setBusy(''); }
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4 max-w-3xl">
|
||||||
|
<p className="text-xs text-muted-foreground leading-relaxed">{t('wpub.hint')}</p>
|
||||||
|
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.enabled} onCheckedChange={(c) => patch({ enabled: !!c })} />
|
||||||
|
{t('wpub.enable')}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{cfg.enabled && (<>
|
||||||
|
{/* ── The file ── */}
|
||||||
|
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||||
|
<Label className="text-xs font-semibold">{t('wpub.fileSection')}</Label>
|
||||||
|
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
||||||
|
<Label className="text-sm">{t('wpub.format')}</Label>
|
||||||
|
<Select value={cfg.format} onValueChange={(v) => patch({ format: v })}>
|
||||||
|
<SelectTrigger className="h-8 w-56"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="html">{t('wpub.formatHtml')}</SelectItem>
|
||||||
|
<SelectItem value="csv">{t('wpub.formatCsv')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.folder')}</Label>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input className="h-8 font-mono text-xs flex-1" value={cfg.folder}
|
||||||
|
onChange={(e) => set({ folder: e.target.value })} onBlur={() => patch({ folder: cfg.folder })} />
|
||||||
|
<Button variant="outline" size="sm" className="h-8" onClick={async () => {
|
||||||
|
try { const p = await PickBackupFolder(); if (p) patch({ folder: p }); } catch { /* cancelled */ }
|
||||||
|
}}><FolderOpen className="size-3.5" /> {t('wpub.browse')}</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.fileName')}</Label>
|
||||||
|
<Input className="h-8 w-56 font-mono text-xs" value={cfg.file_name}
|
||||||
|
onChange={(e) => set({ file_name: e.target.value })} onBlur={() => patch({ file_name: cfg.file_name })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.title')}</Label>
|
||||||
|
<Input className="h-8" placeholder={t('wpub.titlePh')} value={cfg.title}
|
||||||
|
onChange={(e) => set({ title: e.target.value })} onBlur={() => patch({ title: cfg.title })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.count')}</Label>
|
||||||
|
<Input type="number" min={1} max={100000} className="h-8 w-28 font-mono text-xs" value={countText}
|
||||||
|
onChange={(e) => setCountText(e.target.value)}
|
||||||
|
onBlur={() => {
|
||||||
|
const n = Math.floor(Number(countText));
|
||||||
|
if (Number.isFinite(n) && n > 0) patch({ count: n }); else setCountText(String(cfg.count));
|
||||||
|
}} />
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.every')}</Label>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Input type="number" min={0} max={1440} className="h-8 w-28 font-mono text-xs" value={everyText}
|
||||||
|
onChange={(e) => setEveryText(e.target.value)}
|
||||||
|
onBlur={() => {
|
||||||
|
const n = Math.floor(Number(everyText));
|
||||||
|
if (Number.isFinite(n) && n >= 0) patch({ interval_min: n }); else setEveryText(String(cfg.interval_min));
|
||||||
|
}} />
|
||||||
|
<span className="text-xs text-muted-foreground">{t('wpub.everyHint')}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* ── Columns ── */}
|
||||||
|
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<Label className="text-xs font-semibold">{t('wpub.columns')}</Label>
|
||||||
|
<span className="text-[11px] text-muted-foreground">
|
||||||
|
{t('wpub.columnsCount', { n: cfg.columns?.length ?? 0, total: cols.length })}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* CHOSEN, in publication order — this is the list that answers "what
|
||||||
|
will the page look like", which a sectioned catalogue cannot. */}
|
||||||
|
{(cfg.columns?.length ?? 0) > 0 && (
|
||||||
|
<div className="flex flex-wrap gap-1.5">
|
||||||
|
{cfg.columns.map((k) => {
|
||||||
|
const c = cols.find((x) => x.key === k);
|
||||||
|
return (
|
||||||
|
<button key={k} type="button" onClick={() => toggleCol(k)}
|
||||||
|
title={t('wpub.removeColumn')}
|
||||||
|
className="px-2 py-0.5 rounded-full border border-primary bg-primary text-primary-foreground text-[11px] font-medium">
|
||||||
|
{c?.header ?? k} ×
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* One dropdown, alphabetical, filtered as you type. The catalogue is
|
||||||
|
123 fields: laid out on the page it buries every other setting, and
|
||||||
|
sorting by anything but the alphabet means hunting. The menu stays
|
||||||
|
open while ticking — picking eight columns should be one visit. */}
|
||||||
|
<DropdownMenu>
|
||||||
|
<DropdownMenuTrigger asChild>
|
||||||
|
<Button variant="outline" size="sm" className="w-full justify-between h-8 text-xs font-normal">
|
||||||
|
{t('wpub.columnsPick')}
|
||||||
|
<ChevronsUpDown className="size-3.5 opacity-60" />
|
||||||
|
</Button>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
{/* The search box is OUTSIDE the scrolling area, not sticky inside it.
|
||||||
|
Sticky kept it in place but the rows scrolled over it: a menu item
|
||||||
|
carries its own background and its own stacking, so it wins over a
|
||||||
|
sticky sibling however high its z-index. A header that never
|
||||||
|
scrolls has nothing to lose the fight with. */}
|
||||||
|
<DropdownMenuContent align="start" className="w-72 p-0 flex flex-col max-h-80">
|
||||||
|
<div className="p-1.5 border-b border-border/60 bg-popover shrink-0">
|
||||||
|
<Input className="h-7 text-xs" placeholder={t('wpub.columnsSearch')}
|
||||||
|
value={colSearch}
|
||||||
|
onChange={(e) => setColSearch(e.target.value)}
|
||||||
|
onKeyDown={(e) => e.stopPropagation()} />
|
||||||
|
</div>
|
||||||
|
<div className="overflow-y-auto p-1">
|
||||||
|
{[...cols]
|
||||||
|
.sort((a, b) => a.header.localeCompare(b.header))
|
||||||
|
.filter((c) => {
|
||||||
|
const q = colSearch.trim().toLowerCase();
|
||||||
|
return !q || c.header.toLowerCase().includes(q) || c.key.toLowerCase().includes(q);
|
||||||
|
})
|
||||||
|
.map((c) => (
|
||||||
|
<DropdownMenuCheckboxItem
|
||||||
|
key={c.key}
|
||||||
|
checked={cfg.columns?.includes(c.key) ?? false}
|
||||||
|
onCheckedChange={() => toggleCol(c.key)}
|
||||||
|
onSelect={(e) => e.preventDefault()}
|
||||||
|
className="text-xs"
|
||||||
|
>
|
||||||
|
{c.header}
|
||||||
|
<span className="ml-auto pl-2 text-[10px] text-muted-foreground font-mono">{c.group}</span>
|
||||||
|
</DropdownMenuCheckboxItem>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</DropdownMenuContent>
|
||||||
|
</DropdownMenu>
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('wpub.columnsHint')}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* ── Upload ── */}
|
||||||
|
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.ftp_enabled} onCheckedChange={(c) => patch({ ftp_enabled: !!c })} />
|
||||||
|
{t('wpub.ftpEnable')}
|
||||||
|
</label>
|
||||||
|
{cfg.ftp_enabled && (
|
||||||
|
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
||||||
|
<Label className="text-sm">{t('wpub.ftpHost')}</Label>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input className="h-8 flex-1" placeholder="ftp.example.com" value={cfg.ftp_host}
|
||||||
|
onChange={(e) => set({ ftp_host: e.target.value })} onBlur={() => patch({ ftp_host: cfg.ftp_host })} />
|
||||||
|
<Input type="number" className="h-8 w-24 font-mono text-xs" value={cfg.ftp_port}
|
||||||
|
onChange={(e) => set({ ftp_port: Number(e.target.value) || 21 })}
|
||||||
|
onBlur={() => patch({ ftp_port: cfg.ftp_port })} />
|
||||||
|
</div>
|
||||||
|
<Label className="text-sm">{t('wpub.ftpUser')}</Label>
|
||||||
|
<Input className="h-8" value={cfg.ftp_user}
|
||||||
|
onChange={(e) => set({ ftp_user: e.target.value })} onBlur={() => patch({ ftp_user: cfg.ftp_user })} />
|
||||||
|
<Label className="text-sm">{t('wpub.ftpPassword')}</Label>
|
||||||
|
<Input type="password" className="h-8" value={cfg.ftp_password}
|
||||||
|
onChange={(e) => set({ ftp_password: e.target.value })} onBlur={() => patch({ ftp_password: cfg.ftp_password })} />
|
||||||
|
<Label className="text-sm">{t('wpub.ftpFolder')}</Label>
|
||||||
|
<Input className="h-8 font-mono text-xs" placeholder="/www/log" value={cfg.ftp_folder}
|
||||||
|
onChange={(e) => set({ ftp_folder: e.target.value })} onBlur={() => patch({ ftp_folder: cfg.ftp_folder })} />
|
||||||
|
<Label className="text-sm">{t('wpub.ftpFileName')}</Label>
|
||||||
|
<Input className="h-8 w-56 font-mono text-xs" value={cfg.ftp_file_name}
|
||||||
|
onChange={(e) => set({ ftp_file_name: e.target.value })} onBlur={() => patch({ ftp_file_name: cfg.ftp_file_name })} />
|
||||||
|
<span />
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.ftp_tls} onCheckedChange={(c) => patch({ ftp_tls: !!c })} />
|
||||||
|
{t('wpub.ftpTls')}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-3 border-t border-border/60 pt-3 flex-wrap">
|
||||||
|
<Button size="sm" onClick={() => run('publish')} disabled={busy !== ''}>
|
||||||
|
{busy === 'publish' ? <Loader2 className="size-3.5 animate-spin" /> : <Upload className="size-3.5" />}
|
||||||
|
{t('wpub.publishNow')}
|
||||||
|
</Button>
|
||||||
|
{cfg.ftp_enabled && (
|
||||||
|
<Button variant="outline" size="sm" onClick={() => run('test')} disabled={busy !== ''}>
|
||||||
|
{busy === 'test' ? <Loader2 className="size-3.5 animate-spin" /> : null}
|
||||||
|
{t('wpub.testFtp')}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>)}
|
||||||
|
|
||||||
|
{msg && <p className="text-xs text-success break-all">{msg}</p>}
|
||||||
|
{err && <p className="text-xs text-danger break-all">{err}</p>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ import { Checkbox } from '@/components/ui/checkbox';
|
|||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import {
|
import {
|
||||||
QSLPickPhotos, QSLGenerateProposals, QSLListTemplates, QSLGetTemplate,
|
QSLPickPhotos, QSLGenerateProposals, QSLListTemplates, QSLGetTemplate,
|
||||||
|
QSLListOtherProfileTemplates, QSLCopyTemplateToActiveProfile,
|
||||||
QSLSaveTemplate, QSLSetDefaultTemplate, QSLDeleteTemplate, QSLSavePreview,
|
QSLSaveTemplate, QSLSetDefaultTemplate, QSLDeleteTemplate, QSLSavePreview,
|
||||||
QSLPreviewDataURL, QSLResolvePreview, QSLStylePresets,
|
QSLPreviewDataURL, QSLResolvePreview, QSLStylePresets,
|
||||||
} from '../../../wailsjs/go/main/App';
|
} from '../../../wailsjs/go/main/App';
|
||||||
@@ -59,6 +60,7 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [error, setError] = useState('');
|
const [error, setError] = useState('');
|
||||||
const [saved, setSaved] = useState<QSLTemplateInfo[]>([]);
|
const [saved, setSaved] = useState<QSLTemplateInfo[]>([]);
|
||||||
|
const [foreign, setForeign] = useState<any[]>([]);
|
||||||
const [previews, setPreviews] = useState<Record<number, string>>({});
|
const [previews, setPreviews] = useState<Record<number, string>>({});
|
||||||
const [presets, setPresets] = useState<QSLPresetInfo[]>([]);
|
const [presets, setPresets] = useState<QSLPresetInfo[]>([]);
|
||||||
const [fontFamilies, setFontFamilies] = useState<string[]>([]);
|
const [fontFamilies, setFontFamilies] = useState<string[]>([]);
|
||||||
@@ -88,6 +90,8 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
if (url) p[t.id] = url;
|
if (url) p[t.id] = url;
|
||||||
}));
|
}));
|
||||||
setPreviews(p);
|
setPreviews(p);
|
||||||
|
// The designs this profile cannot see, offered for copying.
|
||||||
|
try { setForeign(((await QSLListOtherProfileTemplates()) ?? []) as any[]); } catch { /* nothing to offer */ }
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(String(e));
|
setError(String(e));
|
||||||
}
|
}
|
||||||
@@ -274,7 +278,29 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="space-y-2">
|
<section className="space-y-2">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
<h3 className="text-sm font-semibold">Saved templates</h3>
|
<h3 className="text-sm font-semibold">Saved templates</h3>
|
||||||
|
{/* Designs owned by another profile. A second profile is usually
|
||||||
|
the same operator with a different rig or locator — same
|
||||||
|
callsign, same cards — and redrawing one because the antenna
|
||||||
|
changed is work nobody should have to do. */}
|
||||||
|
{!!foreign.length && (
|
||||||
|
<select
|
||||||
|
value=""
|
||||||
|
onChange={async (e) => {
|
||||||
|
const id = parseInt(e.target.value, 10);
|
||||||
|
if (!id) return;
|
||||||
|
try { await QSLCopyTemplateToActiveProfile(id); await refreshSaved(); }
|
||||||
|
catch (err) { setError(String(err)); }
|
||||||
|
}}
|
||||||
|
className="h-7 rounded-md border border-border bg-background px-2 text-xs">
|
||||||
|
<option value="">Copy from another profile…</option>
|
||||||
|
{foreign.map((f) => (
|
||||||
|
<option key={f.id} value={f.id}>{f.profile_name} — {f.name}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
{!saved.length && <p className="text-xs text-muted-foreground">None yet.</p>}
|
{!saved.length && <p className="text-xs text-muted-foreground">None yet.</p>}
|
||||||
<div className="grid grid-cols-3 gap-3">
|
<div className="grid grid-cols-3 gap-3">
|
||||||
{saved.map((t) => (
|
{saved.map((t) => (
|
||||||
|
|||||||
+52
-42
File diff suppressed because one or more lines are too long
@@ -0,0 +1,93 @@
|
|||||||
|
// Row colouring for the log grid, by QSL status.
|
||||||
|
//
|
||||||
|
// Four categories, each scoped to the channels the operator cares about —
|
||||||
|
// paper QSL, LoTW, eQSL, QRZ.com. The rules are ORDERED and the first match
|
||||||
|
// wins, because a contact is usually several of them at once.
|
||||||
|
|
||||||
|
export type RowColorRule = {
|
||||||
|
id: string;
|
||||||
|
color: string;
|
||||||
|
enabled: boolean;
|
||||||
|
channels?: string[]; // empty = every channel
|
||||||
|
};
|
||||||
|
export type RowColorSettings = {
|
||||||
|
enabled: boolean;
|
||||||
|
style?: 'bar' | 'tint' | 'both';
|
||||||
|
intensity?: number;
|
||||||
|
bandmap_lotw?: boolean;
|
||||||
|
rules: RowColorRule[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||||
|
|
||||||
|
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
||||||
|
// "upload status" rather than a QSL flag, but they carry the same Y / R letters.
|
||||||
|
const FIELDS: Record<string, { sent: string; rcvd: string }> = {
|
||||||
|
qsl: { sent: 'qsl_sent', rcvd: 'qsl_rcvd' },
|
||||||
|
lotw: { sent: 'lotw_sent', rcvd: 'lotw_rcvd' },
|
||||||
|
eqsl: { sent: 'eqsl_sent', rcvd: 'eqsl_rcvd' },
|
||||||
|
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
|
||||||
|
};
|
||||||
|
|
||||||
|
// ADIF QSL fields are single letters. Y is the only one that means "yes";
|
||||||
|
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
|
||||||
|
// and the one an operator looks for when deciding what to send.
|
||||||
|
const yes = (v: any) => String(v ?? '').trim().toUpperCase() === 'Y';
|
||||||
|
const owed = (v: any) => {
|
||||||
|
const s = String(v ?? '').trim().toUpperCase();
|
||||||
|
return s === 'R' || s === 'Q';
|
||||||
|
};
|
||||||
|
|
||||||
|
const chansOf = (r: RowColorRule): readonly string[] =>
|
||||||
|
r.channels && r.channels.length ? r.channels : CHANNELS;
|
||||||
|
|
||||||
|
function ruleMatches(q: any, r: RowColorRule): boolean {
|
||||||
|
const cs = chansOf(r);
|
||||||
|
switch (r.id) {
|
||||||
|
case 'confirmed':
|
||||||
|
return cs.some((c) => yes(q[FIELDS[c]?.rcvd]));
|
||||||
|
case 'sent':
|
||||||
|
return cs.some((c) => yes(q[FIELDS[c]?.sent]));
|
||||||
|
case 'to_send':
|
||||||
|
return cs.some((c) => owed(q[FIELDS[c]?.sent]));
|
||||||
|
case 'worked':
|
||||||
|
// The catch-all: nothing sent, nothing asked for, nothing back.
|
||||||
|
return !CHANNELS.some((c) => yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent]));
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Walks the rules IN ORDER — the order is the priority, and the settings panel
|
||||||
|
// shows it numbered so it can be read rather than guessed.
|
||||||
|
export function matchRowRule(q: any, cfg: RowColorSettings | null): RowColorRule | null {
|
||||||
|
if (!q || !cfg?.rules) return null;
|
||||||
|
for (const r of cfg.rules) {
|
||||||
|
if (r.enabled && ruleMatches(q, r)) return r;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The colour is never a fill by default.
|
||||||
|
//
|
||||||
|
// A log where nearly every contact has SOME QSL state ends up with every row
|
||||||
|
// painted, and colour that is always present stops being information. The
|
||||||
|
// default is a stripe down the left edge; a tint is offered at a chosen strength.
|
||||||
|
export function rowStyleFor(q: any, cfg: RowColorSettings | null): Record<string, string> | undefined {
|
||||||
|
if (!cfg?.enabled) return undefined;
|
||||||
|
const rule = matchRowRule(q, cfg);
|
||||||
|
if (!rule?.color) return undefined;
|
||||||
|
|
||||||
|
const style = cfg.style ?? 'bar';
|
||||||
|
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
||||||
|
const out: Record<string, string> = {};
|
||||||
|
if (style === 'tint' || style === 'both') {
|
||||||
|
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
||||||
|
}
|
||||||
|
if (style === 'bar' || style === 'both') {
|
||||||
|
// inset shadow rather than a border: a border would shift the cells three
|
||||||
|
// pixels on coloured rows only, and the columns would stop lining up.
|
||||||
|
out.boxShadow = `inset 3px 0 0 ${rule.color}`;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
// 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 };
|
||||||
|
|
||||||
|
// Both options are withdrawn from the filter panel for now. The machinery below
|
||||||
|
// is deliberately kept whole — it is correct and hard-won — so putting the two
|
||||||
|
// switches back is this one flag and the block they came from in App.tsx.
|
||||||
|
//
|
||||||
|
// The saved preferences are left untouched in localStorage rather than cleared:
|
||||||
|
// an operator who had either turned on gets them back exactly as they were the
|
||||||
|
// day the options return, instead of silently starting from off.
|
||||||
|
export const SPOT_DISPLAY_OPTIONS_EXPOSED = false;
|
||||||
|
|
||||||
|
export function readSpotDisplayOptions(): SpotDisplayOptions {
|
||||||
|
if (!SPOT_DISPLAY_OPTIONS_EXPOSED) return { muteWorked: false, slotHighlight: false };
|
||||||
|
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;
|
||||||
|
new_grid?: boolean;
|
||||||
|
} | undefined;
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
|
||||||
|
// Slot promotion runs first: a callsign not yet worked on this band and mode
|
||||||
|
// is not done, whatever the entity says, so it earns a status before the mute
|
||||||
|
// below can take its colour away.
|
||||||
|
if (o.slotHighlight && e.worked_slot === false && (!e.status || e.status === 'worked')) {
|
||||||
|
e = { ...e, status: 'new-call' } as NonNullable<T>;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mute drops the blue already-worked-callsign mark, and NOTHING else.
|
||||||
|
//
|
||||||
|
// It used to blank the status as well, on the theory that a spot bringing no
|
||||||
|
// novelty should stop painting entirely. That was wrong twice over. The status
|
||||||
|
// is what the cluster list reads to DIM a row, so blanking it turned every
|
||||||
|
// quiet grey row bright white — the option made the list louder, not quieter.
|
||||||
|
// And an empty status means "entity not resolved" everywhere else, so muted
|
||||||
|
// spots had to carry a flag saying they did not really mean that.
|
||||||
|
//
|
||||||
|
// Leaving the status alone costs nothing: a worked entity already renders with
|
||||||
|
// no colour and gets dimmed, so removing the blue is the entire job.
|
||||||
|
if (o.muteWorked) {
|
||||||
|
e = { ...e, worked_call: false } as NonNullable<T>;
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
// spotIsWorked answers "does this spot bring me nothing?", which is what the
|
||||||
|
// "hide worked" filter is really asking.
|
||||||
|
//
|
||||||
|
// The extra markers are ORTHOGONAL to the entity status — a spot can be a worked
|
||||||
|
// entity AND a new park, prefix, county or grid — so they win. Without that, a
|
||||||
|
// new prefix in an entity worked years ago vanished the moment the filter went
|
||||||
|
// on, which is the opposite of what an operator hunting prefixes wants.
|
||||||
|
export function spotIsWorked(e: Entry): boolean {
|
||||||
|
if (!e) return false;
|
||||||
|
if (e.new_pota || e.new_county || e.new_pfx || e.new_grid) return false;
|
||||||
|
return !!e.worked_call || e.status === 'worked';
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
// The "extra" spot markers — the ones ORTHOGONAL to the entity status.
|
||||||
|
//
|
||||||
|
// A spot's entity status (new DXCC / new band / new slot / worked) answers one
|
||||||
|
// question. These answer others that can be true at the same time: the park is
|
||||||
|
// new even if the entity is worked, the county is new even if the band is not.
|
||||||
|
// Both the DX-cluster list and the band map show them, and they have to agree —
|
||||||
|
// the same fact must not be green in one panel and violet in the next, so the
|
||||||
|
// colours live HERE and nowhere else. This is also the table a per-marker colour
|
||||||
|
// setting will drive, which is why it is a table rather than three constants.
|
||||||
|
//
|
||||||
|
// Colour choices:
|
||||||
|
// POTA green — parks; the association is worth keeping
|
||||||
|
// county violet — a chart hue, because every semantic token was already
|
||||||
|
// spoken for: red, orange and yellow are the entity
|
||||||
|
// statuses, blue is "callsign worked", green is POTA
|
||||||
|
// worked blue — matches the WKD-CALL badge the cluster list has always used
|
||||||
|
// prefix yellow — unchanged
|
||||||
|
// grid magenta — the last hue in the categorical set that is not already
|
||||||
|
// spoken for here and does not read as a status; a grid is
|
||||||
|
// never urgent the way a new entity is
|
||||||
|
export type SpotMarkerKey = 'new_pota' | 'new_county' | 'new_pfx' | 'worked_call' | 'new_grid';
|
||||||
|
|
||||||
|
export type SpotMarker = {
|
||||||
|
key: SpotMarkerKey;
|
||||||
|
colour: string; // a CSS colour — a var() reference, so it follows the theme
|
||||||
|
labelKey: string; // i18n key, short form (badge / legend)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Order is the display order, in both panels.
|
||||||
|
export const SPOT_MARKERS: SpotMarker[] = [
|
||||||
|
{ key: 'new_pota', colour: 'var(--success)', labelKey: 'clg2.newPota' },
|
||||||
|
{ key: 'new_county', colour: 'var(--chart-5)', labelKey: 'clg2.newCounty' },
|
||||||
|
{ key: 'new_pfx', colour: 'var(--caution)', labelKey: 'clg2.newPfx' },
|
||||||
|
{ key: 'new_grid', colour: 'var(--chart-7)', labelKey: 'clg2.newGrid' },
|
||||||
|
{ key: 'worked_call', colour: 'var(--info)', labelKey: 'clg2.wkdCall' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const markerColour = (key: SpotMarkerKey): string =>
|
||||||
|
SPOT_MARKERS.find((m) => m.key === key)?.colour ?? 'var(--muted-foreground)';
|
||||||
|
|
||||||
|
// activeMarkers returns the markers set on a status entry, in display order.
|
||||||
|
export function activeMarkers(e: Record<string, unknown> | undefined): SpotMarker[] {
|
||||||
|
if (!e) return [];
|
||||||
|
return SPOT_MARKERS.filter((m) => !!e[m.key]);
|
||||||
|
}
|
||||||
@@ -6,14 +6,14 @@ import { GetUIPref } from '../../wailsjs/go/main/App';
|
|||||||
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
|
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
|
||||||
// preference. The choice is persisted (localStorage + portable UI pref, so it
|
// preference. The choice is persisted (localStorage + portable UI pref, so it
|
||||||
// travels with the data/ folder like the language).
|
// travels with the data/ folder like the language).
|
||||||
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic'
|
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic' | 'sahara'
|
||||||
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
|
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
|
||||||
|
|
||||||
// Selectable, concrete themes (excludes 'auto') in display order: lights first,
|
// Selectable, concrete themes (excludes 'auto') in display order: lights first,
|
||||||
// then darks, with high-contrast last — it is an accessibility choice, not a
|
// then darks, with high-contrast last — it is an accessibility choice, not a
|
||||||
// taste one, and listing it among the moods buries it.
|
// taste one, and listing it among the moods buries it.
|
||||||
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
|
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
|
||||||
'light-warm', 'light-cool', 'light-sage', 'light-nordic',
|
'light-warm', 'light-cool', 'light-sage', 'light-nordic', 'sahara',
|
||||||
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
|
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
|
||||||
'high-contrast',
|
'high-contrast',
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
+78
-1
@@ -775,6 +775,82 @@
|
|||||||
color-scheme: light;
|
color-scheme: light;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ---- Theme 1e: Sahara — Warm light, taken a step deeper --------------------
|
||||||
|
Warm light's cream is kept for panels and the entry strip (#faf6eb, the one
|
||||||
|
surface an operator stares at while typing a call), but the page behind them
|
||||||
|
and every toolbar, tab bar and table header go one shade further into the
|
||||||
|
sand. That was the whole request: same family, just a little darker, so the
|
||||||
|
cream panels lift clearly instead of blending into the page.
|
||||||
|
Ink is a deep warm brown rather than black: pure black on sand glares.
|
||||||
|
The accent moves from Warm light's burnt orange to ochre to keep the two
|
||||||
|
themes apart at a glance in the theme picker. ---------------------------- */
|
||||||
|
[data-theme="sahara"] {
|
||||||
|
--background: #dcceab; /* deep sand — the page */
|
||||||
|
--foreground: #2b2318; /* deep warm brown-ink */
|
||||||
|
--card: #faf6eb; /* lifted panel / entry strip — kept cream */
|
||||||
|
--card-foreground: #2b2318;
|
||||||
|
--popover: #faf6eb;
|
||||||
|
--popover-foreground: #2b2318;
|
||||||
|
--primary: #a55f14; /* ochre */
|
||||||
|
--primary-foreground: #fffbf2;
|
||||||
|
--secondary: #cdbb92;
|
||||||
|
--secondary-foreground: #2b2318;
|
||||||
|
--muted: #cdbb92; /* toolbars / tab bar / table headers */
|
||||||
|
--muted-foreground: #544731; /* readable on both sands */
|
||||||
|
--accent: #e9d3a6; /* warm highlight */
|
||||||
|
--accent-foreground: #6b3a06;
|
||||||
|
--destructive: #b91c1c;
|
||||||
|
--destructive-foreground: #ffffff;
|
||||||
|
--destructive-muted: #fdecec;
|
||||||
|
--destructive-muted-foreground: #b91c1c;
|
||||||
|
--border: #b6a179; /* sand a step down again, so edges read */
|
||||||
|
--input: #b6a179;
|
||||||
|
--ring: #c2760c; /* amber focus ring */
|
||||||
|
|
||||||
|
--success: #15803d;
|
||||||
|
--success-foreground: #ffffff;
|
||||||
|
--success-muted: #dcf3e1;
|
||||||
|
--success-muted-foreground: #14532d;
|
||||||
|
--success-border: #86d99f;
|
||||||
|
|
||||||
|
--warning: #b45309;
|
||||||
|
--warning-foreground: #ffffff;
|
||||||
|
--warning-muted: #fbeacd;
|
||||||
|
--warning-muted-foreground: #7c3d05;
|
||||||
|
--warning-border: #e8b96a;
|
||||||
|
|
||||||
|
--caution: #a16207;
|
||||||
|
--caution-foreground: #1c1917;
|
||||||
|
--caution-muted: #f7edcb;
|
||||||
|
--caution-muted-foreground: #713f12;
|
||||||
|
--caution-border: #e0c069;
|
||||||
|
|
||||||
|
--danger: #be123c;
|
||||||
|
--danger-foreground: #ffffff;
|
||||||
|
--danger-muted: #fbe3e8;
|
||||||
|
--danger-muted-foreground: #9f1239;
|
||||||
|
--danger-border: #ee9aac;
|
||||||
|
|
||||||
|
--info: #0369a1;
|
||||||
|
--info-foreground: #ffffff;
|
||||||
|
--info-muted: #e0eef6;
|
||||||
|
--info-muted-foreground: #075985;
|
||||||
|
--info-border: #86c5e4;
|
||||||
|
|
||||||
|
/* Band/mode matrix — the app's blues kept, on a sand neutral so an empty slot
|
||||||
|
recedes into the grid instead of punching a hole in it. */
|
||||||
|
--mx-call-conf: #15803d;
|
||||||
|
--mx-call-work: #7fd6a4;
|
||||||
|
--mx-dx-conf: #3730a3;
|
||||||
|
--mx-dx-work: #a5b4fc;
|
||||||
|
--mx-none: #cdbb92;
|
||||||
|
|
||||||
|
--scrollbar-thumb: #ac9868;
|
||||||
|
--scrollbar-thumb-hover: #927d4e;
|
||||||
|
--card-shadow: 0 1px 2px rgba(43, 35, 24, 0.07), 0 0 0 1px rgba(43, 35, 24, 0.03);
|
||||||
|
color-scheme: light;
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
|
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
|
||||||
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
|
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
|
||||||
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
|
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
|
||||||
@@ -793,7 +869,8 @@
|
|||||||
[data-theme="light-warm"],
|
[data-theme="light-warm"],
|
||||||
[data-theme="light-cool"],
|
[data-theme="light-cool"],
|
||||||
[data-theme="light-sage"],
|
[data-theme="light-sage"],
|
||||||
[data-theme="light-nordic"] {
|
[data-theme="light-nordic"],
|
||||||
|
[data-theme="sahara"] {
|
||||||
--chart-1: #2a78d6; /* blue — default single-series hue */
|
--chart-1: #2a78d6; /* blue — default single-series hue */
|
||||||
--chart-2: #1baf7a; /* aqua */
|
--chart-2: #1baf7a; /* aqua */
|
||||||
--chart-3: #eda100; /* yellow */
|
--chart-3: #eda100; /* yellow */
|
||||||
|
|||||||
@@ -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.1';
|
export const APP_VERSION = '0.25.1';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+63
@@ -10,12 +10,15 @@ 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';
|
||||||
|
import {pskr} from '../models';
|
||||||
import {spe} from '../models';
|
import {spe} from '../models';
|
||||||
import {solar} from '../models';
|
import {solar} from '../models';
|
||||||
import {tunergenius} from '../models';
|
import {tunergenius} from '../models';
|
||||||
|
import {webpub} from '../models';
|
||||||
import {winkeyer} from '../models';
|
import {winkeyer} from '../models';
|
||||||
import {alerts} from '../models';
|
import {alerts} from '../models';
|
||||||
import {audio} from '../models';
|
import {audio} from '../models';
|
||||||
@@ -85,6 +88,8 @@ export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Reco
|
|||||||
|
|
||||||
export function AwardsFolder():Promise<string>;
|
export function AwardsFolder():Promise<string>;
|
||||||
|
|
||||||
|
export function BackfillDistances():Promise<main.BackfillDistancesResult>;
|
||||||
|
|
||||||
export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
|
export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
|
||||||
|
|
||||||
export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
|
export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
|
||||||
@@ -171,6 +176,8 @@ export function DiscoverFlexRadios():Promise<Array<cat.FlexRadio>>;
|
|||||||
|
|
||||||
export function DismissAwardUpdate(arg1:string):Promise<void>;
|
export function DismissAwardUpdate(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function DismissQSLViaRepair():Promise<void>;
|
||||||
|
|
||||||
export function DownloadAllReferenceLists():Promise<string>;
|
export function DownloadAllReferenceLists():Promise<string>;
|
||||||
|
|
||||||
export function DownloadAndApplyUpdate(arg1:string):Promise<void>;
|
export function DownloadAndApplyUpdate(arg1:string):Promise<void>;
|
||||||
@@ -385,6 +392,10 @@ export function GetAwards():Promise<Array<award.Result>>;
|
|||||||
|
|
||||||
export function GetBackupSettings():Promise<main.BackupSettings>;
|
export function GetBackupSettings():Promise<main.BackupSettings>;
|
||||||
|
|
||||||
|
export function GetBandOpenSettings():Promise<main.BandOpenSettings>;
|
||||||
|
|
||||||
|
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>;
|
||||||
@@ -395,6 +406,8 @@ export function GetCatalogCodes():Promise<Array<string>>;
|
|||||||
|
|
||||||
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
|
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
|
||||||
|
|
||||||
|
export function GetChaseNewGrids():Promise<boolean>;
|
||||||
|
|
||||||
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
|
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
|
||||||
|
|
||||||
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
||||||
@@ -431,10 +444,16 @@ export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
|
|||||||
|
|
||||||
export function GetFlexState():Promise<cat.FlexTXState>;
|
export function GetFlexState():Promise<cat.FlexTXState>;
|
||||||
|
|
||||||
|
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
||||||
|
|
||||||
export function GetIcomState():Promise<cat.IcomTXState>;
|
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||||
|
|
||||||
|
export function GetLinkedAmps():Promise<Array<string>>;
|
||||||
|
|
||||||
export function GetListsSettings():Promise<main.ListsSettings>;
|
export function GetListsSettings():Promise<main.ListsSettings>;
|
||||||
|
|
||||||
|
export function GetLiveOpenings():Promise<Array<bandopen.Opening>>;
|
||||||
|
|
||||||
export function GetLiveStations():Promise<Array<main.LiveStation>>;
|
export function GetLiveStations():Promise<Array<main.LiveStation>>;
|
||||||
|
|
||||||
export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>;
|
export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>;
|
||||||
@@ -461,6 +480,8 @@ export function GetPGXLStatus():Promise<powergenius.Status>;
|
|||||||
|
|
||||||
export function GetPOTAToken():Promise<string>;
|
export function GetPOTAToken():Promise<string>;
|
||||||
|
|
||||||
|
export function GetPSKReporterStatus():Promise<pskr.Status>;
|
||||||
|
|
||||||
export function GetPendingQSOs():Promise<Array<qso.QSO>>;
|
export function GetPendingQSOs():Promise<Array<qso.QSO>>;
|
||||||
|
|
||||||
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
||||||
@@ -475,6 +496,8 @@ export function GetRotatorHeading():Promise<main.RotatorHeading>;
|
|||||||
|
|
||||||
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
||||||
|
|
||||||
|
export function GetRowColors():Promise<main.RowColorSettings>;
|
||||||
|
|
||||||
export function GetSPEStatus():Promise<spe.Status>;
|
export function GetSPEStatus():Promise<spe.Status>;
|
||||||
|
|
||||||
export function GetScpStatus():Promise<main.ScpStatus>;
|
export function GetScpStatus():Promise<main.ScpStatus>;
|
||||||
@@ -487,6 +510,8 @@ export function GetSlotStats():Promise<qso.SlotStats>;
|
|||||||
|
|
||||||
export function GetSolarData():Promise<solar.Data>;
|
export function GetSolarData():Promise<solar.Data>;
|
||||||
|
|
||||||
|
export function GetSpotTTLMinutes():Promise<number>;
|
||||||
|
|
||||||
export function GetStartupStatus():Promise<main.StartupStatus>;
|
export function GetStartupStatus():Promise<main.StartupStatus>;
|
||||||
|
|
||||||
export function GetStationDevices():Promise<Array<main.StationDevice>>;
|
export function GetStationDevices():Promise<Array<main.StationDevice>>;
|
||||||
@@ -509,6 +534,10 @@ export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
|
|||||||
|
|
||||||
export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>;
|
export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>;
|
||||||
|
|
||||||
|
export function GetWebPublishConfig():Promise<webpub.Config>;
|
||||||
|
|
||||||
|
export function GetWebPublishStatus():Promise<main.WebPublishStatus>;
|
||||||
|
|
||||||
export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
|
export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
|
||||||
|
|
||||||
export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
||||||
@@ -667,10 +696,14 @@ export function LookupCallsign(arg1:string):Promise<lookup.Result>;
|
|||||||
|
|
||||||
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
|
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
|
||||||
|
|
||||||
|
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function MotorReadElements():Promise<Array<number>>;
|
export function MotorReadElements():Promise<Array<number>>;
|
||||||
|
|
||||||
export function MotorSetElement(arg1:number,arg2:number):Promise<void>;
|
export function MotorSetElement(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
|
export function MotorTuneKHz(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function MoveDatabase(arg1:string):Promise<void>;
|
export function MoveDatabase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function NetActivate(arg1:string):Promise<qso.QSO>;
|
export function NetActivate(arg1:string):Promise<qso.QSO>;
|
||||||
@@ -737,6 +770,10 @@ export function PickSaveDatabase():Promise<string>;
|
|||||||
|
|
||||||
export function PopulateBuiltinReferences(arg1:string):Promise<number>;
|
export function PopulateBuiltinReferences(arg1:string):Promise<number>;
|
||||||
|
|
||||||
|
export function PublishLogNow():Promise<string>;
|
||||||
|
|
||||||
|
export function QSLCopyTemplateToActiveProfile(arg1:number):Promise<number>;
|
||||||
|
|
||||||
export function QSLDefaultTemplateID():Promise<number>;
|
export function QSLDefaultTemplateID():Promise<number>;
|
||||||
|
|
||||||
export function QSLDeleteTemplate(arg1:number):Promise<void>;
|
export function QSLDeleteTemplate(arg1:number):Promise<void>;
|
||||||
@@ -751,6 +788,8 @@ export function QSLGetEmailTemplates():Promise<main.QSLEmailTemplates>;
|
|||||||
|
|
||||||
export function QSLGetTemplate(arg1:number):Promise<string>;
|
export function QSLGetTemplate(arg1:number):Promise<string>;
|
||||||
|
|
||||||
|
export function QSLListOtherProfileTemplates():Promise<Array<main.QSLForeignTemplate>>;
|
||||||
|
|
||||||
export function QSLListTemplates():Promise<Array<main.QSLTemplateInfo>>;
|
export function QSLListTemplates():Promise<Array<main.QSLTemplateInfo>>;
|
||||||
|
|
||||||
export function QSLPhotoDataURL(arg1:number,arg2:string):Promise<string>;
|
export function QSLPhotoDataURL(arg1:number,arg2:string):Promise<string>;
|
||||||
@@ -771,6 +810,8 @@ export function QSLSetDefaultTemplate(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function QSLStylePresets():Promise<Array<main.QSLPresetInfo>>;
|
export function QSLStylePresets():Promise<Array<main.QSLPresetInfo>>;
|
||||||
|
|
||||||
|
export function QSLViaRepairStatus():Promise<main.QSLViaRepairStatus>;
|
||||||
|
|
||||||
export function QSOAudioBegin():Promise<boolean>;
|
export function QSOAudioBegin():Promise<boolean>;
|
||||||
|
|
||||||
export function QSOAudioCancel():Promise<void>;
|
export function QSOAudioCancel():Promise<void>;
|
||||||
@@ -809,6 +850,8 @@ export function RenameLogbook(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
|
export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
|
||||||
|
|
||||||
|
export function RepairQSLVia():Promise<main.QSLViaRepairResult>;
|
||||||
|
|
||||||
export function ReplaceAwardReferences(arg1:string,arg2:Array<awardref.Ref>):Promise<number>;
|
export function ReplaceAwardReferences(arg1:string,arg2:Array<awardref.Ref>):Promise<number>;
|
||||||
|
|
||||||
export function ReportLiveActivity(arg1:number,arg2:string,arg3:string):Promise<void>;
|
export function ReportLiveActivity(arg1:number,arg2:string,arg3:string):Promise<void>;
|
||||||
@@ -863,6 +906,8 @@ export function SaveAwardReference(arg1:string,arg2:awardref.Ref):Promise<void>;
|
|||||||
|
|
||||||
export function SaveBackupSettings(arg1:main.BackupSettings):Promise<void>;
|
export function SaveBackupSettings(arg1:main.BackupSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveBandOpenSettings(arg1:main.BandOpenSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveCATSettings(arg1:main.CATSettings):Promise<void>;
|
export function SaveCATSettings(arg1:main.CATSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveCabrilloFile():Promise<string>;
|
export function SaveCabrilloFile():Promise<string>;
|
||||||
@@ -899,6 +944,8 @@ export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
|
|||||||
|
|
||||||
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
||||||
@@ -913,6 +960,8 @@ export function SaveUDPIntegration(arg1:udp.Config):Promise<udp.Config>;
|
|||||||
|
|
||||||
export function SaveUltrabeamSettings(arg1:main.UltrabeamSettings):Promise<void>;
|
export function SaveUltrabeamSettings(arg1:main.UltrabeamSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveWebPublishConfig(arg1:webpub.Config):Promise<void>;
|
||||||
|
|
||||||
export function SaveWinkeyerSettings(arg1:main.WinkeyerSettings):Promise<void>;
|
export function SaveWinkeyerSettings(arg1:main.WinkeyerSettings):Promise<void>;
|
||||||
|
|
||||||
export function ScpLookup(arg1:string):Promise<scp.Result>;
|
export function ScpLookup(arg1:string):Promise<scp.Result>;
|
||||||
@@ -943,24 +992,34 @@ export function SetCIVTrace(arg1:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function SetCWDecoderPitch(arg1:number):Promise<void>;
|
export function SetCWDecoderPitch(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetChaseNewGrids(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
|
export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetCompactHeight(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetCompactMode(arg1:boolean):Promise<void>;
|
export function SetCompactMode(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||||
|
|
||||||
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetLinkedAmps(arg1:Array<string>):Promise<void>;
|
||||||
|
|
||||||
|
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetPassphrase(arg1:string):Promise<void>;
|
export function SetPassphrase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
||||||
@@ -1047,6 +1106,8 @@ export function TestStationDevice(arg1:main.StationDevice):Promise<main.StationT
|
|||||||
|
|
||||||
export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
|
export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function TestWebPublishFTP(arg1:webpub.Config):Promise<string>;
|
||||||
|
|
||||||
export function TuneYaesuATU():Promise<void>;
|
export function TuneYaesuATU():Promise<void>;
|
||||||
|
|
||||||
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
||||||
@@ -1079,6 +1140,8 @@ export function UploadCallsign(arg1:string):Promise<string>;
|
|||||||
|
|
||||||
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
|
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
|
||||||
|
|
||||||
|
export function WebPublishColumns():Promise<Array<Record<string, string>>>;
|
||||||
|
|
||||||
export function WinkeyerBackspace():Promise<void>;
|
export function WinkeyerBackspace():Promise<void>;
|
||||||
|
|
||||||
export function WinkeyerConnect():Promise<void>;
|
export function WinkeyerConnect():Promise<void>;
|
||||||
|
|||||||
@@ -118,6 +118,10 @@ export function AwardsFolder() {
|
|||||||
return window['go']['main']['App']['AwardsFolder']();
|
return window['go']['main']['App']['AwardsFolder']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function BackfillDistances() {
|
||||||
|
return window['go']['main']['App']['BackfillDistances']();
|
||||||
|
}
|
||||||
|
|
||||||
export function BackfillUSCounties() {
|
export function BackfillUSCounties() {
|
||||||
return window['go']['main']['App']['BackfillUSCounties']();
|
return window['go']['main']['App']['BackfillUSCounties']();
|
||||||
}
|
}
|
||||||
@@ -290,6 +294,10 @@ export function DismissAwardUpdate(arg1) {
|
|||||||
return window['go']['main']['App']['DismissAwardUpdate'](arg1);
|
return window['go']['main']['App']['DismissAwardUpdate'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function DismissQSLViaRepair() {
|
||||||
|
return window['go']['main']['App']['DismissQSLViaRepair']();
|
||||||
|
}
|
||||||
|
|
||||||
export function DownloadAllReferenceLists() {
|
export function DownloadAllReferenceLists() {
|
||||||
return window['go']['main']['App']['DownloadAllReferenceLists']();
|
return window['go']['main']['App']['DownloadAllReferenceLists']();
|
||||||
}
|
}
|
||||||
@@ -718,6 +726,14 @@ export function GetBackupSettings() {
|
|||||||
return window['go']['main']['App']['GetBackupSettings']();
|
return window['go']['main']['App']['GetBackupSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetBandOpenSettings() {
|
||||||
|
return window['go']['main']['App']['GetBandOpenSettings']();
|
||||||
|
}
|
||||||
|
|
||||||
|
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']();
|
||||||
}
|
}
|
||||||
@@ -738,6 +754,10 @@ export function GetChangelog() {
|
|||||||
return window['go']['main']['App']['GetChangelog']();
|
return window['go']['main']['App']['GetChangelog']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetChaseNewGrids() {
|
||||||
|
return window['go']['main']['App']['GetChaseNewGrids']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetChatHistory(arg1) {
|
export function GetChatHistory(arg1) {
|
||||||
return window['go']['main']['App']['GetChatHistory'](arg1);
|
return window['go']['main']['App']['GetChatHistory'](arg1);
|
||||||
}
|
}
|
||||||
@@ -810,14 +830,26 @@ export function GetFlexState() {
|
|||||||
return window['go']['main']['App']['GetFlexState']();
|
return window['go']['main']['App']['GetFlexState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetGridCacheStatus() {
|
||||||
|
return window['go']['main']['App']['GetGridCacheStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetIcomState() {
|
export function GetIcomState() {
|
||||||
return window['go']['main']['App']['GetIcomState']();
|
return window['go']['main']['App']['GetIcomState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetLinkedAmps() {
|
||||||
|
return window['go']['main']['App']['GetLinkedAmps']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetListsSettings() {
|
export function GetListsSettings() {
|
||||||
return window['go']['main']['App']['GetListsSettings']();
|
return window['go']['main']['App']['GetListsSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetLiveOpenings() {
|
||||||
|
return window['go']['main']['App']['GetLiveOpenings']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetLiveStations() {
|
export function GetLiveStations() {
|
||||||
return window['go']['main']['App']['GetLiveStations']();
|
return window['go']['main']['App']['GetLiveStations']();
|
||||||
}
|
}
|
||||||
@@ -870,6 +902,10 @@ export function GetPOTAToken() {
|
|||||||
return window['go']['main']['App']['GetPOTAToken']();
|
return window['go']['main']['App']['GetPOTAToken']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetPSKReporterStatus() {
|
||||||
|
return window['go']['main']['App']['GetPSKReporterStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetPendingQSOs() {
|
export function GetPendingQSOs() {
|
||||||
return window['go']['main']['App']['GetPendingQSOs']();
|
return window['go']['main']['App']['GetPendingQSOs']();
|
||||||
}
|
}
|
||||||
@@ -898,6 +934,10 @@ export function GetRotators() {
|
|||||||
return window['go']['main']['App']['GetRotators']();
|
return window['go']['main']['App']['GetRotators']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetRowColors() {
|
||||||
|
return window['go']['main']['App']['GetRowColors']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetSPEStatus() {
|
export function GetSPEStatus() {
|
||||||
return window['go']['main']['App']['GetSPEStatus']();
|
return window['go']['main']['App']['GetSPEStatus']();
|
||||||
}
|
}
|
||||||
@@ -922,6 +962,10 @@ export function GetSolarData() {
|
|||||||
return window['go']['main']['App']['GetSolarData']();
|
return window['go']['main']['App']['GetSolarData']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetSpotTTLMinutes() {
|
||||||
|
return window['go']['main']['App']['GetSpotTTLMinutes']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetStartupStatus() {
|
export function GetStartupStatus() {
|
||||||
return window['go']['main']['App']['GetStartupStatus']();
|
return window['go']['main']['App']['GetStartupStatus']();
|
||||||
}
|
}
|
||||||
@@ -966,6 +1010,14 @@ export function GetUltrabeamStatus() {
|
|||||||
return window['go']['main']['App']['GetUltrabeamStatus']();
|
return window['go']['main']['App']['GetUltrabeamStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetWebPublishConfig() {
|
||||||
|
return window['go']['main']['App']['GetWebPublishConfig']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetWebPublishStatus() {
|
||||||
|
return window['go']['main']['App']['GetWebPublishStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetWhatsNew() {
|
export function GetWhatsNew() {
|
||||||
return window['go']['main']['App']['GetWhatsNew']();
|
return window['go']['main']['App']['GetWhatsNew']();
|
||||||
}
|
}
|
||||||
@@ -1282,6 +1334,10 @@ export function LookupCallsignFresh(arg1) {
|
|||||||
return window['go']['main']['App']['LookupCallsignFresh'](arg1);
|
return window['go']['main']['App']['LookupCallsignFresh'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function MotorNudgeKHz(arg1) {
|
||||||
|
return window['go']['main']['App']['MotorNudgeKHz'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function MotorReadElements() {
|
export function MotorReadElements() {
|
||||||
return window['go']['main']['App']['MotorReadElements']();
|
return window['go']['main']['App']['MotorReadElements']();
|
||||||
}
|
}
|
||||||
@@ -1290,6 +1346,10 @@ export function MotorSetElement(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['MotorSetElement'](arg1, arg2);
|
return window['go']['main']['App']['MotorSetElement'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function MotorTuneKHz(arg1) {
|
||||||
|
return window['go']['main']['App']['MotorTuneKHz'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function MoveDatabase(arg1) {
|
export function MoveDatabase(arg1) {
|
||||||
return window['go']['main']['App']['MoveDatabase'](arg1);
|
return window['go']['main']['App']['MoveDatabase'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1422,6 +1482,14 @@ export function PopulateBuiltinReferences(arg1) {
|
|||||||
return window['go']['main']['App']['PopulateBuiltinReferences'](arg1);
|
return window['go']['main']['App']['PopulateBuiltinReferences'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function PublishLogNow() {
|
||||||
|
return window['go']['main']['App']['PublishLogNow']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function QSLCopyTemplateToActiveProfile(arg1) {
|
||||||
|
return window['go']['main']['App']['QSLCopyTemplateToActiveProfile'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function QSLDefaultTemplateID() {
|
export function QSLDefaultTemplateID() {
|
||||||
return window['go']['main']['App']['QSLDefaultTemplateID']();
|
return window['go']['main']['App']['QSLDefaultTemplateID']();
|
||||||
}
|
}
|
||||||
@@ -1450,6 +1518,10 @@ export function QSLGetTemplate(arg1) {
|
|||||||
return window['go']['main']['App']['QSLGetTemplate'](arg1);
|
return window['go']['main']['App']['QSLGetTemplate'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function QSLListOtherProfileTemplates() {
|
||||||
|
return window['go']['main']['App']['QSLListOtherProfileTemplates']();
|
||||||
|
}
|
||||||
|
|
||||||
export function QSLListTemplates() {
|
export function QSLListTemplates() {
|
||||||
return window['go']['main']['App']['QSLListTemplates']();
|
return window['go']['main']['App']['QSLListTemplates']();
|
||||||
}
|
}
|
||||||
@@ -1490,6 +1562,10 @@ export function QSLStylePresets() {
|
|||||||
return window['go']['main']['App']['QSLStylePresets']();
|
return window['go']['main']['App']['QSLStylePresets']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function QSLViaRepairStatus() {
|
||||||
|
return window['go']['main']['App']['QSLViaRepairStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function QSOAudioBegin() {
|
export function QSOAudioBegin() {
|
||||||
return window['go']['main']['App']['QSOAudioBegin']();
|
return window['go']['main']['App']['QSOAudioBegin']();
|
||||||
}
|
}
|
||||||
@@ -1566,6 +1642,10 @@ export function RenderEQSL(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['RenderEQSL'](arg1, arg2);
|
return window['go']['main']['App']['RenderEQSL'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RepairQSLVia() {
|
||||||
|
return window['go']['main']['App']['RepairQSLVia']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ReplaceAwardReferences(arg1, arg2) {
|
export function ReplaceAwardReferences(arg1, arg2) {
|
||||||
return window['go']['main']['App']['ReplaceAwardReferences'](arg1, arg2);
|
return window['go']['main']['App']['ReplaceAwardReferences'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -1674,6 +1754,10 @@ export function SaveBackupSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveBackupSettings'](arg1);
|
return window['go']['main']['App']['SaveBackupSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveBandOpenSettings(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveBandOpenSettings'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveCATSettings(arg1) {
|
export function SaveCATSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveCATSettings'](arg1);
|
return window['go']['main']['App']['SaveCATSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1746,6 +1830,10 @@ export function SaveRotators(arg1) {
|
|||||||
return window['go']['main']['App']['SaveRotators'](arg1);
|
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveRowColors(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveRowColors'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveSelfSpotSettings(arg1) {
|
export function SaveSelfSpotSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1774,6 +1862,10 @@ export function SaveUltrabeamSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveUltrabeamSettings'](arg1);
|
return window['go']['main']['App']['SaveUltrabeamSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveWebPublishConfig(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveWebPublishConfig'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveWinkeyerSettings(arg1) {
|
export function SaveWinkeyerSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveWinkeyerSettings'](arg1);
|
return window['go']['main']['App']['SaveWinkeyerSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1834,6 +1926,10 @@ export function SetCWDecoderPitch(arg1) {
|
|||||||
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
|
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetChaseNewGrids(arg1) {
|
||||||
|
return window['go']['main']['App']['SetChaseNewGrids'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetClublogCtyEnabled(arg1) {
|
export function SetClublogCtyEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1846,6 +1942,10 @@ export function SetClusterAutoConnect(arg1) {
|
|||||||
return window['go']['main']['App']['SetClusterAutoConnect'](arg1);
|
return window['go']['main']['App']['SetClusterAutoConnect'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetCompactHeight(arg1) {
|
||||||
|
return window['go']['main']['App']['SetCompactHeight'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetCompactMode(arg1) {
|
export function SetCompactMode(arg1) {
|
||||||
return window['go']['main']['App']['SetCompactMode'](arg1);
|
return window['go']['main']['App']['SetCompactMode'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1858,6 +1958,14 @@ export function SetKenwoodKeySpeed(arg1) {
|
|||||||
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetLinkedAmps(arg1) {
|
||||||
|
return window['go']['main']['App']['SetLinkedAmps'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetMotorFollow(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetOpsLogQSLReceived(arg1, arg2) {
|
export function SetOpsLogQSLReceived(arg1, arg2) {
|
||||||
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
|
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -1870,6 +1978,10 @@ export function SetScpEnabled(arg1) {
|
|||||||
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetSpotTTLMinutes(arg1) {
|
||||||
|
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1) {
|
export function SetTelemetryEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2042,6 +2154,10 @@ export function TestUltrabeam(arg1) {
|
|||||||
return window['go']['main']['App']['TestUltrabeam'](arg1);
|
return window['go']['main']['App']['TestUltrabeam'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function TestWebPublishFTP(arg1) {
|
||||||
|
return window['go']['main']['App']['TestWebPublishFTP'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function TuneYaesuATU() {
|
export function TuneYaesuATU() {
|
||||||
return window['go']['main']['App']['TuneYaesuATU']();
|
return window['go']['main']['App']['TuneYaesuATU']();
|
||||||
}
|
}
|
||||||
@@ -2106,6 +2222,10 @@ export function UploadQSOsManual(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
|
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function WebPublishColumns() {
|
||||||
|
return window['go']['main']['App']['WebPublishColumns']();
|
||||||
|
}
|
||||||
|
|
||||||
export function WinkeyerBackspace() {
|
export function WinkeyerBackspace() {
|
||||||
return window['go']['main']['App']['WinkeyerBackspace']();
|
return window['go']['main']['App']['WinkeyerBackspace']();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -677,6 +677,58 @@ export namespace awardref {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace bandopen {
|
||||||
|
|
||||||
|
export class Opening {
|
||||||
|
band: string;
|
||||||
|
calls: number;
|
||||||
|
median_km: number;
|
||||||
|
bearing_min: number;
|
||||||
|
bearing_max: number;
|
||||||
|
compass: string;
|
||||||
|
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.compass = source["compass"];
|
||||||
|
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 {
|
||||||
@@ -1279,6 +1331,7 @@ export namespace extsvc {
|
|||||||
upload_flags: string[];
|
upload_flags: string[];
|
||||||
write_log: boolean;
|
write_log: boolean;
|
||||||
auto_upload: boolean;
|
auto_upload: boolean;
|
||||||
|
on_air: boolean;
|
||||||
upload_mode: string;
|
upload_mode: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
@@ -1303,6 +1356,7 @@ export namespace extsvc {
|
|||||||
this.upload_flags = source["upload_flags"];
|
this.upload_flags = source["upload_flags"];
|
||||||
this.write_log = source["write_log"];
|
this.write_log = source["write_log"];
|
||||||
this.auto_upload = source["auto_upload"];
|
this.auto_upload = source["auto_upload"];
|
||||||
|
this.on_air = source["on_air"];
|
||||||
this.upload_mode = source["upload_mode"];
|
this.upload_mode = source["upload_mode"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1389,6 +1443,8 @@ export namespace lookup {
|
|||||||
cont?: string;
|
cont?: string;
|
||||||
email?: string;
|
email?: string;
|
||||||
qsl_via?: string;
|
qsl_via?: string;
|
||||||
|
web?: string;
|
||||||
|
zip?: string;
|
||||||
image_url?: string;
|
image_url?: string;
|
||||||
source: string;
|
source: string;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
@@ -1416,6 +1472,8 @@ export namespace lookup {
|
|||||||
this.cont = source["cont"];
|
this.cont = source["cont"];
|
||||||
this.email = source["email"];
|
this.email = source["email"];
|
||||||
this.qsl_via = source["qsl_via"];
|
this.qsl_via = source["qsl_via"];
|
||||||
|
this.web = source["web"];
|
||||||
|
this.zip = source["zip"];
|
||||||
this.image_url = source["image_url"];
|
this.image_url = source["image_url"];
|
||||||
this.source = source["source"];
|
this.source = source["source"];
|
||||||
this.fetched_at = this.convertValues(source["fetched_at"], null);
|
this.fetched_at = this.convertValues(source["fetched_at"], null);
|
||||||
@@ -1879,6 +1937,22 @@ export namespace main {
|
|||||||
this.to = source["to"];
|
this.to = source["to"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class BackfillDistancesResult {
|
||||||
|
scanned: number;
|
||||||
|
filled: number;
|
||||||
|
no_grid: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new BackfillDistancesResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.scanned = source["scanned"];
|
||||||
|
this.filled = source["filled"];
|
||||||
|
this.no_grid = source["no_grid"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class BackfillUSCountiesResult {
|
export class BackfillUSCountiesResult {
|
||||||
scanned: number;
|
scanned: number;
|
||||||
county: number;
|
county: number;
|
||||||
@@ -1921,6 +1995,22 @@ export namespace main {
|
|||||||
this.default_folder = source["default_folder"];
|
this.default_folder = source["default_folder"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class BandOpenSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
bands: string[];
|
||||||
|
available: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new BandOpenSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.bands = source["bands"];
|
||||||
|
this.available = source["available"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class CATSettings {
|
export class CATSettings {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
backend: string;
|
backend: string;
|
||||||
@@ -2335,6 +2425,22 @@ export namespace main {
|
|||||||
this.body = source["body"];
|
this.body = source["body"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class GridCacheStatus {
|
||||||
|
enabled: boolean;
|
||||||
|
known: number;
|
||||||
|
pending: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new GridCacheStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.known = source["known"];
|
||||||
|
this.pending = source["pending"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ModePreset {
|
export class ModePreset {
|
||||||
name: string;
|
name: string;
|
||||||
default_rst_sent?: string;
|
default_rst_sent?: string;
|
||||||
@@ -2437,6 +2543,7 @@ export namespace main {
|
|||||||
primary: string;
|
primary: string;
|
||||||
failsafe: string;
|
failsafe: string;
|
||||||
download_images: boolean;
|
download_images: boolean;
|
||||||
|
qrz_prefer_nickname: boolean;
|
||||||
cache_ttl_days: number;
|
cache_ttl_days: number;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
@@ -2452,6 +2559,7 @@ export namespace main {
|
|||||||
this.primary = source["primary"];
|
this.primary = source["primary"];
|
||||||
this.failsafe = source["failsafe"];
|
this.failsafe = source["failsafe"];
|
||||||
this.download_images = source["download_images"];
|
this.download_images = source["download_images"];
|
||||||
|
this.qrz_prefer_nickname = source["qrz_prefer_nickname"];
|
||||||
this.cache_ttl_days = source["cache_ttl_days"];
|
this.cache_ttl_days = source["cache_ttl_days"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2677,6 +2785,24 @@ export namespace main {
|
|||||||
this.data_b64 = source["data_b64"];
|
this.data_b64 = source["data_b64"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class QSLForeignTemplate {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
profile_id: number;
|
||||||
|
profile_name: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new QSLForeignTemplate(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.profile_id = source["profile_id"];
|
||||||
|
this.profile_name = source["profile_name"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class QSLPresetInfo {
|
export class QSLPresetInfo {
|
||||||
name: string;
|
name: string;
|
||||||
label: string;
|
label: string;
|
||||||
@@ -2733,6 +2859,32 @@ export namespace main {
|
|||||||
this.updated_at = source["updated_at"];
|
this.updated_at = source["updated_at"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class QSLViaRepairResult {
|
||||||
|
moved: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new QSLViaRepairResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.moved = source["moved"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class QSLViaRepairStatus {
|
||||||
|
affected: number;
|
||||||
|
asked: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new QSLViaRepairStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.affected = source["affected"];
|
||||||
|
this.asked = source["asked"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class QSOAwardRef {
|
export class QSOAwardRef {
|
||||||
code: string;
|
code: string;
|
||||||
ref: string;
|
ref: string;
|
||||||
@@ -2888,6 +3040,64 @@ export namespace main {
|
|||||||
this.motorized = source["motorized"];
|
this.motorized = source["motorized"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class RowColorRule {
|
||||||
|
id: string;
|
||||||
|
color: string;
|
||||||
|
enabled: boolean;
|
||||||
|
channels: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RowColorRule(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.color = source["color"];
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.channels = source["channels"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class RowColorSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
style: string;
|
||||||
|
intensity: number;
|
||||||
|
bandmap_lotw: boolean;
|
||||||
|
configured: boolean;
|
||||||
|
rules: RowColorRule[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RowColorSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.style = source["style"];
|
||||||
|
this.intensity = source["intensity"];
|
||||||
|
this.bandmap_lotw = source["bandmap_lotw"];
|
||||||
|
this.configured = source["configured"];
|
||||||
|
this.rules = this.convertValues(source["rules"], RowColorRule);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 class ScpStatus {
|
export class ScpStatus {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
count: number;
|
count: number;
|
||||||
@@ -2937,6 +3147,7 @@ export namespace main {
|
|||||||
band: string;
|
band: string;
|
||||||
mode: string;
|
mode: string;
|
||||||
pota_ref?: string;
|
pota_ref?: string;
|
||||||
|
spotter?: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new SpotQuery(source);
|
return new SpotQuery(source);
|
||||||
@@ -2948,6 +3159,7 @@ export namespace main {
|
|||||||
this.band = source["band"];
|
this.band = source["band"];
|
||||||
this.mode = source["mode"];
|
this.mode = source["mode"];
|
||||||
this.pota_ref = source["pota_ref"];
|
this.pota_ref = source["pota_ref"];
|
||||||
|
this.spotter = source["spotter"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class SpotStatus {
|
export class SpotStatus {
|
||||||
@@ -2959,9 +3171,16 @@ 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;
|
||||||
|
grid?: string;
|
||||||
|
new_grid: boolean;
|
||||||
|
spotter_continent?: string;
|
||||||
|
lotw: 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 +3196,16 @@ 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.grid = source["grid"];
|
||||||
|
this.new_grid = source["new_grid"];
|
||||||
|
this.spotter_continent = source["spotter_continent"];
|
||||||
|
this.lotw = source["lotw"];
|
||||||
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 {
|
||||||
@@ -3110,6 +3336,7 @@ export namespace main {
|
|||||||
my_country: string;
|
my_country: string;
|
||||||
my_sota_ref: string;
|
my_sota_ref: string;
|
||||||
my_pota_ref: string;
|
my_pota_ref: string;
|
||||||
|
my_iota: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new StationSettings(source);
|
return new StationSettings(source);
|
||||||
@@ -3123,6 +3350,7 @@ export namespace main {
|
|||||||
this.my_country = source["my_country"];
|
this.my_country = source["my_country"];
|
||||||
this.my_sota_ref = source["my_sota_ref"];
|
this.my_sota_ref = source["my_sota_ref"];
|
||||||
this.my_pota_ref = source["my_pota_ref"];
|
this.my_pota_ref = source["my_pota_ref"];
|
||||||
|
this.my_iota = source["my_iota"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class StationTestResult {
|
export class StationTestResult {
|
||||||
@@ -3160,6 +3388,7 @@ export namespace main {
|
|||||||
export class ULSStatusResult {
|
export class ULSStatusResult {
|
||||||
count: number;
|
count: number;
|
||||||
updated_at: string;
|
updated_at: string;
|
||||||
|
needs_refresh: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new ULSStatusResult(source);
|
return new ULSStatusResult(source);
|
||||||
@@ -3169,6 +3398,7 @@ export namespace main {
|
|||||||
if ('string' === typeof source) source = JSON.parse(source);
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
this.count = source["count"];
|
this.count = source["count"];
|
||||||
this.updated_at = source["updated_at"];
|
this.updated_at = source["updated_at"];
|
||||||
|
this.needs_refresh = source["needs_refresh"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class UltrabeamSettings {
|
export class UltrabeamSettings {
|
||||||
@@ -3181,8 +3411,10 @@ export namespace main {
|
|||||||
baud: number;
|
baud: number;
|
||||||
follow: boolean;
|
follow: boolean;
|
||||||
step_khz: number;
|
step_khz: number;
|
||||||
|
track_mode: string;
|
||||||
tx_inhibit: boolean;
|
tx_inhibit: boolean;
|
||||||
bands: string[];
|
bands: string[];
|
||||||
|
band_freqs: Record<string, number>;
|
||||||
freq_min_mhz: number;
|
freq_min_mhz: number;
|
||||||
freq_max_mhz: number;
|
freq_max_mhz: number;
|
||||||
|
|
||||||
@@ -3201,8 +3433,10 @@ export namespace main {
|
|||||||
this.baud = source["baud"];
|
this.baud = source["baud"];
|
||||||
this.follow = source["follow"];
|
this.follow = source["follow"];
|
||||||
this.step_khz = source["step_khz"];
|
this.step_khz = source["step_khz"];
|
||||||
|
this.track_mode = source["track_mode"];
|
||||||
this.tx_inhibit = source["tx_inhibit"];
|
this.tx_inhibit = source["tx_inhibit"];
|
||||||
this.bands = source["bands"];
|
this.bands = source["bands"];
|
||||||
|
this.band_freqs = source["band_freqs"];
|
||||||
this.freq_min_mhz = source["freq_min_mhz"];
|
this.freq_min_mhz = source["freq_min_mhz"];
|
||||||
this.freq_max_mhz = source["freq_max_mhz"];
|
this.freq_max_mhz = source["freq_max_mhz"];
|
||||||
}
|
}
|
||||||
@@ -3216,6 +3450,11 @@ export namespace main {
|
|||||||
band: number;
|
band: number;
|
||||||
moving: boolean;
|
moving: boolean;
|
||||||
elements: number[];
|
elements: number[];
|
||||||
|
follow: boolean;
|
||||||
|
step_khz: number;
|
||||||
|
track_mode: string;
|
||||||
|
bands: string[];
|
||||||
|
band_freqs: Record<string, number>;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new UltrabeamStatusInfo(source);
|
return new UltrabeamStatusInfo(source);
|
||||||
@@ -3231,6 +3470,11 @@ export namespace main {
|
|||||||
this.band = source["band"];
|
this.band = source["band"];
|
||||||
this.moving = source["moving"];
|
this.moving = source["moving"];
|
||||||
this.elements = source["elements"];
|
this.elements = source["elements"];
|
||||||
|
this.follow = source["follow"];
|
||||||
|
this.step_khz = source["step_khz"];
|
||||||
|
this.track_mode = source["track_mode"];
|
||||||
|
this.bands = source["bands"];
|
||||||
|
this.band_freqs = source["band_freqs"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class UpdateInfo {
|
export class UpdateInfo {
|
||||||
@@ -3267,6 +3511,20 @@ export namespace main {
|
|||||||
this.text = source["text"];
|
this.text = source["text"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class WebPublishStatus {
|
||||||
|
last_run: string;
|
||||||
|
last_err: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new WebPublishStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.last_run = source["last_run"];
|
||||||
|
this.last_err = source["last_err"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class WinkeyerSettings {
|
export class WinkeyerSettings {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
port: string;
|
port: string;
|
||||||
@@ -3633,6 +3891,7 @@ export namespace profile {
|
|||||||
my_city: string;
|
my_city: string;
|
||||||
my_postal_code: string;
|
my_postal_code: string;
|
||||||
my_sota_ref: string;
|
my_sota_ref: string;
|
||||||
|
my_iota: string;
|
||||||
my_pota_ref: string;
|
my_pota_ref: string;
|
||||||
my_rig: string;
|
my_rig: string;
|
||||||
my_antenna: string;
|
my_antenna: string;
|
||||||
@@ -3670,6 +3929,7 @@ export namespace profile {
|
|||||||
this.my_city = source["my_city"];
|
this.my_city = source["my_city"];
|
||||||
this.my_postal_code = source["my_postal_code"];
|
this.my_postal_code = source["my_postal_code"];
|
||||||
this.my_sota_ref = source["my_sota_ref"];
|
this.my_sota_ref = source["my_sota_ref"];
|
||||||
|
this.my_iota = source["my_iota"];
|
||||||
this.my_pota_ref = source["my_pota_ref"];
|
this.my_pota_ref = source["my_pota_ref"];
|
||||||
this.my_rig = source["my_rig"];
|
this.my_rig = source["my_rig"];
|
||||||
this.my_antenna = source["my_antenna"];
|
this.my_antenna = source["my_antenna"];
|
||||||
@@ -3707,6 +3967,52 @@ export namespace profile {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace pskr {
|
||||||
|
|
||||||
|
export class Status {
|
||||||
|
running: boolean;
|
||||||
|
received: number;
|
||||||
|
// Go type: time
|
||||||
|
last_at: any;
|
||||||
|
last_err?: string;
|
||||||
|
broker: string;
|
||||||
|
bands: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Status(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.running = source["running"];
|
||||||
|
this.received = source["received"];
|
||||||
|
this.last_at = this.convertValues(source["last_at"], null);
|
||||||
|
this.last_err = source["last_err"];
|
||||||
|
this.broker = source["broker"];
|
||||||
|
this.bands = source["bands"];
|
||||||
|
}
|
||||||
|
|
||||||
|
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 qslcard {
|
export namespace qslcard {
|
||||||
|
|
||||||
export class Bevel {
|
export class Bevel {
|
||||||
@@ -4008,6 +4314,7 @@ export namespace qso {
|
|||||||
}
|
}
|
||||||
export class QSO {
|
export class QSO {
|
||||||
id: number;
|
id: number;
|
||||||
|
number?: number;
|
||||||
callsign: string;
|
callsign: string;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
qso_date: any;
|
qso_date: any;
|
||||||
@@ -4049,6 +4356,8 @@ export namespace qso {
|
|||||||
qsl_sent_date?: string;
|
qsl_sent_date?: string;
|
||||||
qsl_rcvd_date?: string;
|
qsl_rcvd_date?: string;
|
||||||
qsl_via?: string;
|
qsl_via?: string;
|
||||||
|
qsl_sent_via?: string;
|
||||||
|
qsl_rcvd_via?: string;
|
||||||
qsl_msg?: string;
|
qsl_msg?: string;
|
||||||
qslmsg_rcvd?: string;
|
qslmsg_rcvd?: string;
|
||||||
lotw_sent?: string;
|
lotw_sent?: string;
|
||||||
@@ -4148,6 +4457,7 @@ export namespace qso {
|
|||||||
constructor(source: any = {}) {
|
constructor(source: any = {}) {
|
||||||
if ('string' === typeof source) source = JSON.parse(source);
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
this.id = source["id"];
|
this.id = source["id"];
|
||||||
|
this.number = source["number"];
|
||||||
this.callsign = source["callsign"];
|
this.callsign = source["callsign"];
|
||||||
this.qso_date = this.convertValues(source["qso_date"], null);
|
this.qso_date = this.convertValues(source["qso_date"], null);
|
||||||
this.qso_date_off = this.convertValues(source["qso_date_off"], null);
|
this.qso_date_off = this.convertValues(source["qso_date_off"], null);
|
||||||
@@ -4187,6 +4497,8 @@ export namespace qso {
|
|||||||
this.qsl_sent_date = source["qsl_sent_date"];
|
this.qsl_sent_date = source["qsl_sent_date"];
|
||||||
this.qsl_rcvd_date = source["qsl_rcvd_date"];
|
this.qsl_rcvd_date = source["qsl_rcvd_date"];
|
||||||
this.qsl_via = source["qsl_via"];
|
this.qsl_via = source["qsl_via"];
|
||||||
|
this.qsl_sent_via = source["qsl_sent_via"];
|
||||||
|
this.qsl_rcvd_via = source["qsl_rcvd_via"];
|
||||||
this.qsl_msg = source["qsl_msg"];
|
this.qsl_msg = source["qsl_msg"];
|
||||||
this.qslmsg_rcvd = source["qslmsg_rcvd"];
|
this.qslmsg_rcvd = source["qslmsg_rcvd"];
|
||||||
this.lotw_sent = source["lotw_sent"];
|
this.lotw_sent = source["lotw_sent"];
|
||||||
@@ -4813,6 +5125,53 @@ export namespace udp {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace webpub {
|
||||||
|
|
||||||
|
export class Config {
|
||||||
|
enabled: boolean;
|
||||||
|
format: string;
|
||||||
|
folder: string;
|
||||||
|
file_name: string;
|
||||||
|
title: string;
|
||||||
|
count: number;
|
||||||
|
interval_min: number;
|
||||||
|
columns: string[];
|
||||||
|
ftp_enabled: boolean;
|
||||||
|
ftp_host: string;
|
||||||
|
ftp_port: number;
|
||||||
|
ftp_user: string;
|
||||||
|
ftp_password: string;
|
||||||
|
ftp_tls: boolean;
|
||||||
|
ftp_folder: string;
|
||||||
|
ftp_file_name: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Config(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.format = source["format"];
|
||||||
|
this.folder = source["folder"];
|
||||||
|
this.file_name = source["file_name"];
|
||||||
|
this.title = source["title"];
|
||||||
|
this.count = source["count"];
|
||||||
|
this.interval_min = source["interval_min"];
|
||||||
|
this.columns = source["columns"];
|
||||||
|
this.ftp_enabled = source["ftp_enabled"];
|
||||||
|
this.ftp_host = source["ftp_host"];
|
||||||
|
this.ftp_port = source["ftp_port"];
|
||||||
|
this.ftp_user = source["ftp_user"];
|
||||||
|
this.ftp_password = source["ftp_password"];
|
||||||
|
this.ftp_tls = source["ftp_tls"];
|
||||||
|
this.ftp_folder = source["ftp_folder"];
|
||||||
|
this.ftp_file_name = source["ftp_file_name"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace winkeyer {
|
export namespace winkeyer {
|
||||||
|
|
||||||
export class Status {
|
export class Status {
|
||||||
|
|||||||
@@ -4,14 +4,16 @@ go 1.25.0
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/braheezy/shine-mp3 v0.1.0
|
github.com/braheezy/shine-mp3 v0.1.0
|
||||||
|
github.com/eclipse/paho.mqtt.golang v1.5.1
|
||||||
github.com/go-ole/go-ole v1.3.0
|
github.com/go-ole/go-ole v1.3.0
|
||||||
github.com/go-sql-driver/mysql v1.10.0
|
github.com/go-sql-driver/mysql v1.10.0
|
||||||
github.com/gorilla/websocket v1.5.3
|
github.com/gorilla/websocket v1.5.3
|
||||||
|
github.com/jlaffaye/ftp v0.2.2
|
||||||
github.com/moutend/go-wca v0.3.0
|
github.com/moutend/go-wca v0.3.0
|
||||||
github.com/wailsapp/wails/v2 v2.11.0
|
github.com/wailsapp/wails/v2 v2.11.0
|
||||||
github.com/wneessen/go-mail v0.7.3
|
github.com/wneessen/go-mail v0.7.3
|
||||||
go.bug.st/serial v1.7.1
|
go.bug.st/serial v1.7.1
|
||||||
golang.org/x/net v0.35.0
|
golang.org/x/net v0.44.0
|
||||||
golang.org/x/sys v0.45.0
|
golang.org/x/sys v0.45.0
|
||||||
golang.org/x/text v0.37.0
|
golang.org/x/text v0.37.0
|
||||||
modernc.org/sqlite v1.50.1
|
modernc.org/sqlite v1.50.1
|
||||||
@@ -43,7 +45,8 @@ require (
|
|||||||
github.com/valyala/fasttemplate v1.2.2 // indirect
|
github.com/valyala/fasttemplate v1.2.2 // indirect
|
||||||
github.com/wailsapp/go-webview2 v1.0.22 // indirect
|
github.com/wailsapp/go-webview2 v1.0.22 // indirect
|
||||||
github.com/wailsapp/mimetype v1.4.1 // indirect
|
github.com/wailsapp/mimetype v1.4.1 // indirect
|
||||||
golang.org/x/crypto v0.33.0 // indirect
|
golang.org/x/crypto v0.42.0 // indirect
|
||||||
|
golang.org/x/sync v0.20.0 // indirect
|
||||||
modernc.org/libc v1.72.3 // indirect
|
modernc.org/libc v1.72.3 // indirect
|
||||||
modernc.org/mathutil v1.7.1 // indirect
|
modernc.org/mathutil v1.7.1 // indirect
|
||||||
modernc.org/memory v1.11.0 // indirect
|
modernc.org/memory v1.11.0 // indirect
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
|
github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
|
||||||
|
github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
|
||||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||||
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
||||||
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
|
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
|
||||||
@@ -25,6 +27,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs
|
|||||||
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
|
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
|
||||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
||||||
|
github.com/jlaffaye/ftp v0.2.2 h1:JwjrXCAIjN9ZYrF1/8qlmHFXDteh9MHYaiEIh/Oqtd8=
|
||||||
|
github.com/jlaffaye/ftp v0.2.2/go.mod h1:zuLAKdqFqFvNgkCrH0SC7K1XyUiydS7BFCmmoHUWWg0=
|
||||||
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
|
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
|
||||||
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
|
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
|
||||||
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
||||||
@@ -64,8 +68,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
|||||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||||
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
|
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
|
||||||
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
|
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
|
||||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
|
github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
|
||||||
github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
|
github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
|
||||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||||
@@ -82,13 +86,13 @@ github.com/wneessen/go-mail v0.7.3 h1:g3DravXC5SMlVdboFrQA8Jx95A8sOzoBeS5F+vzNRK
|
|||||||
github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk=
|
github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk=
|
||||||
go.bug.st/serial v1.7.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc=
|
go.bug.st/serial v1.7.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc=
|
||||||
go.bug.st/serial v1.7.1/go.mod h1:d0MmS16Qt9b1m06yoYRNUXhRRTJV5Qg2S5EKqQtnayQ=
|
go.bug.st/serial v1.7.1/go.mod h1:d0MmS16Qt9b1m06yoYRNUXhRRTJV5Qg2S5EKqQtnayQ=
|
||||||
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
|
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
|
||||||
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
|
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
|
||||||
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
|
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
|
||||||
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
|
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
|
||||||
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
|
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
|
||||||
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
|
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
|
||||||
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
|
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
|
||||||
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// HRDLog "ON AIR" — publishing the live frequency, mode and rig on hrdlog.net,
|
||||||
|
// so the site shows "F4BPO is on air 14,074,000 FT8 IC-7300" while the station
|
||||||
|
// is operating.
|
||||||
|
//
|
||||||
|
// The endpoint and its field names come from HRDLog's own library
|
||||||
|
// (github.com/iw1qlh/HRDLOG-net-library), not from reading someone's traffic.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/extsvc"
|
||||||
|
)
|
||||||
|
|
||||||
|
// onAirEvery is how often the status is refreshed. HRDLog drops a station from
|
||||||
|
// the on-air list when it stops hearing from it, so this is a heartbeat, not a
|
||||||
|
// change notification.
|
||||||
|
const onAirEvery = 2 * time.Minute
|
||||||
|
|
||||||
|
// hrdlogOnAirLoop publishes while the option is on and the rig is readable.
|
||||||
|
func (a *App) hrdlogOnAirLoop() {
|
||||||
|
defer func() { _ = recover() }() // never crash the app from a status broadcast
|
||||||
|
t := time.NewTicker(onAirEvery)
|
||||||
|
defer t.Stop()
|
||||||
|
for range t.C {
|
||||||
|
a.publishHRDLogOnAir()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// publishHRDLogOnAir sends one update. Silent when switched off, unconfigured,
|
||||||
|
// or when the rig has nothing to report — an announcement with no frequency
|
||||||
|
// would say the operator is on air on 0 Hz.
|
||||||
|
func (a *App) publishHRDLogOnAir() {
|
||||||
|
cfg := a.loadExternalServices().HRDLog
|
||||||
|
if !cfg.OnAir || strings.TrimSpace(cfg.Callsign) == "" || strings.TrimSpace(cfg.Code) == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if a.cat == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
st := a.cat.State()
|
||||||
|
if !st.Connected || st.FreqHz <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// The rig NAME as the operator knows it — that string is what the site
|
||||||
|
// displays. The active profile's MyRig first, since it is what every QSO is
|
||||||
|
// stamped with; the CAT backend's own model only when the profile has none.
|
||||||
|
radio := ""
|
||||||
|
if a.profiles != nil {
|
||||||
|
if pr, err := a.profiles.Active(a.ctx); err == nil {
|
||||||
|
radio = strings.TrimSpace(pr.MyRig)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if radio == "" {
|
||||||
|
radio = strings.TrimSpace(st.Rig)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
msg, err := extsvc.SendHRDLogOnAir(ctx, nil, cfg.Callsign, cfg.Code, st.FreqHz, st.Mode, radio)
|
||||||
|
if err != nil {
|
||||||
|
// Logged, never surfaced: this is a broadcast the operator did not ask
|
||||||
|
// for at this instant, and a toast every two minutes on a flaky link
|
||||||
|
// would be worse than the missing status.
|
||||||
|
applog.Printf("hrdlog on-air: %v (%s)", err, msg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("hrdlog on-air: %s %.3f MHz %s (%s) — %s",
|
||||||
|
cfg.Callsign, float64(st.FreqHz)/1e6, st.Mode, radio, msg)
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package adif
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// ADIF defines CNTY as "STATE,COUNTY" — "GA,BARROW". OpsLog exported the bare
|
||||||
|
// county, which a receiving logger cannot resolve: county names repeat across
|
||||||
|
// states, and there is a Washington County in thirty of them.
|
||||||
|
func TestADIFCountyFormat(t *testing.T) {
|
||||||
|
for _, tc := range []struct{ state, county, want string }{
|
||||||
|
{"GA", "BARROW", "GA,BARROW"},
|
||||||
|
{"ga", "Barrow", "GA,Barrow"}, // the state is a code, upper-cased; the name is not touched
|
||||||
|
{"", "BARROW", "BARROW"}, // no state known: a bare name beats nothing
|
||||||
|
{"GA", "", ""}, // no county: nothing to write
|
||||||
|
{"GA", "GA,BARROW", "GA,BARROW"}, // already formatted — never double the prefix
|
||||||
|
{" GA ", " BARROW ", "GA,BARROW"},
|
||||||
|
} {
|
||||||
|
if got := adifCounty(tc.state, tc.county); got != tc.want {
|
||||||
|
t.Errorf("adifCounty(%q, %q) = %q, want %q", tc.state, tc.county, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the mirror: a file from a logger that follows the standard must fill both
|
||||||
|
// columns, while a file carrying the bare county still imports unchanged.
|
||||||
|
func TestSplitADIFCounty(t *testing.T) {
|
||||||
|
for _, tc := range []struct{ in, county, state string }{
|
||||||
|
{"GA,BARROW", "BARROW", "GA"},
|
||||||
|
{"ga, Barrow", "Barrow", "GA"},
|
||||||
|
{"BARROW", "BARROW", ""}, // the old OpsLog form, and many other loggers
|
||||||
|
{"", "", ""},
|
||||||
|
{" ", "", ""},
|
||||||
|
} {
|
||||||
|
c, s := splitADIFCounty(tc.in)
|
||||||
|
if c != tc.county || s != tc.state {
|
||||||
|
t.Errorf("splitADIFCounty(%q) = (%q, %q), want (%q, %q)", tc.in, c, s, tc.county, tc.state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Round trip: what OpsLog writes, OpsLog reads back to the same two values.
|
||||||
|
func TestCountyRoundTrip(t *testing.T) {
|
||||||
|
c, s := splitADIFCounty(adifCounty("GA", "BARROW"))
|
||||||
|
if c != "BARROW" || s != "GA" {
|
||||||
|
t.Errorf("round trip gave (%q, %q), want (BARROW, GA)", c, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
+32
-2
@@ -221,7 +221,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
|||||||
w("VUCC_GRIDS", q.VUCCGrids)
|
w("VUCC_GRIDS", q.VUCCGrids)
|
||||||
w("COUNTRY", q.Country)
|
w("COUNTRY", q.Country)
|
||||||
w("STATE", q.State)
|
w("STATE", q.State)
|
||||||
w("CNTY", q.County)
|
w("CNTY", adifCounty(q.State, q.County))
|
||||||
wi("DXCC", q.DXCC)
|
wi("DXCC", q.DXCC)
|
||||||
w("CONT", q.Continent)
|
w("CONT", q.Continent)
|
||||||
wi("CQZ", q.CQZ)
|
wi("CQZ", q.CQZ)
|
||||||
@@ -241,6 +241,14 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
|||||||
w("QSLSDATE", q.QSLSentDate)
|
w("QSLSDATE", q.QSLSentDate)
|
||||||
w("QSLRDATE", q.QSLRcvdDate)
|
w("QSLRDATE", q.QSLRcvdDate)
|
||||||
w("QSL_VIA", q.QSLVia)
|
w("QSL_VIA", q.QSLVia)
|
||||||
|
// M (manager) is import-only in the QSL Via enumeration: we keep it when a
|
||||||
|
// file gives it to us, but a file we write must not carry it.
|
||||||
|
if q.QSLSentVia != QSLViaManager {
|
||||||
|
w("QSL_SENT_VIA", q.QSLSentVia)
|
||||||
|
}
|
||||||
|
if q.QSLRcvdVia != QSLViaManager {
|
||||||
|
w("QSL_RCVD_VIA", q.QSLRcvdVia)
|
||||||
|
}
|
||||||
w("QSLMSG", q.QSLMsg)
|
w("QSLMSG", q.QSLMsg)
|
||||||
w("QSLMSG_RCVD", q.QSLMsgRcvd)
|
w("QSLMSG_RCVD", q.QSLMsgRcvd)
|
||||||
w("LOTW_QSL_SENT", q.LOTWSent)
|
w("LOTW_QSL_SENT", q.LOTWSent)
|
||||||
@@ -285,7 +293,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
|||||||
w("MY_GRIDSQUARE_EXT", q.MyGridExt)
|
w("MY_GRIDSQUARE_EXT", q.MyGridExt)
|
||||||
w("MY_COUNTRY", q.MyCountry)
|
w("MY_COUNTRY", q.MyCountry)
|
||||||
w("MY_STATE", q.MyState)
|
w("MY_STATE", q.MyState)
|
||||||
w("MY_CNTY", q.MyCounty)
|
w("MY_CNTY", adifCounty(q.MyState, q.MyCounty))
|
||||||
w("MY_IOTA", q.MyIOTA)
|
w("MY_IOTA", q.MyIOTA)
|
||||||
w("MY_SOTA_REF", q.MySOTARef)
|
w("MY_SOTA_REF", q.MySOTARef)
|
||||||
w("MY_POTA_REF", q.MyPOTARef)
|
w("MY_POTA_REF", q.MyPOTARef)
|
||||||
@@ -413,3 +421,25 @@ func modeForExport(mode, submode string) (string, string) {
|
|||||||
}
|
}
|
||||||
return mode, ""
|
return mode, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// adifCounty renders CNTY the way ADIF specifies: "STATE,COUNTY", e.g.
|
||||||
|
// "GA,BARROW".
|
||||||
|
//
|
||||||
|
// OpsLog stores the two apart, and exported only the county — which a receiving
|
||||||
|
// logger cannot resolve, since county names repeat across states (there is a
|
||||||
|
// Washington County in thirty of them). The award engine here was never
|
||||||
|
// affected because it reads the columns, not the ADIF; the damage was to
|
||||||
|
// everyone we send a file to.
|
||||||
|
//
|
||||||
|
// The county alone is still written when no state is known: a bare name is
|
||||||
|
// worth more than nothing, and inventing a prefix would be worse than either.
|
||||||
|
// A county that ALREADY carries a comma is passed through — it has been
|
||||||
|
// formatted once, and doubling the prefix would corrupt it.
|
||||||
|
func adifCounty(state, county string) string {
|
||||||
|
c := strings.TrimSpace(county)
|
||||||
|
s := strings.TrimSpace(state)
|
||||||
|
if c == "" || s == "" || strings.Contains(c, ",") {
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
return strings.ToUpper(s) + "," + c
|
||||||
|
}
|
||||||
|
|||||||
@@ -135,8 +135,8 @@ var Fields = []FieldDef{
|
|||||||
{Name: "QSLSDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
{Name: "QSLSDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSLRDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
{Name: "QSLRDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSL_VIA", Kind: KindText, Category: "QSL", Promoted: true},
|
{Name: "QSL_VIA", Kind: KindText, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSL_SENT_VIA", Kind: KindEnum, Category: "QSL"},
|
{Name: "QSL_SENT_VIA", Kind: KindEnum, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSL_RCVD_VIA", Kind: KindEnum, Category: "QSL"},
|
{Name: "QSL_RCVD_VIA", Kind: KindEnum, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSLMSG", Kind: KindText, Category: "QSL", Promoted: true},
|
{Name: "QSLMSG", Kind: KindText, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSLMSG_INTL", Kind: KindText, Category: "QSL", Intl: true},
|
{Name: "QSLMSG_INTL", Kind: KindText, Category: "QSL", Intl: true},
|
||||||
{Name: "QSLMSG_RCVD", Kind: KindText, Category: "QSL", Promoted: true},
|
{Name: "QSLMSG_RCVD", Kind: KindText, Category: "QSL", Promoted: true},
|
||||||
|
|||||||
+39
-5
@@ -428,7 +428,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
|||||||
q.VUCCGrids = strings.ToUpper(rec["vucc_grids"])
|
q.VUCCGrids = strings.ToUpper(rec["vucc_grids"])
|
||||||
q.Country = rec["country"]
|
q.Country = rec["country"]
|
||||||
q.State = strings.ToUpper(rec["state"])
|
q.State = strings.ToUpper(rec["state"])
|
||||||
q.County = rec["cnty"]
|
q.County, _ = splitADIFCounty(rec["cnty"])
|
||||||
|
if st := rec["state"]; strings.TrimSpace(st) == "" {
|
||||||
|
if _, fromCnty := splitADIFCounty(rec["cnty"]); fromCnty != "" {
|
||||||
|
q.State = fromCnty
|
||||||
|
}
|
||||||
|
}
|
||||||
if v, ok := parseInt(rec["dxcc"]); ok {
|
if v, ok := parseInt(rec["dxcc"]); ok {
|
||||||
q.DXCC = &v
|
q.DXCC = &v
|
||||||
}
|
}
|
||||||
@@ -459,10 +464,17 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
|||||||
q.QSLRcvd = rec["qsl_rcvd"]
|
q.QSLRcvd = rec["qsl_rcvd"]
|
||||||
q.QSLSentDate = rec["qslsdate"]
|
q.QSLSentDate = rec["qslsdate"]
|
||||||
q.QSLRcvdDate = rec["qslrdate"]
|
q.QSLRcvdDate = rec["qslrdate"]
|
||||||
|
// QSL_VIA is the manager. QSL_SENT_VIA / QSL_RCVD_VIA are the routing
|
||||||
|
// method, an enumeration of their own.
|
||||||
|
//
|
||||||
|
// These used to be one field here: an empty QSL_VIA was filled from
|
||||||
|
// QSL_SENT_VIA, on the theory that loggers writing one meant the other.
|
||||||
|
// They do not — Log4OM defaults QSL_SENT_VIA to E, and the import put "E"
|
||||||
|
// where every panel in OpsLog shows the manager's callsign. Keeping them
|
||||||
|
// apart is also what lets an export give them back.
|
||||||
q.QSLVia = rec["qsl_via"]
|
q.QSLVia = rec["qsl_via"]
|
||||||
if q.QSLVia == "" { // many loggers (Log4OM) write QSL_SENT_VIA instead
|
q.QSLSentVia = NormaliseQSLVia(rec["qsl_sent_via"])
|
||||||
q.QSLVia = rec["qsl_sent_via"]
|
q.QSLRcvdVia = NormaliseQSLVia(rec["qsl_rcvd_via"])
|
||||||
}
|
|
||||||
q.QSLMsg = rec["qslmsg"]
|
q.QSLMsg = rec["qslmsg"]
|
||||||
q.QSLMsgRcvd = rec["qslmsg_rcvd"]
|
q.QSLMsgRcvd = rec["qslmsg_rcvd"]
|
||||||
q.LOTWSent = rec["lotw_qsl_sent"]
|
q.LOTWSent = rec["lotw_qsl_sent"]
|
||||||
@@ -515,7 +527,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
|||||||
q.MyGridExt = strings.ToUpper(rec["my_gridsquare_ext"])
|
q.MyGridExt = strings.ToUpper(rec["my_gridsquare_ext"])
|
||||||
q.MyCountry = rec["my_country"]
|
q.MyCountry = rec["my_country"]
|
||||||
q.MyState = strings.ToUpper(rec["my_state"])
|
q.MyState = strings.ToUpper(rec["my_state"])
|
||||||
q.MyCounty = rec["my_cnty"]
|
q.MyCounty, _ = splitADIFCounty(rec["my_cnty"])
|
||||||
|
if st := rec["my_state"]; strings.TrimSpace(st) == "" {
|
||||||
|
if _, fromCnty := splitADIFCounty(rec["my_cnty"]); fromCnty != "" {
|
||||||
|
q.MyState = fromCnty
|
||||||
|
}
|
||||||
|
}
|
||||||
q.MyIOTA = strings.ToUpper(rec["my_iota"])
|
q.MyIOTA = strings.ToUpper(rec["my_iota"])
|
||||||
q.MySOTARef = strings.ToUpper(rec["my_sota_ref"])
|
q.MySOTARef = strings.ToUpper(rec["my_sota_ref"])
|
||||||
q.MyPOTARef = strings.ToUpper(rec["my_pota_ref"])
|
q.MyPOTARef = strings.ToUpper(rec["my_pota_ref"])
|
||||||
@@ -698,3 +715,20 @@ var promotableSubmodes = map[string]bool{
|
|||||||
func submodeSubsumesParent(submode string) bool {
|
func submodeSubsumesParent(submode string) bool {
|
||||||
return promotableSubmodes[submode]
|
return promotableSubmodes[submode]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// splitADIFCounty reads CNTY, which ADIF defines as "STATE,COUNTY".
|
||||||
|
//
|
||||||
|
// Returns the county on its own plus the state the field carried, so an import
|
||||||
|
// from a logger that follows the standard fills BOTH columns here. Files that
|
||||||
|
// write the bare county — as OpsLog itself used to — still import unchanged.
|
||||||
|
//
|
||||||
|
// The state from the field never overrides an explicit STATE tag: STATE is the
|
||||||
|
// dedicated field and the more specific statement. It only fills a blank.
|
||||||
|
func splitADIFCounty(cnty string) (county, state string) {
|
||||||
|
cnty = strings.TrimSpace(cnty)
|
||||||
|
i := strings.Index(cnty, ",")
|
||||||
|
if i < 0 {
|
||||||
|
return cnty, ""
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(cnty[i+1:]), strings.ToUpper(strings.TrimSpace(cnty[:i]))
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package adif
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// The ADIF "QSL Via" enumeration, used by QSL_SENT_VIA and QSL_RCVD_VIA. It
|
||||||
|
// says how a card travelled, and is a different thing entirely from QSL_VIA,
|
||||||
|
// which is the manager's callsign.
|
||||||
|
const (
|
||||||
|
QSLViaBureau = "B"
|
||||||
|
QSLViaDirect = "D"
|
||||||
|
QSLViaElectronic = "E"
|
||||||
|
// QSLViaManager is import-only in the standard: it may be read from another
|
||||||
|
// logger's file, never written to one. OpsLog keeps it when it arrives so
|
||||||
|
// the operator's own data is not silently altered, and NormaliseQSLVia is
|
||||||
|
// the only place that decides so.
|
||||||
|
QSLViaManager = "M"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NormaliseQSLVia folds what other loggers and OpsLog's own older versions put
|
||||||
|
// in a routing field down to the ADIF enumeration.
|
||||||
|
//
|
||||||
|
// It accepts the letter, the English word, and the French one — OpsLog wrote
|
||||||
|
// "Bureau", "Direct" and "Electronic" in full for a long time, and the QSL
|
||||||
|
// Manager panel still shows those words to a French operator. Anything it does
|
||||||
|
// not recognise comes back empty rather than being passed through: this feeds
|
||||||
|
// an enumerated ADIF field, and inventing a value there breaks the file for
|
||||||
|
// every other logger that reads it.
|
||||||
|
func NormaliseQSLVia(s string) string {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(s)) {
|
||||||
|
case "B", "BUREAU", "BURO", "VIA BUREAU":
|
||||||
|
return QSLViaBureau
|
||||||
|
case "D", "DIRECT":
|
||||||
|
return QSLViaDirect
|
||||||
|
case "E", "ELECTRONIC", "ELECTRONIQUE", "ÉLECTRONIQUE", "OQRS":
|
||||||
|
return QSLViaElectronic
|
||||||
|
case "M", "MANAGER":
|
||||||
|
return QSLViaManager
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsQSLViaRouting reports whether a QSL_VIA value is in fact a routing method
|
||||||
|
// that ended up in the manager field.
|
||||||
|
//
|
||||||
|
// It exists for one repair: OpsLog's QSL Manager panel wrote "Bureau",
|
||||||
|
// "Direct" and "Electronic" into QSL_VIA, and imports folded QSL_SENT_VIA
|
||||||
|
// there too, so logs hold a mixture of managers and routing words in one
|
||||||
|
// column. A manager is a callsign, never one of these six words, so the test
|
||||||
|
// is exact — but it is deliberately narrow: anything else, including a manager
|
||||||
|
// whose callsign happens to be unusual, is left alone.
|
||||||
|
func IsQSLViaRouting(s string) bool {
|
||||||
|
return NormaliseQSLVia(s) != ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package adif
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestNormaliseQSLVia(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"B": "B", "b": "B", "Bureau": "B", "BUREAU": "B", " buro ": "B",
|
||||||
|
"D": "D", "Direct": "D", "direct": "D",
|
||||||
|
"E": "E", "Electronic": "E", "électronique": "E", "OQRS": "E",
|
||||||
|
"M": "M", "Manager": "M",
|
||||||
|
// A manager's callsign is not a routing method, and neither is noise.
|
||||||
|
"M0OXO": "", "EA5GL": "", "": "", "Bureau via M0OXO": "", "X": "",
|
||||||
|
} {
|
||||||
|
if got := NormaliseQSLVia(in); got != want {
|
||||||
|
t.Errorf("NormaliseQSLVia(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The repair moves values out of the manager column. A false positive would
|
||||||
|
// erase a real manager, so the guard is worth its own test: every callsign-like
|
||||||
|
// value must be refused.
|
||||||
|
func TestIsQSLViaRoutingRefusesManagers(t *testing.T) {
|
||||||
|
for _, call := range []string{
|
||||||
|
"M0OXO", "EA5GL", "F5CWU", "DJ9ZB", "W3HNK", "IK2DUW", "N7RO",
|
||||||
|
"BUREAU M0OXO", "via bureau DL1XYZ", "QSL DIRECT ONLY",
|
||||||
|
} {
|
||||||
|
if IsQSLViaRouting(call) {
|
||||||
|
t.Errorf("%q was taken for a routing method — the repair would erase it", call)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, v := range []string{"B", "D", "E", "M", "Bureau", "Direct", "Electronic"} {
|
||||||
|
if !IsQSLViaRouting(v) {
|
||||||
|
t.Errorf("%q should be recognised as a routing method", v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -119,3 +119,85 @@ func renderRecord(q qso.QSO, includeApp bool) string {
|
|||||||
bw.Flush()
|
bw.Flush()
|
||||||
return buf.String()
|
return buf.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestQSLViaFieldsRoundTrip covers the case reported as issue #16: a log
|
||||||
|
// exported by another logger carries a manager in QSL_VIA and a routing method
|
||||||
|
// in QSL_SENT_VIA, and the two must stay apart.
|
||||||
|
//
|
||||||
|
// Before this, QSL_SENT_VIA was folded into QSL_VIA whenever QSL_VIA was empty
|
||||||
|
// — so a Log4OM log, which defaults QSL_SENT_VIA to E, showed "E" wherever
|
||||||
|
// OpsLog displays the manager — and QSL_RCVD_VIA was thrown away outright: it
|
||||||
|
// was listed as a promoted field with no column behind it, so it was not even
|
||||||
|
// kept among the extras. Neither was ever exported, which made an import
|
||||||
|
// followed by an export destroy both.
|
||||||
|
func TestQSLViaFieldsRoundTrip(t *testing.T) {
|
||||||
|
in := qso.QSO{
|
||||||
|
Callsign: "3B9FR", Band: "20m", Mode: "CW",
|
||||||
|
QSODate: time.Date(2026, 6, 6, 12, 0, 0, 0, time.UTC),
|
||||||
|
QSLVia: "M0OXO", // the manager
|
||||||
|
QSLSentVia: "D", // sent direct
|
||||||
|
QSLRcvdVia: "B", // came back via the bureau
|
||||||
|
}
|
||||||
|
var buf bytes.Buffer
|
||||||
|
bw := bufio.NewWriter(&buf)
|
||||||
|
bw.WriteString("<EOH>\n")
|
||||||
|
writeRecord(bw, in, true, nil)
|
||||||
|
bw.Flush()
|
||||||
|
|
||||||
|
var rec Record
|
||||||
|
if err := Parse(strings.NewReader(buf.String()), func(r Record) error { rec = r; return nil }); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
out, ok := recordToQSO(rec)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("recordToQSO returned !ok")
|
||||||
|
}
|
||||||
|
for name, c := range map[string]struct{ got, want string }{
|
||||||
|
"QSL_VIA": {out.QSLVia, in.QSLVia},
|
||||||
|
"QSL_SENT_VIA": {out.QSLSentVia, in.QSLSentVia},
|
||||||
|
"QSL_RCVD_VIA": {out.QSLRcvdVia, in.QSLRcvdVia},
|
||||||
|
} {
|
||||||
|
if c.got != c.want {
|
||||||
|
t.Errorf("%s: got %q, want %q", name, c.got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestQSLSentViaDoesNotBecomeManager pins the exact shape a Log4OM export has:
|
||||||
|
// no QSL_VIA at all, QSL_SENT_VIA defaulted to E. The manager field must come
|
||||||
|
// back empty rather than holding "E".
|
||||||
|
func TestQSLSentViaDoesNotBecomeManager(t *testing.T) {
|
||||||
|
const rec = "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW" +
|
||||||
|
"<QSL_SENT_VIA:1>E<EOR>\n"
|
||||||
|
var got Record
|
||||||
|
if err := Parse(strings.NewReader("<EOH>\n"+rec), func(r Record) error { got = r; return nil }); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
q, ok := recordToQSO(got)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("recordToQSO returned !ok")
|
||||||
|
}
|
||||||
|
if q.QSLVia != "" {
|
||||||
|
t.Errorf("QSL_VIA = %q — the routing method leaked into the manager field again", q.QSLVia)
|
||||||
|
}
|
||||||
|
if q.QSLSentVia != "E" {
|
||||||
|
t.Errorf("QSL_SENT_VIA = %q, want %q", q.QSLSentVia, "E")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// M is import-only in the ADIF QSL Via enumeration: keep it when given, never
|
||||||
|
// write it back out.
|
||||||
|
func TestQSLViaManagerIsImportOnly(t *testing.T) {
|
||||||
|
in := qso.QSO{
|
||||||
|
Callsign: "3B9FR", Band: "20m", Mode: "CW",
|
||||||
|
QSODate: time.Date(2026, 6, 6, 12, 0, 0, 0, time.UTC),
|
||||||
|
QSLSentVia: "M", QSLRcvdVia: "M",
|
||||||
|
}
|
||||||
|
var buf bytes.Buffer
|
||||||
|
bw := bufio.NewWriter(&buf)
|
||||||
|
writeRecord(bw, in, true, nil)
|
||||||
|
bw.Flush()
|
||||||
|
if s := buf.String(); strings.Contains(s, "QSL_SENT_VIA") || strings.Contains(s, "QSL_RCVD_VIA") {
|
||||||
|
t.Errorf("exported an import-only value:\n%s", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+63
-9
@@ -449,6 +449,34 @@ type RefMeta struct {
|
|||||||
Pattern string
|
Pattern string
|
||||||
re *regexp.Regexp
|
re *regexp.Regexp
|
||||||
Valid bool
|
Valid bool
|
||||||
|
// Per-reference validity window, ISO "2006-01-02". A reference is not
|
||||||
|
// forever: a park is delisted, a county is merged, a castle loses its
|
||||||
|
// reference number. A QSO made while it existed still counts — it was a valid
|
||||||
|
// contact on the day — and one made after it stopped existing does not.
|
||||||
|
//
|
||||||
|
// Empty means "no window of its own", and the award's own ValidFrom/ValidTo
|
||||||
|
// then govern, as they already do for every QSO in the award (see inScope).
|
||||||
|
// That fallback is deliberately NOT duplicated here: two places enforcing the
|
||||||
|
// same dates is two places for them to disagree.
|
||||||
|
ValidFrom string
|
||||||
|
ValidTo string
|
||||||
|
}
|
||||||
|
|
||||||
|
// activeOn reports whether the reference existed on the day of the QSO.
|
||||||
|
//
|
||||||
|
// Compared as ISO date strings rather than parsed times on purpose: the stored
|
||||||
|
// values are "2025-08-01"-shaped and lexical order on that shape IS
|
||||||
|
// chronological order, so this cannot fail on a malformed date the way a parse
|
||||||
|
// can — a reference with a typo in its window keeps counting instead of silently
|
||||||
|
// vanishing from an operator's totals.
|
||||||
|
func (m RefMeta) activeOn(day string) bool {
|
||||||
|
if m.ValidFrom != "" && day < m.ValidFrom {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if m.ValidTo != "" && day > m.ValidTo {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewRefList builds the engine's reference view from (code, meta) pairs.
|
// NewRefList builds the engine's reference view from (code, meta) pairs.
|
||||||
@@ -721,9 +749,14 @@ func EmissionOf(mode string) string { return emissionOf(mode) }
|
|||||||
// abbreviating "Saint"→"St." and hyphenating "Matanuska-Susitna". The rules:
|
// abbreviating "Saint"→"St." and hyphenating "Matanuska-Susitna". The rules:
|
||||||
// - if cnty already carries "ST,County", split on the first comma; else take
|
// - if cnty already carries "ST,County", split on the first comma; else take
|
||||||
// the state from the STATE column;
|
// the state from the STATE column;
|
||||||
// - upper-case; drop periods and apostrophes; hyphens→space; strip a trailing
|
// - upper-case; fold accents (the FIPS list writes "Doña Ana", callbooks and
|
||||||
// County/Parish/Borough/Census Area/Municipality; fold Saint(e)→St(e);
|
// logs write "Dona Ana"); drop periods and apostrophes; hyphens→space;
|
||||||
// collapse whitespace;
|
// expand the parenthetical shapes GeoNames uses for county-equivalents
|
||||||
|
// ("Baltimore (city)", "Nome (CA)") and drop its "City and County of"
|
||||||
|
// style prefixes; strip a trailing County/Parish/Borough/Census Area/
|
||||||
|
// Municipality; fold Saint(e)→St(e); collapse whitespace;
|
||||||
|
// - fold the counties renamed since the USA-CA list was drawn onto the name
|
||||||
|
// the award still uses, so a QSO there counts for something (see renamed);
|
||||||
// - require a 2-letter state and a non-empty county, else no match ("").
|
// - require a 2-letter state and a non-empty county, else no match ("").
|
||||||
func USCountyKey(state, cnty string) string {
|
func USCountyKey(state, cnty string) string {
|
||||||
s := strings.TrimSpace(cnty)
|
s := strings.TrimSpace(cnty)
|
||||||
@@ -736,10 +769,11 @@ func USCountyKey(state, cnty string) string {
|
|||||||
} else {
|
} else {
|
||||||
st, co = strings.TrimSpace(state), s
|
st, co = strings.TrimSpace(state), s
|
||||||
}
|
}
|
||||||
co = strings.ToUpper(co)
|
co = strings.ToUpper(foldAccents(co))
|
||||||
co = strings.ReplaceAll(co, ".", "")
|
co = strings.ReplaceAll(co, ".", "")
|
||||||
co = strings.ReplaceAll(co, "'", "")
|
co = strings.ReplaceAll(co, "'", "")
|
||||||
co = strings.ReplaceAll(co, "-", " ")
|
co = strings.ReplaceAll(co, "-", " ")
|
||||||
|
co = expandCountyEquivalent(co)
|
||||||
for _, suf := range []string{" COUNTY", " PARISH", " BOROUGH", " CENSUS AREA", " MUNICIPALITY"} {
|
for _, suf := range []string{" COUNTY", " PARISH", " BOROUGH", " CENSUS AREA", " MUNICIPALITY"} {
|
||||||
if strings.HasSuffix(co, suf) {
|
if strings.HasSuffix(co, suf) {
|
||||||
co = strings.TrimSuffix(co, suf)
|
co = strings.TrimSuffix(co, suf)
|
||||||
@@ -760,6 +794,9 @@ func USCountyKey(state, cnty string) string {
|
|||||||
if len(st) != 2 || co == "" {
|
if len(st) != 2 || co == "" {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
if alias, ok := renamed[st+"/"+co]; ok {
|
||||||
|
co = alias
|
||||||
|
}
|
||||||
// Separator is "/", NOT ",": the QSOFIELDS matcher splits a field value on
|
// Separator is "/", NOT ",": the QSOFIELDS matcher splits a field value on
|
||||||
// commas/semicolons (n-fer POTA "US-1,US-2"), which would shatter "AL,AUTAUGA"
|
// commas/semicolons (n-fer POTA "US-1,US-2"), which would shatter "AL,AUTAUGA"
|
||||||
// into two non-matching tokens. The stored ADIF cnty keeps its comma; only
|
// into two non-matching tokens. The stored ADIF cnty keeps its comma; only
|
||||||
@@ -956,11 +993,13 @@ func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool)
|
|||||||
// describes is worse than no trace, because it is believed.
|
// describes is worse than no trace, because it is believed.
|
||||||
func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool, ex *Explanation) []string {
|
func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool, ex *Explanation) []string {
|
||||||
predefined := hasList && !d.Dynamic
|
predefined := hasList && !d.Dynamic
|
||||||
|
// The day of the contact, for per-reference validity windows.
|
||||||
|
day := q.QSODate.Format("2006-01-02")
|
||||||
|
|
||||||
// run executes one rule and, when tracing, records it.
|
// run executes one rule and, when tracing, records it.
|
||||||
run := func(label, field, matchBy, pattern string, rex *regexp.Regexp, exact bool, leading, trailing, prefix string) []string {
|
run := func(label, field, matchBy, pattern string, rex *regexp.Regexp, exact bool, leading, trailing, prefix string) []string {
|
||||||
raw := searchOne(field, matchBy, rex, exact, leading, trailing, prefix, q, rl, predefined)
|
raw := searchOne(field, matchBy, rex, exact, leading, trailing, prefix, q, rl, predefined)
|
||||||
kept := keepRefs(predefined, rl, raw)
|
kept := keepRefs(predefined, rl, raw, day)
|
||||||
if ex != nil {
|
if ex != nil {
|
||||||
s := Step{Rule: label, Field: field, MatchBy: matchBy, Exact: exact, Pattern: pattern,
|
s := Step{Rule: label, Field: field, MatchBy: matchBy, Exact: exact, Pattern: pattern,
|
||||||
FieldValue: strings.TrimSpace(stripAffix(fieldRaw(field, q), leading, trailing)),
|
FieldValue: strings.TrimSpace(stripAffix(fieldRaw(field, q), leading, trailing)),
|
||||||
@@ -974,7 +1013,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
|
|||||||
if _, ok := keptSet[n]; ok {
|
if _, ok := keptSet[n]; ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
s.Rejected = append(s.Rejected, rejection(predefined, rl, n))
|
s.Rejected = append(s.Rejected, rejection(predefined, rl, n, day))
|
||||||
}
|
}
|
||||||
ex.Steps = append(ex.Steps, s)
|
ex.Steps = append(ex.Steps, s)
|
||||||
}
|
}
|
||||||
@@ -1026,7 +1065,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
|
|||||||
// hand. Applied HERE (not just in MatchQSO) so Compute — which powers the
|
// hand. Applied HERE (not just in MatchQSO) so Compute — which powers the
|
||||||
// awards panel and the per-QSO refs editor — honours overrides too. For a
|
// awards panel and the per-QSO refs editor — honours overrides too. For a
|
||||||
// predefined award the ref is still validated against the list below.
|
// predefined award the ref is still validated against the list below.
|
||||||
manual := keepRefs(predefined, rl, manualRefs(q, d.Code))
|
manual := keepRefs(predefined, rl, manualRefs(q, d.Code), day)
|
||||||
if ex != nil {
|
if ex != nil {
|
||||||
ex.Manual = manual
|
ex.Manual = manual
|
||||||
}
|
}
|
||||||
@@ -1065,7 +1104,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
|
|||||||
// become a reference. "Nothing matched" is the least useful thing a matcher can
|
// become a reference. "Nothing matched" is the least useful thing a matcher can
|
||||||
// say; every one of this week's award bugs was a rejection with a plain reason
|
// say; every one of this week's award bugs was a rejection with a plain reason
|
||||||
// that nothing was printing.
|
// that nothing was printing.
|
||||||
func rejection(predefined bool, rl refList, code string) Rejected {
|
func rejection(predefined bool, rl refList, code, day string) Rejected {
|
||||||
switch {
|
switch {
|
||||||
case code == "":
|
case code == "":
|
||||||
return Rejected{Candidate: code, Reason: "empty"}
|
return Rejected{Candidate: code, Reason: "empty"}
|
||||||
@@ -1076,6 +1115,17 @@ func rejection(predefined bool, rl refList, code string) Rejected {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return Rejected{Candidate: code, Reason: "not in the award's reference list"}
|
return Rejected{Candidate: code, Reason: "not in the award's reference list"}
|
||||||
}
|
}
|
||||||
|
// Spell the dates out. "Did not count" on a contact the operator remembers
|
||||||
|
// making is exactly the moment they need to be told it is the REFERENCE that
|
||||||
|
// has a window, not their log that is wrong.
|
||||||
|
if !m.activeOn(day) {
|
||||||
|
switch {
|
||||||
|
case m.ValidTo != "" && day > m.ValidTo:
|
||||||
|
return Rejected{Candidate: code, Reason: fmt.Sprintf("the reference ceased to exist on %s, after this QSO of %s", m.ValidTo, day)}
|
||||||
|
default:
|
||||||
|
return Rejected{Candidate: code, Reason: fmt.Sprintf("the reference did not exist until %s, after this QSO of %s", m.ValidFrom, day)}
|
||||||
|
}
|
||||||
|
}
|
||||||
if !m.Valid {
|
if !m.Valid {
|
||||||
return Rejected{Candidate: code, Reason: "listed but disabled"}
|
return Rejected{Candidate: code, Reason: "listed but disabled"}
|
||||||
}
|
}
|
||||||
@@ -1088,7 +1138,7 @@ func rejection(predefined bool, rl refList, code string) Rejected {
|
|||||||
// so we do NOT additionally require the QSO's entity to match the reference's own
|
// so we do NOT additionally require the QSO's entity to match the reference's own
|
||||||
// DXCC — that wrongly excluded e.g. WAS Alaska (state AK is DXCC entity 6, not
|
// DXCC — that wrongly excluded e.g. WAS Alaska (state AK is DXCC entity 6, not
|
||||||
// 291). Per-reference DXCC stays metadata for the picker.
|
// 291). Per-reference DXCC stays metadata for the picker.
|
||||||
func keepRefs(predefined bool, rl refList, found []string) []string {
|
func keepRefs(predefined bool, rl refList, found []string, day string) []string {
|
||||||
if !predefined {
|
if !predefined {
|
||||||
out := make([]string, 0, len(found))
|
out := make([]string, 0, len(found))
|
||||||
for _, c := range found {
|
for _, c := range found {
|
||||||
@@ -1106,6 +1156,10 @@ func keepRefs(predefined bool, rl refList, found []string) []string {
|
|||||||
if !ok || !m.Valid {
|
if !ok || !m.Valid {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// The reference has to have existed on the day of the contact.
|
||||||
|
if !m.activeOn(day) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if _, dup := seen[c]; dup {
|
if _, dup := seen[c]; dup {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|||||||
+1017
-1016
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,109 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
func day(s string) time.Time {
|
||||||
|
t, err := time.Parse("2006-01-02", s)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
// A reference is not forever. A park is delisted, a district is merged, a castle
|
||||||
|
// loses its number. A contact made while it existed still counts — it was a
|
||||||
|
// valid contact on the day — and one made after it stopped existing does not.
|
||||||
|
func TestRefValidityWindow(t *testing.T) {
|
||||||
|
m := RefMeta{Code: "KL-01", Valid: true, ValidTo: "2025-08-31"}
|
||||||
|
for _, tc := range []struct {
|
||||||
|
day string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{"2019-01-01", true},
|
||||||
|
{"2025-08-31", true}, // the last day it existed still counts
|
||||||
|
{"2025-09-01", false},
|
||||||
|
{"2026-08-12", false},
|
||||||
|
} {
|
||||||
|
if got := m.activeOn(tc.day); got != tc.want {
|
||||||
|
t.Errorf("KL-01 on %s: active=%v, want %v", tc.day, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A reference that only came into being partway through.
|
||||||
|
n := RefMeta{Code: "KL-99", Valid: true, ValidFrom: "2025-01-15"}
|
||||||
|
if n.activeOn("2025-01-14") {
|
||||||
|
t.Error("counted a QSO from before the reference existed")
|
||||||
|
}
|
||||||
|
if !n.activeOn("2025-01-15") {
|
||||||
|
t.Error("the first day it existed must count")
|
||||||
|
}
|
||||||
|
|
||||||
|
// No window of its own: the award's own dates govern, as they already do for
|
||||||
|
// every QSO in the award. Nothing here may narrow that.
|
||||||
|
if !(RefMeta{Code: "X", Valid: true}).activeOn("1970-01-01") {
|
||||||
|
t.Error("a reference with no window must count on any date")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The whole point: the same QSO counts before the cutoff and does not after.
|
||||||
|
func TestExpiredRefStopsCountingForLaterQSOs(t *testing.T) {
|
||||||
|
d := &Def{
|
||||||
|
Code: "RDA", Name: "Russian District Award", Valid: true,
|
||||||
|
Type: TypeQSOFields, Field: "note", MatchBy: "code",
|
||||||
|
Confirm: []string{"lotw"},
|
||||||
|
}
|
||||||
|
metas := []RefMeta{
|
||||||
|
{Code: "KL-01", Name: "Petrozavodsk", Valid: true, ValidTo: "2025-08-31"},
|
||||||
|
{Code: "KL-04", Name: "Kostomuksha", Valid: true},
|
||||||
|
}
|
||||||
|
|
||||||
|
q := func(ref, on string) *qso.QSO {
|
||||||
|
return &qso.QSO{Callsign: "RA1ABC", Band: "20m", Notes: ref, QSODate: day(on)}
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := MatchQSO(*d, metas, q("KL-01", "2025-06-01")); len(got) != 1 || got[0] != "KL-01" {
|
||||||
|
t.Errorf("a QSO made while KL-01 existed must count: got %v", got)
|
||||||
|
}
|
||||||
|
if got := MatchQSO(*d, metas, q("KL-01", "2025-09-15")); len(got) != 0 {
|
||||||
|
t.Errorf("a QSO made after KL-01 ceased to exist must not count: got %v", got)
|
||||||
|
}
|
||||||
|
if got := MatchQSO(*d, metas, q("KL-04", "2025-09-15")); len(got) != 1 || got[0] != "KL-04" {
|
||||||
|
t.Errorf("a reference with no window is unaffected: got %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The claim that an empty per-reference window "inherits the award's" has to be
|
||||||
|
// a fact about the code, not a comment. Compute and MatchQSO both gate on
|
||||||
|
// inScope, which enforces the award's own dates — so a reference with no window
|
||||||
|
// of its own is already bounded by them, and duplicating the check per reference
|
||||||
|
// would only create a second place for the same dates to disagree.
|
||||||
|
func TestEmptyRefWindowInheritsTheAward(t *testing.T) {
|
||||||
|
d := Def{
|
||||||
|
Code: "RDA", Name: "Russian District Award", Valid: true,
|
||||||
|
Type: TypeQSOFields, Field: "note", MatchBy: "code",
|
||||||
|
Confirm: []string{"lotw"},
|
||||||
|
ValidFrom: "1991-06-12", // the award itself starts here
|
||||||
|
}
|
||||||
|
metas := []RefMeta{{Code: "KL-04", Name: "Kostomuksha", Valid: true}} // no window of its own
|
||||||
|
|
||||||
|
q := func(on string) *qso.QSO {
|
||||||
|
return &qso.QSO{Callsign: "RA1ABC", Band: "20m", Notes: "KL-04", QSODate: day(on)}
|
||||||
|
}
|
||||||
|
if got := MatchQSO(d, metas, q("1991-06-11")); len(got) != 0 {
|
||||||
|
t.Errorf("a QSO before the AWARD's start counted for a reference with no window of its own: %v", got)
|
||||||
|
}
|
||||||
|
if got := MatchQSO(d, metas, q("1991-06-12")); len(got) != 1 {
|
||||||
|
t.Errorf("a QSO on the award's first day must count: %v", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// And a reference window NARROWER than the award's still applies on top.
|
||||||
|
metas[0].ValidTo = "2025-08-31"
|
||||||
|
if got := MatchQSO(d, metas, q("2025-09-01")); len(got) != 0 {
|
||||||
|
t.Errorf("the reference's own end date was ignored: %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// Name normalisation for USCountyKey. It exists because the county a QSO
|
||||||
|
// carries and the county the USA-CA reference list carries come from different
|
||||||
|
// hands and rarely agree letter for letter:
|
||||||
|
//
|
||||||
|
// - the reference is the FIPS list ("Doña Ana County", "Baltimore city");
|
||||||
|
// - a callbook writes what the licensee typed;
|
||||||
|
// - and OpsLog's own offline resolver reads GeoNames, which spells the
|
||||||
|
// county-equivalents its own way ("Baltimore (city)", "Nome (CA)",
|
||||||
|
// "City and County of San Francisco").
|
||||||
|
//
|
||||||
|
// Measured against a full FCC ULS import (1.56 M US callsigns), the shapes
|
||||||
|
// handled here account for ~7 300 stations whose county matched nothing at all
|
||||||
|
// — they showed as a new county for ever and counted for no award.
|
||||||
|
//
|
||||||
|
// Everything here is SPELLING. A county that genuinely no longer exists under
|
||||||
|
// that name is a different problem, handled by renamed below.
|
||||||
|
|
||||||
|
// foldAccents strips the diacritics that separate a FIPS name from the ASCII
|
||||||
|
// every log and callbook actually holds. Only the letters that occur in US
|
||||||
|
// place names are listed — this is not a general Unicode folder, and it must
|
||||||
|
// not become one: silently folding arbitrary marks would let two distinct
|
||||||
|
// references collapse onto one key.
|
||||||
|
var accents = strings.NewReplacer(
|
||||||
|
"ñ", "n", "Ñ", "N",
|
||||||
|
"á", "a", "Á", "A",
|
||||||
|
"é", "e", "É", "E",
|
||||||
|
"í", "i", "Í", "I",
|
||||||
|
"ó", "o", "Ó", "O",
|
||||||
|
"ú", "u", "Ú", "U",
|
||||||
|
"ü", "u", "Ü", "U",
|
||||||
|
"ç", "c", "Ç", "C",
|
||||||
|
)
|
||||||
|
|
||||||
|
func foldAccents(s string) string {
|
||||||
|
// Fast path: US county names are ASCII with a single exception (Doña Ana),
|
||||||
|
// so the common case must not pay for the replacer.
|
||||||
|
for i := 0; i < len(s); i++ {
|
||||||
|
if s[i] >= 0x80 {
|
||||||
|
return accents.Replace(s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// expandCountyEquivalent rewrites GeoNames' parenthetical and prefixed spellings
|
||||||
|
// of county-equivalents into the plain FIPS form, which the rest of USCountyKey
|
||||||
|
// then normalises as usual.
|
||||||
|
//
|
||||||
|
// Input is already upper-cased with periods and hyphens removed.
|
||||||
|
//
|
||||||
|
// BALTIMORE (CITY) → BALTIMORE CITY (FIPS "Baltimore city")
|
||||||
|
// NOME (CA) → NOME CENSUS AREA (suffix stripped after)
|
||||||
|
// CITY AND COUNTY OF SAN FRANCISCO → SAN FRANCISCO
|
||||||
|
//
|
||||||
|
// The truncated "(CITY" is not a typo here: GeoNames really does ship
|
||||||
|
// "Colonial Heights (city" with the closing parenthesis missing.
|
||||||
|
func expandCountyEquivalent(co string) string {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(co, " (CITY)"):
|
||||||
|
co = strings.TrimSuffix(co, " (CITY)") + " CITY"
|
||||||
|
case strings.HasSuffix(co, " (CITY"):
|
||||||
|
co = strings.TrimSuffix(co, " (CITY") + " CITY"
|
||||||
|
case strings.HasSuffix(co, " (CA)"):
|
||||||
|
co = strings.TrimSuffix(co, " (CA)") + " CENSUS AREA"
|
||||||
|
}
|
||||||
|
// "City and County of X" and "City and Borough of X" are the same place as
|
||||||
|
// FIPS's bare "X" (San Francisco, Denver, Honolulu, Juneau, Sitka). Note the
|
||||||
|
// order: the longer prefixes must be tried before "CITY OF ".
|
||||||
|
for _, p := range []string{
|
||||||
|
"CITY AND COUNTY OF ",
|
||||||
|
"CITY AND BOROUGH OF ",
|
||||||
|
"MUNICIPALITY OF ",
|
||||||
|
"BOROUGH OF ",
|
||||||
|
"CITY OF ",
|
||||||
|
} {
|
||||||
|
if strings.HasPrefix(co, p) {
|
||||||
|
return strings.TrimPrefix(co, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return co
|
||||||
|
}
|
||||||
|
|
||||||
|
// renamed folds a county renamed or re-drawn since the CQ USA-CA list was
|
||||||
|
// published onto the name the award still counts. Keys and values are finished
|
||||||
|
// USCountyKey county parts (upper-case, no spaces), looked up as "ST/COUNTY".
|
||||||
|
//
|
||||||
|
// This deliberately does NOT track the FIPS list. USA-CA is a fixed target of
|
||||||
|
// ~3 100 counties; when a state renames one, the award does not reissue its
|
||||||
|
// list, so a QSO with the new name would otherwise match nothing and count for
|
||||||
|
// nothing. Folding it onto the old name is the only outcome that scores.
|
||||||
|
//
|
||||||
|
// Connecticut is absent on purpose. Its 2022 planning regions are not renamed
|
||||||
|
// counties: a region is drawn from towns belonging to several different
|
||||||
|
// counties, so there is no name that maps to another name. That one is resolved
|
||||||
|
// from the station's ZIP, in internal/uls.
|
||||||
|
var renamed = map[string]string{
|
||||||
|
// Wade Hampton Census Area, AK → Kusilvak Census Area (2015).
|
||||||
|
"AK/KUSILVAK": "WADEHAMPTON",
|
||||||
|
// Shannon County, SD → Oglala Lakota County (2015).
|
||||||
|
"SD/OGLALALAKOTA": "SHANNON",
|
||||||
|
// Valdez-Cordova Census Area, AK was split in two (2019). Both halves fold
|
||||||
|
// back to the parent the award still lists.
|
||||||
|
"AK/CHUGACH": "VALDEZCORDOVA",
|
||||||
|
"AK/COPPERRIVER": "VALDEZCORDOVA",
|
||||||
|
|
||||||
|
// Alaska's four "X City and Borough". The reference codes for these look
|
||||||
|
// wrong and are not: the trailing " BOROUGH" is stripped as a county type,
|
||||||
|
// leaving "JUNEAU CITY AND". Nothing else in the chain produces that shape
|
||||||
|
// — a log that simply says "Juneau", and GeoNames' "City and Borough of
|
||||||
|
// Juneau", both arrive here as "JUNEAU" and would match nothing. Rather
|
||||||
|
// than re-key four published references, bend the bare name onto them.
|
||||||
|
"AK/JUNEAU": "JUNEAUCITYAND",
|
||||||
|
"AK/SITKA": "SITKACITYAND",
|
||||||
|
"AK/WRANGELL": "WRANGELLCITYAND",
|
||||||
|
"AK/YAKUTAT": "YAKUTATCITYAND",
|
||||||
|
}
|
||||||
@@ -1943,7 +1943,7 @@ func usCounties() []Ref {
|
|||||||
ref("NM/COLFAX", "Colfax County, NM", 291),
|
ref("NM/COLFAX", "Colfax County, NM", 291),
|
||||||
ref("NM/CURRY", "Curry County, NM", 291),
|
ref("NM/CURRY", "Curry County, NM", 291),
|
||||||
ref("NM/DEBACA", "De Baca County, NM", 291),
|
ref("NM/DEBACA", "De Baca County, NM", 291),
|
||||||
ref("NM/DO̱AANA", "Do̱a Ana County, NM", 291),
|
ref("NM/DONAANA", "Doña Ana County, NM", 291),
|
||||||
ref("NM/EDDY", "Eddy County, NM", 291),
|
ref("NM/EDDY", "Eddy County, NM", 291),
|
||||||
ref("NM/GRANT", "Grant County, NM", 291),
|
ref("NM/GRANT", "Grant County, NM", 291),
|
||||||
ref("NM/GUADALUPE", "Guadalupe County, NM", 291),
|
ref("NM/GUADALUPE", "Guadalupe County, NM", 291),
|
||||||
|
|||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"unicode/utf8"
|
||||||
|
|
||||||
|
"hamlog/internal/award"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestUSCountyRefsSelfConsistent is the guard that was missing when the Doña Ana
|
||||||
|
// row shipped mangled: its code was "NM/DO̱AANA", which no log, no callbook and
|
||||||
|
// no county database could ever produce, so that county was unwinnable and
|
||||||
|
// nothing said so.
|
||||||
|
//
|
||||||
|
// Every reference must reproduce its own code from its own display name through
|
||||||
|
// award.USCountyKey — the same function cmd/cntygen used to build it. That ties
|
||||||
|
// the generated file to the matcher: change the normalisation rules and this
|
||||||
|
// fails the moment one of the 3 102 references stops matching itself.
|
||||||
|
func TestUSCountyRefsSelfConsistent(t *testing.T) {
|
||||||
|
refs := usCounties()
|
||||||
|
if len(refs) < 3000 {
|
||||||
|
t.Fatalf("only %d counties — the generated list looks truncated", len(refs))
|
||||||
|
}
|
||||||
|
for _, r := range refs {
|
||||||
|
if !utf8.ValidString(r.Name) || !utf8.ValidString(r.Code) {
|
||||||
|
t.Errorf("%s (%q): not valid UTF-8", r.Code, r.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Name is "County Name, ST".
|
||||||
|
i := strings.LastIndex(r.Name, ", ")
|
||||||
|
if i < 0 {
|
||||||
|
t.Errorf("%s: name %q is not \"County, ST\"", r.Code, r.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
name, st := r.Name[:i], r.Name[i+2:]
|
||||||
|
if got := award.USCountyKey(st, name); got != r.Code {
|
||||||
|
t.Errorf("USCountyKey(%q, %q) = %q, want %q", st, name, got, r.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUSCountyRefsUnique catches a normalisation rule loose enough to collapse
|
||||||
|
// two real counties onto one key — the failure mode that would silently merge
|
||||||
|
// them in every award total.
|
||||||
|
func TestUSCountyRefsUnique(t *testing.T) {
|
||||||
|
seen := map[string]string{}
|
||||||
|
for _, r := range usCounties() {
|
||||||
|
if prev, dup := seen[r.Code]; dup {
|
||||||
|
t.Errorf("code %s is shared by %q and %q", r.Code, prev, r.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[r.Code] = r.Name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUSCountyResolverShapes pins the spellings OpsLog's own offline resolver
|
||||||
|
// produces (GeoNames, via internal/uls) against the reference. These are the
|
||||||
|
// real strings that were failing to match, with the number of US callsigns each
|
||||||
|
// covers in a full FCC ULS import.
|
||||||
|
func TestUSCountyResolverShapes(t *testing.T) {
|
||||||
|
valid := map[string]bool{}
|
||||||
|
for _, r := range usCounties() {
|
||||||
|
valid[r.Code] = true
|
||||||
|
}
|
||||||
|
cases := []struct {
|
||||||
|
st, county, want string
|
||||||
|
}{
|
||||||
|
{"CA", "City and County of San Francisco", "CA/SANFRANCISCO"}, // 4 217 calls
|
||||||
|
{"NM", "Doña Ana", "NM/DONAANA"}, // 1 214
|
||||||
|
{"NM", "Dona Ana", "NM/DONAANA"}, // what logs hold
|
||||||
|
{"MD", "Baltimore (city)", "MD/BALTIMORECITY"}, // 885
|
||||||
|
{"MO", "St. Louis (city)", "MO/STLOUISCITY"}, // 574
|
||||||
|
{"MO", "St. Louis", "MO/STLOUIS"}, // the county, distinct
|
||||||
|
{"AK", "Nome (CA)", "AK/NOME"}, // 252
|
||||||
|
{"AK", "Yukon-Koyukuk (CA)", "AK/YUKONKOYUKUK"}, // 84
|
||||||
|
{"AK", "City and Borough of Wrangell", "AK/WRANGELLCITYAND"}, // 27
|
||||||
|
{"AK", "Juneau", "AK/JUNEAUCITYAND"}, // a log that just says Juneau
|
||||||
|
{"AK", "Kusilvak", "AK/WADEHAMPTON"}, // renamed 2015
|
||||||
|
{"SD", "Oglala Lakota County", "SD/SHANNON"}, // renamed 2015
|
||||||
|
{"AK", "Chugach Census Area", "AK/VALDEZCORDOVA"}, // split 2019
|
||||||
|
{"AK", "Copper River Census Area", "AK/VALDEZCORDOVA"},
|
||||||
|
{"CO", "City and County of Denver", "CO/DENVER"},
|
||||||
|
{"HI", "City and County of Honolulu", "HI/HONOLULU"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
got := award.USCountyKey(c.st, c.county)
|
||||||
|
if got != c.want {
|
||||||
|
t.Errorf("USCountyKey(%q, %q) = %q, want %q", c.st, c.county, got, c.want)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !valid[got] {
|
||||||
|
t.Errorf("USCountyKey(%q, %q) = %q, which is not in the reference list", c.st, c.county, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUSCountyKeepsVirginiaCitiesOut guards the other direction: cmd/cntygen
|
||||||
|
// drops Virginia's independent cities and Carson City on purpose, because CQ's
|
||||||
|
// USA-CA does not count them. Normalising their names must not smuggle them
|
||||||
|
// back in as some neighbouring county.
|
||||||
|
func TestUSCountyKeepsVirginiaCitiesOut(t *testing.T) {
|
||||||
|
valid := map[string]bool{}
|
||||||
|
for _, r := range usCounties() {
|
||||||
|
valid[r.Code] = true
|
||||||
|
}
|
||||||
|
for _, c := range []string{"Virginia Beach (city)", "City of Alexandria", "Lynchburg (city)"} {
|
||||||
|
if k := award.USCountyKey("VA", c); valid[k] {
|
||||||
|
t.Errorf("%q resolved to %s, which USA-CA does not count", c, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Charles City and James City ARE counties, despite the name.
|
||||||
|
for _, c := range []string{"Charles City", "James City"} {
|
||||||
|
if k := award.USCountyKey("VA", c); !valid[k] {
|
||||||
|
t.Errorf("%q resolved to %s, which is missing from the reference", c, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,383 @@
|
|||||||
|
// 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 // path length accepted; MaxKm 0 = no ceiling
|
||||||
|
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 Es envelope.
|
||||||
|
//
|
||||||
|
// Below ~500 km a 6 m contact is ordinary tropo or ground wave and says nothing
|
||||||
|
// about the ionosphere, so that floor stays.
|
||||||
|
//
|
||||||
|
// There is NO ceiling. There used to be one at 2400 km, on the reasoning that
|
||||||
|
// past a single hop the bearing test stops meaning anything. That was wrong, and
|
||||||
|
// it silently threw away exactly the openings worth hearing about: multi-hop Es
|
||||||
|
// is ordinary on 6 m, 5000 km paths are common and 10000 km happens. Those are
|
||||||
|
// still directional — a double hop leaves the same sector it entered — so the
|
||||||
|
// bearing test holds perfectly well, and it is the test doing the real work here.
|
||||||
|
//
|
||||||
|
// 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: 0, // no ceiling — see above
|
||||||
|
BearingSpread: 90,
|
||||||
|
Requiet: 45 * time.Minute,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bands watched.
|
||||||
|
//
|
||||||
|
// 10 m is in, and it is HF. The line is not "HF versus VHF" but "is an opening
|
||||||
|
// here an event": 20 m being open is the normal state of the band and saying so
|
||||||
|
// is noise, while 10 m spends most of a solar cycle shut and opens sharply when
|
||||||
|
// it goes — which is what an operator wants interrupting them for.
|
||||||
|
//
|
||||||
|
// 12 m was tried and dropped. It behaves too much like 20 m at this point in the
|
||||||
|
// cycle: open often enough that announcing it is a notification rather than
|
||||||
|
// news, and every band that cries wolf costs the ones that do not.
|
||||||
|
var watched = map[string]bool{"10m": true, "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))] }
|
||||||
|
|
||||||
|
// maxTerrestrialKm is the longest path a band can carry through the atmosphere.
|
||||||
|
// Zero means no limit.
|
||||||
|
//
|
||||||
|
// The flat 2400 km ceiling was removed because it threw away real multi-hop Es
|
||||||
|
// on 6 m, and that was right — but "no limit anywhere" then let something else
|
||||||
|
// through. A 2 m opening was announced at 9650 km towards Japan, on stations
|
||||||
|
// that were unmistakably working EME: the moon is not an opening, and pointing
|
||||||
|
// an antenna at that bearing would find nothing.
|
||||||
|
//
|
||||||
|
// So the limit is per band, and it is physics rather than a threshold. Two
|
||||||
|
// metres reaches a few thousand kilometres by tropospheric duct or a chain of Es
|
||||||
|
// clouds and no further; beyond that the path went via the moon or a satellite,
|
||||||
|
// neither of which says anything about the band. Six and ten metres have no
|
||||||
|
// ceiling at all — multi-hop Es and F2 genuinely go round the world.
|
||||||
|
var maxTerrestrialKm = map[string]int{
|
||||||
|
"2m": 3500,
|
||||||
|
"4m": 4000,
|
||||||
|
}
|
||||||
|
|
||||||
|
// MaxKmFor returns the plausibility ceiling for a band, 0 for none.
|
||||||
|
func MaxKmFor(band string) int { return maxTerrestrialKm[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"`
|
||||||
|
// Compass is the sector as a point of the compass ("NE"), computed here so
|
||||||
|
// the UI never has to redo the wrap-round-north arithmetic that Sector()
|
||||||
|
// already gets right — two answers to that question is how a badge ends up
|
||||||
|
// naming the opposite direction.
|
||||||
|
Compass string `json:"compass"`
|
||||||
|
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 || (d.cfg.MaxKm > 0 && s.DistKm > d.cfg.MaxKm) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Past what the atmosphere can carry on this band, the path went via the moon
|
||||||
|
// or a satellite. Those are real contacts and real reports; they are simply
|
||||||
|
// not evidence about the band.
|
||||||
|
if m := MaxKmFor(band); m > 0 && s.DistKm > m {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
// The DENSEST sector, not the sector covering everything.
|
||||||
|
//
|
||||||
|
// This used to demand that EVERY station fit inside one 90° arc, which is the
|
||||||
|
// right shape for a sporadic-E cloud and hopeless for anything else. With 10
|
||||||
|
// and 12 m open on F2 the reports come from all round the compass, the arc is
|
||||||
|
// 360°, and the test can never pass — so the busier the band, the less likely
|
||||||
|
// an opening was announced. Backwards.
|
||||||
|
//
|
||||||
|
// Finding the busiest 90° instead keeps the Es signature intact — a cloud
|
||||||
|
// still makes one direction dense — and lets an F2 opening toward South
|
||||||
|
// America be seen through the handful of Europeans that are always there.
|
||||||
|
lo, hi, n := densestSector(bearings, cfg.BearingSpread)
|
||||||
|
if n < cfg.MinCalls {
|
||||||
|
return nil // nothing concentrated anywhere: a busy band, not an opening
|
||||||
|
}
|
||||||
|
sort.Ints(dists)
|
||||||
|
sort.Strings(calls)
|
||||||
|
if len(calls) > 5 {
|
||||||
|
calls = calls[:5]
|
||||||
|
}
|
||||||
|
op := &Opening{
|
||||||
|
Band: band, Calls: len(seen), MedianKm: dists[len(dists)/2],
|
||||||
|
BearingMin: lo, BearingMax: hi, Examples: calls,
|
||||||
|
}
|
||||||
|
op.Compass = compass(midBearing(lo, hi))
|
||||||
|
return op
|
||||||
|
}
|
||||||
|
|
||||||
|
// arc returns the smallest compass sector containing every bearing, coping with
|
||||||
|
// the wrap at north: 350° and 10° are 20° apart, not 340°.
|
||||||
|
// densestSector returns the width-degree arc containing the most bearings, as
|
||||||
|
// its start, end and count.
|
||||||
|
//
|
||||||
|
// Brute force over each bearing as a starting edge. n is at most a few hundred
|
||||||
|
// distinct callsigns in a twelve-minute window, so n² is nothing, and it runs
|
||||||
|
// once per accepted spot rather than once per decode.
|
||||||
|
//
|
||||||
|
// The arc STARTS on a real bearing rather than sweeping every degree: the
|
||||||
|
// densest window can always be slid until its leading edge sits on a station, so
|
||||||
|
// nothing is missed and there are 360 fewer positions to try.
|
||||||
|
func densestSector(b []int, width int) (lo, hi, count int) {
|
||||||
|
if len(b) == 0 {
|
||||||
|
return 0, 0, 0
|
||||||
|
}
|
||||||
|
s := append([]int(nil), b...)
|
||||||
|
sort.Ints(s)
|
||||||
|
best, bestAt := 0, 0
|
||||||
|
for i, start := range s {
|
||||||
|
n := 0
|
||||||
|
for _, x := range s {
|
||||||
|
// Distance clockwise from start to x, so the wrap through 0° needs no
|
||||||
|
// special case — which is where the old arc() logic earned its keep and
|
||||||
|
// this one has to match it.
|
||||||
|
d := x - start
|
||||||
|
if d < 0 {
|
||||||
|
d += 360
|
||||||
|
}
|
||||||
|
if d <= width {
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if n > best {
|
||||||
|
best, bestAt = n, i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lo = s[bestAt]
|
||||||
|
// The end is the furthest station actually inside the window, not lo+width:
|
||||||
|
// reporting an empty 90° when every station sits in the first 20° would
|
||||||
|
// overstate the opening's width by four times.
|
||||||
|
hi = lo
|
||||||
|
for _, x := range s {
|
||||||
|
d := x - lo
|
||||||
|
if d < 0 {
|
||||||
|
d += 360
|
||||||
|
}
|
||||||
|
if d <= width {
|
||||||
|
if e := (lo + d) % 360; d >= ((hi-lo)+360)%360 {
|
||||||
|
hi = e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return lo, hi, best
|
||||||
|
}
|
||||||
|
|
||||||
|
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(midBearing(o.BearingMin, o.BearingMax)) +
|
||||||
|
" (" + strconv.Itoa(o.BearingMin) + "–" + strconv.Itoa(o.BearingMax) + "°)"
|
||||||
|
}
|
||||||
|
|
||||||
|
// midBearing is the middle of the arc running CLOCKWISE from min to max.
|
||||||
|
//
|
||||||
|
// Not the arithmetic mean, which is wrong for every sector crossing north and
|
||||||
|
// wrong by the worst possible amount: an opening reported as 353–61° averaged to
|
||||||
|
// 207° and was announced as SW when it was NE — the exact opposite direction, to
|
||||||
|
// an operator who might turn a beam on it. The detector itself has handled the
|
||||||
|
// 0/360 wrap since it was written; only this label did not.
|
||||||
|
func midBearing(min, max int) float64 {
|
||||||
|
span := max - min
|
||||||
|
if span < 0 {
|
||||||
|
span += 360
|
||||||
|
}
|
||||||
|
return math.Mod(float64(min)+float64(span)/2, 360)
|
||||||
|
}
|
||||||
|
|
||||||
|
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,310 @@
|
|||||||
|
package bandopen
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Multi-hop must be detected, not thrown away.
|
||||||
|
//
|
||||||
|
// The detector used to cap paths at 2400 km, on the reasoning that past one hop
|
||||||
|
// the bearing test stops meaning anything. Nexus flagged a 6 m opening at
|
||||||
|
// 5477 km that OpsLog never saw: the spots were discarded before any test ran.
|
||||||
|
// Multi-hop Es is directional — a second hop leaves the sector the first one
|
||||||
|
// entered — so distance is not what tells an opening from noise. The sector is.
|
||||||
|
func TestMultiHopOpeningIsDetected(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
|
||||||
|
var got *Opening
|
||||||
|
for i, call := range []string{"LU1AA", "PY2BB", "LU3CC", "PY4DD"} {
|
||||||
|
if op := d.Add(Spot{
|
||||||
|
Call: call, Band: "6m",
|
||||||
|
DistKm: 5400 + i*40, // double hop, far past the old ceiling
|
||||||
|
Bearing: +i * 5, // one sector, as a real cloud illuminates
|
||||||
|
At: base.Add(time.Duration(i) * time.Minute),
|
||||||
|
}, 47.0); op != nil {
|
||||||
|
got = op
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if got == nil {
|
||||||
|
t.Fatal("a four-station 5400 km burst in one sector was not reported as an opening")
|
||||||
|
}
|
||||||
|
if got.Band != "6m" {
|
||||||
|
t.Errorf("band = %q, want 6m", got.Band)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The floor stays: a short path says nothing about the ionosphere.
|
||||||
|
func TestGroundWaveIsStillIgnored(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
|
||||||
|
for i, call := range []string{"F1AA", "F2BB", "F3CC", "F4DD"} {
|
||||||
|
if op := d.Add(Spot{
|
||||||
|
Call: call, Band: "6m", DistKm: 120, Bearing: 90,
|
||||||
|
At: base.Add(time.Duration(i) * time.Minute),
|
||||||
|
}, 47.0); op != nil {
|
||||||
|
t.Fatalf("a 120 km burst was reported as an opening: %+v", op)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A sector crossing north must not be labelled by its opposite.
|
||||||
|
//
|
||||||
|
// Sector() averaged the two bearings arithmetically, so 353–61° — plainly north
|
||||||
|
// — came out as (353+61)/2 = 207°, announced as SW. The worst possible error:
|
||||||
|
// not vague, but exactly reversed, to an operator who may turn a beam on it.
|
||||||
|
func TestSectorAcrossNorth(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
min, max int
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{353, 61, "NE"}, // the one seen in the field
|
||||||
|
{303, 11, "NW"}, // the other one
|
||||||
|
{35, 75, "NE"}, // no wrap, unchanged
|
||||||
|
{170, 190, "S"}, // due south, no wrap
|
||||||
|
{340, 20, "N"}, // straddling north evenly
|
||||||
|
{260, 300, "W"}, // due west
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
o := Opening{BearingMin: c.min, BearingMax: c.max}
|
||||||
|
got := o.Sector()
|
||||||
|
if !strings.HasPrefix(got, c.want+" ") {
|
||||||
|
t.Errorf("Sector(%d–%d°) = %q, want it to start with %q", c.min, c.max, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A band open in one direction must be found THROUGH the everyday noise.
|
||||||
|
//
|
||||||
|
// The detector used to demand that every station fit inside one 90° arc. On 10
|
||||||
|
// and 12 m with F2 open, reports arrive from all round the compass, the arc is
|
||||||
|
// 360°, and the test could never pass: the busier the band, the less likely an
|
||||||
|
// opening was announced. Reported from the field — 70 000 decodes, 10 and 12 m
|
||||||
|
// plainly open, nothing said.
|
||||||
|
func TestOpeningFoundThroughAllRoundNoise(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
|
||||||
|
// Four stations concentrated to the south-west — the opening.
|
||||||
|
south := []struct {
|
||||||
|
call string
|
||||||
|
deg int
|
||||||
|
}{{"PY2AA", 220}, {"LU3BB", 228}, {"PY5CC", 235}, {"CX4DD", 240}}
|
||||||
|
// And the usual Europeans scattered everywhere, which is what used to veto it.
|
||||||
|
noise := []struct {
|
||||||
|
call string
|
||||||
|
deg int
|
||||||
|
}{{"DL1XX", 40}, {"SM2YY", 20}, {"EA3ZZ", 190}, {"UA9QQ", 70}, {"G4WW", 320}}
|
||||||
|
|
||||||
|
var got *Opening
|
||||||
|
for i, s := range noise {
|
||||||
|
d.Add(Spot{Call: s.call, Band: "10m", DistKm: 1200, Bearing: s.deg,
|
||||||
|
At: base.Add(time.Duration(i) * time.Second)}, 47.0)
|
||||||
|
}
|
||||||
|
for i, s := range south {
|
||||||
|
if op := d.Add(Spot{Call: s.call, Band: "10m", DistKm: 9800, Bearing: s.deg,
|
||||||
|
At: base.Add(time.Duration(10+i) * time.Second)}, 47.0); op != nil {
|
||||||
|
got = op
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if got == nil {
|
||||||
|
t.Fatal("an opening concentrated to the SW was not found among stations all round the compass")
|
||||||
|
}
|
||||||
|
mid := midBearing(got.BearingMin, got.BearingMax)
|
||||||
|
if mid < 200 || mid > 260 {
|
||||||
|
t.Errorf("sector middle %.0f° — the reported sector is not the busy one (%d–%d°)",
|
||||||
|
mid, got.BearingMin, got.BearingMax)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stations evenly all round the compass and nothing concentrated: still nothing.
|
||||||
|
// The point of the change was to stop requiring global agreement, not to start
|
||||||
|
// calling every busy band an opening.
|
||||||
|
func TestScatteredBandIsNotAnOpening(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
|
||||||
|
for i, deg := range []int{0, 60, 120, 180, 240, 300} {
|
||||||
|
if op := d.Add(Spot{Call: string(rune('A'+i)) + "1AAA", Band: "10m",
|
||||||
|
DistKm: 3000, Bearing: deg, At: base.Add(time.Duration(i) * time.Second)}, 47.0); op != nil {
|
||||||
|
t.Fatalf("evenly scattered stations were called an opening: %+v", op)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package bandopen
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A 2 m "opening" was announced at 9650 km towards Japan on stations that were
|
||||||
|
// plainly working EME. The moon is not an opening: an operator pointing an
|
||||||
|
// antenna at that bearing finds nothing.
|
||||||
|
func TestEMEIsNotAnOpeningOnTwoMetres(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := time.Date(2026, 8, 12, 6, 0, 0, 0, time.UTC)
|
||||||
|
for i, call := range []string{"7M4RRM", "JA7RPC", "JF1AWC", "JK1TPA", "JH1JCQ"} {
|
||||||
|
if op := d.Add(Spot{
|
||||||
|
Call: call, Band: "2m", DistKm: 9650, Bearing: 40 + i*3,
|
||||||
|
At: base.Add(time.Duration(i) * time.Minute),
|
||||||
|
}, 47.0); op != nil {
|
||||||
|
t.Fatalf("a 9650 km 2 m path was announced as an opening: %+v", op)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// But a real 2 m opening — an Es chain at a plausible distance — must survive.
|
||||||
|
func TestLongButPlausibleTwoMetresStillCounts(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := time.Date(2026, 6, 20, 18, 0, 0, 0, time.UTC)
|
||||||
|
var got *Opening
|
||||||
|
for i, call := range []string{"EA1AA", "CT1BB", "EA7CC", "CT7DD"} {
|
||||||
|
if op := d.Add(Spot{
|
||||||
|
Call: call, Band: "2m", DistKm: 2000 + i*30, Bearing: 200 + i*4,
|
||||||
|
At: base.Add(time.Duration(i) * time.Minute),
|
||||||
|
}, 47.0); op != nil {
|
||||||
|
got = op
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if got == nil {
|
||||||
|
t.Fatal("a 2000 km 2 m burst in one sector was not reported")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Six metres keeps no ceiling: multi-hop Es genuinely goes that far, which is
|
||||||
|
// why the flat limit was removed in the first place.
|
||||||
|
func TestSixMetresHasNoCeiling(t *testing.T) {
|
||||||
|
if MaxKmFor("6m") != 0 || MaxKmFor("10m") != 0 {
|
||||||
|
t.Error("6 m and 10 m must have no distance ceiling")
|
||||||
|
}
|
||||||
|
if MaxKmFor("2m") == 0 {
|
||||||
|
t.Error("2 m must have one")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -200,6 +200,31 @@ func (m *Manager) SetPTT(on bool) error {
|
|||||||
return m.exec(func(b Backend) error { return b.SetPTT(on) })
|
return m.exec(func(b Backend) error { return b.SetPTT(on) })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// splitSetter is implemented by the backends that can arm split AND place the
|
||||||
|
// transmit frequency. Both together: arming without setting the dial transmits
|
||||||
|
// on whatever the transmit VFO happened to hold, which is worse than refusing.
|
||||||
|
type splitSetter interface {
|
||||||
|
SetSplit(on bool, txHz int64) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSplit arms or clears split on the rig, with the transmit frequency.
|
||||||
|
//
|
||||||
|
// Returns a plain error on a backend that cannot do it, and that is the point.
|
||||||
|
// The shared-CAT server used to answer "done" to WSJT-X's split commands while
|
||||||
|
// doing nothing at all — the software then believed it was transmitting up the
|
||||||
|
// band when it was transmitting on the DX's own frequency. A refusal WSJT-X can
|
||||||
|
// report is worth far more than a success it cannot check.
|
||||||
|
func (m *Manager) SetSplit(on bool, txHz int64) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
s, ok := b.(splitSetter)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("cat: this radio's backend cannot set split from software — " +
|
||||||
|
"use Split Operating: Fake It in WSJT-X/JTDX, or set split on the radio itself")
|
||||||
|
}
|
||||||
|
return s.SetSplit(on, txHz)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// SpotInfo is one cluster spot to render on a backend that supports a spot
|
// SpotInfo is one cluster spot to render on a backend that supports a spot
|
||||||
// overlay (the FlexRadio panadapter). Color is an optional "#AARRGGBB" string;
|
// overlay (the FlexRadio panadapter). Color is an optional "#AARRGGBB" string;
|
||||||
// the backend picks a default when it's empty. (Status-based colouring can be
|
// the backend picks a default when it's empty. (Status-based colouring can be
|
||||||
|
|||||||
+126
-6
@@ -130,8 +130,30 @@ type Kenwood struct {
|
|||||||
tx bool
|
tx bool
|
||||||
txAt time.Time
|
txAt time.Time
|
||||||
lastState RigState
|
lastState RigState
|
||||||
|
// ifRejects counts consecutive "?;" answers to IF;. See State().
|
||||||
|
ifRejects int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// errRigRejected marks a "?;" — the rig understood the frame and declined it.
|
||||||
|
// Distinct from a serial fault on purpose: one is "ask again in a moment", the
|
||||||
|
// other is "the link is gone", and collapsing them is what dropped CAT sharing.
|
||||||
|
var errRigRejected = errors.New("rejected by rig")
|
||||||
|
|
||||||
|
// ifRejectGrace is how many consecutive "?;" answers to IF; are ridden out
|
||||||
|
// before the link is called dead.
|
||||||
|
//
|
||||||
|
// A Kenwood answers "?;" while it is busy — the tail of a transmission, a menu
|
||||||
|
// open on the front panel. The TS-590SG does it for a moment after RX;, which is
|
||||||
|
// exactly when the poll resumes: WSJT-X keyed through shared CAT, dropped PTT,
|
||||||
|
// and the very next IF; came back "?;". One rejected poll then tore down the
|
||||||
|
// whole link, WSJT-X lost the rig, and Hamlib went on to send an uninitialised
|
||||||
|
// frequency (2^63) that OpsLog rightly refused — an alarming error message whose
|
||||||
|
// real cause was three lines earlier in the log.
|
||||||
|
//
|
||||||
|
// Three at 250 ms is under a second of tolerance: long enough for the rig to
|
||||||
|
// finish whatever it was doing, far too short to hide an unplugged cable.
|
||||||
|
const ifRejectGrace = 3
|
||||||
|
|
||||||
// SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set
|
// SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set
|
||||||
// before Connect.
|
// before Connect.
|
||||||
func (k *Kenwood) SetLowerLines(v bool) {
|
func (k *Kenwood) SetLowerLines(v bool) {
|
||||||
@@ -281,8 +303,21 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
}
|
}
|
||||||
raw, err := k.ask("IF;")
|
raw, err := k.ask("IF;")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
// A "?;" is the rig saying "busy", not "gone". Ride out a few and keep
|
||||||
|
// serving the last known state, so the CAT link the digital software keys
|
||||||
|
// through survives the moment after a transmission. A serial fault is NOT
|
||||||
|
// covered: that returns a different error and drops through at once.
|
||||||
|
if errors.Is(err, errRigRejected) && k.lastState.Connected && k.ifRejects < ifRejectGrace {
|
||||||
|
k.ifRejects++
|
||||||
|
debugLog.Printf("kenwood: IF; rejected (%d/%d) — rig busy, keeping the link", k.ifRejects, ifRejectGrace)
|
||||||
|
s := k.lastState
|
||||||
|
s.Connected = true
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
k.ifRejects = 0
|
||||||
return RigState{}, err
|
return RigState{}, err
|
||||||
}
|
}
|
||||||
|
k.ifRejects = 0
|
||||||
f, ok := parseKenwoodIF(raw)
|
f, ok := parseKenwoodIF(raw)
|
||||||
if !ok {
|
if !ok {
|
||||||
return RigState{}, fmt.Errorf("kenwood: unparsable IF frame %q", raw)
|
return RigState{}, fmt.Errorf("kenwood: unparsable IF frame %q", raw)
|
||||||
@@ -342,16 +377,36 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
f.Split = split
|
f.Split = split
|
||||||
|
|
||||||
if f.Split {
|
if f.Split {
|
||||||
// The transmit VFO is the other one. Read it rather than assume, and fall
|
// The OTHER VFO is the one IF did not report. Read it rather than assume,
|
||||||
// back to simplex if it cannot be read: a wrong TX frequency is written
|
// and fall back to simplex if it cannot be read: a wrong TX frequency is
|
||||||
// into the log, which is worse than showing no split at all.
|
// written into the log, which is worse than showing no split at all.
|
||||||
other := "FB;"
|
other := "FB;"
|
||||||
if f.VFO == "B" {
|
if f.VFO == "B" {
|
||||||
other = "FA;"
|
other = "FA;"
|
||||||
}
|
}
|
||||||
|
var otherHz int64
|
||||||
if r, err := k.ask(other); err == nil {
|
if r, err := k.ask(other); err == nil {
|
||||||
if hz, ok := parseKenwoodFreq(r, strings.TrimSuffix(other, ";")); ok && hz > 0 && hz != rx {
|
if hz, ok := parseKenwoodFreq(r, strings.TrimSuffix(other, ";")); ok && hz > 0 && hz != rx {
|
||||||
tx = hz
|
otherHz = hz
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if otherHz > 0 {
|
||||||
|
// WHICH of the two is the transmit frequency depends on whether the rig
|
||||||
|
// is transmitting RIGHT NOW.
|
||||||
|
//
|
||||||
|
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on
|
||||||
|
// receive and the TRANSMIT VFO on transmit. The code took it as the
|
||||||
|
// receive VFO always, so the moment the operator keyed up the two
|
||||||
|
// frequencies swapped: correct on receive, reversed on transmit, which
|
||||||
|
// is exactly how it was reported from a TS-590 on USB.
|
||||||
|
//
|
||||||
|
// It matters beyond the display. FreqHz is what a QSO is logged on, and
|
||||||
|
// a contact made in split would have gone into the log on the DX's
|
||||||
|
// frequency instead of the operator's.
|
||||||
|
if f.TX {
|
||||||
|
tx, rx = rx, otherHz
|
||||||
|
} else {
|
||||||
|
tx = otherHz
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -385,7 +440,31 @@ func (k *Kenwood) SetFrequency(hz int64) error {
|
|||||||
if k.curVFO == "B" {
|
if k.curVFO == "B" {
|
||||||
cmd = "FB"
|
cmd = "FB"
|
||||||
}
|
}
|
||||||
return k.write(fmt.Sprintf("%s%011d;", cmd, hz))
|
if err := k.write(fmt.Sprintf("%s%011d;", cmd, hz)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Remember what we just commanded.
|
||||||
|
//
|
||||||
|
// While PTT is held the poll is skipped and State() hands back lastState — the
|
||||||
|
// rig answers "?;" to IF; mid-transmission, and reading that as a fault used
|
||||||
|
// to drop the whole link. But a frequency SET during that window then went
|
||||||
|
// unrecorded, so the cache kept describing the dial as it was before.
|
||||||
|
//
|
||||||
|
// WSJT-X's "Fake It" is exactly that sequence: move the dial, key, transmit,
|
||||||
|
// and afterwards put it back. Polling during the over, it was told the rig was
|
||||||
|
// still on the receive frequency — so there was nothing to put back, and the
|
||||||
|
// dial stayed on the transmit frequency for good. Every following over
|
||||||
|
// started from there, which is the drift that was reported.
|
||||||
|
//
|
||||||
|
// Only simplex is updated here. Under split, FreqHz means the transmit
|
||||||
|
// frequency while this write lands on whichever VFO the operator is on, and
|
||||||
|
// guessing which side moved would be worse than a stale value the next poll
|
||||||
|
// corrects on its own.
|
||||||
|
if !k.lastState.Split {
|
||||||
|
k.curFreq = hz
|
||||||
|
k.lastState.FreqHz = hz
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k *Kenwood) SetMode(mode string) error {
|
func (k *Kenwood) SetMode(mode string) error {
|
||||||
@@ -458,6 +537,43 @@ func isKenwoodDataMode(mode string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetSplit arms or clears split, and when arming puts txHz on the transmit VFO.
|
||||||
|
//
|
||||||
|
// Both halves in one call on purpose. WSJT-X sends "split on, VFO B" and "VFO B
|
||||||
|
// to 14075300" as two commands, and honouring only the first is worse than
|
||||||
|
// honouring neither: split would arm on whatever VFO B happened to hold, so the
|
||||||
|
// operator transmits somewhere they never chose while the software reports
|
||||||
|
// exactly what they asked for. Nothing is armed here until the frequency is on
|
||||||
|
// the dial.
|
||||||
|
//
|
||||||
|
// FR selects the receive VFO, FT the transmit one — the same pair the poll loop
|
||||||
|
// already reads to detect split, so this writes what State() knows how to read.
|
||||||
|
func (k *Kenwood) SetSplit(on bool, txHz int64) error {
|
||||||
|
k.mu.Lock()
|
||||||
|
defer k.mu.Unlock()
|
||||||
|
if k.port == nil {
|
||||||
|
return fmt.Errorf("kenwood: not connected")
|
||||||
|
}
|
||||||
|
if !on {
|
||||||
|
// Transmit follows receive again. FR is left alone: which VFO the operator
|
||||||
|
// listens on is theirs to choose, and clearing split should not move them.
|
||||||
|
return k.write("FT0;")
|
||||||
|
}
|
||||||
|
if txHz <= 0 || txHz > 99_999_999_999 {
|
||||||
|
return fmt.Errorf("kenwood: split TX frequency %d out of the 11-digit CAT range", txHz)
|
||||||
|
}
|
||||||
|
// The transmit dial FIRST, then arm. Arming first would transmit on the old
|
||||||
|
// contents of VFO B for however long the next command takes to arrive — brief,
|
||||||
|
// but on the wrong frequency, and this runs the instant before a transmission.
|
||||||
|
if err := k.write(fmt.Sprintf("FB%011d;", txHz)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := k.write("FR0;"); err != nil { // receive on A
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return k.write("FT1;") // transmit on B
|
||||||
|
}
|
||||||
|
|
||||||
func (k *Kenwood) SetPTT(on bool) error {
|
func (k *Kenwood) SetPTT(on bool) error {
|
||||||
k.mu.Lock()
|
k.mu.Lock()
|
||||||
defer k.mu.Unlock()
|
defer k.mu.Unlock()
|
||||||
@@ -524,6 +640,10 @@ func (k *Kenwood) ask(cmd string) (string, error) {
|
|||||||
k.rx = k.rx[i+1:]
|
k.rx = k.rx[i+1:]
|
||||||
traceText("kenwood", "RX", frame)
|
traceText("kenwood", "RX", frame)
|
||||||
if frame == "?;" {
|
if frame == "?;" {
|
||||||
|
// Sentinel-wrapped so the poll loop can tell "the rig said no" apart
|
||||||
|
// from a serial fault. The two look identical as plain errors and must
|
||||||
|
// not be handled the same way: one means try again in a moment, the
|
||||||
|
// other means the link is gone.
|
||||||
// IF; and ID; are universal on Kenwood/Elecraft — a "?;" to them is a
|
// IF; and ID; are universal on Kenwood/Elecraft — a "?;" to them is a
|
||||||
// transient "busy" (typically mid-transmit, or a menu open on the rig),
|
// transient "busy" (typically mid-transmit, or a menu open on the rig),
|
||||||
// NOT "unsupported". Latching them off would blind the poll loop for
|
// NOT "unsupported". Latching them off would blind the poll loop for
|
||||||
@@ -533,7 +653,7 @@ func (k *Kenwood) ask(cmd string) (string, error) {
|
|||||||
k.unsupported[want] = true
|
k.unsupported[want] = true
|
||||||
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
||||||
}
|
}
|
||||||
return "", fmt.Errorf("kenwood: %s rejected", want)
|
return "", fmt.Errorf("kenwood: %s rejected: %w", want, errRigRejected)
|
||||||
}
|
}
|
||||||
if strings.HasPrefix(frame, want) {
|
if strings.HasPrefix(frame, want) {
|
||||||
return frame, nil
|
return frame, nil
|
||||||
|
|||||||
@@ -29,7 +29,30 @@ const kenwoodCWChunk = 24
|
|||||||
|
|
||||||
// kenwoodCWAllowed is what the keyer can send; anything else is dropped, since an
|
// kenwoodCWAllowed is what the keyer can send; anything else is dropped, since an
|
||||||
// unsupported byte can abort the buffer and lose the rest of the message.
|
// unsupported byte can abort the buffer and lose the rest of the message.
|
||||||
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:;()"
|
// The semicolon is deliberately absent: it TERMINATES a CAT frame. The TS-590
|
||||||
|
// manual says so outright for P2, and one in a macro would close the command
|
||||||
|
// early and leave the rest of the text to be read as commands of its own.
|
||||||
|
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:()"
|
||||||
|
|
||||||
|
// padCW pads a piece to the fixed 24-character P2 a Kenwood demands.
|
||||||
|
//
|
||||||
|
// This is where CW over CAT failed on a TS-590SG. The KY command was written
|
||||||
|
// against Elecraft's, which takes a variable-length string, so "KY OH5CX;" went
|
||||||
|
// out and the radio answered "?;" — read as "this rig refuses CW over CAT", and
|
||||||
|
// the operator was told to go and buy a serial keyer.
|
||||||
|
//
|
||||||
|
// The TS-590 manual is explicit: P2 has a FIXED length of 24, and characters
|
||||||
|
// left blank are filled with spaces which are NOT keyed. So the padding costs
|
||||||
|
// nothing on air — it is simply the shape the command has to have.
|
||||||
|
//
|
||||||
|
// Elecraft is left variable-length: it accepts short strings, and padding there
|
||||||
|
// would key the trailing spaces as word gaps.
|
||||||
|
func (k *Kenwood) padCW(chunk string) string {
|
||||||
|
if k.elecraft || len(chunk) >= kenwoodCWChunk {
|
||||||
|
return chunk
|
||||||
|
}
|
||||||
|
return chunk + strings.Repeat(" ", kenwoodCWChunk-len(chunk))
|
||||||
|
}
|
||||||
|
|
||||||
// SendCW queues a message on the rig's keyer, fed in 24-character pieces, waiting
|
// SendCW queues a message on the rig's keyer, fed in 24-character pieces, waiting
|
||||||
// for buffer room between pieces so a long macro doesn't lose its tail.
|
// for buffer room between pieces so a long macro doesn't lose its tail.
|
||||||
@@ -51,7 +74,7 @@ func (k *Kenwood) SendCW(text string) error {
|
|||||||
chunk := msg[:n]
|
chunk := msg[:n]
|
||||||
msg = msg[n:]
|
msg = msg[n:]
|
||||||
k.waitCWBuffer(3 * time.Second)
|
k.waitCWBuffer(3 * time.Second)
|
||||||
if err := k.write("KY " + chunk + ";"); err != nil {
|
if err := k.write("KY " + k.padCW(chunk) + ";"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := k.afterKY(); err != nil {
|
if err := k.afterKY(); err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The TS-590 wants a FIXED 24-character P2. Sending the bare text is what made
|
||||||
|
// CW over CAT fail on a real TS-590SG: "KY OH5CX;" came back "?;", which OpsLog
|
||||||
|
// reported as "this radio rejected CW over CAT" and sent the operator off to buy
|
||||||
|
// a serial keyer he did not need.
|
||||||
|
func TestKenwoodCWPadsToTheFixedWidth(t *testing.T) {
|
||||||
|
k := &Kenwood{}
|
||||||
|
got := k.padCW("OH5CX")
|
||||||
|
if len(got) != kenwoodCWChunk {
|
||||||
|
t.Errorf("padCW(%q) is %d chars, want exactly %d — the rig rejects anything else",
|
||||||
|
"OH5CX", len(got), kenwoodCWChunk)
|
||||||
|
}
|
||||||
|
if got[:5] != "OH5CX" || strings.TrimRight(got, " ") != "OH5CX" {
|
||||||
|
t.Errorf("padCW = %q — the text must be intact and the rest spaces", got)
|
||||||
|
}
|
||||||
|
// A full piece is already the right width and must not grow.
|
||||||
|
full := strings.Repeat("A", kenwoodCWChunk)
|
||||||
|
if k.padCW(full) != full {
|
||||||
|
t.Error("a full 24-character piece was padded further")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Elecraft takes variable length, and padding there would key the trailing
|
||||||
|
// spaces as word gaps.
|
||||||
|
e := &Kenwood{elecraft: true}
|
||||||
|
if e.padCW("OH5CX") != "OH5CX" {
|
||||||
|
t.Errorf("Elecraft piece was padded: %q", e.padCW("OH5CX"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ";" terminates a CAT frame. The manual forbids it in P2, and one arriving in a
|
||||||
|
// macro would close the command early and leave the rest to be read as commands.
|
||||||
|
func TestKenwoodCWDropsTheSemicolon(t *testing.T) {
|
||||||
|
if got := filterKenwoodCW("CQ; DE OH5CX"); strings.Contains(got, ";") {
|
||||||
|
t.Errorf("filterKenwoodCW kept a semicolon: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// WSJT-X "Fake It" against the transmit-window cache.
|
||||||
|
//
|
||||||
|
// Fake It keeps the radio on one dial frequency and shifts it only for the
|
||||||
|
// duration of each over: set the transmit frequency, key, transmit, unkey, set
|
||||||
|
// it back. The restore is not unconditional — WSJT-X reads the frequency back
|
||||||
|
// and puts the dial where it believes it should be.
|
||||||
|
//
|
||||||
|
// That read lands inside the window where this backend deliberately stops
|
||||||
|
// polling, because a Kenwood answers "?;" to IF; while it is transmitting and
|
||||||
|
// treating that as a fault used to drop the whole shared link. The cache
|
||||||
|
// answers instead. So the cache has to account for frequency SETS made during
|
||||||
|
// the window, or it describes the dial as it was before the over — and WSJT-X,
|
||||||
|
// told the radio is already on the receive frequency, has nothing to restore.
|
||||||
|
//
|
||||||
|
// This reproduces the sequence from a reported session: the dial stayed on the
|
||||||
|
// transmit frequency after the first over and every later one started there.
|
||||||
|
func TestKenwoodFakeItRestoresAfterTransmit(t *testing.T) {
|
||||||
|
const (
|
||||||
|
rxHz = 7074000 // where the operator is listening
|
||||||
|
txHz = 7075500 // where Fake It moves the dial to transmit
|
||||||
|
)
|
||||||
|
|
||||||
|
rig := &ts2000{vfoA: rxHz, mode: '2'}
|
||||||
|
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||||
|
k.dialPort = dialTo(rig)
|
||||||
|
if err := k.Connect(); err != nil {
|
||||||
|
t.Fatalf("connect: %v", err)
|
||||||
|
}
|
||||||
|
defer k.Disconnect()
|
||||||
|
|
||||||
|
if s, err := k.ReadState(); err != nil || s.FreqHz != rxHz {
|
||||||
|
t.Fatalf("before the over: %d (err %v) — want %d", s.FreqHz, err, rxHz)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The over: shift the dial, then key.
|
||||||
|
if err := k.SetFrequency(txHz); err != nil {
|
||||||
|
t.Fatalf("set transmit frequency: %v", err)
|
||||||
|
}
|
||||||
|
if err := k.SetPTT(true); err != nil {
|
||||||
|
t.Fatalf("ptt on: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WSJT-X reads back mid-over. The wire is not polled here — this is the
|
||||||
|
// cache talking, and it must not still be saying rxHz.
|
||||||
|
s, err := k.ReadState()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read during the over: %v", err)
|
||||||
|
}
|
||||||
|
if s.FreqHz != txHz {
|
||||||
|
t.Errorf("during the over the backend reported %d, want %d — "+
|
||||||
|
"reporting the pre-over frequency is what stops Fake It restoring the dial", s.FreqHz, txHz)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := k.SetPTT(false); err != nil {
|
||||||
|
t.Fatalf("ptt off: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The restore, once the over is done.
|
||||||
|
if err := k.SetFrequency(rxHz); err != nil {
|
||||||
|
t.Fatalf("restore: %v", err)
|
||||||
|
}
|
||||||
|
if rig.vfoA != rxHz {
|
||||||
|
t.Errorf("dial left on %d after the over, want %d", rig.vfoA, rxHz)
|
||||||
|
}
|
||||||
|
if s, err := k.ReadState(); err != nil || s.FreqHz != rxHz {
|
||||||
|
t.Errorf("after the over: %d (err %v) — want %d", s.FreqHz, err, rxHz)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Under split the same write must NOT touch the cache: FreqHz means the
|
||||||
|
// transmit frequency while the write lands on whichever VFO the operator is on,
|
||||||
|
// so guessing which side moved would put a wrong number in front of the
|
||||||
|
// operator. A stale one survives only until the next poll.
|
||||||
|
func TestKenwoodSplitCacheLeftToThePoll(t *testing.T) {
|
||||||
|
rig := &ts2000{vfoA: 14025000, vfoB: 14030000, mode: '3', split: true}
|
||||||
|
k := NewKenwood("COM-TEST", 9600, "CW")
|
||||||
|
k.dialPort = dialTo(rig)
|
||||||
|
if err := k.Connect(); err != nil {
|
||||||
|
t.Fatalf("connect: %v", err)
|
||||||
|
}
|
||||||
|
defer k.Disconnect()
|
||||||
|
|
||||||
|
s, err := k.ReadState()
|
||||||
|
if err != nil || !s.Split {
|
||||||
|
t.Fatalf("split not seen: %+v (err %v)", s, err)
|
||||||
|
}
|
||||||
|
before := s.FreqHz
|
||||||
|
|
||||||
|
if err := k.SetFrequency(14026000); err != nil {
|
||||||
|
t.Fatalf("set: %v", err)
|
||||||
|
}
|
||||||
|
if k.lastState.FreqHz != before {
|
||||||
|
t.Errorf("split cache moved to %d on a VFO write, want it left at %d for the poll",
|
||||||
|
k.lastState.FreqHz, before)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -108,6 +108,9 @@ type ts2000 struct {
|
|||||||
mode byte
|
mode byte
|
||||||
onB bool
|
onB bool
|
||||||
split bool
|
split bool
|
||||||
|
// tx models the rig KEYED. On a real Kenwood in split, IF then reports the
|
||||||
|
// TRANSMIT VFO as the one in use — which is the whole point of the test below.
|
||||||
|
tx bool
|
||||||
// lazyIF models a rig that answers FR/FT correctly but never fills IF's
|
// lazyIF models a rig that answers FR/FT correctly but never fills IF's
|
||||||
// split bit — the behaviour reported on a Flex through its Kenwood CAT
|
// split bit — the behaviour reported on a Flex through its Kenwood CAT
|
||||||
// emulation, where the frequency reads perfectly and split never appears.
|
// emulation, where the frequency reads perfectly and split never appears.
|
||||||
@@ -138,8 +141,12 @@ func (r *ts2000) answer(cmd string) string {
|
|||||||
}
|
}
|
||||||
// The catemu layout: IF | freq(11) | step(4) | RIT(±5) | 3 | mem(2) |
|
// The catemu layout: IF | freq(11) | step(4) | RIT(±5) | 3 | mem(2) |
|
||||||
// rx/tx | mode | VFO | scan | split | tone | tone#(2) | shift | ;
|
// rx/tx | mode | VFO | scan | split | tone | tone#(2) | shift | ;
|
||||||
|
txByte := 0
|
||||||
|
if r.tx {
|
||||||
|
txByte = 1
|
||||||
|
}
|
||||||
return fmt.Sprintf("IF%011d%04d%+06d%03d%02d%01d%c%c%01d%c%01d%02d%01d;",
|
return fmt.Sprintf("IF%011d%04d%+06d%03d%02d%01d%c%c%01d%c%01d%02d%01d;",
|
||||||
cur, 0, 0, 0, 0, 0, r.mode, vfoDigit, 0, split, 0, 0, 0)
|
cur, 0, 0, 0, 0, txByte, r.mode, vfoDigit, 0, split, 0, 0, 0)
|
||||||
case strings.HasPrefix(cmd, "FA") && len(cmd) > 3:
|
case strings.HasPrefix(cmd, "FA") && len(cmd) > 3:
|
||||||
fmt.Sscanf(cmd, "FA%d;", &r.vfoA)
|
fmt.Sscanf(cmd, "FA%d;", &r.vfoA)
|
||||||
return ""
|
return ""
|
||||||
@@ -174,6 +181,19 @@ func dialTo(rig *ts2000) func() (serial.Port, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// dialToBusy is dialTo with a hook that makes the rig answer "?;" instead —
|
||||||
|
// what a real Kenwood does while it is busy, rather than staying silent.
|
||||||
|
func dialToBusy(rig *ts2000, busy func(cmd string) bool) func() (serial.Port, error) {
|
||||||
|
return func() (serial.Port, error) {
|
||||||
|
return &fakeSerial{toRig: &strings.Builder{}, answer: func(cmd string) string {
|
||||||
|
if busy(cmd) {
|
||||||
|
return "?;"
|
||||||
|
}
|
||||||
|
return rig.answer(cmd)
|
||||||
|
}}, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestKenwoodAgainstEmulatedRig(t *testing.T) {
|
func TestKenwoodAgainstEmulatedRig(t *testing.T) {
|
||||||
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'} // 20 m USB
|
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'} // 20 m USB
|
||||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||||
@@ -383,3 +403,103 @@ func TestKenwoodNoisyRigIsReportedAsNoiseNotSilence(t *testing.T) {
|
|||||||
t.Errorf("error was %q — it should say data arrived, and quote it", err)
|
t.Errorf("error was %q — it should say data arrived, and quote it", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A "?;" to IF; must not tear the link down.
|
||||||
|
//
|
||||||
|
// The TS-590SG answers "?;" for a moment after coming out of transmit, which is
|
||||||
|
// exactly when the poll resumes. In the field that single rejected poll dropped
|
||||||
|
// the whole CAT link: WSJT-X, keying through shared CAT, lost the rig, and
|
||||||
|
// Hamlib then sent an uninitialised frequency (2^63) that OpsLog refused — an
|
||||||
|
// alarming error whose real cause was three lines earlier.
|
||||||
|
func TestKenwoodBusyRigKeepsTheLink(t *testing.T) {
|
||||||
|
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'}
|
||||||
|
busy := 0
|
||||||
|
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||||
|
k.dialPort = dialToBusy(rig, func(cmd string) bool {
|
||||||
|
if strings.HasPrefix(cmd, "IF") && busy > 0 {
|
||||||
|
busy--
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
})
|
||||||
|
if err := k.Connect(); err != nil {
|
||||||
|
t.Fatalf("connect: %v", err)
|
||||||
|
}
|
||||||
|
defer k.Disconnect()
|
||||||
|
|
||||||
|
// One good read establishes the state the busy window will keep serving.
|
||||||
|
first, err := k.ReadState()
|
||||||
|
if err != nil || !first.Connected {
|
||||||
|
t.Fatalf("first read: %+v err=%v", first, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Inside the grace: still connected, still reporting the last good frequency.
|
||||||
|
busy = ifRejectGrace
|
||||||
|
for i := 1; i <= ifRejectGrace; i++ {
|
||||||
|
s, err := k.ReadState()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("reject %d dropped the link: %v", i, err)
|
||||||
|
}
|
||||||
|
if !s.Connected || s.FreqHz != first.FreqHz {
|
||||||
|
t.Errorf("reject %d gave %+v — want the last good state, still connected", i, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The rig answers again → the tolerance resets, so a later busy spell gets
|
||||||
|
// the full allowance instead of inheriting the previous one.
|
||||||
|
if s, err := k.ReadState(); err != nil || !s.Connected {
|
||||||
|
t.Fatalf("recovery read failed: %+v err=%v", s, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Past the grace, a persistent refusal IS a fault and must surface.
|
||||||
|
busy = ifRejectGrace + 1
|
||||||
|
var lastErr error
|
||||||
|
for i := 0; i <= ifRejectGrace; i++ {
|
||||||
|
if _, lastErr = k.ReadState(); lastErr != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if lastErr == nil {
|
||||||
|
t.Error("a rig refusing IF; forever was still reported as healthy")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// In split, the two frequencies must not swap the moment the operator keys up.
|
||||||
|
//
|
||||||
|
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on receive
|
||||||
|
// and the TRANSMIT VFO on transmit. The backend took it as the receive VFO
|
||||||
|
// always, so everything read correctly until the PTT closed and then reversed —
|
||||||
|
// reported from a TS-590 on USB.
|
||||||
|
//
|
||||||
|
// It matters beyond the display: FreqHz is what a QSO is LOGGED on, so a split
|
||||||
|
// contact would have been logged on the DX's frequency instead of the operator's.
|
||||||
|
func TestKenwoodSplitDoesNotSwapOnTransmit(t *testing.T) {
|
||||||
|
rig := &ts2000{vfoA: 14200000, vfoB: 14205000, mode: '2', split: true}
|
||||||
|
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||||
|
k.dialPort = dialTo(rig)
|
||||||
|
if err := k.Connect(); err != nil {
|
||||||
|
t.Fatalf("connect: %v", err)
|
||||||
|
}
|
||||||
|
defer k.Disconnect()
|
||||||
|
|
||||||
|
// Receiving: IF reports VFO A, the receive dial.
|
||||||
|
s, err := k.ReadState()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read on receive: %v", err)
|
||||||
|
}
|
||||||
|
if !s.Split || s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
|
||||||
|
t.Fatalf("on receive: split=%v tx=%d rx=%d — want tx 14205000, rx 14200000",
|
||||||
|
s.Split, s.FreqHz, s.RxFreqHz)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keyed: the rig switches to the transmit VFO and sets IF's TX byte.
|
||||||
|
rig.onB, rig.tx = true, true
|
||||||
|
s, err = k.ReadState()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read on transmit: %v", err)
|
||||||
|
}
|
||||||
|
if s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
|
||||||
|
t.Errorf("on transmit: tx=%d rx=%d — the two swapped; want tx 14205000, rx 14200000",
|
||||||
|
s.FreqHz, s.RxFreqHz)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- MY_IOTA: the island reference the station operates FROM, e.g. "EU-005".
|
||||||
|
--
|
||||||
|
-- An official ADIF field, and the QSO table has carried my_iota since 0001 —
|
||||||
|
-- only the station profile could not supply it, so an island activation had to
|
||||||
|
-- have the reference typed on every contact or added afterwards. Blank by
|
||||||
|
-- default: the overwhelming majority of stations are not on an island.
|
||||||
|
ALTER TABLE station_profiles ADD COLUMN my_iota TEXT NOT NULL DEFAULT '';
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- The lookup cache gains the two fields the providers were already sending and
|
||||||
|
-- nothing was reading: the operator's own site, and the postal code.
|
||||||
|
--
|
||||||
|
-- `web` matters beyond the cache: the qso table has had a `web` column since
|
||||||
|
-- 0003 and no lookup ever filled it.
|
||||||
|
ALTER TABLE callsign_cache ADD COLUMN web TEXT;
|
||||||
|
ALTER TABLE callsign_cache ADD COLUMN zip TEXT;
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
-- QSL_SENT_VIA / QSL_RCVD_VIA — the ADIF fields that say HOW a card travelled.
|
||||||
|
--
|
||||||
|
-- Until now OpsLog had one column, qsl_via, and used it for two unrelated
|
||||||
|
-- things: the QSL manager (what ADIF's QSL_VIA holds) and the routing method.
|
||||||
|
-- Imports made it worse — QSL_SENT_VIA was folded into qsl_via when qsl_via was
|
||||||
|
-- empty, so a Log4OM log arrived with "E" sitting where the manager belongs —
|
||||||
|
-- and QSL_RCVD_VIA was dropped outright, listed as a promoted field with no
|
||||||
|
-- column behind it, so it was not even kept among the extras.
|
||||||
|
--
|
||||||
|
-- These two columns hold the ADIF enumeration: B (bureau), D (direct),
|
||||||
|
-- E (electronic). M (manager) is accepted on import only, per the standard.
|
||||||
|
--
|
||||||
|
-- Adding the columns is all that happens here. Existing qsl_via values are NOT
|
||||||
|
-- touched: separating a manager from a routing word rewrites what an operator
|
||||||
|
-- can see in their own log, so it is offered once, with a count, and only runs
|
||||||
|
-- when they say yes.
|
||||||
|
ALTER TABLE qso ADD COLUMN qsl_sent_via TEXT;
|
||||||
|
ALTER TABLE qso ADD COLUMN qsl_rcvd_via TEXT;
|
||||||
@@ -132,6 +132,18 @@ func (db *DB) Entities() []*Entity {
|
|||||||
func (db *DB) Lookup(callsign string) (Match, bool) {
|
func (db *DB) Lookup(callsign string) (Match, bool) {
|
||||||
db.mu.RLock()
|
db.mu.RLock()
|
||||||
defer db.mu.RUnlock()
|
defer db.mu.RUnlock()
|
||||||
|
// Maritime and aeronautical mobile belong to NO entity, and that is not a
|
||||||
|
// technicality — the station is at sea or in the air. RI1FJL/MM resolved to
|
||||||
|
// Franz Josef Land while the expedition was still on its way there, telling
|
||||||
|
// the operator they had worked an entity they had not.
|
||||||
|
//
|
||||||
|
// The previous choice was deliberate ("the log should still show the
|
||||||
|
// operator's country") and it is wrong for exactly that reason: a home
|
||||||
|
// country here is not extra information, it is a false claim about where the
|
||||||
|
// contact happened.
|
||||||
|
if IsMobileNoEntity(callsign) {
|
||||||
|
return Match{}, false
|
||||||
|
}
|
||||||
call := normalizeCallsign(callsign)
|
call := normalizeCallsign(callsign)
|
||||||
if call == "" {
|
if call == "" {
|
||||||
return Match{}, false
|
return Match{}, false
|
||||||
@@ -364,3 +376,22 @@ func replaceAreaDigit(call string, d byte) string {
|
|||||||
}
|
}
|
||||||
return call
|
return call
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsMobileNoEntity reports a callsign DXCC assigns to no entity: a TRAILING
|
||||||
|
// /MM (maritime mobile) or /AM (aeronautical mobile).
|
||||||
|
//
|
||||||
|
// Trailing only. A LEADING "MM" is the Scotland prefix and "AM" is Spain, so
|
||||||
|
// MM0ABC and AM5X are ordinary calls — treating those as entity-less would be a
|
||||||
|
// far larger error than the one this fixes.
|
||||||
|
func IsMobileNoEntity(callsign string) bool {
|
||||||
|
s := strings.ToUpper(strings.TrimSpace(callsign))
|
||||||
|
i := strings.LastIndex(s, "/")
|
||||||
|
if i < 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
switch s[i+1:] {
|
||||||
|
case "MM", "AM":
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package dxcc
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// /MM and /AM belong to NO DXCC entity: the station is at sea or in the air.
|
||||||
|
//
|
||||||
|
// This is not a technicality. RI1FJL/MM resolved to Franz Josef Land while the
|
||||||
|
// expedition was still sailing there, which told the operator they had worked
|
||||||
|
// an entity they had not.
|
||||||
|
func TestMobileNoEntity(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
call string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{"RI1FJL/MM", true},
|
||||||
|
{"YB1SCY/AM", true},
|
||||||
|
{"ri1fjl/mm", true},
|
||||||
|
{" RI1FJL/MM ", true},
|
||||||
|
// A LEADING MM is Scotland and AM is Spain. Treating those as
|
||||||
|
// entity-less would be a far larger error than the one this fixes.
|
||||||
|
{"MM0ABC", false},
|
||||||
|
{"AM5X", false},
|
||||||
|
{"MM/F4BPO", false},
|
||||||
|
{"AM/DL1ABC", false},
|
||||||
|
// Other suffixes keep their entity — a portable station is still ashore.
|
||||||
|
{"F4BPO/P", false},
|
||||||
|
{"F4BPO/M", false},
|
||||||
|
{"4U1UN/B", false},
|
||||||
|
{"F4BPO", false},
|
||||||
|
// Only the LAST element counts: RI1FJL/MM/P is still maritime, and a
|
||||||
|
// call whose /MM is not final is not.
|
||||||
|
{"RI1FJL/MM/P", false},
|
||||||
|
{"", false},
|
||||||
|
} {
|
||||||
|
if got := IsMobileNoEntity(tc.call); got != tc.want {
|
||||||
|
t.Errorf("IsMobileNoEntity(%q) = %v, want %v", tc.call, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+27
-1
@@ -4,6 +4,7 @@ package email
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/wneessen/go-mail"
|
"github.com/wneessen/go-mail"
|
||||||
@@ -85,7 +86,32 @@ func SendFiles(cfg Config, to, subject, body string, attachPaths []string) error
|
|||||||
return fmt.Errorf("smtp client: %w", err)
|
return fmt.Errorf("smtp client: %w", err)
|
||||||
}
|
}
|
||||||
if err := client.DialAndSend(m); err != nil {
|
if err := client.DialAndSend(m); err != nil {
|
||||||
return fmt.Errorf("send: %w", err)
|
return fmt.Errorf("send via %s:%d (%s, %s): %w",
|
||||||
|
cfg.Host, cfg.Port, cfg.Encryption, describeSize(attachPaths), err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// describeSize reports what was attached, in bytes.
|
||||||
|
//
|
||||||
|
// "An existing connection was forcibly closed" during DATA is the same message
|
||||||
|
// whether the server refused the size, hit a quota, or simply dropped the
|
||||||
|
// socket — and the first of those is the only one the operator can act on
|
||||||
|
// directly. Naming the size rules it in or out without a second attempt.
|
||||||
|
func describeSize(paths []string) string {
|
||||||
|
var total int64
|
||||||
|
n := 0
|
||||||
|
for _, p := range paths {
|
||||||
|
if p == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if fi, err := os.Stat(p); err == nil {
|
||||||
|
total += fi.Size()
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
return "no attachment"
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%d attachment(s), %d KB", n, (total+1023)/1024)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// "An existing connection was forcibly closed" during DATA reads the same
|
||||||
|
// whether the server refused the SIZE, hit a quota, or just dropped the socket
|
||||||
|
// — and only the first is something the operator can act on. Naming the size in
|
||||||
|
// the error rules it in or out without a second attempt.
|
||||||
|
func TestDescribeSize(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
a := filepath.Join(dir, "card.jpg")
|
||||||
|
if err := os.WriteFile(a, make([]byte, 2048), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := describeSize(nil); got != "no attachment" {
|
||||||
|
t.Errorf("no attachment = %q", got)
|
||||||
|
}
|
||||||
|
if got := describeSize([]string{""}); got != "no attachment" {
|
||||||
|
t.Errorf("blank path = %q, want it ignored", got)
|
||||||
|
}
|
||||||
|
if got := describeSize([]string{a}); got != "1 attachment(s), 2 KB" {
|
||||||
|
t.Errorf("one file = %q", got)
|
||||||
|
}
|
||||||
|
// A path that does not exist must not be counted — the mail library skips it,
|
||||||
|
// so reporting it would describe a message that was never sent.
|
||||||
|
if got := describeSize([]string{a, filepath.Join(dir, "gone.jpg")}); got != "1 attachment(s), 2 KB" {
|
||||||
|
t.Errorf("missing file counted: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,6 +27,19 @@ const clublogBatchURL = "https://clublog.org/putlogs.php"
|
|||||||
// must send a real, app-identifying User-Agent.
|
// must send a real, app-identifying User-Agent.
|
||||||
const clublogUserAgent = "OpsLog/1.0 (+https://github.com/GregTroar/OpsLog)"
|
const clublogUserAgent = "OpsLog/1.0 (+https://github.com/GregTroar/OpsLog)"
|
||||||
|
|
||||||
|
// looksLikeHTML reports a body that is a web page rather than an answer. Club
|
||||||
|
// Log serves its normal site for refusals and blocks, so this is what separates
|
||||||
|
// "here is what went wrong" from 4 KB of markup an operator cannot act on.
|
||||||
|
func looksLikeHTML(s string) bool {
|
||||||
|
l := strings.ToLower(strings.TrimSpace(s))
|
||||||
|
return strings.HasPrefix(l, "<!doctype html") || strings.HasPrefix(l, "<html")
|
||||||
|
}
|
||||||
|
|
||||||
|
// clublogDownloadURL is Club Log's ADIF export. Used ONLY to verify credentials
|
||||||
|
// (see TestClublog): it is the one authenticated endpoint that cannot change
|
||||||
|
// anything in the operator's log, which is what a test button must never do.
|
||||||
|
const clublogDownloadURL = "https://clublog.org/getadif.php"
|
||||||
|
|
||||||
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
||||||
// requires an api parameter that identifies the client software (not the
|
// requires an api parameter that identifies the client software (not the
|
||||||
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
||||||
@@ -204,17 +217,84 @@ func stripHTMLBrief(s string) string {
|
|||||||
// TestClublog validates the configured credentials by attempting a no-op
|
// TestClublog validates the configured credentials by attempting a no-op
|
||||||
// style check. Club Log has no dedicated status endpoint, so we report the
|
// style check. Club Log has no dedicated status endpoint, so we report the
|
||||||
// fields look complete; a real failure surfaces on the first upload.
|
// fields look complete; a real failure surfaces on the first upload.
|
||||||
|
// TestClublog checks the credentials against Club Log, not against themselves.
|
||||||
|
//
|
||||||
|
// It used to verify that the three fields were non-empty and then report
|
||||||
|
// "Ready — <call> via <email>". Nothing was sent anywhere, so a wrong password
|
||||||
|
// produced exactly the same green message as a right one. That is worse than
|
||||||
|
// having no button: it is confidence the test never earned, and it cost an
|
||||||
|
// operator the one moment they were actually looking for the problem.
|
||||||
|
//
|
||||||
|
// The download endpoint is used because it is READ-ONLY: testing a password
|
||||||
|
// must not put a record into someone's log. Club Log answers a rejected login
|
||||||
|
// with 403 before sending any body, so the answer arrives immediately; on
|
||||||
|
// success the body is a log, and we read a few bytes and hang up rather than
|
||||||
|
// pull it down to prove a point.
|
||||||
func TestClublog(ctx context.Context, cfg ServiceConfig) (string, error) {
|
func TestClublog(ctx context.Context, cfg ServiceConfig) (string, error) {
|
||||||
_ = ctx
|
email := strings.TrimSpace(cfg.Email)
|
||||||
|
call := strings.ToUpper(strings.TrimSpace(cfg.Callsign))
|
||||||
switch {
|
switch {
|
||||||
case strings.TrimSpace(cfg.Email) == "":
|
case email == "":
|
||||||
return "", fmt.Errorf("clublog: account email not set")
|
return "", fmt.Errorf("clublog: account email not set")
|
||||||
case cfg.Password == "":
|
case cfg.Password == "":
|
||||||
return "", fmt.Errorf("clublog: password not set")
|
return "", fmt.Errorf("clublog: password not set")
|
||||||
case strings.TrimSpace(cfg.Callsign) == "":
|
case call == "":
|
||||||
return "", fmt.Errorf("clublog: logbook callsign not set")
|
return "", fmt.Errorf("clublog: logbook callsign not set")
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("Ready — %s via %s", strings.ToUpper(strings.TrimSpace(cfg.Callsign)), strings.TrimSpace(cfg.Email)), nil
|
|
||||||
|
if ctx == nil {
|
||||||
|
ctx = context.Background()
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
form := url.Values{}
|
||||||
|
form.Set("email", email)
|
||||||
|
form.Set("password", cfg.Password)
|
||||||
|
form.Set("call", call)
|
||||||
|
// No date filter. A "startyear=2099" was tried to keep the reply small, but
|
||||||
|
// Club Log answers an unrecognised request with the SAME 403 it uses for a
|
||||||
|
// refused login — so an unverified parameter would have made every correct
|
||||||
|
// password look wrong, which is the failure this whole change exists to end.
|
||||||
|
// The reply is capped at 4 KB and the body closed immediately instead; the
|
||||||
|
// status code arrives before any of it.
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, clublogDownloadURL, strings.NewReader(form.Encode()))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("clublog: build request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
req.Header.Set("User-Agent", clublogUserAgent)
|
||||||
|
|
||||||
|
resp, err := (&http.Client{Timeout: 30 * time.Second}).Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("clublog: could not reach Club Log: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
|
||||||
|
msg := strings.TrimSpace(string(body))
|
||||||
|
|
||||||
|
switch resp.StatusCode {
|
||||||
|
case http.StatusOK:
|
||||||
|
return fmt.Sprintf("Ready — %s via %s (Club Log accepted the login)", call, email), nil
|
||||||
|
case http.StatusUnauthorized, http.StatusForbidden:
|
||||||
|
// Club Log refuses with its ordinary web page, not an error string, so the
|
||||||
|
// body is 4 KB of markup that says nothing to an operator. It goes to the
|
||||||
|
// log — that is where a real diagnosis happens — and the message says the
|
||||||
|
// one thing there is to do about it.
|
||||||
|
LogSink("clublog: login refused (http %d), body: %s", resp.StatusCode, msg)
|
||||||
|
return "", fmt.Errorf("Club Log refused the login — check the account e-mail, " +
|
||||||
|
"the password and the logbook callsign. They are the Club Log website's own credentials")
|
||||||
|
default:
|
||||||
|
LogSink("clublog: unexpected http %d, body: %s", resp.StatusCode, msg)
|
||||||
|
if looksLikeHTML(msg) {
|
||||||
|
return "", fmt.Errorf("clublog: Club Log answered with a web page (http %d) instead of a log — see the log file", resp.StatusCode)
|
||||||
|
}
|
||||||
|
if len(msg) > 200 {
|
||||||
|
msg = msg[:200] + "…"
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("clublog: http %d %s", resp.StatusCode, msg)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// clublogPost performs the form POST and maps the HTTP status to a result.
|
// clublogPost performs the form POST and maps the HTTP status to a result.
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package extsvc
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// Club Log answers a refused login with its ordinary web page. The operator must
|
||||||
|
// get a sentence they can act on, not four kilobytes of markup — that was the
|
||||||
|
// first thing reported once the test started working at all.
|
||||||
|
func TestLooksLikeHTML(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
body string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{"<!DOCTYPE html>\n<html lang='en'>…403 - Access denied…", true},
|
||||||
|
{" <html><head><title>403</title></head></html>", true},
|
||||||
|
{"<HTML>", true},
|
||||||
|
{"Invalid credentials", false},
|
||||||
|
{"", false},
|
||||||
|
// An ADIF answer must never be mistaken for a page.
|
||||||
|
{"<eoh>\n<call:5>F4BPO <band:3>20m <eor>", false},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := looksLikeHTML(c.body); got != c.want {
|
||||||
|
t.Errorf("looksLikeHTML(%.40q) = %v, want %v", c.body, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -81,6 +81,8 @@ type ServiceConfig struct {
|
|||||||
UploadFlags []string `json:"upload_flags"` // LoTW: set of lotw_sent values that mean "ready to upload" — any of "N"/"R"
|
UploadFlags []string `json:"upload_flags"` // LoTW: set of lotw_sent values that mean "ready to upload" — any of "N"/"R"
|
||||||
WriteLog bool `json:"write_log"` // LoTW: pass -t to write a TQSL diagnostic log
|
WriteLog bool `json:"write_log"` // LoTW: pass -t to write a TQSL diagnostic log
|
||||||
AutoUpload bool `json:"auto_upload"`
|
AutoUpload bool `json:"auto_upload"`
|
||||||
|
// OnAir: HRDLog only — publish the live frequency, mode and rig on the site.
|
||||||
|
OnAir bool `json:"on_air"`
|
||||||
UploadMode UploadMode `json:"upload_mode"`
|
UploadMode UploadMode `json:"upload_mode"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,4 +144,10 @@ type UploadResult struct {
|
|||||||
OK bool // the service accepted (or already had) the QSO
|
OK bool // the service accepted (or already had) the QSO
|
||||||
LogID string // service-assigned record id, when provided
|
LogID string // service-assigned record id, when provided
|
||||||
Message string // human-readable detail (reason on failure)
|
Message string // human-readable detail (reason on failure)
|
||||||
|
// Ignored is set when the service accepted the submission but left some or
|
||||||
|
// all of the QSOs out of it. TQSL does this for contacts already uploaded
|
||||||
|
// AND for contacts outside the certificate's date range, and reports both
|
||||||
|
// with the same exit code — so the caller must show the message rather than
|
||||||
|
// decide on its own that everything went through.
|
||||||
|
Ignored bool
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -143,3 +144,59 @@ func TestHRDLog(ctx context.Context, client *http.Client, cfg ServiceConfig) (st
|
|||||||
}
|
}
|
||||||
return fmt.Sprintf("Credentials accepted — %s", callsign), nil
|
return fmt.Sprintf("Credentials accepted — %s", callsign), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// hrdlogOnAirURL is HRDLog's live-status endpoint — what puts "F4BPO is on air
|
||||||
|
// 14,074,000 FM IC-7300" on the site's front page.
|
||||||
|
//
|
||||||
|
// Endpoint and field names taken from HRDLog's own library (github.com/iw1qlh/
|
||||||
|
// HRDLOG-net-library, HrdProtocol.SendOnAirAsync), not from guesswork: it posts
|
||||||
|
// Frequency in Hz, Mode, Radio, Callsign, Code and App.
|
||||||
|
//
|
||||||
|
// HTTPS where that library uses plain HTTP. The upload code is a credential and
|
||||||
|
// has no business crossing the network in clear; the sibling NewEntry endpoint
|
||||||
|
// on the same host already serves TLS.
|
||||||
|
const hrdlogOnAirURL = "https://robot.hrdlog.net/OnAir.aspx"
|
||||||
|
|
||||||
|
// SendHRDLogOnAir publishes the current frequency, mode and rig.
|
||||||
|
//
|
||||||
|
// Deliberately fire-and-forget in spirit: it is a status broadcast, so a
|
||||||
|
// failure is logged and never surfaced as an error the operator must clear —
|
||||||
|
// but the message is returned so the caller can log WHAT the site said rather
|
||||||
|
// than only that something went wrong.
|
||||||
|
func SendHRDLogOnAir(ctx context.Context, client *http.Client, callsign, code string, freqHz int64, mode, radio string) (string, error) {
|
||||||
|
callsign = strings.ToUpper(strings.TrimSpace(callsign))
|
||||||
|
code = strings.TrimSpace(code)
|
||||||
|
if callsign == "" || code == "" {
|
||||||
|
return "", fmt.Errorf("hrdlog: callsign and upload code required")
|
||||||
|
}
|
||||||
|
if freqHz <= 0 {
|
||||||
|
return "", fmt.Errorf("hrdlog: no frequency to announce")
|
||||||
|
}
|
||||||
|
form := url.Values{}
|
||||||
|
form.Set("Callsign", callsign)
|
||||||
|
form.Set("Code", code)
|
||||||
|
form.Set("App", hrdlogApp)
|
||||||
|
form.Set("Frequency", strconv.FormatInt(freqHz, 10))
|
||||||
|
form.Set("Mode", strings.TrimSpace(mode))
|
||||||
|
form.Set("Radio", strings.TrimSpace(radio))
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, hrdlogOnAirURL, strings.NewReader(form.Encode()))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("hrdlog on-air: build request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
if client == nil {
|
||||||
|
client = &http.Client{Timeout: 15 * time.Second}
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("hrdlog on-air: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 32*1024))
|
||||||
|
msg := strings.TrimSpace(string(body))
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return msg, fmt.Errorf("hrdlog on-air: http %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return msg, nil
|
||||||
|
}
|
||||||
|
|||||||
+75
-5
@@ -178,8 +178,12 @@ func fileExists(p string) bool {
|
|||||||
//
|
//
|
||||||
// tqsl -d -x -a all -l "<location>" -u [-p <keypass>] <file.adi>
|
// tqsl -d -x -a all -l "<location>" -u [-p <keypass>] <file.adi>
|
||||||
//
|
//
|
||||||
// Exit codes (TQSL): 0 = uploaded; 8 = nothing new (all duplicates/out of
|
// Exit codes are TQSL's own (see the table in its cmdline help). 8 and 9 are
|
||||||
// range); 9 = some uploaded, some skipped; anything else = failure.
|
// the ones that matter and both used to be read as plain success: 8 means NO
|
||||||
|
// QSOs were processed and 9 means some were left out — in each case because
|
||||||
|
// they were already uploaded OR outside the callsign certificate's date range.
|
||||||
|
// Reporting either as success is how a contact came to be stamped "uploaded"
|
||||||
|
// while LoTW had never seen it.
|
||||||
func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord string) (UploadResult, error) {
|
func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord string) (UploadResult, error) {
|
||||||
tqsl := strings.TrimSpace(cfg.TQSLPath)
|
tqsl := strings.TrimSpace(cfg.TQSLPath)
|
||||||
loc := strings.TrimSpace(cfg.StationLocation)
|
loc := strings.TrimSpace(cfg.StationLocation)
|
||||||
@@ -249,11 +253,31 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TQSL's exit codes, from its own cmdline documentation. Two of them used to
|
||||||
|
// be read as plain success, and that is how contacts came to be stamped
|
||||||
|
// "uploaded" while LoTW had never seen them:
|
||||||
|
//
|
||||||
|
// 8 NO QSOs were processed — already uploaded OR OUT OF DATE RANGE
|
||||||
|
// 9 some processed, some ignored — same two reasons
|
||||||
|
// 14 some already uploaded, the rest signed
|
||||||
|
//
|
||||||
|
// "Out of date range" is the one that bites: a contact older than the
|
||||||
|
// callsign certificate's validity is silently left out, and reporting that as
|
||||||
|
// success stamped it sent for ever. TQSL says which case it is in its output,
|
||||||
|
// so the message is carried up rather than replaced with a guess.
|
||||||
switch code {
|
switch code {
|
||||||
case 0, 9:
|
case 0:
|
||||||
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
|
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
|
||||||
|
case 9, 14:
|
||||||
|
return UploadResult{OK: true, Ignored: true, Message: tqslDetail(msg,
|
||||||
|
"uploaded — but TQSL left some contacts out (already uploaded, or outside the certificate's date range)")}, nil
|
||||||
case 8:
|
case 8:
|
||||||
return UploadResult{OK: true, Message: "already uploaded (duplicate)"}, nil
|
// Nothing reached LoTW. NOT stamped as sent: a duplicate left at "R" is
|
||||||
|
// harmless and will be refused again, while a contact wrongly marked sent
|
||||||
|
// is one the operator will never think to look at again.
|
||||||
|
return UploadResult{OK: false, Ignored: true, Message: tqslDetail(msg,
|
||||||
|
"TQSL uploaded nothing — every contact was already uploaded, or outside the certificate's date range")},
|
||||||
|
fmt.Errorf("lotw: no QSOs processed")
|
||||||
default:
|
default:
|
||||||
if msg == "" {
|
if msg == "" {
|
||||||
msg = fmt.Sprintf("tqsl exit code %d", code)
|
msg = fmt.Sprintf("tqsl exit code %d", code)
|
||||||
@@ -262,6 +286,29 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// tqslDetail keeps the lines of TQSL's own output that say what happened to the
|
||||||
|
// contacts, and appends the summary.
|
||||||
|
//
|
||||||
|
// TQSL is explicit — "414 QSO records were already uploaded", "N QSO records
|
||||||
|
// are out of date range" — and that sentence is the whole answer to "why is my
|
||||||
|
// contact not on LoTW". It used to be captured and thrown away.
|
||||||
|
func tqslDetail(out, summary string) string {
|
||||||
|
var keep []string
|
||||||
|
for _, ln := range strings.Split(out, "\n") {
|
||||||
|
ln = strings.TrimSpace(ln)
|
||||||
|
l := strings.ToLower(ln)
|
||||||
|
if strings.Contains(l, "qso") && (strings.Contains(l, "already uploaded") ||
|
||||||
|
strings.Contains(l, "date range") || strings.Contains(l, "ignored") ||
|
||||||
|
strings.Contains(l, "duplicate")) {
|
||||||
|
keep = append(keep, ln)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(keep) == 0 {
|
||||||
|
return summary
|
||||||
|
}
|
||||||
|
return summary + " — " + strings.Join(keep, "; ")
|
||||||
|
}
|
||||||
|
|
||||||
// TestLoTW validates the LoTW config: tqsl present and the chosen station
|
// TestLoTW validates the LoTW config: tqsl present and the chosen station
|
||||||
// location exists in station_data.
|
// location exists in station_data.
|
||||||
func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
||||||
@@ -277,10 +324,33 @@ func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("lotw: can't read station locations: %w", err)
|
return "", fmt.Errorf("lotw: can't read station locations: %w", err)
|
||||||
}
|
}
|
||||||
|
found := ""
|
||||||
for _, l := range locs {
|
for _, l := range locs {
|
||||||
if strings.EqualFold(l.Name, loc) {
|
if strings.EqualFold(l.Name, loc) {
|
||||||
return fmt.Sprintf("Ready — TQSL found, location %q (%s)", l.Name, l.Call), nil
|
found = l.Call
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if found == "" {
|
||||||
return "", fmt.Errorf("lotw: station location %q not found in TQSL", loc)
|
return "", fmt.Errorf("lotw: station location %q not found in TQSL", loc)
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoTW is TWO credentials doing two jobs, and the button used to report only
|
||||||
|
// the first. Uploading goes through TQSL and is signed by the certificate —
|
||||||
|
// the website password is never involved, so a wrong one breaks nothing until
|
||||||
|
// the day confirmations are downloaded and nobody connects the two events.
|
||||||
|
//
|
||||||
|
// So the download login is tested separately, and said separately. A future
|
||||||
|
// "since" date makes LoTW return an empty report rather than the whole
|
||||||
|
// account: the credentials are what is being checked, not the log.
|
||||||
|
up := fmt.Sprintf("Ready — TQSL found, location %q (%s)", loc, found)
|
||||||
|
if strings.TrimSpace(cfg.Username) == "" || cfg.Password == "" {
|
||||||
|
return up + ". Download login not set — confirmations cannot be fetched.", nil
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
if _, err := DownloadLoTWConfirmations(ctx, nil, cfg, "2099-01-01", ""); err != nil {
|
||||||
|
return "", fmt.Errorf("%s — but the DOWNLOAD login failed: %w", up, err)
|
||||||
|
}
|
||||||
|
return up + ". Download login accepted.", nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package extsvc
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// TQSL's own exit codes, from its cmdline documentation:
|
||||||
|
//
|
||||||
|
// 0 success
|
||||||
|
// 8 NO QSOs were processed — already uploaded OR out of date range
|
||||||
|
// 9 some processed, some ignored — same two reasons
|
||||||
|
// 14 some already uploaded, the rest signed
|
||||||
|
//
|
||||||
|
// 8 and 9 both used to be read as plain success, and that is how a contact came
|
||||||
|
// to be stamped "uploaded to LoTW" while LoTW had never seen it. The one that
|
||||||
|
// bites is "out of date range": a contact older than the callsign certificate's
|
||||||
|
// validity is silently left out of the submission.
|
||||||
|
func TestTQSLDetailKeepsTheReason(t *testing.T) {
|
||||||
|
out := `13:22:01: Signing using Callsign G0ABC, DXCC Entity ENGLAND
|
||||||
|
13:22:02: /tmp/x.adi: 20 QSO records are out of date range
|
||||||
|
13:22:02: Final Status: No QSOs were processed (8)`
|
||||||
|
got := tqslDetail(out, "summary")
|
||||||
|
if got == "summary" {
|
||||||
|
t.Fatal("threw away TQSL's explanation — that sentence is the whole answer to \"why is my contact not on LoTW\"")
|
||||||
|
}
|
||||||
|
if !contains(got, "out of date range") {
|
||||||
|
t.Errorf("the reason was lost: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTQSLDetailFallsBackToTheSummary(t *testing.T) {
|
||||||
|
if got := tqslDetail("nothing useful here", "summary"); got != "summary" {
|
||||||
|
t.Errorf("got %q, want the plain summary when TQSL said nothing specific", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func contains(h, n string) bool {
|
||||||
|
return len(h) >= len(n) && (func() bool {
|
||||||
|
for i := 0; i+len(n) <= len(h); i++ {
|
||||||
|
if h[i:i+len(n)] == n {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
})()
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
// Package geo is the one place that turns Maidenhead locators into positions,
|
||||||
|
// and positions into distances and bearings.
|
||||||
|
//
|
||||||
|
// It exists because there were about to be three copies. These functions lived
|
||||||
|
// in package main, which the internal packages cannot import, so the PSK
|
||||||
|
// Reporter watcher had its geometry injected from main and the web publisher
|
||||||
|
// was about to grow its own. A bearing that disagrees with itself between two
|
||||||
|
// panels is the kind of fault nobody reports, because each screen looks
|
||||||
|
// plausible on its own.
|
||||||
|
package geo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GridToLatLon parses a Maidenhead locator (4 or 6 characters) and returns the
|
||||||
|
// centre of that square in degrees. ok=false on malformed input.
|
||||||
|
func GridToLatLon(grid string) (lat, lon float64, ok bool) {
|
||||||
|
g := strings.ToUpper(strings.TrimSpace(grid))
|
||||||
|
if len(g) < 4 {
|
||||||
|
return 0, 0, false
|
||||||
|
}
|
||||||
|
A := g[0] - 'A'
|
||||||
|
B := g[1] - 'A'
|
||||||
|
C := g[2] - '0'
|
||||||
|
D := g[3] - '0'
|
||||||
|
if A > 17 || B > 17 || C > 9 || D > 9 {
|
||||||
|
return 0, 0, false
|
||||||
|
}
|
||||||
|
lon = -180 + float64(A)*20 + float64(C)*2
|
||||||
|
lat = -90 + float64(B)*10 + float64(D)*1
|
||||||
|
if len(g) >= 6 {
|
||||||
|
E := g[4] - 'A'
|
||||||
|
F := g[5] - 'A'
|
||||||
|
if E <= 23 && F <= 23 {
|
||||||
|
lon += float64(E)*(5.0/60.0) + 2.5/60.0
|
||||||
|
lat += float64(F)*(2.5/60.0) + 1.25/60.0
|
||||||
|
return lat, lon, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 4-character locator: aim at the centre of the square.
|
||||||
|
lon += 1
|
||||||
|
lat += 0.5
|
||||||
|
return lat, lon, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// HaversineKm returns the great-circle distance between two positions in
|
||||||
|
// kilometres. Mean Earth radius 6371 km.
|
||||||
|
func HaversineKm(lat1, lon1, lat2, lon2 float64) float64 {
|
||||||
|
const R = 6371.0
|
||||||
|
rad := math.Pi / 180.0
|
||||||
|
dLat := (lat2 - lat1) * rad
|
||||||
|
dLon := (lon2 - lon1) * rad
|
||||||
|
a := math.Sin(dLat/2)*math.Sin(dLat/2) +
|
||||||
|
math.Cos(lat1*rad)*math.Cos(lat2*rad)*math.Sin(dLon/2)*math.Sin(dLon/2)
|
||||||
|
return R * 2 * math.Atan2(math.Sqrt(a), math.Sqrt(1-a))
|
||||||
|
}
|
||||||
|
|
||||||
|
// DistanceBetweenGrids is the distance in kilometres between two locators,
|
||||||
|
// ok=false when either cannot be parsed.
|
||||||
|
func DistanceBetweenGrids(a, b string) (km float64, ok bool) {
|
||||||
|
lat1, lon1, ok1 := GridToLatLon(a)
|
||||||
|
lat2, lon2, ok2 := GridToLatLon(b)
|
||||||
|
if !ok1 || !ok2 {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return HaversineKm(lat1, lon1, lat2, lon2), true
|
||||||
|
}
|
||||||
|
|
||||||
|
// LatLonToGrid returns the 4-character Maidenhead square for a position.
|
||||||
|
func LatLonToGrid(lat, lon float64) string {
|
||||||
|
lon = math.Mod(lon+180, 360)
|
||||||
|
if lon < 0 {
|
||||||
|
lon += 360
|
||||||
|
}
|
||||||
|
lat = lat + 90
|
||||||
|
if lat < 0 {
|
||||||
|
lat = 0
|
||||||
|
} else if lat > 180 {
|
||||||
|
lat = 180
|
||||||
|
}
|
||||||
|
return string([]byte{
|
||||||
|
byte('A' + int(lon/20)),
|
||||||
|
byte('A' + int(lat/10)),
|
||||||
|
byte('0' + int(math.Mod(lon, 20)/2)),
|
||||||
|
byte('0' + int(math.Mod(lat, 10)/1)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// NeighbourGrids returns the square holding (lat, lon) and the ring of squares
|
||||||
|
// around it — 9 squares for ring 1, 25 for ring 2.
|
||||||
|
//
|
||||||
|
// Used to filter the PSK Reporter feed at the BROKER rather than in OpsLog. A
|
||||||
|
// square is about 111 km tall and 150 km wide at mid latitudes, so one ring is
|
||||||
|
// roughly the 300 km "around here" the feed already meant, and the traffic that
|
||||||
|
// used to be received and discarded is never sent.
|
||||||
|
func NeighbourGrids(lat, lon float64, ring int) []string {
|
||||||
|
if ring < 0 {
|
||||||
|
ring = 0
|
||||||
|
}
|
||||||
|
seen := map[string]bool{}
|
||||||
|
out := []string{}
|
||||||
|
for dLat := -ring; dLat <= ring; dLat++ {
|
||||||
|
for dLon := -ring; dLon <= ring; dLon++ {
|
||||||
|
// One square step: 1° of latitude, 2° of longitude.
|
||||||
|
la := lat + float64(dLat)
|
||||||
|
lo := lon + float64(dLon)*2
|
||||||
|
if la > 90 || la < -90 {
|
||||||
|
continue // past a pole there is no square, not a wrapped one
|
||||||
|
}
|
||||||
|
g := LatLonToGrid(la, lo)
|
||||||
|
if !seen[g] {
|
||||||
|
seen[g] = true
|
||||||
|
out = append(out, g)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package geo
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The squares the PSK Reporter feed is filtered on. A wrong ring means either
|
||||||
|
// receiving the world again or hearing nothing.
|
||||||
|
func TestNeighbourGrids(t *testing.T) {
|
||||||
|
// JN36 is around 46.5N 5.5E.
|
||||||
|
lat, lon, ok := GridToLatLon("JN36")
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("JN36 did not resolve")
|
||||||
|
}
|
||||||
|
if got := LatLonToGrid(lat, lon); got != "JN36" {
|
||||||
|
t.Fatalf("round trip gave %q, want JN36", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
ring := NeighbourGrids(lat, lon, 1)
|
||||||
|
if len(ring) != 9 {
|
||||||
|
t.Errorf("ring 1 has %d squares, want 9: %v", len(ring), ring)
|
||||||
|
}
|
||||||
|
found := false
|
||||||
|
for _, g := range ring {
|
||||||
|
if g == "JN36" {
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
if len(g) != 4 {
|
||||||
|
t.Errorf("not a 4-character square: %q", g)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Errorf("the operator's own square is missing from %v", ring)
|
||||||
|
}
|
||||||
|
if n := len(NeighbourGrids(lat, lon, 0)); n != 1 {
|
||||||
|
t.Errorf("ring 0 has %d squares, want just the operator's", n)
|
||||||
|
}
|
||||||
|
if n := len(NeighbourGrids(lat, lon, 2)); n != 25 {
|
||||||
|
t.Errorf("ring 2 has %d squares, want 25", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Near a pole a step north has nowhere to go; it must be dropped, not wrapped
|
||||||
|
// onto a square on the far side of the world.
|
||||||
|
func TestNeighbourGridsNearThePole(t *testing.T) {
|
||||||
|
for _, g := range NeighbourGrids(89.5, 25, 1) {
|
||||||
|
if len(g) != 4 {
|
||||||
|
t.Errorf("bad square near the pole: %q", g)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,226 @@
|
|||||||
|
// Package gridcache is the long-term callsign→grid store behind grid chasing.
|
||||||
|
//
|
||||||
|
// Its own SQLite file, not a table in the settings database: that one sits
|
||||||
|
// wherever the operator put it, often a synchronised folder, and this rewrites
|
||||||
|
// itself every minute. Deleting the file costs a few days of listening.
|
||||||
|
//
|
||||||
|
// A callsign has one grid and the newest report wins — a stale locator reads as
|
||||||
|
// a square already worked, which is worse than none.
|
||||||
|
package gridcache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
_ "modernc.org/sqlite"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Retention bounds a store that would otherwise only ever grow. Two years is
|
||||||
|
// chosen to be far longer than any propagation interest and short enough that a
|
||||||
|
// reassigned callsign eventually stops carrying its previous holder's square —
|
||||||
|
// the one way this cache can be actively wrong rather than merely empty.
|
||||||
|
const Retention = 2 * 365 * 24 * time.Hour
|
||||||
|
|
||||||
|
// FlushEvery is the batch interval. Long enough that a burst of reports costs
|
||||||
|
// one transaction, short enough that a crash loses a minute of learning.
|
||||||
|
const FlushEvery = 60 * time.Second
|
||||||
|
|
||||||
|
// Sources a locator can come from.
|
||||||
|
const (
|
||||||
|
SourceDecode = "decode" // a CQ this station's own receiver decoded
|
||||||
|
SourceMQTT = "mqtt" // a PSK Reporter report
|
||||||
|
)
|
||||||
|
|
||||||
|
// Entry is one locator and where it came from.
|
||||||
|
type Entry struct {
|
||||||
|
Grid string
|
||||||
|
Source string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Store struct {
|
||||||
|
db *sql.DB
|
||||||
|
|
||||||
|
mu sync.Mutex
|
||||||
|
dirty map[string]Entry // call → what to write
|
||||||
|
|
||||||
|
stop chan struct{}
|
||||||
|
stopOnce sync.Once
|
||||||
|
wg sync.WaitGroup
|
||||||
|
|
||||||
|
logf func(string, ...any)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open creates or opens the store at path and prunes what has aged out.
|
||||||
|
func Open(path string, logf func(string, ...any)) (*Store, error) {
|
||||||
|
if logf == nil {
|
||||||
|
logf = func(string, ...any) {}
|
||||||
|
}
|
||||||
|
// WAL so a flush never blocks a read, and a busy timeout because the flush
|
||||||
|
// goroutine and the startup load can overlap on a slow disk.
|
||||||
|
db, err := sql.Open("sqlite", path+"?_pragma=journal_mode(WAL)&_pragma=busy_timeout(5000)")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("gridcache: open %s: %w", path, err)
|
||||||
|
}
|
||||||
|
if _, err := db.Exec("CREATE TABLE IF NOT EXISTS grids (" +
|
||||||
|
"call TEXT PRIMARY KEY, grid TEXT NOT NULL, updated_at INTEGER NOT NULL, " +
|
||||||
|
"source TEXT NOT NULL DEFAULT '')"); err != nil {
|
||||||
|
db.Close()
|
||||||
|
return nil, fmt.Errorf("gridcache: schema: %w", err)
|
||||||
|
}
|
||||||
|
// A file written before the column existed keeps its rows; this fails
|
||||||
|
// harmlessly when the column is already there.
|
||||||
|
db.Exec("ALTER TABLE grids ADD COLUMN source TEXT NOT NULL DEFAULT ''")
|
||||||
|
s := &Store{db: db, dirty: map[string]Entry{}, stop: make(chan struct{}), logf: logf}
|
||||||
|
if n, err := s.prune(); err != nil {
|
||||||
|
s.logf("gridcache: prune failed: %v", err)
|
||||||
|
} else if n > 0 {
|
||||||
|
s.logf("gridcache: pruned %d locators not heard in %d days", n, int(Retention.Hours()/24))
|
||||||
|
}
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) prune() (int64, error) {
|
||||||
|
cut := time.Now().Add(-Retention).Unix()
|
||||||
|
res, err := s.db.Exec(`DELETE FROM grids WHERE updated_at < ?`, cut)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return res.RowsAffected()
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadAll returns every stored locator, for seeding the in-memory map at
|
||||||
|
// startup. One query and one map build — the point of the whole package is that
|
||||||
|
// nothing afterwards has to ask the database anything.
|
||||||
|
func (s *Store) LoadAll() (map[string]string, error) {
|
||||||
|
rows, err := s.db.Query(`SELECT call, grid FROM grids`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("gridcache: load: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]string, 4096)
|
||||||
|
for rows.Next() {
|
||||||
|
var call, grid string
|
||||||
|
if err := rows.Scan(&call, &grid); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out[call] = grid
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Put queues a locator for writing. Callers pass only what CHANGED — an
|
||||||
|
// unchanged report is the common case by a wide margin and must not reach here,
|
||||||
|
// or the batch would carry the whole feed instead of the news in it.
|
||||||
|
func (s *Store) Put(call, grid, source string) {
|
||||||
|
call = strings.ToUpper(strings.TrimSpace(call))
|
||||||
|
grid = strings.TrimSpace(grid)
|
||||||
|
if call == "" || grid == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.mu.Lock()
|
||||||
|
s.dirty[call] = Entry{Grid: grid, Source: source}
|
||||||
|
s.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start runs the flush loop until Close.
|
||||||
|
func (s *Store) Start(ctx context.Context) {
|
||||||
|
s.wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer s.wg.Done()
|
||||||
|
t := time.NewTicker(FlushEvery)
|
||||||
|
defer t.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-s.stop:
|
||||||
|
return
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-t.C:
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
s.logf("gridcache: flush failed: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Flush writes the pending batch in one transaction. Safe to call with nothing
|
||||||
|
// pending, which is most of the time on a quiet band.
|
||||||
|
func (s *Store) Flush() error {
|
||||||
|
s.mu.Lock()
|
||||||
|
if len(s.dirty) == 0 {
|
||||||
|
s.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
batch := s.dirty
|
||||||
|
s.dirty = map[string]Entry{}
|
||||||
|
s.mu.Unlock()
|
||||||
|
|
||||||
|
tx, err := s.db.Begin()
|
||||||
|
if err != nil {
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
st, err := tx.Prepare(`INSERT INTO grids (call, grid, updated_at, source) VALUES (?, ?, ?, ?)
|
||||||
|
ON CONFLICT(call) DO UPDATE SET grid = excluded.grid, updated_at = excluded.updated_at,
|
||||||
|
source = excluded.source`)
|
||||||
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer st.Close()
|
||||||
|
now := time.Now().Unix()
|
||||||
|
for call, e := range batch {
|
||||||
|
if _, err := st.Exec(call, e.Grid, now, e.Source); err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := tx.Commit(); err != nil {
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Logged because a batch that never reaches the disk looks exactly like one
|
||||||
|
// that does: the locators are in memory either way until the next restart,
|
||||||
|
// which is the one moment the difference shows.
|
||||||
|
s.logf("gridcache: wrote %d locators", len(batch))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// requeue puts a failed batch back, without overwriting anything learnt while it
|
||||||
|
// was in flight — the newer value is the right one.
|
||||||
|
func (s *Store) requeue(batch map[string]Entry) {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
for call, e := range batch {
|
||||||
|
if _, newer := s.dirty[call]; !newer {
|
||||||
|
s.dirty[call] = e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pending reports how many locators are waiting to be written.
|
||||||
|
func (s *Store) Pending() int {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
return len(s.dirty)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close stops the loop and writes whatever is pending. A restart is the moment
|
||||||
|
// the cache is most valuable, so losing the last minute of learning to a clean
|
||||||
|
// shutdown would be a poor trade.
|
||||||
|
func (s *Store) Close() error {
|
||||||
|
s.stopOnce.Do(func() { close(s.stop) })
|
||||||
|
s.wg.Wait()
|
||||||
|
err := s.Flush()
|
||||||
|
if cerr := s.db.Close(); err == nil {
|
||||||
|
err = cerr
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
package gridcache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func open(t *testing.T) (*Store, string) {
|
||||||
|
t.Helper()
|
||||||
|
path := filepath.Join(t.TempDir(), "grids.db")
|
||||||
|
s, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open: %v", err)
|
||||||
|
}
|
||||||
|
return s, path
|
||||||
|
}
|
||||||
|
|
||||||
|
// The whole reason the store exists: what was learnt is still there after a
|
||||||
|
// restart, so the cluster's locator column is full in the first second instead
|
||||||
|
// of after an hour of listening.
|
||||||
|
func TestSurvivesRestart(t *testing.T) {
|
||||||
|
s, path := open(t)
|
||||||
|
s.Put("F4BPO", "JN36", SourceDecode)
|
||||||
|
s.Put("OH5CX", "KP30", SourceDecode)
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatalf("flush: %v", err)
|
||||||
|
}
|
||||||
|
if err := s.Close(); err != nil {
|
||||||
|
t.Fatalf("close: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
again, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("reopen: %v", err)
|
||||||
|
}
|
||||||
|
defer again.Close()
|
||||||
|
got, err := again.LoadAll()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("load: %v", err)
|
||||||
|
}
|
||||||
|
if got["F4BPO"] != "JN36" || got["OH5CX"] != "KP30" {
|
||||||
|
t.Errorf("locators lost across a restart: %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A callsign has ONE grid and the newest report wins. Operators move, go
|
||||||
|
// portable, go on expedition — and a stale locator is worse than none for grid
|
||||||
|
// chasing, because it reads as a square already worked.
|
||||||
|
func TestNewestReportWins(t *testing.T) {
|
||||||
|
s, _ := open(t)
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
|
s.Put("F4BPO", "JN36", SourceDecode)
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
s.Put("F4BPO", "KP30", SourceDecode) // moved
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := s.LoadAll()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if got["F4BPO"] != "KP30" {
|
||||||
|
t.Errorf("grid = %q, want the newer KP30", got["F4BPO"])
|
||||||
|
}
|
||||||
|
if len(got) != 1 {
|
||||||
|
t.Errorf("a callsign must hold one row, got %d: %v", len(got), got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nothing reaches the disk until a flush, and a flush with nothing pending is
|
||||||
|
// not an error — that is most minutes on a quiet band.
|
||||||
|
func TestBatching(t *testing.T) {
|
||||||
|
s, _ := open(t)
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
|
for _, c := range []string{"A1AA", "B2BB", "C3CC"} {
|
||||||
|
s.Put(c, "JN36", SourceDecode)
|
||||||
|
}
|
||||||
|
if n := s.Pending(); n != 3 {
|
||||||
|
t.Errorf("pending = %d, want 3 queued and unwritten", n)
|
||||||
|
}
|
||||||
|
if got, _ := s.LoadAll(); len(got) != 0 {
|
||||||
|
t.Errorf("wrote before the flush: %v", got)
|
||||||
|
}
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if n := s.Pending(); n != 0 {
|
||||||
|
t.Errorf("pending = %d after a flush, want 0", n)
|
||||||
|
}
|
||||||
|
if got, _ := s.LoadAll(); len(got) != 3 {
|
||||||
|
t.Errorf("flush wrote %d rows, want 3", len(got))
|
||||||
|
}
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Errorf("empty flush must be a no-op, got %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Age is what bounds a store that would otherwise only grow. A callsign not
|
||||||
|
// heard in two years is likely reassigned, and carrying its previous holder's
|
||||||
|
// square is the one way this cache can be actively wrong rather than empty.
|
||||||
|
func TestPruneOnOpen(t *testing.T) {
|
||||||
|
s, path := open(t)
|
||||||
|
s.Put("FRESH", "JN36", SourceDecode)
|
||||||
|
s.Put("STALE", "IO91", SourceDecode)
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// Backdate one row past the retention window.
|
||||||
|
old := time.Now().Add(-Retention - 24*time.Hour).Unix()
|
||||||
|
if _, err := s.db.Exec(`UPDATE grids SET updated_at = ? WHERE call = 'STALE'`, old); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
s.Close()
|
||||||
|
|
||||||
|
again, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer again.Close()
|
||||||
|
got, _ := again.LoadAll()
|
||||||
|
if _, ok := got["STALE"]; ok {
|
||||||
|
t.Error("an entry past the retention window survived — the store is unbounded")
|
||||||
|
}
|
||||||
|
if got["FRESH"] != "JN36" {
|
||||||
|
t.Error("pruning took a live entry with it")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close has to write what the last minute learnt: a restart is exactly when the
|
||||||
|
// cache is worth the most, so losing it to a clean shutdown would be a poor
|
||||||
|
// trade.
|
||||||
|
func TestCloseFlushes(t *testing.T) {
|
||||||
|
s, path := open(t)
|
||||||
|
s.Put("LATE", "JN36", SourceDecode)
|
||||||
|
if err := s.Close(); err != nil {
|
||||||
|
t.Fatalf("close: %v", err)
|
||||||
|
}
|
||||||
|
again, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer again.Close()
|
||||||
|
got, _ := again.LoadAll()
|
||||||
|
if got["LATE"] != "JN36" {
|
||||||
|
t.Error("what was pending at shutdown was dropped")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -59,6 +59,7 @@ type Event struct {
|
|||||||
|
|
||||||
// A WSJT-X Decode (heard station) to render on the panadapter.
|
// A WSJT-X Decode (heard station) to render on the panadapter.
|
||||||
DecodeCall string // transmitting (DE) callsign
|
DecodeCall string // transmitting (DE) callsign
|
||||||
|
DecodeGrid string // 4-char grid, CQ decodes only
|
||||||
DecodeFreqHz int64 // RF frequency (dial + audio offset)
|
DecodeFreqHz int64 // RF frequency (dial + audio offset)
|
||||||
DecodeSNR int // reported SNR (dB)
|
DecodeSNR int // reported SNR (dB)
|
||||||
DecodeCQ bool // the decode was a CQ
|
DecodeCQ bool // the decode was a CQ
|
||||||
@@ -300,6 +301,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
ev.DecodeCall = w.DecodeCall
|
ev.DecodeCall = w.DecodeCall
|
||||||
|
ev.DecodeGrid = w.DecodeGrid
|
||||||
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
||||||
ev.DecodeSNR = w.SNR
|
ev.DecodeSNR = w.SNR
|
||||||
ev.DecodeCQ = w.IsCQ
|
ev.DecodeCQ = w.IsCQ
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ type WSJTEvent struct {
|
|||||||
// known dial frequency (from Status) to DeltaFreqHz to get the RF frequency.
|
// known dial frequency (from Status) to DeltaFreqHz to get the RF frequency.
|
||||||
IsDecode bool
|
IsDecode bool
|
||||||
DecodeCall string // the sender (DE) callsign extracted from the message text
|
DecodeCall string // the sender (DE) callsign extracted from the message text
|
||||||
|
DecodeGrid string // 4-char grid, CQ decodes only — the exchange carries none
|
||||||
DeltaFreqHz int64 // audio offset within the passband (Hz)
|
DeltaFreqHz int64 // audio offset within the passband (Hz)
|
||||||
SNR int // reported signal-to-noise (dB)
|
SNR int // reported signal-to-noise (dB)
|
||||||
IsCQ bool // the decode was a CQ call
|
IsCQ bool // the decode was a CQ call
|
||||||
@@ -239,13 +240,14 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return WSJTEvent{}, false, err
|
return WSJTEvent{}, false, err
|
||||||
}
|
}
|
||||||
call, isCQ := wsjtSender(msg)
|
call, isCQ, grid := wsjtSender(msg)
|
||||||
if call == "" {
|
if call == "" {
|
||||||
return WSJTEvent{}, false, nil // free-text / telemetry / unparseable → ignore
|
return WSJTEvent{}, false, nil // free-text / telemetry / unparseable → ignore
|
||||||
}
|
}
|
||||||
ev.IsDecode = true
|
ev.IsDecode = true
|
||||||
ev.DecodeCall = call
|
ev.DecodeCall = call
|
||||||
ev.IsCQ = isCQ
|
ev.IsCQ = isCQ
|
||||||
|
ev.DecodeGrid = grid
|
||||||
ev.DeltaFreqHz = int64(df)
|
ev.DeltaFreqHz = int64(df)
|
||||||
ev.SNR = int(snr)
|
ev.SNR = int(snr)
|
||||||
ev.Mode = strings.ToUpper(strings.TrimSpace(mode))
|
ev.Mode = strings.ToUpper(strings.TrimSpace(mode))
|
||||||
@@ -263,17 +265,20 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
|||||||
return WSJTEvent{}, false, nil
|
return WSJTEvent{}, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// wsjtSender extracts the transmitting (DE) callsign from a WSJT-X message and
|
// wsjtSender extracts the transmitting (DE) callsign from a WSJT-X message,
|
||||||
// whether it was a CQ. Grammar:
|
// whether it was a CQ, and the grid when the message carries one. Grammar:
|
||||||
//
|
//
|
||||||
// CQ [modifier] <de_call> [grid] → de_call, isCQ=true
|
// CQ [modifier] <de_call> [grid] → de_call, isCQ=true, grid
|
||||||
// <to_call> <de_call> [report|…] → de_call, isCQ=false
|
// <to_call> <de_call> [report|…] → de_call, isCQ=false
|
||||||
//
|
//
|
||||||
|
// Only a CQ carries a grid: the standard exchange puts a signal report in that
|
||||||
|
// third slot, never a locator.
|
||||||
|
//
|
||||||
// Returns "" for free-text / telemetry / hashed-call messages we can't resolve.
|
// Returns "" for free-text / telemetry / hashed-call messages we can't resolve.
|
||||||
func wsjtSender(message string) (call string, isCQ bool) {
|
func wsjtSender(message string) (call string, isCQ bool, grid string) {
|
||||||
f := strings.Fields(strings.ToUpper(strings.TrimSpace(message)))
|
f := strings.Fields(strings.ToUpper(strings.TrimSpace(message)))
|
||||||
if len(f) == 0 {
|
if len(f) == 0 {
|
||||||
return "", false
|
return "", false, ""
|
||||||
}
|
}
|
||||||
if f[0] == "CQ" {
|
if f[0] == "CQ" {
|
||||||
// Skip an optional modifier after CQ (DX / a region like NA / a zone like
|
// Skip an optional modifier after CQ (DX / a region like NA / a zone like
|
||||||
@@ -282,16 +287,41 @@ func wsjtSender(message string) (call string, isCQ bool) {
|
|||||||
if len(f) > 2 && !looksLikeCall(f[1]) {
|
if len(f) > 2 && !looksLikeCall(f[1]) {
|
||||||
idx = 2
|
idx = 2
|
||||||
}
|
}
|
||||||
if idx < len(f) && looksLikeCall(f[idx]) {
|
if idx < len(f) {
|
||||||
return f[idx], true
|
c := f[idx]
|
||||||
|
// A GRID sitting in the callsign slot means the real call was
|
||||||
|
// unparseable and the skip above went one word too far. JN36 has letters
|
||||||
|
// and digits and passes every shape test there is, so without this the
|
||||||
|
// station's grid gets logged, spotted and coloured as its callsign.
|
||||||
|
if looksLikeCall(c) && !isGridField(c) {
|
||||||
|
if idx+1 < len(f) && isGridField(f[idx+1]) {
|
||||||
|
grid = f[idx+1]
|
||||||
}
|
}
|
||||||
return "", true
|
return c, true, grid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "", true, ""
|
||||||
}
|
}
|
||||||
// Standard exchange: the DE (sender) call is the second token.
|
// Standard exchange: the DE (sender) call is the second token.
|
||||||
if len(f) >= 2 && looksLikeCall(f[1]) {
|
if len(f) >= 2 && looksLikeCall(f[1]) {
|
||||||
return f[1], false
|
return f[1], false, ""
|
||||||
}
|
}
|
||||||
return "", false
|
return "", false, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// isGridField reports a 4-character Maidenhead field+square (JN36).
|
||||||
|
//
|
||||||
|
// RR73 is the reason this is not a bare pattern match: it is a sign-off, not a
|
||||||
|
// locator, yet R falls inside A–R and 73 inside 00–99, so it satisfies the
|
||||||
|
// Maidenhead shape exactly. WSJT-X never puts it in the slot after a CQ call,
|
||||||
|
// but a station sending "CQ RR73" style free text would silently plant a
|
||||||
|
// nonexistent grid in the log's grid index, and nothing downstream could tell.
|
||||||
|
func isGridField(s string) bool {
|
||||||
|
if len(s) != 4 || s == "RR73" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return s[0] >= 'A' && s[0] <= 'R' && s[1] >= 'A' && s[1] <= 'R' &&
|
||||||
|
s[2] >= '0' && s[2] <= '9' && s[3] >= '0' && s[3] <= '9'
|
||||||
}
|
}
|
||||||
|
|
||||||
// looksLikeCall is a loose callsign test: 3–12 chars of A–Z/0–9//, with at least
|
// looksLikeCall is a loose callsign test: 3–12 chars of A–Z/0–9//, with at least
|
||||||
|
|||||||
@@ -7,26 +7,37 @@ func TestWSJTSender(t *testing.T) {
|
|||||||
msg string
|
msg string
|
||||||
wantCall string
|
wantCall string
|
||||||
wantCQ bool
|
wantCQ bool
|
||||||
|
wantGrid string
|
||||||
}{
|
}{
|
||||||
{"CQ K1ABC FN42", "K1ABC", true},
|
{"CQ K1ABC FN42", "K1ABC", true, "FN42"},
|
||||||
{"CQ DX W2XYZ EM12", "W2XYZ", true}, // modifier "DX" skipped
|
{"CQ DX W2XYZ EM12", "W2XYZ", true, "EM12"}, // modifier "DX" skipped
|
||||||
{"CQ NA VE3ABC FN03", "VE3ABC", true}, // region modifier skipped
|
{"CQ NA VE3ABC FN03", "VE3ABC", true, "FN03"}, // region modifier skipped
|
||||||
{"CQ 020 JA1XYZ PM95", "JA1XYZ", true},// zone modifier skipped
|
{"CQ 020 JA1XYZ PM95", "JA1XYZ", true, "PM95"}, // zone modifier skipped
|
||||||
{"W2XYZ K1ABC -10", "K1ABC", false}, // exchange → sender is 2nd call
|
{"W2XYZ K1ABC -10", "K1ABC", false, ""}, // exchange → sender is 2nd call
|
||||||
{"W2XYZ K1ABC R-10", "K1ABC", false},
|
{"W2XYZ K1ABC R-10", "K1ABC", false, ""},
|
||||||
{"W2XYZ K1ABC RR73", "K1ABC", false},
|
{"W2XYZ K1ABC RR73", "K1ABC", false, ""},
|
||||||
{"F4BPO K1ABC/P 73", "K1ABC/P", false},// portable call kept
|
{"F4BPO K1ABC/P 73", "K1ABC/P", false, ""}, // portable call kept
|
||||||
{"CQ F/DL1ABC JO31", "F/DL1ABC", true},// compound prefix
|
{"CQ F/DL1ABC JO31", "F/DL1ABC", true, "JO31"}, // compound prefix, grid still valid
|
||||||
|
{"CQ K1ABC", "K1ABC", true, ""}, // CQ without a grid
|
||||||
|
{"CQ K1ABC RR73", "K1ABC", true, ""}, // RR73 is a sign-off, NOT grid RR73
|
||||||
|
{"CQ K1ABC FN4", "K1ABC", true, ""}, // 3 chars is not a field+square
|
||||||
|
{"CQ K1ABC FN42AB", "K1ABC", true, ""}, // 6-char: WSJT-X never sends it here
|
||||||
|
{"CQ K1ABC 73", "K1ABC", true, ""}, // bare sign-off
|
||||||
|
{"CQ K1ABC SS42", "K1ABC", true, ""}, // S is past R — no such field
|
||||||
|
// An unknown word after CQ made the parser skip a slot; a grid passes every
|
||||||
|
// shape test a callsign does, so it came back AS the callsign.
|
||||||
|
{"CQ FOO JN36", "", true, ""},
|
||||||
// Non-callsign / free text → no sender.
|
// Non-callsign / free text → no sender.
|
||||||
{"TNX 73 GL", "", false},
|
{"TNX 73 GL", "", false, ""},
|
||||||
{"K1ABC RR73", "", false}, // only one call + a token → 2nd token not a call
|
{"K1ABC RR73", "", false, ""}, // only one call + a token → 2nd token not a call
|
||||||
{"", "", false},
|
{"", "", false, ""},
|
||||||
{"CQ CQ CQ", "", true}, // CQ but no resolvable call
|
{"CQ CQ CQ", "", true, ""}, // CQ but no resolvable call
|
||||||
}
|
}
|
||||||
for _, c := range cases {
|
for _, c := range cases {
|
||||||
call, cq := wsjtSender(c.msg)
|
call, cq, grid := wsjtSender(c.msg)
|
||||||
if call != c.wantCall || cq != c.wantCQ {
|
if call != c.wantCall || cq != c.wantCQ || grid != c.wantGrid {
|
||||||
t.Errorf("wsjtSender(%q) = (%q,%v), want (%q,%v)", c.msg, call, cq, c.wantCall, c.wantCQ)
|
t.Errorf("wsjtSender(%q) = (%q,%v,%q), want (%q,%v,%q)",
|
||||||
|
c.msg, call, cq, grid, c.wantCall, c.wantCQ, c.wantGrid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,6 +94,13 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return Result{}, err
|
return Result{}, err
|
||||||
}
|
}
|
||||||
|
return parseHamQTHSearch(body)
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseHamQTHSearch turns one answer into a Result. Split out from the request
|
||||||
|
// so the field mapping can be checked against a captured payload — which is how
|
||||||
|
// the missing full name and picture were found.
|
||||||
|
func parseHamQTHSearch(body []byte) (Result, error) {
|
||||||
var resp hamqthRoot
|
var resp hamqthRoot
|
||||||
if err := xml.Unmarshal(body, &resp); err != nil {
|
if err := xml.Unmarshal(body, &resp); err != nil {
|
||||||
return Result{}, fmt.Errorf("hamqth: parse callsign: %w", err)
|
return Result{}, fmt.Errorf("hamqth: parse callsign: %w", err)
|
||||||
@@ -112,11 +119,20 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
|||||||
if s.Callsign == "" {
|
if s.Callsign == "" {
|
||||||
return Result{}, ErrNotFound
|
return Result{}, ErrNotFound
|
||||||
}
|
}
|
||||||
|
// <nick> is the name the operator goes BY on the air, which is what belongs
|
||||||
|
// in a log — "Igor", not "Igor Vladimirovich Getman". adr_name is the postal
|
||||||
|
// name and is used only when there is nothing else, so a record carrying
|
||||||
|
// neither nick nor name no longer resolves to blank.
|
||||||
|
name := strings.TrimSpace(s.Nick + " " + s.LastName)
|
||||||
|
if name == "" {
|
||||||
|
name = strings.TrimSpace(s.AdrName)
|
||||||
|
}
|
||||||
r := Result{
|
r := Result{
|
||||||
Callsign: strings.ToUpper(s.Callsign),
|
Callsign: strings.ToUpper(s.Callsign),
|
||||||
Name: strings.TrimSpace(s.Nick + " " + s.LastName),
|
Name: name,
|
||||||
QTH: firstNonEmpty(s.QTH, s.AdrCity),
|
QTH: firstNonEmpty(s.QTH, s.AdrCity),
|
||||||
Address: s.AdrStreet1,
|
Address: s.AdrStreet1,
|
||||||
|
Zip: s.AdrZip,
|
||||||
State: strings.ToUpper(s.USState),
|
State: strings.ToUpper(s.USState),
|
||||||
County: s.USCounty,
|
County: s.USCounty,
|
||||||
Country: firstNonEmpty(s.AdrCountry, s.Country),
|
Country: firstNonEmpty(s.AdrCountry, s.Country),
|
||||||
@@ -124,6 +140,8 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
|||||||
Continent: strings.ToUpper(s.Continent),
|
Continent: strings.ToUpper(s.Continent),
|
||||||
Email: s.Email,
|
Email: s.Email,
|
||||||
QSLVia: s.QSLVia,
|
QSLVia: s.QSLVia,
|
||||||
|
Web: s.Web,
|
||||||
|
ImageURL: s.Picture,
|
||||||
}
|
}
|
||||||
r.Lat, _ = strconv.ParseFloat(s.Latitude, 64)
|
r.Lat, _ = strconv.ParseFloat(s.Latitude, 64)
|
||||||
r.Lon, _ = strconv.ParseFloat(s.Longitude, 64)
|
r.Lon, _ = strconv.ParseFloat(s.Longitude, 64)
|
||||||
@@ -182,4 +200,14 @@ type hamqthSearch struct {
|
|||||||
Continent string `xml:"continent"`
|
Continent string `xml:"continent"`
|
||||||
Email string `xml:"email"`
|
Email string `xml:"email"`
|
||||||
QSLVia string `xml:"qsl_via"`
|
QSLVia string `xml:"qsl_via"`
|
||||||
|
// AdrName is the full postal name. Many records carry it and no <name> at
|
||||||
|
// all, so building the name from <nick> + <name> silently kept the first
|
||||||
|
// name and dropped the rest.
|
||||||
|
AdrName string `xml:"adr_name"`
|
||||||
|
AdrZip string `xml:"adr_zip"`
|
||||||
|
// Picture is HamQTH's profile photo. Result.ImageURL was documented as "QRZ
|
||||||
|
// only" because this element was never read — QRZ calls the same thing
|
||||||
|
// <image>.
|
||||||
|
Picture string `xml:"picture"`
|
||||||
|
Web string `xml:"web"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,128 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/xml"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A real HamQTH answer, captured from the live API.
|
||||||
|
//
|
||||||
|
// Two things it settles. The email IS returned and must reach the QSO. And the
|
||||||
|
// element names are not the ones a reading of the documentation suggests:
|
||||||
|
// there is no <name> here at all, the full name is <adr_name>, and the picture
|
||||||
|
// is <picture> where QRZ calls it <image>. The stray <div> is an advert the
|
||||||
|
// server injects into its own XML; the parser has to shrug it off.
|
||||||
|
const hamqthEU1EU = `<?xml version="1.0"?>
|
||||||
|
<HamQTH xmlns="https://www.hamqth.com" version="2.8">
|
||||||
|
<div id="in-page-channel-node-id" data-channel-name="in_page_channel_Sux7_K"/>
|
||||||
|
<search>
|
||||||
|
<callsign>eu1eu</callsign>
|
||||||
|
<nick>Igor</nick>
|
||||||
|
<qth>Minsk-5</qth>
|
||||||
|
<country>Belarus</country>
|
||||||
|
<adif>27</adif>
|
||||||
|
<itu>29</itu>
|
||||||
|
<cq>16</cq>
|
||||||
|
<grid>KO33SV</grid>
|
||||||
|
<adr_name>Igor Vladimirovich Getman</adr_name>
|
||||||
|
<adr_street1>A/ya 143</adr_street1>
|
||||||
|
<adr_city>Minsk-5</adr_city>
|
||||||
|
<adr_zip>220005</adr_zip>
|
||||||
|
<adr_country>Belarus</adr_country>
|
||||||
|
<adr_adif>27</adr_adif>
|
||||||
|
<district>WAARB-LE</district>
|
||||||
|
<lotw>?</lotw>
|
||||||
|
<qsldirect>?</qsldirect>
|
||||||
|
<qsl>?</qsl>
|
||||||
|
<eqsl>Y</eqsl>
|
||||||
|
<email>eu1eu@mail.ru</email>
|
||||||
|
<latitude>53.88999938964844</latitude>
|
||||||
|
<longitude>27.59000015258789</longitude>
|
||||||
|
<continent>EU</continent>
|
||||||
|
<utc_offset>-2</utc_offset>
|
||||||
|
<picture>https://www.hamqth.com/images/default/ts-930_qith_old_radios.jpg</picture>
|
||||||
|
</search>
|
||||||
|
</HamQTH>`
|
||||||
|
|
||||||
|
func TestHamQTHParsesEveryUsefulField(t *testing.T) {
|
||||||
|
var root hamqthRoot
|
||||||
|
if err := xml.Unmarshal([]byte(hamqthEU1EU), &root); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
s := root.Search
|
||||||
|
|
||||||
|
for _, c := range []struct{ name, got, want string }{
|
||||||
|
{"callsign", s.Callsign, "eu1eu"},
|
||||||
|
{"email", s.Email, "[email protected]"},
|
||||||
|
{"grid", s.Grid, "KO33SV"},
|
||||||
|
{"qth", s.QTH, "Minsk-5"},
|
||||||
|
{"street", s.AdrStreet1, "A/ya 143"},
|
||||||
|
{"city", s.AdrCity, "Minsk-5"},
|
||||||
|
{"country", s.AdrCountry, "Belarus"},
|
||||||
|
{"continent", s.Continent, "EU"},
|
||||||
|
{"dxcc", s.DXCC, "27"},
|
||||||
|
{"cq", s.CQ, "16"},
|
||||||
|
{"itu", s.ITU, "29"},
|
||||||
|
} {
|
||||||
|
if c.got != c.want {
|
||||||
|
t.Errorf("%s = %q, want %q", c.name, c.got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The fields the parser was blind to. Each is data OpsLog has somewhere to put.
|
||||||
|
func TestHamQTHParsesTheFieldsThatWereMissing(t *testing.T) {
|
||||||
|
var root hamqthRoot
|
||||||
|
if err := xml.Unmarshal([]byte(hamqthEU1EU), &root); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
s := root.Search
|
||||||
|
|
||||||
|
// The postal name, the fallback when a record carries no nick and no name.
|
||||||
|
if s.AdrName != "Igor Vladimirovich Getman" {
|
||||||
|
t.Errorf("adr_name = %q", s.AdrName)
|
||||||
|
}
|
||||||
|
if s.LastName != "" {
|
||||||
|
t.Errorf("this record has no <name>; got %q", s.LastName)
|
||||||
|
}
|
||||||
|
// The profile picture. Result.ImageURL existed and said "QRZ only" — HamQTH
|
||||||
|
// sends one too, under a different element name.
|
||||||
|
if s.Picture == "" {
|
||||||
|
t.Error("picture not parsed")
|
||||||
|
}
|
||||||
|
if s.AdrZip != "220005" {
|
||||||
|
t.Errorf("adr_zip = %q", s.AdrZip)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// End to end: what the provider hands back must carry the email, the full name
|
||||||
|
// and the picture.
|
||||||
|
func TestHamQTHResultCarriesTheLot(t *testing.T) {
|
||||||
|
r, err := parseHamQTHSearch([]byte(hamqthEU1EU))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if r.Email != "[email protected]" {
|
||||||
|
t.Errorf("Email = %q — this is what was reported missing", r.Email)
|
||||||
|
}
|
||||||
|
// The nick, not the postal name: a log wants the name the operator goes by
|
||||||
|
// on the air. adr_name is only the fallback when there is nothing else.
|
||||||
|
if r.Name != "Igor" {
|
||||||
|
t.Errorf("Name = %q, want the on-air nick", r.Name)
|
||||||
|
}
|
||||||
|
if r.ImageURL == "" {
|
||||||
|
t.Error("ImageURL empty — HamQTH sent a picture")
|
||||||
|
}
|
||||||
|
if r.Grid != "KO33SV" {
|
||||||
|
t.Errorf("Grid = %q", r.Grid)
|
||||||
|
}
|
||||||
|
if r.Lat < 53.8 || r.Lat > 53.9 {
|
||||||
|
t.Errorf("Lat = %v", r.Lat)
|
||||||
|
}
|
||||||
|
if r.DXCC != 27 || r.CQZ != 16 || r.ITUZ != 29 {
|
||||||
|
t.Errorf("dxcc/cq/itu = %d/%d/%d", r.DXCC, r.CQZ, r.ITUZ)
|
||||||
|
}
|
||||||
|
if r.Address != "A/ya 143" {
|
||||||
|
t.Errorf("Address = %q", r.Address)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,7 +37,13 @@ type Result struct {
|
|||||||
Continent string `json:"cont,omitempty"`
|
Continent string `json:"cont,omitempty"`
|
||||||
Email string `json:"email,omitempty"`
|
Email string `json:"email,omitempty"`
|
||||||
QSLVia string `json:"qsl_via,omitempty"`
|
QSLVia string `json:"qsl_via,omitempty"`
|
||||||
ImageURL string `json:"image_url,omitempty"` // profile picture URL (QRZ only for now)
|
// Web is the operator's own site. The QSO table has had a `web` column all
|
||||||
|
// along and nothing ever filled it, because no provider mapping read the
|
||||||
|
// field.
|
||||||
|
Web string `json:"web,omitempty"`
|
||||||
|
// Zip is the postal code. HamQTH and QRZ both send one.
|
||||||
|
Zip string `json:"zip,omitempty"`
|
||||||
|
ImageURL string `json:"image_url,omitempty"` // profile picture URL
|
||||||
Source string `json:"source"` // "qrz", "hamqth", or "cache"
|
Source string `json:"source"` // "qrz", "hamqth", or "cache"
|
||||||
FetchedAt time.Time `json:"fetched_at"`
|
FetchedAt time.Time `json:"fetched_at"`
|
||||||
}
|
}
|
||||||
@@ -176,12 +182,20 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
|
|||||||
r.Callsign = call
|
r.Callsign = call
|
||||||
r.Source = p.Name()
|
r.Source = p.Name()
|
||||||
r.FetchedAt = time.Now().UTC()
|
r.FetchedAt = time.Now().UTC()
|
||||||
// The home record's location is the operator's HOME, not where they
|
// The home record's location is the operator's HOME — clear it so
|
||||||
// are portable now — clear it so cty.dat fills the real entity.
|
// cty.dat fills in where they actually are.
|
||||||
|
//
|
||||||
|
// UNLESS the suffix says nothing about location. /QRP is a statement
|
||||||
|
// about power, not about place: M0BFS/QRP is M0BFS, at home, running
|
||||||
|
// five watts. Wiping the grid there threw away the one field the
|
||||||
|
// operator was looking the call up for, and it came back empty while
|
||||||
|
// the same lookup without the suffix answered perfectly.
|
||||||
|
if !saysNothingAboutLocation(call) {
|
||||||
r.Country, r.Continent = "", ""
|
r.Country, r.Continent = "", ""
|
||||||
r.CQZ, r.ITUZ, r.DXCC = 0, 0, 0
|
r.CQZ, r.ITUZ, r.DXCC = 0, 0, 0
|
||||||
r.Lat, r.Lon = 0, 0
|
r.Lat, r.Lon = 0, 0
|
||||||
r.Grid, r.State, r.County = "", "", ""
|
r.Grid, r.State, r.County = "", "", ""
|
||||||
|
}
|
||||||
fillFromDXCC(&r, dxcc) // entity/zones/lat-lon from the FULL (slashed) call
|
fillFromDXCC(&r, dxcc) // entity/zones/lat-lon from the FULL (slashed) call
|
||||||
normalizeNames(&r)
|
normalizeNames(&r)
|
||||||
_ = m.cache.Put(ctx, r)
|
_ = m.cache.Put(ctx, r)
|
||||||
@@ -232,6 +246,33 @@ var LogSink = func(string, ...any) {}
|
|||||||
// right and must be looked up exactly as entered.
|
// right and must be looked up exactly as entered.
|
||||||
var opSuffixes = map[string]bool{"M": true, "MM": true, "AM": true, "P": true, "QRP": true}
|
var opSuffixes = map[string]bool{"M": true, "MM": true, "AM": true, "P": true, "QRP": true}
|
||||||
|
|
||||||
|
// nonLocationSuffixes say nothing about WHERE the operator is.
|
||||||
|
//
|
||||||
|
// /QRP is a statement about power. /M and /P and their kin are not: mobile and
|
||||||
|
// portable both mean "somewhere other than the home station", which is exactly
|
||||||
|
// why the home record's location is discarded for them. Keeping that distinction
|
||||||
|
// is the difference between a grid that is stale and a grid that is absent.
|
||||||
|
var nonLocationSuffixes = map[string]bool{"QRP": true}
|
||||||
|
|
||||||
|
// saysNothingAboutLocation reports a call whose every suffix leaves the operator
|
||||||
|
// at their registered address — so the home record's location can be trusted.
|
||||||
|
func saysNothingAboutLocation(call string) bool {
|
||||||
|
parts := strings.Split(strings.ToUpper(strings.TrimSpace(call)), "/")
|
||||||
|
if len(parts) < 2 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
base := strings.TrimSpace(parts[0])
|
||||||
|
if len(base) < 3 || !strings.ContainsAny(base, "0123456789") {
|
||||||
|
return false // "JW/OR1A": the first part is a prefix — a location change
|
||||||
|
}
|
||||||
|
for _, p := range parts[1:] {
|
||||||
|
if !nonLocationSuffixes[strings.TrimSpace(p)] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
// stripOpSuffix returns the bare callsign when call carries nothing but
|
// stripOpSuffix returns the bare callsign when call carries nothing but
|
||||||
// operational suffixes ("F4LYI/M" → "F4LYI", true). Reports false for anything
|
// operational suffixes ("F4LYI/M" → "F4LYI", true). Reports false for anything
|
||||||
// that changes entity or area ("JW/OR1A", "F4BPO/8"), and for a call whose base
|
// that changes entity or area ("JW/OR1A", "F4BPO/8"), and for a call whose base
|
||||||
@@ -411,12 +452,13 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
row := c.db.QueryRowContext(ctx, `
|
row := c.db.QueryRowContext(ctx, `
|
||||||
SELECT callsign, name, qth, address, state, cnty, country, grid,
|
SELECT callsign, name, qth, address, state, cnty, country, grid,
|
||||||
lat, lon, dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
lat, lon, dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
||||||
source, fetched_at
|
web, zip, source, fetched_at
|
||||||
FROM callsign_cache WHERE callsign = ?`, callsign)
|
FROM callsign_cache WHERE callsign = ?`, callsign)
|
||||||
var (
|
var (
|
||||||
r Result
|
r Result
|
||||||
name, qth, addr, state, cnty sql.NullString
|
name, qth, addr, state, cnty sql.NullString
|
||||||
country, grid, cont, email, qslVia, image sql.NullString
|
country, grid, cont, email, qslVia, image sql.NullString
|
||||||
|
web, zip sql.NullString
|
||||||
src string
|
src string
|
||||||
dxcc, cqz, ituz sql.NullInt64
|
dxcc, cqz, ituz sql.NullInt64
|
||||||
lat, lon sql.NullFloat64
|
lat, lon sql.NullFloat64
|
||||||
@@ -424,7 +466,7 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
)
|
)
|
||||||
if err := row.Scan(&r.Callsign, &name, &qth, &addr, &state, &cnty,
|
if err := row.Scan(&r.Callsign, &name, &qth, &addr, &state, &cnty,
|
||||||
&country, &grid, &lat, &lon,
|
&country, &grid, &lat, &lon,
|
||||||
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image,
|
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image, &web, &zip,
|
||||||
&src, &fetched); err != nil {
|
&src, &fetched); err != nil {
|
||||||
return Result{}, false
|
return Result{}, false
|
||||||
}
|
}
|
||||||
@@ -446,6 +488,8 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
r.Lon = lon.Float64
|
r.Lon = lon.Float64
|
||||||
r.Continent = cont.String
|
r.Continent = cont.String
|
||||||
r.Email = email.String
|
r.Email = email.String
|
||||||
|
r.Web = web.String
|
||||||
|
r.Zip = zip.String
|
||||||
r.QSLVia = qslVia.String
|
r.QSLVia = qslVia.String
|
||||||
r.ImageURL = image.String
|
r.ImageURL = image.String
|
||||||
r.DXCC = int(dxcc.Int64)
|
r.DXCC = int(dxcc.Int64)
|
||||||
@@ -462,7 +506,7 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
updateCols := []string{
|
updateCols := []string{
|
||||||
"name", "qth", "address", "state", "cnty",
|
"name", "qth", "address", "state", "cnty",
|
||||||
"country", "grid", "lat", "lon",
|
"country", "grid", "lat", "lon",
|
||||||
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url",
|
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url", "web", "zip",
|
||||||
"source", "fetched_at",
|
"source", "fetched_at",
|
||||||
}
|
}
|
||||||
// The lookup cache always lives in the local SQLite database, so SQLite
|
// The lookup cache always lives in the local SQLite database, so SQLite
|
||||||
@@ -475,8 +519,8 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
INSERT INTO callsign_cache(callsign, name, qth, address, state, cnty,
|
INSERT INTO callsign_cache(callsign, name, qth, address, state, cnty,
|
||||||
country, grid, lat, lon,
|
country, grid, lat, lon,
|
||||||
dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
||||||
source, fetched_at)
|
web, zip, source, fetched_at)
|
||||||
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?)
|
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?, ?,?)
|
||||||
ON CONFLICT(callsign) DO UPDATE SET ` + strings.Join(sets, ", ")
|
ON CONFLICT(callsign) DO UPDATE SET ` + strings.Join(sets, ", ")
|
||||||
_, err := c.db.ExecContext(ctx, q,
|
_, err := c.db.ExecContext(ctx, q,
|
||||||
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
|
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
|
||||||
@@ -485,7 +529,7 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
nullableFloat(r.Lat), nullableFloat(r.Lon),
|
nullableFloat(r.Lat), nullableFloat(r.Lon),
|
||||||
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
|
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
|
||||||
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
|
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
|
||||||
nullable(r.ImageURL),
|
nullable(r.ImageURL), nullable(r.Web), nullable(r.Zip),
|
||||||
r.Source, db.NowISO(),
|
r.Source, db.NowISO(),
|
||||||
)
|
)
|
||||||
return err
|
return err
|
||||||
|
|||||||
+33
-14
@@ -21,6 +21,12 @@ type QRZ struct {
|
|||||||
|
|
||||||
HTTP *http.Client
|
HTTP *http.Client
|
||||||
|
|
||||||
|
// PreferNickname takes QRZ's <nickname> over the composed first+last name
|
||||||
|
// when the operator has published one. It is the name they go BY on the air,
|
||||||
|
// which is what belongs in a log — HamQTH's <nick> is already used that way,
|
||||||
|
// and this brings QRZ into line for operators who want it.
|
||||||
|
PreferNickname bool
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
session string
|
session string
|
||||||
loggedAt time.Time
|
loggedAt time.Time
|
||||||
@@ -117,7 +123,7 @@ func (q *QRZ) fetch(ctx context.Context, sessionKey, callsign string) (Result, e
|
|||||||
}
|
}
|
||||||
r := Result{
|
r := Result{
|
||||||
Callsign: strings.ToUpper(c.Call),
|
Callsign: strings.ToUpper(c.Call),
|
||||||
Name: joinName(c.FName, c.Name),
|
Name: qrzName(q.PreferNickname, c.Nickname, c.FName, c.Name),
|
||||||
QTH: c.Addr2,
|
QTH: c.Addr2,
|
||||||
Address: composeQRZAddress(c.Addr1, c.Addr2, c.Zip, c.Country),
|
Address: composeQRZAddress(c.Addr1, c.Addr2, c.Zip, c.Country),
|
||||||
State: strings.ToUpper(c.State),
|
State: strings.ToUpper(c.State),
|
||||||
@@ -169,6 +175,7 @@ type qrzSession struct {
|
|||||||
type qrzCallsign struct {
|
type qrzCallsign struct {
|
||||||
Call string `xml:"call"`
|
Call string `xml:"call"`
|
||||||
FName string `xml:"fname"`
|
FName string `xml:"fname"`
|
||||||
|
Nickname string `xml:"nickname"` // the name the operator goes by on the air
|
||||||
Name string `xml:"name"`
|
Name string `xml:"name"`
|
||||||
Addr1 string `xml:"addr1"`
|
Addr1 string `xml:"addr1"`
|
||||||
Addr2 string `xml:"addr2"`
|
Addr2 string `xml:"addr2"`
|
||||||
@@ -213,19 +220,6 @@ func composeQRZAddress(addr1, addr2, zip, country string) string {
|
|||||||
return strings.Join(parts, ", ")
|
return strings.Join(parts, ", ")
|
||||||
}
|
}
|
||||||
|
|
||||||
func joinName(first, last string) string {
|
|
||||||
first = strings.TrimSpace(first)
|
|
||||||
last = strings.TrimSpace(last)
|
|
||||||
switch {
|
|
||||||
case first != "" && last != "":
|
|
||||||
return first + " " + last
|
|
||||||
case first != "":
|
|
||||||
return first
|
|
||||||
default:
|
|
||||||
return last
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func firstNonEmpty(s ...string) string {
|
func firstNonEmpty(s ...string) string {
|
||||||
for _, v := range s {
|
for _, v := range s {
|
||||||
v = strings.TrimSpace(v)
|
v = strings.TrimSpace(v)
|
||||||
@@ -235,3 +229,28 @@ func firstNonEmpty(s ...string) string {
|
|||||||
}
|
}
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// qrzName picks what goes in the log's Name field.
|
||||||
|
//
|
||||||
|
// The FIRST name only. A log greets an operator, it does not address an
|
||||||
|
// envelope: "Robert" is what goes out on the air, and "Robert Smith" filled the
|
||||||
|
// field with something no one would ever send. The surname stays available in
|
||||||
|
// the record; it simply is not the name of the contact.
|
||||||
|
//
|
||||||
|
// The nickname is taken ahead of it when the operator asked for that AND QRZ
|
||||||
|
// has one — a blank nickname must never blank the name, which is the whole
|
||||||
|
// reason this is a fallback rather than a swap.
|
||||||
|
//
|
||||||
|
// The surname is the last resort: a record with no first name at all is better
|
||||||
|
// answered with a surname than with nothing.
|
||||||
|
func qrzName(preferNickname bool, nickname, fname, name string) string {
|
||||||
|
if preferNickname {
|
||||||
|
if n := strings.TrimSpace(nickname); n != "" {
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if f := strings.TrimSpace(fname); f != "" {
|
||||||
|
return f
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(name)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// What goes in a log's Name field is the FIRST name. A log greets an operator;
|
||||||
|
// it does not address an envelope. "Robert Smith" filled the field with
|
||||||
|
// something no one would ever send on the air.
|
||||||
|
//
|
||||||
|
// The nickname wins ahead of it when asked for — but a published nickname is
|
||||||
|
// optional, so an empty one must fall through rather than blank the name. That
|
||||||
|
// is the whole difference between a fallback and a swap.
|
||||||
|
func TestQRZName(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
name string
|
||||||
|
prefer bool
|
||||||
|
nickname, fname, last string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"first name only, never the surname", false, "Bob", "Robert", "Smith", "Robert"},
|
||||||
|
{"nickname when asked for", true, "Bob", "Robert", "Smith", "Bob"},
|
||||||
|
{"no nickname published falls back to the FIRST name", true, "", "Robert", "Smith", "Robert"},
|
||||||
|
{"a blank nickname is not a nickname", true, " ", "Robert", "Smith", "Robert"},
|
||||||
|
{"option off ignores the nickname", false, "Bob", "Robert", "Smith", "Robert"},
|
||||||
|
{"surname is the last resort, not the default", true, "", "", "Smith", "Smith"},
|
||||||
|
{"nothing published at all", false, "", "", "", ""},
|
||||||
|
{"nickname alone", true, "Bob", "", "", "Bob"},
|
||||||
|
} {
|
||||||
|
if got := qrzName(tc.prefer, tc.nickname, tc.fname, tc.last); got != tc.want {
|
||||||
|
t.Errorf("%s: qrzName(%v, %q, %q, %q) = %q, want %q",
|
||||||
|
tc.name, tc.prefer, tc.nickname, tc.fname, tc.last, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// A grid came back empty for M0BFS/QRP while the same lookup without the suffix
|
||||||
|
// answered perfectly. The home-call pass wiped the location on the grounds that
|
||||||
|
// a portable operator is not at their registered address — true for /P and /M,
|
||||||
|
// and simply wrong for /QRP, which is a statement about power.
|
||||||
|
func TestSaysNothingAboutLocation(t *testing.T) {
|
||||||
|
keep := []string{"M0BFS/QRP", "f4bpo/qrp", "G0ABC/QRP"}
|
||||||
|
for _, c := range keep {
|
||||||
|
if !saysNothingAboutLocation(c) {
|
||||||
|
t.Errorf("%s: the home location should be kept — /QRP does not move anyone", c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// These DO move the operator, or change the entity outright.
|
||||||
|
drop := []string{"F4BPO/P", "F4BPO/M", "F4BPO/MM", "F4BPO/AM", "JW/OR1A", "VP8/F4BPO", "F4BPO/8", "F4BPO"}
|
||||||
|
for _, c := range drop {
|
||||||
|
if saysNothingAboutLocation(c) {
|
||||||
|
t.Errorf("%s: the home location must NOT be trusted", c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A power suffix on top of a portable one still moves them.
|
||||||
|
if saysNothingAboutLocation("F4BPO/P/QRP") {
|
||||||
|
t.Error("F4BPO/P/QRP is portable — location must not be kept")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -240,12 +240,10 @@ func (c *Client) authLocked() error {
|
|||||||
if _, err := fmt.Fprintf(c.conn, "C%d|auth code=%s\n", id, c.password); err != nil {
|
if _, err := fmt.Fprintf(c.conn, "C%d|auth code=%s\n", id, c.password); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
line, err := c.readReplyLocked(fmt.Sprintf("R%d|", id))
|
||||||
line, err := c.reader.ReadString('\n')
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
applog.Printf("pgxl: auth reply=%q (try %d)", line, try)
|
applog.Printf("pgxl: auth reply=%q (try %d)", line, try)
|
||||||
hex, msg := "", ""
|
hex, msg := "", ""
|
||||||
if p := strings.SplitN(line, "|", 3); len(p) >= 2 {
|
if p := strings.SplitN(line, "|", 3); len(p) >= 2 {
|
||||||
@@ -264,6 +262,39 @@ func (c *Client) authLocked() error {
|
|||||||
return fmt.Errorf("powergenius: authentication failed after 4 tries (R|%s|) — check the remote code", lastHex)
|
return fmt.Errorf("powergenius: authentication failed after 4 tries (R|%s|) — check the remote code", lastHex)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// readReplyLocked reads until the reply carrying `want` as its prefix arrives,
|
||||||
|
// feeding every unsolicited frame it passes to parse() on the way.
|
||||||
|
//
|
||||||
|
// The amplifier PUSHES status frames ("S0|state=…") on the same socket, and it
|
||||||
|
// pushes them constantly once it is in OPERATE — power, SWR and temperature all
|
||||||
|
// move while transmitting. The old code read exactly one line per command and
|
||||||
|
// took whatever came first as its answer, so a single pushed frame put the
|
||||||
|
// stream permanently one reply behind: every later command read the PREVIOUS
|
||||||
|
// command's answer, and the last one waited out the 3 s deadline, failed, and
|
||||||
|
// dropped the connection. That is the reconnect-every-few-seconds seen in the
|
||||||
|
// field, and the stall in transmit — command() holds the mutex across that whole
|
||||||
|
// dead wait, so anything else touching the amplifier queued behind it.
|
||||||
|
//
|
||||||
|
// It only showed up remotely and in OPERATE: on a LAN with an idle amplifier
|
||||||
|
// there is almost nothing to push and the race hardly ever opens.
|
||||||
|
func (c *Client) readReplyLocked(want string) (string, error) {
|
||||||
|
deadline := time.Now().Add(ioTimeout)
|
||||||
|
for {
|
||||||
|
_ = c.conn.SetReadDeadline(deadline)
|
||||||
|
line, err := c.reader.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
// Every frame is worth having, ours or not — a pushed status is fresher
|
||||||
|
// than the one we were about to ask for.
|
||||||
|
c.parse(line)
|
||||||
|
if strings.HasPrefix(line, want) {
|
||||||
|
return line, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Client) dropConn() {
|
func (c *Client) dropConn() {
|
||||||
c.mu.Lock()
|
c.mu.Lock()
|
||||||
if c.conn != nil {
|
if c.conn != nil {
|
||||||
@@ -286,14 +317,7 @@ func (c *Client) command(cmd string) (string, error) {
|
|||||||
if _, err := fmt.Fprintf(c.conn, "C%d|%s\n", id, cmd); err != nil {
|
if _, err := fmt.Fprintf(c.conn, "C%d|%s\n", id, cmd); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
return c.readReplyLocked(fmt.Sprintf("R%d|", id))
|
||||||
line, err := c.reader.ReadString('\n')
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
c.parse(line)
|
|
||||||
return line, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// parse handles "R<id>|0|<k=v …>" and "S0|<k=v …>" status lines.
|
// parse handles "R<id>|0|<k=v …>" and "S0|<k=v …>" status lines.
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user