w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-04-29 18:25:58 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Complete solar weather table #92

Browse Source
This commit is contained in:
Ian Renton
2026-03-29 09:22:03 +01:00
parent 5de5a7ffdf
commit 44f38b8114
10 changed files with 89 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/about.html
View File

@@ -67,7 +67,7 @@
<p>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.</p>
</div>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

4
templates/add_spot.html
View File

@@ -69,8 +69,8 @@
</div>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/add-spot.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script src="/js/add-spot.js?v=1774772523"></script>
<script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

4
templates/alerts.html
View File

@@ -56,8 +56,8 @@
</div>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/alerts.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script src="/js/alerts.js?v=1774772523"></script>
<script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

6
templates/bands.html
View File

@@ -62,9 +62,9 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/spotsbandsandmap.js?v=1774771259"></script>
<script src="/js/bands.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script src="/js/spotsbandsandmap.js?v=1774772523"></script>
<script src="/js/bands.js?v=1774772523"></script>
<script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

8
templates/base.html
View File

@@ -46,10 +46,10 @@
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"></script>
<script src="https://misc.ianrenton.com/jsutils/utils.js?v=1774771259"></script>
<script src="https://misc.ianrenton.com/jsutils/storage.js?v=1774771259"></script>
<script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1774771259"></script>
<script src="https://misc.ianrenton.com/jsutils/geo.js?v=1774771259"></script>
<script src="https://misc.ianrenton.com/jsutils/utils.js?v=1774772523"></script>
<script src="https://misc.ianrenton.com/jsutils/storage.js?v=1774772523"></script>
<script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1774772523"></script>
<script src="https://misc.ianrenton.com/jsutils/geo.js?v=1774772523"></script>
</head>
<body>

49
templates/conditions.html
View File

