From 59dfe03ffa4a4521c540b56c586b3f467a00d30c Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Fri, 29 Jul 2022 21:40:59 +0200 Subject: [PATCH] Update WDC to 2.0 --- Dockerfile | 2 +- defaults/skin-wdc/skin.conf | 137 ++++++++++++++++++++++++++++-------- 2 files changed, 107 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0831460..6c811cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG WEEWX_UID=421 ENV WEEWX_HOME="/home/weewx" ENV WEEWX_VERSION="4.8.0" ENV ARCHIVE="weewx-${WEEWX_VERSION}.tar.gz" -ENV WEEWX_WDC_VERSION="v1.3.3" +ENV WEEWX_WDC_VERSION="v2.0.0" RUN addgroup --system --gid ${WEEWX_UID} weewx \ && adduser --system --uid ${WEEWX_UID} --ingroup weewx weewx diff --git a/defaults/skin-wdc/skin.conf b/defaults/skin-wdc/skin.conf index b958483..fdc9438 100644 --- a/defaults/skin-wdc/skin.conf +++ b/defaults/skin-wdc/skin.conf @@ -1,6 +1,6 @@ # configuration file for the weewx-wdc skin SKIN_NAME = Weather Data Center -SKIN_VERSION = 1.3.3 +SKIN_VERSION = 2.0.0 [Extras] # Show a link to the GitHub respository of this skin. Set to False to hide. @@ -11,6 +11,9 @@ SKIN_VERSION = 1.3.3 # This URL will be used as the image hyperlink: radar_url = https://www.dwd.de/DE/leistungen/radarbild_film/radarbild_film.html + [[forecast_zambretti]] + enable = false + [[forecast_table_settings]] source = Aeris num_periods = 72 @@ -32,44 +35,103 @@ SKIN_VERSION = 1.3.3 show_obvis = 0 [DisplayOptions] + layout = 'alternative' climatological_days = rainDays, summerDays, hotDays, desertDays, tropicalNights, stormDays, iceDays, frostDays # table_tile_observations = outTemp, outHumidity, barometer, windSpeed, windGust, windDir, rain, rainRate, snowDepth, dewpoint, windchill, heatindex, appTemp, UV, ET, radiation, cloudbase, soilMoist1 stat_tile_observations = outTemp, outHumidity, barometer, windSpeed, windGust, windDir, rain, rainRate, snowDepth, dewpoint, windchill, heatindex, appTemp, UV, ET, luminosity, radiation, cloudbase, soilTemp1, soilMoist1, lightning_strike_count - diagram_tile_observations = tempdew, outHumidity, barometer, windchill_heatindex_apptemp, wind, windDir, rain, rainRate, snowDepth, UV, ET, luminosity, radiation, cloudbase, soilTemp1, soilMoist1 - [[diagram_tile_combined_obervations]] - [[[tempdew]]] - label = 'Außentemperatur / Taupunkt' - [[[[obs]]]] - [[[[[outTemp]]]]] - [[[[[dewpoint]]]]] + diagram_tile_observations = temp_min_max_avg, tempdew, outHumidity, barometer, windchill_heatindex_apptemp, wind, windDir, windRose, rain, rainRate, UV, ET, luminosity, radiation, cloudbase, soilTemp1, soilMoist1 + stat_tile_winddir_ordinal = True + diagram_tile_winddir_ordinal = True + windRose_colors = "#f3cec9", "#e7a4b6", "#cd7eaf", "#a262a9", "#6f4d96", "#3d3b72" + [[diagrams]] + [[[combined_observations]]] + [[[[temp_min_max_avg]]]] + label = "Außentemperatur Min/Max/Avg" + pointSize = 3 + [[[[[obs]]]]] + [[[[[[outTemp_min]]]]]] + observation = "outTemp" + aggregate_type = "min" + color = "#0198E1" + [[[[[[outTemp_average]]]]]] + observation = "outTemp" + aggregate_type = "avg" + color = "#666666" + [[[[[[outTemp_max]]]]]] + observation = "outTemp" + aggregate_type = "max" + color = "#8B0000" + [[[[tempdew]]]] + label = 'Außentemperatur / Taupunkt' + [[[[[obs]]]]] + [[[[[[temp]]]]]] + observation = "outTemp" + [[[[[[dew]]]]]] + observation = "dewpoint" - [[[windchill_heatindex_apptemp]]] - label = 'Windchill / Hitzeindex / gefühlte Temperatur' - [[[[obs]]]] - [[[[[windchill]]]]] - color = '#0099CC' - [[[[[heatindex]]]]] - color = '#610000' - [[[[[appTemp]]]]] - color = '#C41E39' + [[[[windchill_heatindex_apptemp]]]] + label = 'Windchill / Hitzeindex / gefühlte Temperatur' + [[[[[obs]]]]] + [[[[[[chill]]]]]] + observation = "windchill" + color = '#0099CC' + [[[[[[heat]]]]]] + observation = "heatindex" + color = '#610000' + [[[[[app]]]]] + observation = "appTemp" + color = '#C41E39' - [[[wind]]] - label = 'Windgeschwindigkeit / Böen' - [[[[obs]]]] - [[[[[windSpeed]]]]] - [[[[[windGust]]]]] + [[[[wind]]]] + label = 'Windgeschwindigkeit / Böen' + [[[[[obs]]]]] + [[[[[[speed]]]]]] + observation = "windSpeed" + [[[[[[gust]]]]]] + observation = "windGust" - [[[lightning_graph]]] - label = 'Blitze' - [[[[obs]]]] - [[[[[lightning_distance]]]]] - color = '#497E76' - [[[[[lightning_strike_count]]]]] - color = '#F0CA00' + [[[line]]] + lineWidth = 2 + pointSize = 5 + isInteractive = True + enablePoints = True + enableCrosshair = True + # @see https://github.com/plouc/nivo/blob/master/packages/line/index.d.ts#L144 + curve = "natural" + [[[bar]]] + enableLabel = False + isInteractive = True + [[[windDir]]] + curve = "basis" + lineWidth = 0 + [[[radiation]]] + curve = "basis" + [[[UV]]] + curve = "step" + [[[rainRate]]] + curve = "linear" + [[[windSpeed]]] + curve = "linear" + [[[windGust]]] + curve = "linear" + + [[[heights]]] + [[[[classic]]]] + height = "220px" + height_md = "300px" + height_lg = "250px" + height_xlg = "225px" + height_max = "225px" + [[[[alternative]]]] + height = "220px" + height_md = "325px" + height_lg = "325px" + height_xlg = "250px" + height_max = "250px" [CheetahGenerator] encoding = html_entities - search_list_extensions = user.general_util.GeneralUtil, user.stats_util.StatsUtil, user.diagram_util.DiagramUtil, user.celestial_util.CelestialUtil, user.archive_util.ArchiveUtil, user.table_util.TableUtil, user.forecast_util.ForecastUtil + search_list_extensions = user.weewx_wdc.WdcGeneralUtil, user.weewx_wdc.WdcStatsUtil, user.weewx_wdc.WdcDiagramUtil, user.weewx_wdc.WdcCelestialUtil, user.weewx_wdc.WdcArchiveUtil, user.weewx_wdc.WdcTableUtil [[SummaryByMonth]] # Reports that summarize "by month" @@ -120,8 +182,21 @@ SKIN_VERSION = 1.3.3 #template = about.html.tmpl #title = About +[Units] + [[TimeFormats]] + # @see https://weewx.com/docs/customizing.htm#Units_TimeFormats + day = %X + week = %x + month = %x + year = %x + rainyear = %x + current = %x %X + ephem_day = %X + ephem_year = %x + stats = %x %X + [CopyGenerator] - copy_once = dist/js/index.js, dist/scss/index.css, favicon.ico, manifest.json, icon-192x192.png, icon-256x256.png, icon-384x384.png, icon-512x512.png, service-worker.js + copy_once = dist/main.js, dist/main.css, plotly-custom-build.min.js, favicon.ico, manifest.json, icon-192x192.png, icon-256x256.png, icon-384x384.png, icon-512x512.png, service-worker.js, offline.html # copy_always = [Generators]