Merge branch 'late-july-24' into 'master'

Late july 24

See merge request gridtracker.org/gridtracker!322

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!

debian/changelog

@@ -1,3 +1,7 @@
+gridtracker (1.24.0715) unstable; urgency=low
+  - Logging: Fixed bug where some US Counties not showing in Call Roster
+  -- Tag Loomis <n0ttl@gridtracker.org>  Mon, 15 Jul 2024 00:00:00 -000
+
 gridtracker (1.24.0711) unstable; urgency=low
   - Logging: Fixed log breaking bug in CloudLog
   -- Tag Loomis <n0ttl@gridtracker.org>  Thu, 11 Jul 2024 00:00:00 -000

gridtracker.spec

@@ -1,6 +1,6 @@
 Name:           {{{ git_name name=gridtracker }}}
 Summary:        GridTracker: An Amateur Radio Companion
-Version:        1.24.0711
+Version:        1.24.0715
 Release:        1%{?dist}
 BuildArch:      noarch
 Source0:        {{{ git_dir_pack }}}
@@ -40,6 +40,8 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
 %license %{_docdir}/%{name}/
 
 %changelog
+* Mon Jul 15 2024 Tag Loomis <n0ttl@gridtracker.org> - 1.24.0715-1
+ - Logging: Fixed bug where some US Counties not showing in Call Roster
 * Thu Jul 11 2024 Tag Loomis <n0ttl@gridtracker.org> - 1.24.0711-1
  - Logging: Fixed log breaking bug in CloudLog
 * Sun Jul 07 2024 Tag Loomis <n0ttl@gridtracker.org> - 1.24.0707-1

package.nw/lib/gt.js

@@ -1094,7 +1094,7 @@ function addLiveCallsign(
       }
     }
 
-    if (newCallsign.state == null && isKnownCallsignUS(finalDxcc) && GT.callsignLookups.ulsUseEnable)
+    if (GT.callsignLookups.ulsUseEnable && isKnownCallsignUS(finalDxcc) && (newCallsign.state == null || newCallsign.cnty == null))
     {
       lookupKnownCallsign(newCallsign);
     }
@@ -5910,7 +5910,7 @@ function finalWsjtxDecode(newMessage, isFox = false, foxMessage)
       }
     }
 
-    if (GT.callsignLookups.ulsUseEnable == true && callsign.state == null && isKnownCallsignUSplus(callsign.dxcc))
+    if (GT.callsignLookups.ulsUseEnable == true && isKnownCallsignUSplus(callsign.dxcc) && (callsign.state == null || callsign.cnty == null))
     {
       lookupKnownCallsign(callsign);
     }

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.24.0711",
+  "version": "1.24.0715",
   "betaVersion": "",
   "description": "GridTracker: An Amateur Radio Companion",
   "author": "GridTracker.org",