From fa5b385d2d0864e0c1b36ebac00c69c8ec7031de Mon Sep 17 00:00:00 2001
From: dm5wk <git@dm5wk.de>
Date: Sun, 2 Jun 2024 12:40:00 +0200
Subject: [PATCH] set frequency unit in yml files

---
 band-plan-de.yml         | 1 +
 band-plan-iaru_r1_hf.yml | 1 +
 band-plan.html           | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/band-plan-de.yml b/band-plan-de.yml
index 378e380..4d7dbaf 100644
--- a/band-plan-de.yml
+++ b/band-plan-de.yml
@@ -7,6 +7,7 @@
     status: Status,
     conditions: Conditions
   }
+  frequency_unit: kHz
   comments:
     - Status: "P: Primär dem Amateurfunk zugewiesen, P+: Primär (weitgehend exklusiv) dem Amateurfunk zugewiesen, S: Sekundär dem Amateurfunk zugewiesen"
     - Conditions: '
diff --git a/band-plan-iaru_r1_hf.yml b/band-plan-iaru_r1_hf.yml
index df4c18d..4585721 100644
--- a/band-plan-iaru_r1_hf.yml
+++ b/band-plan-iaru_r1_hf.yml
@@ -8,6 +8,7 @@
     bandwidth: Bandwidth / Hz,
     description: Description
   }
+  frequency_unit: kHz
   comments:
     - Source Base: '<a href="https://www.iaru-r1.org/wp-content/uploads/2021/06/hf_r1_bandplan.pdf">https://www.iaru-r1.org/wp-content/uploads/2021/06/hf_r1_bandplan.pdf</a>'
     - Source Base Date: "2021-06-09"
diff --git a/band-plan.html b/band-plan.html
index 739add0..6f81fd0 100644
--- a/band-plan.html
+++ b/band-plan.html
@@ -26,6 +26,7 @@ div>label {
 	<link href="https://unpkg.com/tabulator-tables/dist/css/tabulator.min.css" rel="stylesheet">
 	<script src="https://unpkg.com/browser-cjs/require.min.js"></script>
 	<script src="https://unpkg.com/tabulator-tables/dist/js/tabulator.min.js"></script>
+	<script src="https://unpkg.com/js-quantities/build/quantities.js"></script>
 	<!--
 	for pdf saving
 	<script src="https://unpkg.com/jspdf/dist/jspdf.umd.min.js"></script>
@@ -37,8 +38,6 @@ div>label {
 		// eslint-disable-next-line no-undef
 		const yaml = require("https://unpkg.com/js-yaml/dist/js-yaml.min.js");
 		// eslint-disable-next-line no-undef
-		const Measures = require("https://unpkg.com/measures/dist/measures.cjs.js");
-		// eslint-disable-next-line no-undef
 		const path = require("https://unpkg.com/path-browserify/index.js");
 
 		function create_element_link(element, href) {
@@ -185,6 +184,8 @@ div>label {
 							add_column(row, base, header["base"]);
 
 							let [ext_start, ext_end] = ext.frequency.split("-");
+							ext_start = Qty(Number(ext_start), header["extension"].frequency_unit).to(header["base"].frequency_unit).scalar;
+							ext_end = Qty(Number(ext_end), header["extension"].frequency_unit).to(header["base"].frequency_unit).scalar;
 							if (typeof base.frequency === "number") {
 								// at single frequency 
 								if (isInRange(base.frequency, ext_start, ext_end)) {
@@ -279,7 +280,7 @@ div>label {
 					definitions.forEach((column) => {
 						if (column.field == "band") {
 							column.sorter = function(a, b) {
-								return parseFloat(new	Measures().from(a).to("m")) - parseFloat(new Measures().from(b).to("m"));
+								return Qty(a).sub(Qty(b)).toBase().scalar;
 							}
 						}