diff --git a/8/ecolyo.2e9e8423896e91d85c64.js b/8/ecolyo.2c755ae5c7b8e1ef102b.js
similarity index 99%
rename from 8/ecolyo.2e9e8423896e91d85c64.js
rename to 8/ecolyo.2c755ae5c7b8e1ef102b.js
index f43c04473ff215d2a9f0e7bc3c48db455f6b366e..55a64a9326b9116df2a37ac35bcb1766f2e874ae 100644
--- a/8/ecolyo.2e9e8423896e91d85c64.js
+++ b/8/ecolyo.2c755ae5c7b8e1ef102b.js
@@ -119,7 +119,7 @@ var BarChart = function BarChart(_ref) {
var sum = chartData.actualData.reduce(function (a, b) {
return a + b.value;
}, 0);
- var averageConsumption = sum / chartData.actualData.length;
+ var averageConsumption = Math.abs(sum / chartData.actualData.length);
return /*#__PURE__*/_react.default.createElement("svg", {
width: width,
height: height
diff --git a/app/ecolyo.30175324310e8c8b35b5.js b/app/ecolyo.df09794a2b6313212ea7.js
similarity index 99%
rename from app/ecolyo.30175324310e8c8b35b5.js
rename to app/ecolyo.df09794a2b6313212ea7.js
index 5bf349898defcf199c9423495872631a4a0eb235..11ccd6229a70c1d928ce588529204c69796da739 100644
--- a/app/ecolyo.30175324310e8c8b35b5.js
+++ b/app/ecolyo.df09794a2b6313212ea7.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"73e7629512318d26fb7c","2":"62e5292a592368584bc8","4":"7b06b983a73bea16f4e1","5":"009425a2968e054ac6c4","6":"f76c729977c86016121a","7":"9376e18b72a7a8ccfe8c","8":"2e9e8423896e91d85c64","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"73e7629512318d26fb7c","2":"62e5292a592368584bc8","4":"7b06b983a73bea16f4e1","5":"009425a2968e054ac6c4","6":"f76c729977c86016121a","7":"9376e18b72a7a8ccfe8c","8":"2c755ae5c7b8e1ef102b","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -31508,6 +31508,7 @@ var Bar = function Bar(_ref) {
var browser = (0, _detectBrowser.detect)();
var fluidStyle = fluidType === _enums.FluidType.MULTIFLUID ? 'MULTIFLUID' : _enums.FluidType[fluidType];
+ var isMulti = fluidType === _enums.FluidType.MULTIFLUID;
var handleClick = function handleClick() {
if (!isSwitching && !isDuel && clickable) {
@@ -31533,20 +31534,17 @@ var Bar = function Bar(_ref) {
return (_fluid$lastDataDate = fluid.lastDataDate) !== null && _fluid$lastDataDate !== void 0 ? _fluid$lastDataDate : _luxon.DateTime.local(0);
});
-
- var lastDataDate = _luxon.DateTime.max.apply(_luxon.DateTime, (0, _toConsumableArray2.default)(lastDataDates));
-
+ var lastDataDate = isMulti ? _luxon.DateTime.max.apply(_luxon.DateTime, (0, _toConsumableArray2.default)(lastDataDates)) : lastDataDates[fluidType];
var dataMissingUpcoming = Boolean(dataload.date > lastDataDate && dataload.date < _luxon.DateTime.local());
var value = dataload.value;
/** Adjust value for upcoming data (placeholder bars) */
if (dataMissingUpcoming && average) {
- if (average < 0) {
- // Use 1 if average is negative
- value = 1;
- } else if (average > 1) {
+ if (average > 1) {
// Use 10% of average if average is above 1
value = average * 0.1;
+ } else if (isMulti && average < 1) {
+ value = 0.2;
} else {
value = average;
}
diff --git a/index.html b/index.html
index f3f7a4a9afbf49a60f5e931cfbb8b3b24fa61373..f67f9de7cab9d24eb8e342cbc33359f64ee666c6 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.60260cb06d3462fe3dd7.js"></script><script src="app/ecolyo.30175324310e8c8b35b5.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.60260cb06d3462fe3dd7.js"></script><script src="app/ecolyo.df09794a2b6313212ea7.js"></script></div></body></html>
\ No newline at end of file