diff --git a/bin/user/weewx_wdc.py b/bin/user/weewx_wdc.py
index d3d0b285..f13a2eaf 100644
--- a/bin/user/weewx_wdc.py
+++ b/bin/user/weewx_wdc.py
@@ -1599,11 +1599,17 @@ def get_diagram_props(self, obs, context):
**diagram_context_props
}
elif obs in diagrams_config["combined_observations"]:
- return {
- **diagram_base_props,
- **diagrams_config["combined_observations"][obs],
- **diagram_context_props,
- }
+ if context in diagrams_config and 'observations' in diagrams_config[context] and obs in diagrams_config[context]['observations']:
+ return {
+ **diagram_base_props,
+ **diagrams_config["combined_observations"][obs],
+ **diagram_context_props,
+ }
+ else:
+ return {
+ **diagram_base_props,
+ **diagrams_config["combined_observations"][obs],
+ }
else:
return {
**diagram_base_props,
diff --git a/changelog.md b/changelog.md
index e297d886..d43ee322 100644
--- a/changelog.md
+++ b/changelog.md
@@ -721,3 +721,4 @@ See https://github.com/Daveiano/weewx-wdc/compare/v3.2.0...11eed6b3#diff-ba225fb
# Next
- Bugfix: base_path missing for NOAA Report HREF GH-184
+- Bugfix: Removed accidentally added Climatogram on year and stats page
diff --git a/skins/weewx-wdc/skin.conf b/skins/weewx-wdc/skin.conf
index 15738ea9..65d4cc40 100644
--- a/skins/weewx-wdc/skin.conf
+++ b/skins/weewx-wdc/skin.conf
@@ -523,9 +523,6 @@ SKIN_VERSION = 3.3.0
[[[[[radiation]]]]]
[[[[[cloudbase]]]]]
[[[[[appTemp]]]]]
- [[[[[climatogram_year]]]]]
- bottom_date_time_format = "%b"
- tooltip_date_time_format = "%B"
[[[alltime]]]
@@ -547,9 +544,6 @@ SKIN_VERSION = 3.3.0
[[[[[radiation]]]]]
[[[[[cloudbase]]]]]
[[[[[appTemp]]]]]
- [[[[[climatogram_statistics]]]]]
- bottom_date_time_format = "%Y"
- tooltip_date_time_format = "%Y"
# Diagram heights.
[[[heights]]]
diff --git a/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-chromium-linux.txt b/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-chromium-linux.txt
index 4f30708c..d200c512 100644
--- a/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-chromium-linux.txt
+++ b/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-chromium-linux.txt
@@ -1 +1 @@
-10/2101/22
\ No newline at end of file
+20212022
\ No newline at end of file
diff --git a/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-firefox-linux.txt b/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-firefox-linux.txt
index df920313..3ebb1f6d 100644
--- a/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-firefox-linux.txt
+++ b/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-xAxis-3-firefox-linux.txt
@@ -1 +1 @@
-10/2101/22
\ No newline at end of file
+20212022
\ No newline at end of file