@@ -3,7 +3,7 @@
<div class="card mt-5">
<div class="card-header">
Band Conditions
Propagation Conditions
</div>
<div class="card-body">
<div class="row row-cols-1 row-cols-md-2 g-3">
@@ -96,49 +96,50 @@
Solar Weather
</div>
<div class="card-body">
<div class="row border-bottom py-2 align-items-start">
<div class="col-12 col-md-2 fw-semibold">Solar Flux</div>
<div class="col-12 col-md-3">
<div class="row border-bottom align-items-start me-0">
<div class="col-12 col-md-2 py-2 fw-bold">Solar Flux</div>
<div id="sw-solar-flux-vals" class="col-12 col-md-3 py-2">
<span class="me-3">SFI: <strong id="sw-sfi"></strong></span>
<span>Sunspots: <strong id="sw-sunspots"></strong></span>
</div>
<div class="col-12 col-md-7 text-muted" id="sw-band-conditions-desc"></div>
<div id="sw-solar-flux-desc" class="col-12 col-md-7 py-2"></div>
</div>
<div class="row border-bottom py-2 align-items-start">
<div class="col-12 col-md-2 fw-semibold">Geomagnetic</div>
<div class="col-12 col-md-3">
<div class="row border-bottom align-items-start me-0">
<div class="col-12 col-md-2 py-2 fw-bold">Geomagnetic</div>
<div id="sw-geomag-vals" class="col-12 col-md-3 py-2">
<span class="me-3">K: <strong id="sw-k-index"></strong></span>
<span class="me-3">A: <strong id="sw-a-index"></strong></span>
<span class="me-3"><strong>G</strong><strong id="sw-geomag-storm-scale"></strong></span>
<span>Noise: <strong id="sw-geomag-noise"></strong></span>
</div>
<div class="col-12 col-md-7 text-muted">
<span id="sw-geomag-field"></span><span class="mx-1 text-body-tertiary">, </span><span id="sw-geomag-storm-desc"></span>
<div id="sw-geomag-desc" class="col-12 col-md-7 py-2">
<span id="sw-geomag-field"></span>. <span id="sw-geomag-storm-desc"></span>
</div>
</div>
<div class="row border-bottom py-2 align-items-start">
<div class="col-12 col-md-2 fw-semibold">X-ray Flux</div>
<div class="col-12 col-md-3"><strong id="sw-x-ray"></strong></div>
<div class="col-12 col-md-7 text-muted" id="sw-blackout-desc"></div>
<div class="row border-bottom align-items-start me-0">
<div class="col-12 col-md-2 py-2 fw-bold">X-ray Flux</div>
<div id="sw-xray-vals" class="col-12 col-md-3 py-2"><strong id="sw-x-ray"></strong></div>
<div id="sw-xray-desc" class="col-12 col-md-7 py-2"></div>
</div>
<div class="row border-bottom py-2 align-items-start">
<div class="col-12 col-md-2 fw-semibold">Proton Flux</div>
<div class="col-12 col-md-3">
<div class="row border-bottom align-items-start me-0">
<div class="col-12 col-md-2 py-2 fw-bold">Proton Flux</div>
<div id="sw-proton-vals" class="col-12 col-md-3 py-2">
<span class="me-3"><strong id="sw-proton-flux"></strong> pfu</span>
<span class="me-3"><strong>S</strong><strong id="sw-solar-storm-scale"></strong></span>
</div>
<div class="col-12 col-md-7 text-muted" id="sw-proton-flux-desc"></div>
<div id="sw-proton-desc" class="col-12 col-md-7 py-2"></div>
</div>
<div class="row py-2 align-items-start">
<div class="col-12 col-md-2 fw-semibold">Electron Flux</div>
<div class="col-12 col-md-3"><strong id="sw-electron-flux"></strong> efu</div>
<div class="col-12 col-md-7 text-muted" id="sw-electron-flux-desc"></div>
<div class="row border-bottom align-items-start me-0">
<div class="col-12 col-md-2 fw-bold py-2">Electron Flux</div>
<div id="sw-electron-vals" class="col-12 col-md-3 py-2"><strong id="sw-electron-flux"></strong> efu</div>
<div id="sw-electron-desc" class="col-12 col-md-7 py-2"></div>
</div>
<div class="form-text mt-3">Data from <a href="https://hamqsl.net">HamQSL.net</a>.</div>
</div>
</div>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/conditions.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script src="/js/conditions.js?v=1774772523"></script>
<script>$(document).ready(function() { $("#nav-link-conditions").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

6
templates/map.html
View File

@@ -70,9 +70,9 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/spotsbandsandmap.js?v=1774771259"></script>
<script src="/js/map.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script src="/js/spotsbandsandmap.js?v=1774772523"></script>
<script src="/js/map.js?v=1774772523"></script>
<script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

6
templates/spots.html
View File

@@ -87,9 +87,9 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/spotsbandsandmap.js?v=1774771259"></script>
<script src="/js/spots.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script src="/js/spotsbandsandmap.js?v=1774772523"></script>
<script src="/js/spots.js?v=1774772523"></script>
<script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

4
templates/status.html
View File

@@ -59,8 +59,8 @@
</div>
</div>
<script src="/js/common.js?v=1774771259"></script>
<script src="/js/status.js?v=1774771259"></script>
<script src="/js/common.js?v=1774772523"></script>
<script src="/js/status.js?v=1774772523"></script>
<script>
$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav -->
</script>

48
webassets/js/conditions.js
View File

@@ -40,7 +40,7 @@ function loadSolarConditions() {
const swFields = {
'sfi': 'sw-sfi',
'sunspots': 'sw-sunspots',
'band_conditions_desc': 'sw-band-conditions-desc',
'band_conditions_desc': 'sw-solar-flux-desc',
'k_index': 'sw-k-index',
'a_index': 'sw-a-index',
'geomag_field': 'sw-geomag-field',
@@ -48,12 +48,12 @@ function loadSolarConditions() {
'geomag_storm_desc': 'sw-geomag-storm-desc',
'geomag_noise': 'sw-geomag-noise',
'x_ray': 'sw-x-ray',
'blackout_desc': 'sw-blackout-desc',
'blackout_desc': 'sw-xray-desc',
'proton_flux': 'sw-proton-flux',
'solar_storm_scale': 'sw-solar-storm-scale',
'proton_flux_desc': 'sw-proton-flux-desc',
'proton_flux_desc': 'sw-proton-desc',
'electron_flux': 'sw-electron-flux',
'electron_flux_desc': 'sw-electron-flux-desc',
'electron_flux_desc': 'sw-electron-desc',
};
Object.entries(swFields).forEach(function([field, id]) {
const val = jsonData[field];
@@ -61,6 +61,46 @@ function loadSolarConditions() {
$('#' + id).text(val);
}
});
// Solar Weather - colouring
function applySwClass(valsId, descId, cls) {
$('#' + valsId).addClass(cls);
$('#' + descId).addClass(cls);
}
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');
}
const kIndex = jsonData.k_index;
if (kIndex !== null && kIndex !== undefined) {
applySwClass('sw-geomag-vals', 'sw-geomag-desc',
kIndex < 5 ? 'bg-success-subtle' : kIndex < 7 ? 'bg-warning-subtle' : 'bg-danger-subtle');
}
const xRay = jsonData.x_ray;
if (xRay) {
const letter = xRay[0].toUpperCase();
const xRayClass = (letter === 'X') ? 'bg-danger-subtle'
: (letter === 'M') ? 'bg-warning-subtle'
: 'bg-success-subtle';
applySwClass('sw-xray-vals', 'sw-xray-desc', xRayClass);
}
const protonFlux = jsonData.proton_flux;
if (protonFlux !== null && protonFlux !== undefined) {
applySwClass('sw-proton-vals', 'sw-proton-desc',
protonFlux <= 100 ? 'bg-success-subtle' : protonFlux <= 10000 ? 'bg-warning-subtle' : 'bg-danger-subtle');
}
const electronFlux = jsonData.electron_flux;
if (electronFlux !== null && electronFlux !== undefined) {
applySwClass('sw-electron-vals', 'sw-electron-desc',
electronFlux <= 100 ? 'bg-success-subtle' : electronFlux <= 1000 ? 'bg-warning-subtle' : 'bg-danger-subtle');
}
});
}