+
+
@@ -536,11 +499,21 @@ $plotlyPayload = [
(function () {
const payload = ;
const plotEl = document.getElementById('tcrbPlot');
+ const filterForm = document.getElementById('tcrbFilterForm');
+ const selectAllEl = document.getElementById('tcrbSelectAll');
+ const selectNoneEl = document.getElementById('tcrbSelectNone');
+ const filterCheckboxes = filterForm ? Array.from(filterForm.querySelectorAll('input[name="filters[]"]')) : [];
- if (!plotEl || typeof Plotly === 'undefined' || !payload || !Array.isArray(payload.traces) || payload.traces.length === 0) {
+ if (!plotEl || typeof Plotly === 'undefined' || !payload || !Array.isArray(payload.datasets) || payload.datasets.length === 0) {
return;
}
+ if (filterForm) {
+ filterForm.addEventListener('submit', function (event) {
+ event.preventDefault();
+ });
+ }
+
const layout = {
margin: { t: 20, r: 24, b: 56, l: 72 },
paper_bgcolor: 'rgba(0,0,0,0)',
@@ -556,7 +529,7 @@ $plotlyPayload = [
zeroline: false
},
yaxis: {
- title: { text: 'Magnitude (kleiner = heller)' },
+ title: { text: 'Magnitude' },
autorange: 'reversed',
gridcolor: 'rgba(255,255,255,0.12)',
linecolor: '#f8fafc',
@@ -574,7 +547,111 @@ $plotlyPayload = [
modeBarButtonsToRemove: ['select2d', 'lasso2d']
};
- Plotly.newPlot(plotEl, payload.traces, layout, config);
+ function buildDatasetTrace(dataset) {
+ const errorValues = [];
+ let hasErrors = false;
+
+ dataset.points.forEach(function (point) {
+ const errorValue = point.magnitude_error !== null ? Number(point.magnitude_error) : 0;
+ errorValues.push(errorValue);
+ if (errorValue > 0) {
+ hasErrors = true;
+ }
+ });
+
+ return {
+ type: 'scatter',
+ mode: 'lines+markers',
+ name: dataset.filter,
+ x: dataset.points.map(function (point) { return point.observed_at_utc; }),
+ y: dataset.points.map(function (point) { return Number(point.magnitude); }),
+ line: {
+ color: dataset.color,
+ width: 2,
+ shape: 'spline',
+ smoothing: 0.65
+ },
+ marker: {
+ color: dataset.color,
+ size: 3,
+ line: {
+ color: '#0f172a',
+ width: 1
+ }
+ },
+ error_y: {
+ type: 'data',
+ array: errorValues,
+ visible: hasErrors,
+ thickness: 1.1,
+ width: 3,
+ color: dataset.color
+ },
+ customdata: dataset.points.map(function (point) {
+ return [
+ point.jd,
+ point.observer_code !== '' ? point.observer_code : '-',
+ point.magnitude_error !== null ? Number(point.magnitude_error).toFixed(3) : '-'
+ ];
+ }),
+ hovertemplate: 'Filter %{fullData.name}
'
+ + 'Magnitude %{y:.3f}
'
+ + 'Fehler %{customdata[2]}
'
+ + 'UTC %{x}
'
+ + 'JD %{customdata[0]}
'
+ + 'Observer %{customdata[1]}
'
+ };
+ }
+
+ function getActiveFilterCodes() {
+ return filterCheckboxes
+ .filter(function (checkbox) { return checkbox.checked; })
+ .map(function (checkbox) { return checkbox.value; });
+ }
+
+ function renderPlot() {
+ const activeFilterCodes = getActiveFilterCodes();
+ const activeDatasets = payload.datasets.filter(function (dataset) {
+ return activeFilterCodes.includes(dataset.filter);
+ });
+ const traces = activeDatasets.map(buildDatasetTrace);
+
+ if (traces.length === 0) {
+ Plotly.react(plotEl, [], layout, config);
+ return;
+ }
+
+ Plotly.react(plotEl, traces, layout, config);
+ }
+
+ const initiallySelected = Array.isArray(payload.selectedFilters) && payload.selectedFilters.length > 0
+ ? payload.selectedFilters
+ : ['V'];
+
+ filterCheckboxes.forEach(function (checkbox) {
+ checkbox.checked = initiallySelected.includes(checkbox.value);
+ checkbox.addEventListener('change', renderPlot);
+ });
+
+ if (selectAllEl) {
+ selectAllEl.addEventListener('click', function () {
+ filterCheckboxes.forEach(function (checkbox) {
+ checkbox.checked = true;
+ });
+ renderPlot();
+ });
+ }
+
+ if (selectNoneEl) {
+ selectNoneEl.addEventListener('click', function () {
+ filterCheckboxes.forEach(function (checkbox) {
+ checkbox.checked = false;
+ });
+ renderPlot();
+ });
+ }
+
+ renderPlot();
})();
diff --git a/scripts/telegram/telegram_cron.php b/scripts/telegram/telegram_cron.php
index 4f12c30..c0eddbb 100644
--- a/scripts/telegram/telegram_cron.php
+++ b/scripts/telegram/telegram_cron.php
@@ -23,6 +23,7 @@ $stateFile = __DIR__ . DIRECTORY_SEPARATOR . 'telegram_cron_state.json';
$dbConfig = require $rootDir . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'database.php';
$telegramConfig = require $rootDir . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'telegram.php';
require_once $rootDir . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'telegram_message_footer.php';
+$filterColorConfigPath = $rootDir . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'filter_colors.json';
$dsn = sprintf(
'mysql:host=%s;port=%d;dbname=%s;charset=%s',
@@ -547,6 +548,12 @@ function formatGermanDateTime(?string $value): string
function buildTcrbVChartSvg(array $observations, array $latestObservation): string
{
+ $filterColors = loadFilterColors();
+ $vColor = (string) ($filterColors['V'] ?? '#92FF00');
+ $vStrokeColor = darkenHexColor($vColor, 0.35);
+ $vHighlightColor = lightenHexColor($vColor, 0.35);
+ $vHighlightStrokeColor = lightenHexColor($vColor, 0.6);
+
$width = 1200;
$height = 700;
$paddingLeft = 90;
@@ -639,14 +646,15 @@ function buildTcrbVChartSvg(array $observations, array $latestObservation): stri
$yTop = $scaleY($magnitude - $error);
$yBottom = $scaleY($magnitude + $error);
$errorBars[] = sprintf(
- '
' .
- '
' .
- '
',
+ '
' .
+ '
' .
+ '
',
$x,
$yTop,
$yBottom,
$x - 7,
- $x + 7
+ $x + 7,
+ htmlspecialchars($vHighlightColor, ENT_QUOTES, 'UTF-8')
);
}
@@ -658,8 +666,8 @@ function buildTcrbVChartSvg(array $observations, array $latestObservation): stri
$x,
$y,
$isLatest ? 7.0 : 4.2,
- $isLatest ? '#f4d35e' : '#7bd389',
- $isLatest ? '#fff3bf' : '#d9f99d',
+ $isLatest ? $vHighlightColor : $vColor,
+ $isLatest ? $vHighlightStrokeColor : $vHighlightColor,
$isLatest ? 2.6 : 1.4
);
}
@@ -691,13 +699,13 @@ function buildTcrbVChartSvg(array $observations, array $latestObservation): stri
letzte 2 Monate
%s
%s
-
Aktuell: %s%s
+
Aktuell: %s%s
%s UTC
%s
%s
-
+
%s
SVG,
@@ -720,6 +728,7 @@ SVG,
$height - 28,
htmlspecialchars($lastLabel, ENT_QUOTES, 'UTF-8'),
$width - $paddingRight,
+ htmlspecialchars($vHighlightColor, ENT_QUOTES, 'UTF-8'),
htmlspecialchars($latestMagnitude, ENT_QUOTES, 'UTF-8'),
htmlspecialchars($latestError, ENT_QUOTES, 'UTF-8'),
$width - $paddingRight,
@@ -735,10 +744,75 @@ SVG,
$plotBottomY,
$errorBarsSvg,
$pathSvg,
+ htmlspecialchars($vStrokeColor, ENT_QUOTES, 'UTF-8'),
$pointsSvgMarkup
);
}
+function loadFilterColors(): array
+{
+ static $colors = null;
+ global $filterColorConfigPath;
+
+ if (is_array($colors)) {
+ return $colors;
+ }
+
+ $colors = [];
+ if (!is_string($filterColorConfigPath) || !is_file($filterColorConfigPath)) {
+ return $colors;
+ }
+
+ $raw = file_get_contents($filterColorConfigPath);
+ $decoded = is_string($raw) ? json_decode($raw, true) : null;
+ if (!is_array($decoded)) {
+ return $colors;
+ }
+
+ foreach ($decoded as $filterCode => $config) {
+ if (is_array($config) && !empty($config['color'])) {
+ $colors[(string) $filterCode] = (string) $config['color'];
+ }
+ }
+
+ return $colors;
+}
+
+function darkenHexColor(string $hexColor, float $amount): string
+{
+ return adjustHexColor($hexColor, -abs($amount));
+}
+
+function lightenHexColor(string $hexColor, float $amount): string
+{
+ return adjustHexColor($hexColor, abs($amount));
+}
+
+function adjustHexColor(string $hexColor, float $amount): string
+{
+ $hex = ltrim(trim($hexColor), '#');
+ if (!preg_match('/^[0-9a-fA-F]{6}$/', $hex)) {
+ return '#92FF00';
+ }
+
+ $channels = [
+ hexdec(substr($hex, 0, 2)),
+ hexdec(substr($hex, 2, 2)),
+ hexdec(substr($hex, 4, 2)),
+ ];
+
+ foreach ($channels as $index => $value) {
+ if ($amount >= 0) {
+ $channels[$index] = (int) round($value + ((255 - $value) * $amount));
+ } else {
+ $channels[$index] = (int) round($value * (1 + $amount));
+ }
+ $channels[$index] = max(0, min(255, $channels[$index]));
+ }
+
+ return sprintf('#%02X%02X%02X', $channels[0], $channels[1], $channels[2]);
+}
+
function buildTcrbObservationSignature(array $observation): string
{
return implode('|', [