Merge branch 'main' into production

wdr-data · Feb 26, 2024 · ac6bf09 · ac6bf09
2 parents ddb8864 + 8861d49
commit ac6bf09
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/app/src/App.svelte b/app/src/App.svelte
@@ -74,8 +74,8 @@
                 d3range(5).map(d => ({
                     date: dayjs(lastDate)
                         .add(d + 1, 'day')
-                        .toDate()
-                }))
+                        .toDate(),
+                })),
             )
             .map(d => {
                 const day = dayjs(d.date).format('MM-DD');

diff --git a/app/src/Station.svelte b/app/src/Station.svelte
@@ -143,8 +143,8 @@
                 {precipLabelPast}. Das ist {curDay.rain30days > curDay.context.rain30days_hi
                     ? 'besonders viel '
                     : curDay.rain30days < curDay.context.rain30days_lo
-                    ? 'besonders wenig '
-                    : 'normal'}{#if curDay.rain30days < curDay.context.rain30days_lo || curDay.rain30days > curDay.context.rain30days_hi}
+                      ? 'besonders wenig '
+                      : 'normal'}{#if curDay.rain30days < curDay.context.rain30days_lo || curDay.rain30days > curDay.context.rain30days_hi}
                     und etwa {fmtRain(
                         Math.round(
                             Math.abs(

diff --git a/app/src/_partials/ChartDaily.svelte b/app/src/_partials/ChartDaily.svelte
@@ -22,7 +22,7 @@
         top: 50,
         right: $isMobile ? 80 : 80,
         bottom: 60,
-        left: $isMobile ? 30 : 40
+        left: $isMobile ? 30 : 40,
     };
 
     $: xRange = [padding.left, $chartWidth - padding.right];
@@ -40,7 +40,7 @@
         ...dataFiltered.map(d => d.context[show]),
         ...dataFiltered.map(d => d.context[show + '_lo']),
         ...dataFiltered.map(d => d.context[show + '_hi']),
-        ...(includeZero ? [0] : [])
+        ...(includeZero ? [0] : []),
     ].filter(d => d !== undefined);
 
     $: yExtent = extent(yValues).map((d, i) => (show === 'temp' ? d + [-2, 0][i] : d));
@@ -50,15 +50,15 @@
 
     const midMonth = d => {
         return new Date(
-            d.getTime() + (new Date(d.getFullYear(), d.getMonth() + 1, d.getDate()) - d) / 2
+            d.getTime() + (new Date(d.getFullYear(), d.getMonth() + 1, d.getDate()) - d) / 2,
         );
     };
 
     $: formatDay = (d, i) => dayjs(d).format('D');
     $: format1 = (d, i) => dayjs(d).format('D.M.');
     $: format2 = (d, i) => {
         const fmt = [i > 0 && d.getFullYear() != xTicks[i - 1].getFullYear() ? 'YYYY' : ''].join(
-            ''
+            '',
         );
         return fmt ? dayjs(d).format(fmt) : '';
     };
@@ -70,10 +70,10 @@
     export let hasRecordTemp;
     $: {
         hasRecordTemp = !!dataFiltered.find(
-            d => ((
-                d.TXK > d.context.TXK_records.hi[2].TXK ||
-                d.context.TXK_records.hi[2].year == dayjs(d.date).year()
-            ) && dayjs(d.date) < dayjs())
+            d =>
+                (d.TXK > d.context.TXK_records.hi[2].TXK ||
+                    d.context.TXK_records.hi[2].year == dayjs(d.date).year()) &&
+                dayjs(d.date) < dayjs(),
         );
     }
 

diff --git a/scraper/src/analyzeContext.js b/scraper/src/analyzeContext.js
@@ -14,13 +14,14 @@ const { ascendingKey } = require('d3-jetpack');
 const { round, quantileConfig } = require('./shared.js');
 
 const DAYS = [];
-let day = dayjs('2021-01-01');
-while (day.year() === 2021) {
+// SCHALTJAHR?!
+let day = dayjs('2024-01-01');
+while (day.year() === 2024) {
     DAYS.push(day.format('MM-DD'));
     day = day.add(1, 'day');
 }
 
-module.exports = function analyzeContext (data, baseMinYear) {
+module.exports = function analyzeContext(data, baseMinYear) {
     // add some useful date keys
     data.forEach(row => {
         const date = dayjs(row.date);
@@ -40,7 +41,7 @@ module.exports = function analyzeContext (data, baseMinYear) {
     return { daily, monthly };
 };
 
-function getDailyContext (data, day, baseMinYear) {
+function getDailyContext(data, day, baseMinYear) {
     const datesTemp = data.filter(
         d =>
             d.year >= baseMinYear &&
@@ -102,7 +103,7 @@ function getDailyContext (data, day, baseMinYear) {
  * @param {number} baseMinYear begin of 30-year context period
  * @returns {object}
  */
-function getMonthlyContext (data, month, baseMinYear) {
+function getMonthlyContext(data, month, baseMinYear) {
     const stats = [];
     group(
         data.filter(d => d.month === month),