🐞 Displaying missing data in charts correctly with "null" value on al…

…l pages. Disabled animations due to this. Fixes #3
neoground · Mar 12, 2021 · 6c768ab · 6c768ab
1 parent c9b8076
commit 6c768ab
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 81 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,18 +9,21 @@
 
 ### Changed
 
-- Removed graph animations on yearly + monthly archive pages due to 
-  high amount of data which increases performance a lot
-- Month charts now show the same layout as year charts in the archive
-  (full date, better performance)
+- Month archive charts now show the same layout as year 
+  charts in the archive (full date, better performance)
 
 ### Fixed
 
 - Barometer trend can now also be None without throwing an error
 - Max value of radiation is now shown correctly
-- Partly missing data on an archive page will now result in a correct
+- Partly missing data on a page will now result in a correct
   graph with "null" values instead of just ignoring missing data
 
+### Removed
+
+- Graph animations due to high amount of data / problems with 
+  displaying "null" values which increases performance a lot
+
 
 ## 1.4 (2021-03-08)
 

diff --git a/src/graph_area_config.inc b/src/graph_area_config.inc
@@ -29,6 +29,9 @@ chart: {
     #include raw "js/vendor/apexcharts/locales/" + $Extras.language + ".json"
   ],
   defaultLocale: '$Extras.language',
+  animations: {
+    enabled: false
+  },
 },
 dataLabels: {
   enabled: false

diff --git a/src/graph_bar_config.inc b/src/graph_bar_config.inc
@@ -29,6 +29,9 @@
       #include raw "js/vendor/apexcharts/locales/" + $Extras.language + ".json"
     ],
     defaultLocale: '$Extras.language',
+    animations: {
+      enabled: false
+    },
   },
   dataLabels: {
     enabled: false

diff --git a/src/graph_radar_config.inc b/src/graph_radar_config.inc
@@ -28,6 +28,9 @@
       #include raw "js/vendor/apexcharts/locales/" + $Extras.language + ".json"
     ],
     defaultLocale: '$Extras.language',
