diff --git a/data/solar_conditions.py b/data/solar_conditions.py index b422a14..bd73a68 100644 --- a/data/solar_conditions.py +++ b/data/solar_conditions.py @@ -6,9 +6,9 @@ from dataclasses import dataclass # the first entry whose threshold the value meets or exceeds is used. BLACKOUT_DESCRIPTIONS = { - "X": "Extreme HF radio blackout on entire sunlit side", - "M": "Wide area HF radio blackout on sunlit side", - "C": "Occasional loss of HF communications on sunlit side", + "X": "Wide area HF radio blackout across sunlit side", + "M": "Occasional loss of HF communications on sunlit side", + "C": "Low absorption of HF signals on sunlit side", "B": "No significant radio blackout", "A": "No impact", } diff --git a/solarconditionsproviders/hamqsl.py b/solarconditionsproviders/hamqsl.py index 6f98bd2..3d01300 100644 --- a/solarconditionsproviders/hamqsl.py +++ b/solarconditionsproviders/hamqsl.py @@ -94,11 +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()) if text("geomagfield") else None, + "geomag_field": (lambda v: "Unsettled" if v == "Unsettld" else v)(text("geomagfield").title()), "geomag_noise": text("signalnoise"), "hf_conditions": hf_conditions, "vhf_conditions": { - "vhf_aurora_northern_hemi": vhf_map.get(("vhf-aurora", "northern_hemi")), + "vhf_aurora_northern_hemi": vhf_map.get(("vhf-aurora", "northern_hemi")).title().replace("Lat Aur", "Latitude"), "es_2m_europe": vhf_map.get(("E-Skip", "europe")), "es_4m_europe": vhf_map.get(("E-Skip", "europe_4m")), "es_6m_europe": vhf_map.get(("E-Skip", "europe_6m")), diff --git a/spotproviders/parksnpeaks.py b/spotproviders/parksnpeaks.py index 566e6e7..ae63201 100644 --- a/spotproviders/parksnpeaks.py +++ b/spotproviders/parksnpeaks.py @@ -22,42 +22,43 @@ class ParksNPeaks(HTTPSpotProvider): def _http_response_to_spots(self, http_response): new_spots = [] # Iterate through source data - for source_spot in http_response.json(): - # Convert to our spot format - spot = Spot(source=self.name, - source_id=source_spot["actID"], - dx_call=source_spot["actCallsign"].upper(), - de_call=source_spot["actSpoter"].upper() if source_spot["actSpoter"] != "" else None, - # typo exists in API - freq=float(source_spot["actFreq"].replace(",", "")) * 1000000 if ( - source_spot["actFreq"] != "") else None, - # Seen PNP spots with empty frequency, and with comma-separated thousands digits - mode=source_spot["actMode"].upper(), - comment=source_spot["actComments"], - time=datetime.strptime(source_spot["actTime"], "%Y-%m-%d %H:%M:%S").replace( - tzinfo=pytz.UTC).timestamp()) + if http_response and http_response != "": + for source_spot in http_response.json(): + # Convert to our spot format + spot = Spot(source=self.name, + source_id=source_spot["actID"], + dx_call=source_spot["actCallsign"].upper(), + de_call=source_spot["actSpoter"].upper() if source_spot["actSpoter"] != "" else None, + # typo exists in API + freq=float(source_spot["actFreq"].replace(",", "")) * 1000000 if ( + source_spot["actFreq"] != "") else None, + # Seen PNP spots with empty frequency, and with comma-separated thousands digits + mode=source_spot["actMode"].upper(), + comment=source_spot["actComments"], + time=datetime.strptime(source_spot["actTime"], "%Y-%m-%d %H:%M:%S").replace( + tzinfo=pytz.UTC).timestamp()) - # Extract a de_call if it's in the comment but not in the "actSpoter" field - m = re.search(r"\(de ([A-Za-z0-9]*)\)", spot.comment) - if not spot.de_call and m: - spot.de_call = m.group(1) + # Extract a de_call if it's in the comment but not in the "actSpoter" field + m = re.search(r"\(de ([A-Za-z0-9]*)\)", spot.comment) + if not spot.de_call and m: + spot.de_call = m.group(1) - # Record SIG information. Sometimes we get a "SIG" of "QRP", which we ignore as it's not a programme with a - # defined set of references - sig = source_spot["actClass"].upper() - sig_ref = source_spot["actSiteID"] - if sig and sig != "" and sig != "QRP" and sig_ref and sig_ref != "": - spot.sig = sig - spot.sig_refs = [SIGRef(id=source_spot["actSiteID"], sig=source_spot["actClass"].upper())] + # Record SIG information. Sometimes we get a "SIG" of "QRP", which we ignore as it's not a programme with a + # defined set of references + sig = source_spot["actClass"].upper() + sig_ref = source_spot["actSiteID"] + if sig and sig != "" and sig != "QRP" and sig_ref and sig_ref != "": + spot.sig = sig + spot.sig_refs = [SIGRef(id=source_spot["actSiteID"], sig=source_spot["actClass"].upper())] - # Free text location is not present in all spots, so only add it if it's set - if "actLocation" in source_spot and source_spot["actLocation"] != "": - spot.sig_refs[0].name = source_spot["actLocation"] + # Free text location is not present in all spots, so only add it if it's set + if "actLocation" in source_spot and source_spot["actLocation"] != "": + spot.sig_refs[0].name = source_spot["actLocation"] - # Log a warning for the developer if PnP gives us an unknown programme we've never seen before - if sig not in ["POTA", "SOTA", "WWFF", "SIOTA", "ZLOTA", "KRMNPA"]: - logging.warning("PNP spot found with sig " + sig + ", developer needs to add support for this!") + # Log a warning for the developer if PnP gives us an unknown programme we've never seen before + if sig not in ["POTA", "SOTA", "WWFF", "SIOTA", "ZLOTA", "KRMNPA"]: + logging.warning("PNP spot found with sig " + sig + ", developer needs to add support for this!") - # Add new spot to the list - new_spots.append(spot) + # Add new spot to the list + new_spots.append(spot) return new_spots diff --git a/templates/about.html b/templates/about.html index f02d61d..5f8a1bd 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 f87c35a..a8a430d 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 504d549..9a89095 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 d77f2c3..f6e397c 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 9729d50..803376f 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 de1cde2..1ba1c4f 100644 --- a/templates/conditions.html +++ b/templates/conditions.html @@ -96,12 +96,49 @@ Solar Weather
- Coming soon! +
+
Solar Flux
+
+ SFI: + Sunspots: +
+
+
+
+
Geomagnetic
+
+ K: + A: + G + Noise: +
+
+ , +
+
+
+
X-ray Flux
+
+
+
+
+
Proton Flux
+
+ pfu + S +
+
+
+
+
Electron Flux
+
efu
+
+
- - + + {% end %} \ No newline at end of file diff --git a/templates/map.html b/templates/map.html index 710a551..35afad8 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 86d61dc..df3bebe 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 3e5feac..c7e2bed 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 ac61974..12bfec0 100644 --- a/webassets/js/conditions.js +++ b/webassets/js/conditions.js @@ -20,12 +20,47 @@ function loadSolarConditions() { Object.entries(jsonData.vhf_conditions).forEach(function([key, condition]) { const cell = $('#vhf-conditions-' + key); cell.text(condition); - cell.addClass(condition === 'Band Closed' ? 'table-danger' : 'table-success'); + let vhfClass; + if (condition === 'Band Closed') { + vhfClass = 'table-danger'; + } else if (condition.includes('High')) { + vhfClass = 'table-warning'; + } else { + vhfClass = 'table-success'; + } + cell.addClass(vhfClass); }); } if (jsonData.aurora_latitude !== null && jsonData.aurora_latitude !== undefined) { $('#vhf-conditions-aurora-lat').text(jsonData.aurora_latitude + '°'); } + + // Solar Weather + + const swFields = { + 'sfi': 'sw-sfi', + 'sunspots': 'sw-sunspots', + 'band_conditions_desc': 'sw-band-conditions-desc', + 'k_index': 'sw-k-index', + 'a_index': 'sw-a-index', + 'geomag_field': 'sw-geomag-field', + 'geomag_storm_scale': 'sw-geomag-storm-scale', + 'geomag_storm_desc': 'sw-geomag-storm-desc', + 'geomag_noise': 'sw-geomag-noise', + 'x_ray': 'sw-x-ray', + 'blackout_desc': 'sw-blackout-desc', + 'proton_flux': 'sw-proton-flux', + 'solar_storm_scale': 'sw-solar-storm-scale', + 'proton_flux_desc': 'sw-proton-flux-desc', + 'electron_flux': 'sw-electron-flux', + 'electron_flux_desc': 'sw-electron-flux-desc', + }; + Object.entries(swFields).forEach(function([field, id]) { + const val = jsonData[field]; + if (val !== null && val !== undefined) { + $('#' + id).text(val); + } + }); }); }