@ham2k/lib-operation-data 0.7.4 → 0.8.1

package/package.json

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

package/src/lib/modes.js

@@ -162,17 +162,17 @@ const AllSegments = Object.keys(BandPlans.bands).reduce((segments, band) => {
   )
 }, [])
 
-export function modeForFrequency(frequency, { region, country, entity } = {}) {
+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[entity] && b.entities[entity]) return 1
-    if (entity && a.entities[entity] && !b.entities[entity]) 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[country] && b.countries[country]) return 1
-    if (country && a.countries[country] && !b.countries[country]) 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[region] && b.regions[region]) return 1
-    if (region && a.regions[region] && !b.regions[region]) 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,13 +2,13 @@ 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, { region: 2 })).toEqual('USB')
-    expect(modeForFrequency(14140, { entity: 'K' })).toEqual('CW')
+    expect(modeForFrequency(14140, { ituRegion: 2 })).toEqual('SSB')
+    expect(modeForFrequency(14140, { entityPrefix: 'K' })).toEqual('CW')
 
   })
 })