band-plan-de.yml

@@ -7,7 +7,6 @@
     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: '
@@ -85,89 +84,89 @@
   power: {a: 750 W PEP, e: 100 W PEP, n: 10 W ERP}
   status: P
   conditions: 4, 13
-- frequency: 50000-50400
+- frequency: 50000–50400
   power: {a: 750 W PEP, e: 100 W PEP}
   status: S
   conditions: 5???
-- frequency: 50400-52000
+- frequency: 50400–52000
   conditions: 5???
   status: S
   power: {e: 25 W PEP, a: 25 W PEP}
-- frequency: 701500-702100
+- frequency: 701500–702100
   conditions: 6, 13
   status: S
   power: {a: 25 W ERP}
-- frequency: 144000-146000
+- frequency: 144000–146000
   conditions: 7, 13
   status: P+
   power: {n: 10 W EIRP, e: 75 W PEP, a: 750 W PEP}
-- frequency: 430000-440000
+- frequency: 430000–440000
   conditions: 7, 13
   status: P
   power: {n: 10 W EIRP, e: 75 W PEP, a: 750 W PEP}
-- frequency: 1240000-1300000
+- frequency: 1240000–1300000
   conditions: 8, 11, 13
   status: S
   power: {e: 75 W PEP, a: 750 W PEP}
-- frequency: 2320000-2450000
+- frequency: 2320000–2450000
   conditions: 9, 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 3400000-3475000
+- frequency: 3400000–3475000
   conditions: 9
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 5650000-5850000
+- frequency: 5650000–5850000
   conditions: 9, 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 10000000-10500000
+- frequency: 10000000–10500000
   conditions: 9, 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 24000000-24050000
+- frequency: 24000000–24050000
   conditions: 13
   status: P+
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 24050000-24250000
+- frequency: 24050000–24250000
   conditions: 9
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 47000000-47200000
+- frequency: 47000000–47200000
   conditions: 13
   status: P+
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 76000000-77500000
+- frequency: 76000000–77500000
   conditions: 9, 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 77500000-78000000
+- frequency: 77500000–78000000
   conditions: 9, 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 78000000-81500000
+- frequency: 78000000–81500000
   conditions: 9, 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 122250000-123000000
+- frequency: 122250000–123000000
   conditions: 9
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 134000000-136000000
+- frequency: 134000000–136000000
   conditions: 9, 13
   status: P+
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 136000000-141000000
+- frequency: 136000000–141000000
   conditions: 9, 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 241000000-248000000
+- frequency: 241000000–248000000 GHz
   conditions: 13
   status: S
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: 248000000-250000000
+- frequency: 248000000–250000000 GHz
   conditions: 13
   status: P+
   power: {e: 5 W PEP, a: 75 W PEP}
-- frequency: "275000000-9007199254740991"
+- frequency: "> 275000000"
   conditions: 14

band-plan-iaru_r1_hf.yml

@@ -8,7 +8,6 @@
     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"

band-plan.html

@@ -26,7 +26,6 @@ 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>
@@ -38,6 +37,8 @@ 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) {
@@ -184,8 +185,6 @@ 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)) {
@@ -280,7 +279,7 @@ div>label {
 					definitions.forEach((column) => {
 						if (column.field == "band") {
 							column.sorter = function(a, b) {
-								return Qty(a).sub(Qty(b)).toBase().scalar;
+								return parseFloat(new	Measures().from(a).to("m")) - parseFloat(new Measures().from(b).to("m"));
 							}
 						}