diff --git a/solarconditionsproviders/hamqsl.py b/solarconditionsproviders/hamqsl.py index 3d01300..05175a3 100644 --- a/solarconditionsproviders/hamqsl.py +++ b/solarconditionsproviders/hamqsl.py @@ -94,7 +94,11 @@ class HamQSL(HTTPSolarConditionsProvider): "aurora_latitude": float_val("latdegree"), "solar_wind": float_val("solarwind"), "magnetic_field": float_val("magneticfield"), - "geomag_field": (lambda v: "Unsettled" if v == "Unsettld" else v)(text("geomagfield").title()), + "geomag_field": text("geomagfield").title() + .replace("Vr Quiet", "Very Quiet") + .replace("Unsettld", "Unsettled") + .replace("Min Strm", "Minor Storm") + .replace("Maj Strm", "Major Storm"), "geomag_noise": text("signalnoise"), "hf_conditions": hf_conditions, "vhf_conditions": { diff --git a/templates/about.html b/templates/about.html index 989d49c..308e6a9 100644 --- a/templates/about.html +++ b/templates/about.html @@ -67,7 +67,7 @@
This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.
- + {% end %} \ No newline at end of file diff --git a/templates/add_spot.html b/templates/add_spot.html index d52cf5d..d62a4e6 100644 --- a/templates/add_spot.html +++ b/templates/add_spot.html @@ -69,8 +69,8 @@ - - + + {% end %} \ No newline at end of file diff --git a/templates/alerts.html b/templates/alerts.html index 42fc865..7207a86 100644 --- a/templates/alerts.html +++ b/templates/alerts.html @@ -56,8 +56,8 @@ - - + + {% end %} \ No newline at end of file diff --git a/templates/bands.html b/templates/bands.html index 89f8edd..15fd412 100644 --- a/templates/bands.html +++ b/templates/bands.html @@ -62,9 +62,9 @@ - - - + + + {% end %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index bc304f7..f0737b5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -46,10 +46,10 @@ crossorigin="anonymous"> - - - - + + + + diff --git a/templates/conditions.html b/templates/conditions.html index 07ed072..bcba6ad 100644 --- a/templates/conditions.html +++ b/templates/conditions.html @@ -189,8 +189,8 @@ - - + + {% end %} \ No newline at end of file diff --git a/templates/map.html b/templates/map.html index a1b0665..a6ee91b 100644 --- a/templates/map.html +++ b/templates/map.html @@ -70,9 +70,9 @@ - - - + + + {% end %} \ No newline at end of file diff --git a/templates/spots.html b/templates/spots.html index 4bd47fd..7bdfbae 100644 --- a/templates/spots.html +++ b/templates/spots.html @@ -87,9 +87,9 @@ - - - + + + {% end %} \ No newline at end of file diff --git a/templates/status.html b/templates/status.html index 33e796e..16631c2 100644 --- a/templates/status.html +++ b/templates/status.html @@ -59,8 +59,8 @@ - - + + diff --git a/webassets/js/conditions.js b/webassets/js/conditions.js index c323a61..159f704 100644 --- a/webassets/js/conditions.js +++ b/webassets/js/conditions.js @@ -76,7 +76,7 @@ function loadSolarConditions() { const sfi = jsonData.sfi; if (sfi !== null && sfi !== undefined) { applySwClass('sw-solar-flux-vals', 'sw-solar-flux-desc', - sfi > 150 ? 'bg-success-subtle' : sfi > 90 ? 'bg-warning-subtle' : 'bg-danger-subtle'); + sfi > 120 ? 'bg-success-subtle' : sfi > 90 ? 'bg-warning-subtle' : 'bg-danger-subtle'); } const kIndex = jsonData.k_index;