+    animations: {
+      enabled: false
+    },
   },
   dataLabels: {
     enabled: false

diff --git a/src/index.html.tmpl b/src/index.html.tmpl
@@ -502,15 +502,15 @@
           name: "$obs.label.outTemp",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.outTemp.avg.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.outTemp.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         },
         {
           name: "$obs.label.dewpoint",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.dewpoint.avg.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.dewpoint.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -539,15 +539,15 @@
           name: "$obs.label.windchill",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-                    [$record.start.raw, $record.windchill.avg.format(add_label=False, localize=False, None_string="")],
+                    [$record.start.raw, $record.windchill.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         },
         {
           name: "$obs.label.heatindex",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.heatindex.avg.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.heatindex.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -575,7 +575,7 @@
           name: "$obs.label.barometer",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.barometer.avg.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.barometer.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -603,7 +603,7 @@
           name: "$obs.label.rain",
           data: [
             #for $record in $span($day_delta=1).spans(interval=3600)
-                    [$record.start.raw, $record.rain.sum.format(add_label=False, localize=False, None_string="")],
+                    [$record.start.raw, $record.rain.sum.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -631,15 +631,15 @@
           name: "$obs.label.windSpeed",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-                    [$record.start.raw, $record.windSpeed.max.format(add_label=False, localize=False, None_string="")],
+                    [$record.start.raw, $record.windSpeed.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         },
         {
           name: "$obs.label.windGust",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.windGust.max.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.windGust.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -667,7 +667,7 @@
             name: "$obs.label.outHumidity",
             data: [
               #for $record in $span($day_delta=1).spans(interval=600)
-                      [$record.start.raw, $record.outHumidity.avg.format(add_label=False, localize=False, None_string="")],
+                      [$record.start.raw, $record.outHumidity.avg.format(add_label=False, localize=False, None_string="null")],
               #end for
             ]
           }
@@ -808,7 +808,7 @@
           name: "$obs.label.UV",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.UV.max.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.UV.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -834,7 +834,7 @@
           name: "$obs.label.ET",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.ET.max.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.ET.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -860,7 +860,7 @@
           name: "$obs.label.radiation",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.radiation.max.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.radiation.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -890,7 +890,7 @@
           name: "$obs.label.extraTemp1",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.extraTemp1.avg.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.extraTemp1.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -916,7 +916,7 @@
           name: "$obs.label.extraTemp2",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.extraTemp2.avg.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.extraTemp2.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -942,7 +942,7 @@
           name: "$obs.label.extraTemp3",
           data: [
             #for $record in $span($day_delta=1).spans(interval=600)
-            [$record.start.raw, $record.extraTemp3.avg.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.extraTemp3.avg.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }

diff --git a/src/month.html.tmpl b/src/month.html.tmpl
@@ -477,13 +477,13 @@
 
     var seriesdata1 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-        [$record.start.raw, $record.outTemp.avg.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.outTemp.avg.format(add_label=False, $localize=False, None_string="null")],
       #end for
     ];
 
     var seriesdata2 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-        [$record.start.raw, $record.dewpoint.avg.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.dewpoint.avg.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ];
 
@@ -518,13 +518,13 @@
 
     seriesdata1 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-        [$record.start.raw, $record.windchill.avg.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.windchill.avg.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ]
 
     seriesdata2 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-        [$record.start.raw, $record.heatindex.avg.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.heatindex.avg.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ]
 
@@ -558,7 +558,7 @@
 
     seriesdata1 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-              [$record.start.raw, $record.barometer.avg.format(add_label=False, $localize=False, None_string="")],
+              [$record.start.raw, $record.barometer.avg.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ];
 
@@ -588,7 +588,7 @@
 
     seriesdata1 = [
       #for $record in $span($month_delta=1).spans(interval=86400)
-        [$record.start.raw, $record.rain.sum.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.rain.sum.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ]
 
@@ -618,13 +618,13 @@
 
     seriesdata1 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-        [$record.start.raw, $record.windSpeed.max.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.windSpeed.max.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ]
 
     seriesdata2 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-        [$record.start.raw, $record.windGust.max.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.windGust.max.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ]
 
@@ -658,7 +658,7 @@
 
     seriesdata1 = [
       #for $record in $span($month_delta=1).spans(interval=21600)
-        [$record.start.raw, $record.outHumidity.avg.format(add_label=False, $localize=False, None_string="")],
+        [$record.start.raw, $record.outHumidity.avg.format(add_label=False, $localize=False, None_string="null")],
       #end for
       ]
 
@@ -813,7 +813,7 @@
           name: "$obs.label.UV",
           data: [
             #for $record in $span($month_delta=1).spans(interval=21600)
-            [$record.start.raw, $record.UV.max.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.UV.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -839,7 +839,7 @@
           name: "$obs.label.ET",
           data: [
             #for $record in $span($month_delta=1).spans(interval=21600)
-            [$record.start.raw, $record.ET.max.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.ET.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -865,7 +865,7 @@
           name: "$obs.label.radiation",
           data: [
             #for $record in $span($month_delta=1).spans(interval=21600)
-            [$record.start.raw, $record.radiation.max.format(add_label=False, localize=False, None_string="")],
+            [$record.start.raw, $record.radiation.max.format(add_label=False, localize=False, None_string="null")],
             #end for
           ]
         }
@@ -895,7 +895,7 @@
           name: "$obs.label.extraTemp1",
           data: [
             #for $record in $span($month_delta=1).spans(interval=21600)
-            [$record.start.raw, $record.extraTemp1.avg.format(add_label=False, $localize=False, None_string="")],
+            [$record.start.raw, $record.extraTemp1.avg.format(add_label=False, $localize=False, None_string="null")],
             #end for
           ]
         }
@@ -921,7 +921,7 @@
           name: "$obs.label.extraTemp2",
           data: [
             #for $record in $span($month_delta=1).spans(interval=21600)
-            [$record.start.raw, $record.extraTemp2.avg.format(add_label=False, $localize=False, None_string="")],
+            [$record.start.raw, $record.extraTemp2.avg.format(add_label=False, $localize=False, None_string="null")],
             #end for
           ]
         }
@@ -947,7 +947,7 @@
           name: "$obs.label.extraTemp3",
           data: [
             #for $record in $span($month_delta=1).spans(interval=21600)
-            [$record.start.raw, $record.extraTemp3.avg.format(add_label=False, $localize=False, None_string="")],
+            [$record.start.raw, $record.extraTemp3.avg.format(add_label=False, $localize=False, None_string="null")],
             #end for
           ]
         }