Removed accidentally added Climatogram on year and stats page.

Daveiano · Jul 21, 2023 · 5339958 · 5339958
1 parent 71350d5
commit 5339958
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-<g transform="translate(0, 330)" data-test="x-axis" fill="none" font-size="10" font-family="sans-serif" text-anchor="middle"><path class="domain" stroke="currentColor" d="M0.5,0.5H1386" style="fill: none; stroke: rgb(221, 221, 221); stroke-width: 1;"></path><g class="tick" opacity="1" transform="translate(346.375,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" dx="-.8em" transform="rotate(-65)" style="text-anchor: end;">10/21</text></g><g class="tick" opacity="1" transform="translate(1039.125,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" dx="-.8em" transform="rotate(-65)" style="text-anchor: end;">01/22</text></g></g>
+<g transform="translate(0, 330)" data-test="x-axis" fill="none" font-size="10" font-family="sans-serif" text-anchor="middle"><path class="domain" stroke="currentColor" d="M0.5,0.5H1386" style="fill: none; stroke: rgb(221, 221, 221); stroke-width: 1;"></path><g class="tick" opacity="1" transform="translate(346.375,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" dx="-.8em" transform="rotate(-65)" style="text-anchor: end;">2021</text></g><g class="tick" opacity="1" transform="translate(1039.125,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" dx="-.8em" transform="rotate(-65)" style="text-anchor: end;">2022</text></g></g>
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
@@ -1 +1 @@
-<g transform="translate(0, 330)" data-test="x-axis" fill="none" font-size="10" font-family="sans-serif" text-anchor="middle"><path class="domain" stroke="currentColor" d="M0.5,0.5H1386" style="fill: none; stroke: rgb(221, 221, 221); stroke-width: 1px;"></path><g class="tick" opacity="1" transform="translate(346.375,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" style="text-anchor: end;" dx="-.8em" transform="rotate(-65)">10/21</text></g><g class="tick" opacity="1" transform="translate(1039.125,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" style="text-anchor: end;" dx="-.8em" transform="rotate(-65)">01/22</text></g></g>
+<g transform="translate(0, 330)" data-test="x-axis" fill="none" font-size="10" font-family="sans-serif" text-anchor="middle"><path class="domain" stroke="currentColor" d="M0.5,0.5H1386" style="fill: none; stroke: rgb(221, 221, 221); stroke-width: 1px;"></path><g class="tick" opacity="1" transform="translate(346.375,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" style="text-anchor: end;" dx="-.8em" transform="rotate(-65)">2021</text></g><g class="tick" opacity="1" transform="translate(1039.125,0)"><line stroke="currentColor" y2="0"></line><text fill="currentColor" y="6" dy=".15em" style="text-anchor: end;" dx="-.8em" transform="rotate(-65)">2022</text></g></g>