Merge branch 'roll-v-1-22-1007' into 'master'

roll version 1.22.1007

See merge request gridtracker.org/gridtracker!224

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

debian/changelog

@@ -1,3 +1,8 @@
+gridtracker (1.22.1007) unstable; urgency=low
+  - Fix missing callsigns in mh-root when importing BIGCTY
+
+ -- Matthew Chambers <nr0q@gridtracker.org>  Fri, 07 Oct 2022 17:19:00 -0000
+ 
 gridtracker (1.22.1006) unstable; urgency=low
   - Main App:
     - New option in Settings -> Lookups -> Feature Control -> POTA.  When "Enabled", track POTA spots from https://pota.app and auto-report activations. When "Menu Button" checked and menu button active, show active parks following "Map View Filters" rules.
@@ -22,7 +27,7 @@ gridtracker (1.22.1006) unstable; urgency=low
     - Instances now horizontal between controls and roster table (Resolves Issue #166)
     - New option in Settings -> Call Roster -> "Call Roster Delay On Focus".. when enabled will delay redraw of roster after decode round(s) (Resolves Issue #69)
 
-  -- Matthew Chambers <nr0q@gridtracker.org>  Mon, 07 Oct 2022 01:01:00 -0000
+  -- Matthew Chambers <nr0q@gridtracker.org>  Fri, 07 Oct 2022 01:01:00 -0000
 
 gridtracker (1.22.0903) unstable; urgency=low
   - Fixed a bug that displayed 1.25m band QSOs incorrectly.

gridtracker.spec

@@ -1,6 +1,6 @@
 Name:           {{{ git_name name=gridtracker }}}
 Summary:        GridTracker: An amateur radio companion to WSJT-X or JTDX
-Version:        {{{ git_version lead=1.22.1006 }}}
+Version:        {{{ git_version lead=1.22.1007 }}}
 Release:        1%{?dist}
 BuildArch:      noarch
 Source0:        {{{ git_dir_pack }}}
@@ -40,6 +40,8 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
 %license %{_docdir}/%{name}/
 
 %changelog
+* Fri Oct 07 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.1007-1
+  - Fix missing callsigns in mh-root when importing BIGCTY
 * Fri Oct 07 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.1006-1
   - Main App:
     - New option in Settings -> Lookups -> Feature Control -> POTA.  When "Enabled", track POTA spots from https://pota.app and auto-report activations. When "Menu Button" checked and menu button active, show active parks following "Map View Filters" rules.

package.nw/lib/callsigns.js

@@ -861,11 +861,31 @@ function processCtyDat(buffer)
             var arr = ctydata[worldGeoData[key].dxcc].prefix.substr(0, ctydata[worldGeoData[key].dxcc].prefix.length - 1).split(" ");
             for (const x in arr)
             {
-              if (!(arr[x].includes("(")) && !(arr[x].includes("[")) && !(arr[x].includes("<")) && !(arr[x].includes("{")) && !(arr[x].includes("~")))
+              var test = arr[x];
+              var i = arr[x].indexOf("(");
+              if (i > -1)
               {
-                worldGeoData[key].prefix.push(arr[x]);
+                test = test.substr(0, i);
               }
+              i = arr[x].indexOf("[");
+              if (i > -1)
+              {
+                test = test.substr(0, i);
+              }
+              i = arr[x].indexOf("<");
+              if (i > -1)
+              {
+                test = test.substr(0, i);
+              }
+              i = arr[x].indexOf("{");
+              if (i > -1)
+              {
+                test = test.substr(0, i);
+              }
+
+              worldGeoData[key].prefix.push(test);
             }
+            worldGeoData[key].prefix = uniqueArrayFromArray(worldGeoData[key].prefix);
             worldGeoData[key].prefix.sort();
           }
         }

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.22.1006",
+  "version": "1.22.1007",
   "betaVersion": "",
   "description": "GridTracker, an amateur radio companion",
   "author": "GridTracker.org",