@ham2k/lib-operation-data 0.8.4 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +2 -2
  2. package/src/data/bandPlans.json +24 -24
  3. package/src/lib/modes.js +3 -0
  4. package/src/lib/modes.spec.js +5 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ham2k/lib-operation-data",
3
- "version": "0.8.4",
3
+ "version": "0.9.0",
4
4
  "type": "module",
5
5
  "main": "./src/index.js",
6
6
  "exports": {
@@ -8,7 +8,7 @@
8
8
  },
9
9
  "devDependencies": {
10
10
  "jest": "~29",
11
- "standard": "^17.0.0"
11
+ "standard": "^17.1.2"
12
12
  },
13
13
  "scripts": {
14
14
  "test": "node --experimental-vm-modules ./node_modules/.bin/jest"
package/src/data/bandPlans.json CHANGED
@@ -10,7 +10,7 @@
10
10
  "segments": [
11
11
  { "name": "CW", "mhz": [1800, 1843], "mode": "CW" },
12
12
  { "name": "Data", "mhz": [1800, 1810], "mode": "RTTY" },
13
- { "name": "FT8", "mhz": [1840, 1843], "mode": "FT8" },
13
+ { "name": "FT8", "mhz": [1840, 1843], "mode": "FT8", "priority": 100 },
14
14
  { "name": "Phone", "mhz": [1843, 2000], "mode": "SSB", "submode": "LSB" },
15
15
  { "name": "Australia", "mhz": [1800, 1875], "mode": null, "countries": ["au"] }
16
16
  ]
@@ -20,9 +20,9 @@
20
20
  "segments": [
21
21
  { "name": "CW", "mhz": [3500, 3600], "mode": "CW" },
22
22
  { "name": "Phone", "mhz": [3535, 3800], "mode": "SSB", "submode": "LSB", "regions": [ 3 ] },
23
- { "name": "FT8", "mhz": [3568, 3571], "mode": "FT8", "regions": [ 3 ] },
23
+ { "name": "FT8", "mhz": [3568, 3571], "mode": "FT8", "regions": [ 3 ], "priority": 100 },
24
24
  { "name": "Data", "mhz": [3570, 3600], "mode": "RTTY" },
25
- { "name": "FT8", "mhz": [3573, 3576], "mode": "FT8" },
25
+ { "name": "FT8", "mhz": [3573, 3576], "mode": "FT8", "priority": 100 },
26
26
  { "name": "Phone", "mhz": [3600, 4000], "mode": "SSB", "submode": "LSB" },
27
27
  { "name": "Australia", "mhz": [3500, 3800], "mode": null, "countries": ["au"] }
28
28
  ]
@@ -32,7 +32,7 @@
32
32
  "segments": [
33
33
  { "name": "60m Channel 1", "mhz": [5330.5, 5333.5] },
34
34
  { "name": "60m Channel 2", "mhz": [5346.5, 5349.5] },
35
- { "name": "60m Channel 3", "mhz": [5357, 5360], "mode": "FT8" },
35
+ { "name": "60m Channel 3", "mhz": [5357, 5360], "mode": "FT8", "priority": 100 },
36
36
  { "name": "60m Channel 4", "mhz": [5371.5, 5373.5] },
37
37
  { "name": "60m Channel 5", "mhz": [5403.5, 5406.5] }
38
38
  ]
@@ -42,9 +42,9 @@
42
42
  "segments": [
43
43
  { "name": "CW", "mhz": [7000, 7060], "mode": "CW" },
44
44
  { "name": "CW", "mhz": [7000, 7125], "mode": "CW", "countries": [ "us" ] },
45
- { "name": "FT4", "mhz": [7047.5, 7050.5], "mode": "FT4" },
45
+ { "name": "FT4", "mhz": [7047.5, 7050.5], "mode": "FT4", "priority": 100 },
46
46
  { "name": "Phone", "mhz": [7060, 7300], "mode": "SSB", "submode": "LSB" },
47
- { "name": "FT8", "mhz": [7074, 7077], "mode": "FT8" },
47
+ { "name": "FT8", "mhz": [7074, 7077], "mode": "FT8", "priority": 100 },
48
48
  { "name": "Data", "mhz": [7080, 7125], "mode": "RTTY", "countries": [ "us" ] },
49
49
  { "name": "Phone", "mhz": [7125, 7300], "mode": "SSB", "submode": "LSB", "countries": [ "us" ] },
50
50
  { "name": "Australia", "mhz": [7000, 7300], "mode": null, "countries": ["au"] }
@@ -55,20 +55,20 @@
55
55
  "segments": [
56
56
  { "name": "CW", "mhz": [10100, 10150], "mode": "CW" },
57
57
  { "name": "Data", "mhz": [10130, 10140], "mode": "RTTY" },
58
- { "name": "FT8", "mhz": [10136, 10139], "mode": "FT8" },
59
- { "name": "FT4", "mhz": [10140, 10143], "mode": "FT4" },
58
+ { "name": "FT8", "mhz": [10136, 10139], "mode": "FT8", "priority": 100 },
59
+ { "name": "FT4", "mhz": [10140, 10143], "mode": "FT4", "priority": 100 },
60
60
  { "name": "Countries with no plan on 30m", "mhz": [10100, 10150], "mode": null, "countries": ["au", "za"] }
61
61
  ]
62
62
  },
63
63
  "20m": {
64
64
  "mhz": [14000, 14350],
65
65
  "segments": [
66
- { "name": "CW", "mhz": [14000, 14101], "mode": "CW", "regions": [ 2 ] },
67
66
  { "name": "CW", "mhz": [14000, 14150], "mode": "CW" },
68
67
  { "name": "CW", "mhz": [14000, 14070], "mode": "CW", "regions": [ 1 ] },
68
+ { "name": "CW", "mhz": [14000, 14101], "mode": "CW", "regions": [ 2 ] },
69
69
  { "name": "Data", "mhz": [14070, 14095], "mode": "RTTY" },
70
- { "name": "FT8", "mhz": [14074, 14077], "mode": "FT8" },
71
- { "name": "FT4", "mhz": [14080, 14083], "mode": "FT4" },
70
+ { "name": "FT8", "mhz": [14074, 14077], "mode": "FT8", "priority": 100 },
71
+ { "name": "FT4", "mhz": [14080, 14083], "mode": "FT4", "priority": 100 },
72
72
  { "name": "Phone", "mhz": [14112, 14350], "mode": "SSB", "submode": "USB", "regions": [ 1, 2 ] },
73
73
  { "name": "Phone", "mhz": [14150, 14350], "mode": "SSB", "submode": "USB", "countries": [ "us" ] },
74
74
  { "name": "Australia", "mhz": [14000, 14350], "mode": null, "countries": ["au"] }
@@ -79,8 +79,8 @@
79
79
  "segments": [
80
80
  { "name": "CW", "mhz": [18068, 18110], "mode": "CW" },
81
81
  { "name": "Data", "mhz": [18100, 18105], "mode": "RTTY" },
82
- { "name": "FT8", "mhz": [18100, 18103], "mode": "FT8" },
83
- { "name": "FT4", "mhz": [18104, 18107], "mode": "FT4" },
82
+ { "name": "FT8", "mhz": [18100, 18103], "mode": "FT8", "priority": 100 },
83
+ { "name": "FT4", "mhz": [18104, 18107], "mode": "FT4", "priority": 100 },
84
84
  { "name": "Phone", "mhz": [18110, 18168], "mode": "SSB", "submode": "USB" },
85
85
  { "name": "Australia", "mhz": [18068, 18168], "mode": null, "countries": ["au"] }
86
86
  ]
@@ -90,8 +90,8 @@
90
90
  "segments": [
91
91
  { "name": "CW", "mhz": [21000, 21150], "mode": "CW" },
92
92
  { "name": "Data", "mhz": [21070, 21095], "mode": "RTTY" },
93
- { "name": "FT8", "mhz": [21074, 21077], "mode": "FT8" },
94
- { "name": "FT4", "mhz": [21140, 21143], "mode": "FT4" },
93
+ { "name": "FT8", "mhz": [21074, 21077], "mode": "FT8", "priority": 100 },
94
+ { "name": "FT4", "mhz": [21140, 21143], "mode": "FT4", "priority": 100 },
95
95
  { "name": "Phone", "mhz": [21150, 21450], "mode": "SSB", "submode": "USB" },
96
96
  { "name": "Australia", "mhz": [21000, 21450], "mode": null, "countries": ["au"] }
97
97
  ]
@@ -100,8 +100,8 @@
100
100
  "mhz": [24890, 24990],
101
101
  "segments": [
102
102
  { "name": "CW", "mhz": [24890, 24930], "mode": "CW" },
103
- { "name": "FT8", "mhz": [24915, 24918], "mode": "FT8" },
104
- { "name": "FT4", "mhz": [24919, 23922], "mode": "FT4" },
103
+ { "name": "FT8", "mhz": [24915, 24918], "mode": "FT8", "priority": 100 },
104
+ { "name": "FT4", "mhz": [24919, 23922], "mode": "FT4", "priority": 100 },
105
105
  { "name": "Data", "mhz": [24920, 24925], "mode": "RTTY" },
106
106
  { "name": "Phone", "mhz": [24930, 24990], "mode": "SSB", "submode": "USB" },
107
107
  { "name": "Australia", "mhz": [24890, 24990], "mode": null, "countries": ["au"] }
@@ -112,8 +112,8 @@
112
112
  "segments": [
113
113
  { "name": "CW", "mhz": [28000, 28190], "mode": "CW" },
114
114
  { "name": "Data", "mhz": [28070, 28150], "mode": "RTTY" },
115
- { "name": "FT8", "mhz": [28074, 28077], "mode": "FT8" },
116
- { "name": "FT4", "mhz": [28180, 28183], "mode": "FT4" },
115
+ { "name": "FT8", "mhz": [28074, 28077], "mode": "FT8", "priority": 100 },
116
+ { "name": "FT4", "mhz": [28180, 28183], "mode": "FT4", "priority": 100 },
117
117
  { "name": "Beacons", "mhz": [28190, 28300] },
118
118
  { "name": "Phone SSB", "mhz": [28300, 29000], "mode": "SSB", "submode": "USB" },
119
119
  { "name": "AM", "mhz": [29000, 29200], "mode": "AM" },
@@ -132,9 +132,9 @@
132
132
  { "name": "Phone", "mhz": [51000, 51110], "mode": "SSB", "submode": "USB" },
133
133
  { "name": "FM", "mhz": [51110, 52100], "mode": "FM" },
134
134
  { "name": "FM", "mhz": [51110, 52100], "mode": "FM" },
135
- { "name": "FT8", "mhz": [50313, 50316], "mode": "FT8" },
136
- { "name": "FT4", "mhz": [50318, 50321], "mode": "FT4" },
137
- { "name": "FT8", "mhz": [50323, 50326], "mode": "FT8" },
135
+ { "name": "FT8", "mhz": [50313, 50316], "mode": "FT8", "priority": 100 },
136
+ { "name": "FT4", "mhz": [50318, 50321], "mode": "FT4", "priority": 100 },
137
+ { "name": "FT8", "mhz": [50323, 50326], "mode": "FT8", "priority": 100 },
138
138
  { "name": "Australia", "mhz": [50000, 54000], "mode": null, "countries": ["au"] }
139
139
  ]
140
140
  },
@@ -143,8 +143,8 @@
143
143
  "segments": [
144
144
  { "name": "CW", "mhz": [144000, 144100], "mode": "CW" },
145
145
  { "name": "Data", "mhz": [144100, 144200], "mode": "RTTY" },
146
- { "name": "FT8", "mhz": [144174, 144177], "mode": "FT8" },
147
- { "name": "FT8", "mhz": [144170, 144173], "mode": "FT4" },
146
+ { "name": "FT8", "mhz": [144174, 144177], "mode": "FT8", "priority": 100 },
147
+ { "name": "FT4", "mhz": [144170, 144173], "mode": "FT4", "priority": 100 },
148
148
  { "name": "Phone", "mhz": [144200, 144275], "mode": "SSB", "submode": "USB" },
149
149
  { "name": "FM", "mhz": [144300, 148000], "mode": "FM" }
150
150
  ]
package/src/lib/modes.js CHANGED
@@ -171,6 +171,9 @@ export function modeForFrequency(frequency, { ituRegion, countryCode, entityPref
171
171
  ))
172
172
 
173
173
  const sortedSegments = segments.sort((a, b) => {
174
+ if ((a.priority ?? 0) < (b.priority ?? 0)) return 1
175
+ if ((a.priority ?? 0) > (b.priority ?? 0)) return -1
176
+
174
177
  if (entityPrefix && !a.entities[entityPrefix] && b.entities[entityPrefix]) return 1
175
178
  if (entityPrefix && a.entities[entityPrefix] && !b.entities[entityPrefix]) return -1
176
179
 
package/src/lib/modes.spec.js CHANGED
@@ -12,6 +12,11 @@ describe('modeForFrequency', () => {
12
12
  expect(modeForFrequency(14140, { ituRegion: 2 })).toEqual('SSB')
13
13
  })
14
14
 
15
+ it('should handle different priorities', () => {
16
+ // ituRegion 2 should make CW be the match for 14074, but priority 100 for FT8 should make FT8 the match
17
+ expect(modeForFrequency(14074, { ituRegion: 2 })).toEqual('FT8')
18
+ })
19
+
15
20
  // The current bandplan data does not have any entity-specific segments
16
21
  // TODO: mock data for this test
17
22
  // it('should handle different bandplans for different entities', () => {