removed aggregate_interval option from gauges.

Daveiano · Jun 25, 2023 · 7e4a050 · 7e4a050
1 parent 2b5a9fc
commit 7e4a050
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 49 deletions.
diff --git a/bin/user/weewx_wdc.py b/bin/user/weewx_wdc.py
@@ -1795,15 +1795,6 @@ def get_gauge_diagram_prop(self, obs, prop, context):
 
         value = search_up(diagrams_config, prop, None)
 
-        # For week, month, year and alltime use the actual timespan in seconds.
-        if (prop == "aggregate_interval" and value is None):
-            if context == "week":
-                return 3600 * 24 * 7
-            if context == "month":
-                return 3600 * 24 * 30
-            if context == "year":
-                return 3600 * 24 * 365
-
         return value
 
     def get_windrose_data(self, start_ts, end_ts, context):

diff --git a/skins/weewx-wdc/includes/gauge-tile.inc b/skins/weewx-wdc/includes/gauge-tile.inc
@@ -45,22 +45,12 @@
             var $series_name = {
                 #if $context == 'day' and not $daily_archive
                   current: "$getattr($current, $partial_obs_key).nolabel('%.2f').replace(',','.')",
-                #else if $context == 'day' and $daily_archive
-                  current: "$getattr($day, $partial_obs_key).avg.nolabel('%.2f').replace(',','.')",
                 #else
                   current: "$getattr($gauge_obs_binding, 'avg').nolabel('%.2f').replace(',','.')",
                 #end if
 
-                #if $context == 'day' and $daily_archive
-                  min: "$getattr($day, $partial_obs_key).min.nolabel('%.2f').replace(',','.')",
-                  max: "$getattr($day, $partial_obs_key).max.nolabel('%.2f').replace(',','.')",
-                #else if $context == 'day' and not $daily_archive
-                  min: "$getattr($span(time_delta=$int($get_gauge_diagram_prop($partial_obs, 'aggregate_interval', $context))), $partial_obs_key).min.nolabel('%.2f').replace(',','.')",
-                  max: "$getattr($span(time_delta=$int($get_gauge_diagram_prop($partial_obs, 'aggregate_interval', $context))), $partial_obs_key).max.nolabel('%.2f').replace(',','.')",
-                #else
-                  min: "$getattr($gauge_obs_binding, 'min').nolabel('%.2f').replace(',','.')",
-                  max: "$getattr($gauge_obs_binding, 'max').nolabel('%.2f').replace(',','.')",
-                #end if
+                min: "$getattr($gauge_obs_binding, 'min').nolabel('%.2f').replace(',','.')",
+                max: "$getattr($gauge_obs_binding, 'max').nolabel('%.2f').replace(',','.')",
                 obs: '$obs.label[$partial_obs]',
                 unit: "$get_unit_label($get_unit_for_obs($partial_obs, $partial_obs_key, $context))",
                 rounding: $get_rounding($partial_obs, $partial_obs_key),

diff --git a/skins/weewx-wdc/skin.conf b/skins/weewx-wdc/skin.conf
@@ -169,8 +169,6 @@ SKIN_VERSION = 3.2.0
         mode = normal
         color_scheme = interpolateRdBu
         invert_color_scheme = 1
-        [[[day]]]
-            aggregate_interval = 21600 # 6 hours
 
     # ONLY enable these if you have weewx-xaggs installed!
     #[[stat_tiles_xaggs]]

diff --git a/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-Legends-1-firefox-linux.txt b/test/e2e-tests/diagrams/diagrams.test.ts-snapshots/Diagrams-Legends-1-firefox-linux.txt
@@ -1 +1 @@
-<g class="legend" transform="translate(272.49999618530273, 0)"><g transform="translate(0, 0)"><rect width="160" height="19" x="0" y="0" fill="transparent"></rect><rect x="144" y="1.5" width="14" data-testid="legend-rect-outTemp" height="14" style="pointer-events: none;" fill="#8B0000"></rect><text x="134" y="7.5" style="fill: rgb(139, 0, 0); dominant-baseline: central; pointer-events: none; font-size: 11px;" text-anchor="end">Outside Temperature Avg.</text></g><g transform="translate(0, 21)"><rect width="160" height="19" x="0" y="0" fill="transparent"></rect><rect x="144" y="1.5" width="14" data-testid="legend-rect-dewpoint" height="14" style="pointer-events: none;" fill="#5F9EA0"></rect><text x="134" y="7.5" style="fill: rgb(95, 158, 160); dominant-baseline: central; pointer-events: none; font-size: 11px;" text-anchor="end">Dew Point Avg.</text></g></g>
+<g class="legend" transform="translate(272.5000057220459, 0)"><g transform="translate(0, 0)"><rect width="160" height="19" x="0" y="0" fill="transparent"></rect><rect x="144" y="1.5" width="14" data-testid="legend-rect-outTemp" height="14" style="pointer-events: none;" fill="#8B0000"></rect><text x="134" y="7.5" style="fill: rgb(139, 0, 0); dominant-baseline: central; pointer-events: none; font-size: 11px;" text-anchor="end">Outside Temperature Avg.</text></g><g transform="translate(0, 21)"><rect width="160" height="19" x="0" y="0" fill="transparent"></rect><rect x="144" y="1.5" width="14" data-testid="legend-rect-dewpoint" height="14" style="pointer-events: none;" fill="#5F9EA0"></rect><text x="134" y="7.5" style="fill: rgb(95, 158, 160); dominant-baseline: central; pointer-events: none; font-size: 11px;" text-anchor="end">Dew Point Avg.</text></g></g>
diff --git a/test/e2e-tests/diagrams/gauges.test.ts b/test/e2e-tests/diagrams/gauges.test.ts
@@ -5,8 +5,8 @@ test.describe("Gauges", () => {
     {
       url: "artifacts-custom-weewx-html/public_html/index.html",
       current: "20.9°C",
-      min: "11.5°C",
-      max: "21.4°C",
+      min: "11.4°C",
+      max: "21.5°C",
       title: "Outside Temperature",
     },
     {
@@ -22,8 +22,8 @@ test.describe("Gauges", () => {
     {
       url: "artifacts-custom-weewx-html/public_html/index.html",
       current: "177°",
-      min: "146°",
-      max: "177°",
+      min: "130°",
+      max: "183°",
       title: "Wind Direction",
     },
     {

diff --git a/...sic-rendering-url-artifacts-custom-weewx-html-public-html-index-html-1-chromium-linux.txt b/...sic-rendering-url-artifacts-custom-weewx-html-public-html-index-html-1-chromium-linux.txt
@@ -3,12 +3,12 @@
             var outTempGaugeSeries0 = {
                   current: "20.94",
 
-                  min: "11.51",
-                  max: "21.37",
+                min: "11.39",
+                max: "21.50",
                 obs: 'Outside Temperature',
                 unit: "&#176;C",
                 rounding: 1,
-                properties: {'tick_number': '7', 'arc': '1.2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'aggregate_interval': '21600', 'min': '-20', 'max': '40'},
+                properties: {'tick_number': '7', 'arc': '1.2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'min': '-20', 'max': '40'},
                 label: "Outside Temperature"
             }
 
diff --git a/...asic-rendering-url-artifacts-custom-weewx-html-public-html-index-html-1-firefox-linux.txt b/...asic-rendering-url-artifacts-custom-weewx-html-public-html-index-html-1-firefox-linux.txt
@@ -3,12 +3,12 @@
             var outTempGaugeSeries0 = {
                   current: "20.94",
 
-                  min: "11.51",
-                  max: "21.37",
+                min: "11.39",
+                max: "21.50",
                 obs: 'Outside Temperature',
                 unit: "&#176;C",
                 rounding: 1,
-                properties: {'tick_number': '7', 'arc': '1.2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'aggregate_interval': '21600', 'min': '-20', 'max': '40'},
+                properties: {'tick_number': '7', 'arc': '1.2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'min': '-20', 'max': '40'},
                 label: "Outside Temperature"
             }
 
diff --git a/...sic-rendering-url-artifacts-custom-weewx-html-public-html-month-html-1-chromium-linux.txt b/...sic-rendering-url-artifacts-custom-weewx-html-public-html-month-html-1-chromium-linux.txt
@@ -3,8 +3,8 @@
             var outTempGaugeSeries0 = {
                   current: "18.20",
 
-                  min: "8.11",
-                  max: "37.39",
+                min: "8.11",
+                max: "37.39",
                 obs: 'Outside Temperature',
                 unit: "&#176;C",
                 rounding: 1,

diff --git a/...asic-rendering-url-artifacts-custom-weewx-html-public-html-month-html-1-firefox-linux.txt b/...asic-rendering-url-artifacts-custom-weewx-html-public-html-month-html-1-firefox-linux.txt
@@ -3,8 +3,8 @@
             var outTempGaugeSeries0 = {
                   current: "18.20",
 
-                  min: "8.11",
-                  max: "37.39",
+                min: "8.11",
+                max: "37.39",
                 obs: 'Outside Temperature',
                 unit: "&#176;C",
                 rounding: 1,

diff --git a/...uges-Full-arc-url-artifacts-custom-weewx-html-public-html-index-html-1-chromium-linux.txt b/...uges-Full-arc-url-artifacts-custom-weewx-html-public-html-index-html-1-chromium-linux.txt
@@ -3,12 +3,12 @@
             var windDirGaugeSeries3 = {
                   current: "177.34",
 
-                  min: "146.45",
-                  max: "177.34",
+                min: "130.00",
+                max: "183.00",
                 obs: 'Wind Direction',
                 unit: "&#176;",
                 rounding: 0,
-                properties: {'tick_number': '7', 'arc': '2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'aggregate_interval': '21600', 'min': '0', 'max': '360'},
+                properties: {'tick_number': '7', 'arc': '2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'min': '0', 'max': '360'},
                 label: "Wind Direction"
             }
 
diff --git a/...auges-Full-arc-url-artifacts-custom-weewx-html-public-html-index-html-1-firefox-linux.txt b/...auges-Full-arc-url-artifacts-custom-weewx-html-public-html-index-html-1-firefox-linux.txt
@@ -3,12 +3,12 @@
             var windDirGaugeSeries3 = {
                   current: "177.34",
 
-                  min: "146.45",
-                  max: "177.34",
+                min: "130.00",
+                max: "183.00",
                 obs: 'Wind Direction',
                 unit: "&#176;",
                 rounding: 0,
-                properties: {'tick_number': '7', 'arc': '2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'aggregate_interval': '21600', 'min': '0', 'max': '360'},
+                properties: {'tick_number': '7', 'arc': '2', 'offset': '20', 'mode': 'normal', 'color_scheme': 'interpolateRdBu', 'invert_color_scheme': '1', 'min': '0', 'max': '360'},
                 label: "Wind Direction"
             }
 
diff --git a/...uges-Full-arc-url-artifacts-custom-weewx-html-public-html-month-html-1-chromium-linux.txt b/...uges-Full-arc-url-artifacts-custom-weewx-html-public-html-month-html-1-chromium-linux.txt
@@ -3,8 +3,8 @@
             var windDirGaugeSeries3 = {
                   current: "198.48",
 
-                  min: "14.00",
-                  max: "359.00",
+                min: "14.00",
+                max: "359.00",
                 obs: 'Wind Direction',
                 unit: "&#176;",
                 rounding: 0,

diff --git a/...auges-Full-arc-url-artifacts-custom-weewx-html-public-html-month-html-1-firefox-linux.txt b/...auges-Full-arc-url-artifacts-custom-weewx-html-public-html-month-html-1-firefox-linux.txt
@@ -3,8 +3,8 @@
             var windDirGaugeSeries3 = {
                   current: "198.48",
 
-                  min: "14.00",
-                  max: "359.00",
+                min: "14.00",
+                max: "359.00",
                 obs: 'Wind Direction',
                 unit: "&#176;",
                 rounding: 0,

diff --git a/test/test_install_report/src/skin-custom.conf b/test/test_install_report/src/skin-custom.conf
@@ -127,7 +127,6 @@ SKIN_VERSION = 2.2.1
         color_scheme = interpolateRdBu
         invert_color_scheme = 1
         [[[day]]]
-            aggregate_interval = 21600 # 6 hours
             [[[[outTemp]]]]
                 min = -20
                 max = 40