Add more GHz bands

src/components/ChasesList.vue

@@ -8,7 +8,7 @@
         <router-link :to="makeActivatorLink(props.row.otherCallsign.toUpperCase())">{{ props.row.otherCallsign.toUpperCase() }}</router-link>
       </b-table-column>
       <b-table-column field="band" label="Band" :custom-sort="sortBand" sortable numeric>
-        {{ bandForFrequency(props.row.band.replace('MHz', '')) }}
+        {{ bandForDbFrequency(props.row.band) }}
       </b-table-column>
       <b-table-column field="mode" label="Mode" sortable>
         <ModeLabel :mode="props.row.mode" />
@@ -31,8 +31,8 @@ export default {
   },
   methods: {
     sortBand (a, b, isAsc) {
-      let fa = parseFloat(a.band.replace('MHz', ''))
-      let fb = parseFloat(b.band.replace('MHz', ''))
+      let fa = this.dbFrequencyToMHz(a.band)
+      let fb = this.dbFrequencyToMHz(b.band)
       if (fa < fb) {
         return (isAsc ? -1 : 1)
       } else if (fa === fb) {

src/components/QSOList.vue

@@ -9,7 +9,7 @@
         <router-link :to="makeActivatorLink(props.row.OtherCallsign)">{{ props.row.OtherCallsign }}</router-link>
       </b-table-column>
       <b-table-column field="Band" label="Band" :custom-sort="sortBand" class="nowrap" sortable numeric>
-        {{ bandForFrequency(props.row.Band.replace('MHz', '')) }}
+        {{ bandForDbFrequency(props.row.Band) }}
       </b-table-column>
       <b-table-column field="Mode" label="Mode" class="mode nowrap" sortable>
         <ModeLabel :mode="props.row.Mode" />
@@ -40,8 +40,8 @@ export default {
   mixins: [utils],
   methods: {
     sortBand (a, b, isAsc) {
-      let fa = parseFloat(a.Band.replace('MHz', ''))
-      let fb = parseFloat(b.Band.replace('MHz', ''))
+      let fa = this.dbFrequencyToMHz(a.Band)
+      let fb = this.dbFrequencyToMHz(b.Band)
       if (fa < fb) {
         return (isAsc ? -1 : 1)
       } else if (fa === fb) {

src/mixins/utils.js

@@ -19,7 +19,10 @@ let bands = [
   { from: 900, to: 928, band: '33cm' },
   { from: 1200, to: 1400, band: '23cm' },
   { from: 2300, to: 2450, band: '13cm' },
-  { from: 3300, to: 3500, band: '9cm' }
+  { from: 3300, to: 3500, band: '9cm' },
+  { from: 5600, to: 5925, band: '5cm' },
+  { from: 10000, to: 10500, band: '3cm' },
+  { from: 24000, to: 24250, band: '1.2cm' }
 ]
 
 let continents = {
@@ -212,6 +215,21 @@ export default {
         return undefined
       }
     },
+    bandForDbFrequency (dbFrequency) {
+      return this.bandForFrequency(this.dbFrequencyToMHz(dbFrequency))
+    },
+    dbFrequencyToMHz (dbFrequency) {
+      let matches = /^([0-9.]+)([GM]Hz)$/.exec(dbFrequency)
+      if (matches) {
+        let multiplier = 1
+        if (matches[2] === 'GHz') {
+          multiplier = 1000
+        }
+        return parseFloat(matches[1]) * multiplier
+      } else {
+        return dbFrequency
+      }
+    },
     escapeHtml (unsafe) {
       if (unsafe === undefined || unsafe === null) {
         return ''