@ham2k/lib-operation-data 0.8.0 → 0.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ham2k/lib-operation-data",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "type": "module",
   "main": "./src/index.js",
   "exports": {

package/src/data/bandPlans.json

@@ -39,12 +39,12 @@
       "mhz": [7000, 7300],
       "segments": [
         { "name": "CW", "mhz": [7000, 7060], "mode": "CW" },
-        { "name": "CW", "mhz": [7000, 7125], "mode": "CW", "countries": [ "US" ] },
+        { "name": "CW", "mhz": [7000, 7125], "mode": "CW", "countries": [ "us" ] },
         { "name": "FT4", "mhz": [7047.5, 7050.5], "mode": "FT4" },
         { "name": "Phone", "mhz": [7060, 7300], "mode": "SSB", "submode": "LSB" },
         { "name": "FT8", "mhz": [7074, 7077], "mode": "FT8" },
         { "name": "Data", "mhz": [7080, 7125], "mode": "RTTY" },
-        { "name": "Phone", "mhz": [7125, 7300], "mode": "SSB", "submode": "LSB", "countries": [ "US" ] }
+        { "name": "Phone", "mhz": [7125, 7300], "mode": "SSB", "submode": "LSB", "countries": [ "us" ] }
       ]
     },
     "30m": {
@@ -54,7 +54,7 @@
         { "name": "Data", "mhz": [10130, 10140], "mode": "RTTY" },
         { "name": "FT8", "mhz": [10136, 10139], "mode": "FT8" },
         { "name": "FT4", "mhz": [10140, 10143], "mode": "FT4" },
-        { "name": "Australia", "mhz": [10100, 10150], "mode": null, "countries": ["AU"] }
+        { "name": "Australia", "mhz": [10100, 10150], "mode": null, "countries": ["au", "za"] }
       ]
     },
     "20m": {
@@ -67,7 +67,7 @@
         { "name": "FT8", "mhz": [14074, 14077], "mode": "FT8" },
         { "name": "FT4", "mhz": [14080, 14083], "mode": "FT4" },
         { "name": "Phone", "mhz": [14112, 14350], "mode": "SSB", "submode": "USB", "regions": [ 1, 2 ] },
-        { "name": "Phone", "mhz": [14150, 14350], "mode": "SSB", "submode": "USB", "countries": [ "US" ] }
+        { "name": "Phone", "mhz": [14150, 14350], "mode": "SSB", "submode": "USB", "countries": [ "us" ] }
       ]
     },
     "17m": {

package/src/lib/modes.js

@@ -165,14 +165,14 @@ const AllSegments = Object.keys(BandPlans.bands).reduce((segments, band) => {
 export function modeForFrequency(frequency, { ituRegion, countryCode, entityPrefix } = {}) {
   const segments = AllSegments.filter(segment => segment.mhz[0] <= frequency && segment.mhz[1] >= frequency)
   const sortedSegments = segments.sort((a, b) => {
-    if (entity && !a.entities[entityPrefix] && b.entities[entityPrefix]) return 1
-    if (entity && a.entities[entityPrefix] && !b.entities[entityPrefix]) return -1
+    if (entityPrefix && !a.entities[entityPrefix] && b.entities[entityPrefix]) return 1
+    if (entityPrefix && a.entities[entityPrefix] && !b.entities[entityPrefix]) return -1
 
-    if (country && !a.countries[countryCode] && b.countries[countryCode]) return 1
-    if (country && a.countries[countryCode] && !b.countries[countryCode]) return -1
+    if (countryCode && !a.countries[countryCode] && b.countries[countryCode]) return 1
+    if (countryCode && a.countries[countryCode] && !b.countries[countryCode]) return -1
 
-    if (region && !a.regions[ituRegion] && b.regions[ituRegion]) return 1
-    if (region && a.regions[ituRegion] && !b.regions[ituRegion]) return -1
+    if (ituRegion && !a.regions[ituRegion] && b.regions[ituRegion]) return 1
+    if (ituRegion && a.regions[ituRegion] && !b.regions[ituRegion]) return -1
 
     return a.width - b.width
   })

package/src/lib/modes.spec.js

@@ -2,12 +2,12 @@ import { modeForFrequency } from './modes'
 
 describe('modeForFrequency', () => {
   it('should find the most common mode for a frequency', () => {
-    expect(modeForFrequency(14255)).toEqual('USB')
+    expect(modeForFrequency(14255)).toEqual('SSB')
     expect(modeForFrequency(14107)).toEqual('CW')
     expect(modeForFrequency(14074)).toEqual('FT8')
 
     expect(modeForFrequency(14140)).toEqual('CW')
-    expect(modeForFrequency(14140, { ituRegion: 2 })).toEqual('USB')
+    expect(modeForFrequency(14140, { ituRegion: 2 })).toEqual('SSB')
     expect(modeForFrequency(14140, { entityPrefix: 'K' })).toEqual('CW')
 
   })