From a595b9852f07f0820e039b2ecdb01399688b29bd Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sat, 25 Mar 2023 13:53:47 +0100
Subject: [PATCH] Update weewx-wdc

---
 Dockerfile                  |  2 +-
 defaults/skin-wdc/skin.conf | 39 +++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 89099b3..59eb256 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG WEEWX_UID=421
 ENV WEEWX_HOME="/home/weewx"
 ENV WEEWX_VERSION="4.10.2"
 ENV ARCHIVE="weewx-${WEEWX_VERSION}.tar.gz"
-ENV WEEWX_WDC_VERSION="v3.0.1"
+ENV WEEWX_WDC_VERSION="v3.1.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 73b0b5d..0863af8 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 = 3.0.1
+SKIN_VERSION = 3.1.0
 
 [ObservationBindings]
 
@@ -20,6 +20,38 @@ SKIN_VERSION = 3.0.1
     radar_html = '<a href="https://www.dwd.de/DE/leistungen/radarbild_film/radarbild_film.html"><img src="/dwd/radar_nrw.gif" alt="Radar" loading="lazy"></a>'
     radar_heading = Radar
 
+    # Set to True to have the Forecast tile and the radar/externals tile to have the same width.
+    # Default is forecast = 2/3 and radar tile = 1/3.
+    forecast_radar_equal_width = False
+
+    [[mqtt]]
+        mqtt_websockets_enabled = 0
+        mqtt_websockets_host = "localhost"
+        mqtt_websockets_port = 9001
+        mqtt_websockets_ssl = 0
+        mqtt_websockets_topic = "weather/loop"
+
+    # Include various external sources (eg. webcams) here.
+    #[[external_1]]
+    #    source = '<img src="http://your-server.com/uploads/webcam01.jpg" />'
+    #    title = Webcam 1
+    #    title_long = "Webcam 1, facing North"
+
+    #[[external_2]]
+    #    source = '<img src="http://your-server.com/uploads/webcam02.jpg" />'
+    #    title = Webcam 2
+    #    title_long = "Webcam 2, facing South"
+
+    #[[external_3]]
+    #    source = '<img src="http://your-server.com/uploads/webcam01.gif" />'
+    #    title = Webcam 1
+    #    title_long = "Webcam 1, Timelapse"
+
+    #[[external_4]]
+    #    source = '<img src="http://your-server.com/uploads/webcam02.gif" />'
+    #    title = Webcam 2
+    #    title_long = "Webcam 2, Timelapse"
+
     [[forecast_zambretti]]
         enable = False
 
@@ -570,6 +602,9 @@ SKIN_VERSION = 3.0.1
         #[[[about]]]
             #template = about.html.tmpl
             #title = About
+        #[[[externals]]]
+            #template = externals.html.tmpl
+            #title = Webcams/Externals
         [[[DWD]]]
             template = dwd.html.tmpl
             title = Vorhersage vom DWD
@@ -589,7 +624,7 @@ SKIN_VERSION = 3.0.1
         daily_archive = %Y-%m-%d
 
 [CopyGenerator]
-    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_once = dist/main.js, dist/main.css, plotly-custom-build.min.js, dist/live-updates.js, favicon.ico, manifest.json, icon-192x192.png, icon-256x256.png, icon-384x384.png, icon-512x512.png, service-worker.js, offline.html, dist/assets
     copy_always = dwd/SchilderEM.jpg, dwd/radar_nrw.gif, dwd/bwk_bodendruck_weu_ana.png, dwd/bwk_bodendruck_na_ana.png
 
 [Generators]