From 85123ac0748d92a1637ee97a37e8172fa85d547f Mon Sep 17 00:00:00 2001
From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Sun, 14 Mar 2021 17:27:57 +0200
Subject: [PATCH] Add option to turn off grouping of bar datasets (#8641)

* Add option to turn off grouping of bar datasets

* Disregard time offset
---
 docs/docs/charts/bar.mdx                      |   1 +
 src/controllers/controller.bar.js             |  55 ++++---
 .../controller.bar/not-grouped/on-time.js     | 134 ++++++++++++++++++
 .../controller.bar/not-grouped/on-time.png    | Bin 0 -> 17240 bytes
 4 files changed, 167 insertions(+), 23 deletions(-)
 create mode 100644 test/fixtures/controller.bar/not-grouped/on-time.js
 create mode 100644 test/fixtures/controller.bar/not-grouped/on-time.png

diff --git a/docs/docs/charts/bar.mdx b/docs/docs/charts/bar.mdx
index 555fe38e5..d3123a21f 100644
--- a/docs/docs/charts/bar.mdx
+++ b/docs/docs/charts/bar.mdx
@@ -173,6 +173,7 @@ The bar chart accepts the following configuration from the associated dataset op
 | `categoryPercentage` | `number` | `0.8` | Percent (0-1) of the available width each category should be within the sample width. [more...](#barpercentage-vs-categorypercentage)
 | `barThickness` | `number`\|`string` | | Manually set width of each bar in pixels. If set to `'flex'`, it computes "optimal" sample widths that globally arrange bars side by side. If not set (default), bars are equally sized based on the smallest interval. [more...](#barthickness)
 | `base` | `number` | | Base value for the bar in data units along the value axis. If not set, defaults to the value axis base value.
+| `grouped` | `boolean` | `true` | Should the bars be grouped on index axis. When `true`, all the datasets at same index value will be placed next to each other centering on that index value. When `false`, each bar is placed on its actual index-axis value.
 | `maxBarThickness` | `number` | | Set this to ensure that bars are not sized thicker than this.
 | `minBarLength` | `number` | | Set this to ensure that bars have a minimum length in pixels.
 
diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 54be96a96..0d4176f27 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -255,9 +255,9 @@ export default class BarController extends DatasetController {
   updateElements(bars, start, count, mode) {
     const me = this;
     const reset = mode === 'reset';
-    const vscale = me._cachedMeta.vScale;
-    const base = vscale.getBasePixel();
-    const horizontal = vscale.isHorizontal();
+    const vScale = me._cachedMeta.vScale;
+    const base = vScale.getBasePixel();
+    const horizontal = vScale.isHorizontal();
     const ruler = me._getRuler();
     const firstOpts = me.resolveDataElementOptions(start, mode);
     const sharedOptions = me.getSharedOptions(firstOpts);
@@ -266,14 +266,14 @@ export default class BarController extends DatasetController {
     me.updateSharedOptions(sharedOptions, mode, firstOpts);
 
     for (let i = start; i < start + count; i++) {
-      const vpixels = me._calculateBarValuePixels(i);
+      const vpixels = reset ? {base, head: base} : me._calculateBarValuePixels(i);
       const ipixels = me._calculateBarIndexPixels(i, ruler);
 
       const properties = {
         horizontal,
-        base: reset ? base : vpixels.base,
-        x: horizontal ? reset ? base : vpixels.head : ipixels.center,
-        y: horizontal ? ipixels.center : reset ? base : vpixels.head,
+        base: vpixels.base,
+        x: horizontal ? vpixels.head : ipixels.center,
+        y: horizontal ? ipixels.center : vpixels.head,
         height: horizontal ? ipixels.size : undefined,
         width: horizontal ? undefined : ipixels.size
       };
@@ -370,6 +370,7 @@ export default class BarController extends DatasetController {
 	 */
   _getRuler() {
     const me = this;
+    const opts = me.options;
     const meta = me._cachedMeta;
     const iScale = meta.iScale;
     const pixels = [];
@@ -379,11 +380,8 @@ export default class BarController extends DatasetController {
       pixels.push(iScale.getPixelForValue(me.getParsed(i)[iScale.axis], i));
     }
 
-    // Note: a potential optimization would be to skip computing this
-    // only if the barThickness option is defined
-    // Since a scriptable option may return null or undefined that
-    // means the option would have to be of type number
-    const min = computeMinSampleSize(iScale);
+    const barThickness = opts.barThickness;
+    const min = barThickness || computeMinSampleSize(iScale);
 
     return {
       min,
@@ -391,7 +389,10 @@ export default class BarController extends DatasetController {
       start: iScale._startPixel,
       end: iScale._endPixel,
       stackCount: me._getStackCount(),
-      scale: iScale
+      scale: iScale,
+      grouped: opts.grouped,
+      // bar thickness ratio used for non-grouped bars
+      ratio: barThickness ? 1 : opts.categoryPercentage * opts.barPercentage
     };
   }
 
@@ -459,17 +460,24 @@ export default class BarController extends DatasetController {
 	 */
   _calculateBarIndexPixels(index, ruler) {
     const me = this;
+    const scale = ruler.scale;
     const options = me.options;
-    const stackCount = options.skipNull ? me._getStackCount(index) : ruler.stackCount;
-    const range = options.barThickness === 'flex'
-      ? computeFlexCategoryTraits(index, ruler, options, stackCount)
-      : computeFitCategoryTraits(index, ruler, options, stackCount);
-
-    const stackIndex = me._getStackIndex(me.index, me._cachedMeta.stack);
-    const center = range.start + (range.chunk * stackIndex) + (range.chunk / 2);
-    const size = Math.min(
-      valueOrDefault(options.maxBarThickness, Infinity),
-      range.chunk * range.ratio);
+    const maxBarThickness = valueOrDefault(options.maxBarThickness, Infinity);
+    let center, size;
+    if (ruler.grouped) {
+      const stackCount = options.skipNull ? me._getStackCount(index) : ruler.stackCount;
+      const range = options.barThickness === 'flex'
+        ? computeFlexCategoryTraits(index, ruler, options, stackCount)
+        : computeFitCategoryTraits(index, ruler, options, stackCount);
+
+      const stackIndex = me._getStackIndex(me.index, me._cachedMeta.stack);
+      center = range.start + (range.chunk * stackIndex) + (range.chunk / 2);
+      size = Math.min(maxBarThickness, range.chunk * range.ratio);
+    } else {
+      // For non-grouped bar charts, exact pixel values are used
+      center = scale.getPixelForValue(me.getParsed(index)[scale.axis], index);
+      size = Math.min(maxBarThickness, ruler.min * ruler.ratio);
+    }
 
     return {
       base: center - size / 2,
@@ -512,6 +520,7 @@ BarController.defaults = {
 
   categoryPercentage: 0.8,
   barPercentage: 0.9,
+  grouped: true,
 
   animations: {
     numbers: {
diff --git a/test/fixtures/controller.bar/not-grouped/on-time.js b/test/fixtures/controller.bar/not-grouped/on-time.js
new file mode 100644
index 000000000..6c2d44cbb
--- /dev/null
+++ b/test/fixtures/controller.bar/not-grouped/on-time.js
@@ -0,0 +1,134 @@
+const data1 = [
+  {
+    x: '2017-11-02T20:30:00',
+    y: 27
+  },
+  {
+    x: '2017-11-03T20:53:00',
+    y: 30
+  },
+  {
+    x: '2017-11-06T05:46:00',
+    y: 19
+  },
+  {
+    x: '2017-11-06T21:03:00',
+    y: 28
+  },
+  {
+    x: '2017-11-07T20:49:00',
+    y: 29
+  },
+  {
+    x: '2017-11-08T21:52:00',
+    y: 33
+  }
+];
+
+const data2 = [
+  {
+    x: '2017-11-03T13:07:00',
+    y: 45
+  },
+  {
+    x: '2017-11-04T04:50:00',
+    y: 40
+  },
+  {
+    x: '2017-11-06T12:48:00',
+    y: 38
+  },
+  {
+    x: '2017-11-07T12:28:00',
+    y: 42
+  },
+  {
+    x: '2017-11-08T12:45:00',
+    y: 51
+  },
+  {
+    x: '2017-11-09T05:23:00',
+    y: 57
+  }
+];
+
+const data3 = [
+  {
+    x: '2017-11-03T16:30:00',
+    y: 32
+  },
+  {
+    x: '2017-11-04T11:50:00',
+    y: 34
+  },
+  {
+    x: '2017-11-06T18:30:00',
+    y: 28
+  },
+  {
+    x: '2017-11-07T15:51:00',
+    y: 31
+  },
+  {
+    x: '2017-11-08T17:27:00',
+    y: 36
+  },
+  {
+    x: '2017-11-09T06:53:00',
+    y: 31
+  }
+];
+
+module.exports = {
+  description: 'https://github.com/chartjs/Chart.js/issues/5139',
+  config: {
+    type: 'bar',
+    data: {
+      datasets: [
+        {
+          data: data1,
+          backgroundColor: 'rgb(0,0,255)',
+        },
+        {
+          data: data2,
+          backgroundColor: 'rgb(255,0,0)',
+        },
+        {
+          data: data3,
+          backgroundColor: 'rgb(0,255,0)',
+        },
+      ]
+    },
+    options: {
+      barThickness: 10,
+      grouped: false,
+      scales: {
+        x: {
+          bounds: 'ticks',
+          type: 'time',
+          offset: false,
+          position: 'bottom',
+          display: true,
+          time: {
+            isoWeekday: true,
+            unit: 'day'
+          },
+          grid: {
+            offset: false
+          }
+        },
+        y: {
+          beginAtZero: true,
+          display: false
+        }
+      },
+    }
+  },
+  options: {
+    spriteText: true,
+    canvas: {
+      width: 1000,
+      height: 300
+    }
+  }
+};
diff --git a/test/fixtures/controller.bar/not-grouped/on-time.png b/test/fixtures/controller.bar/not-grouped/on-time.png
new file mode 100644
index 0000000000000000000000000000000000000000..92506bd3ae7b05f5d7f791ed195efbe3c361ccd3
GIT binary patch
literal 17240
zc-rlHdt6gjw!Z}`_&|KLr9vS^MeGRDDu{xRC@LZXDk230tQHXh1mzJ8hR9f@j0%c8
z6vRY95D_Bsh!9BX6BU8T8$yT(LU<(M5fYM+<hKsCo#`E&`F%e3b7$srul&RDxX<2e
zuf4vHbq?`6T^zJ$>&>1qV}`clw#~a|%uwgenDL3J)=apwbITRnj2U0gaNN9c&#|j~
z4)JoDf2K-x*5=bkPpMYM-0dOiv|4$AhVAADk2jk**Y4C2&JJ(g`v4be_GTB_{?%ry
z-QmtOZEs<%`RkcmFU*`bduBYvIL>ONRawqg*6NSKtmaa=C_=3yTzj3b@6~Vn<wQGF
z^uFq%y4NqC_czDe{qT$F93e?~GBJML-2&Y3kS<&Hlo3<(>*b+Pzi`d1fx$!ia@mtI
zMiJHTx63Q+*3Q^ndVd)G?y^s8iQk|6^bez_FEh%CwFY0_Ec!pXOsRdDdunE$DLv<L
z__Kt`slx#RLAuSi+Yfqk+gi=bCe9NT2arpu!RI{5H#K|Stj9Z?h$&fv$G>--SV2ZP
z9V_@{#rY88K|f|&i<Nld?DVBp1otJ!=Y1h;p~w%te^GNaj#W7Ry-8TWV_c!r`{tc%
z_?tD}U1B7)ot*dPN23DQCnzje&$9TNHKs3@u!tYG^uKURP6zz_+b_Pjhuyxx1V7=a
z{-GHhhx1M8cYfT{)zTcG{qqN6GcGcZHJle~sQtd(raoq95Y}lBEZ&zt?}hS(yzcqD
zSKq#WaVJWgJ;mYC$3;Ib`mb8l>nQtAHLLcf`nbK3ZuTHsp6nGnYkgp%)XuUO_oT+8
zufJ*oczj(>T=eh*@fg$0V&|Fs4f@n<zf!Z+dxz(e-ZEoWx5kGT(XhU{|5vn|#S>?V
z!n8z(FTdlDBz7t$ZqbMLvXB?{=U<UeTP8MUJu+ft{qT;joI<_T3|#JhAid8+oG6cG
z{l+v&ZD|;tI85T1cVuE#9x^Lp-Gl$w&35AQP4)MVk&D;RWp`{&%8AA2Fgo$?4PQVr
zW+|3_ATMch7^u?vKn!nVywy194{ffTn~ISnekg1I;$=la$^NwD6P&H5WmkE7j^eGp
z``{|nGnhn|k0btm1fqrPs@}wv*b3R5Pd=1qEfH@S9>3@kz^TGjqk{Bzpz?rfHz}uQ
zTt?tXT=JeOsM1rjwSLawJYEJBE?5*RK>b~vHv`%n1%l<v0U;4&t$!T06Ggt6B6s+&
zI3rkU5F(Q3^ms==D97Y|HI)y6UFzgG??4c4w}7Wy@LzH6s~u~Y*((S=fG~t4{{Jf_
zHWsXuiRXI;RW1CJLa%_odaIA=d4I($a;L1!a34c;nGBB<NBsBa`yWa1@XU(BZ$|e`
z*pb%!ZaUu|&{}mLlo|fVf*7(6=6Cn}uRGa|YCi4hNve@HqDf3^*=dYq<$qqe<$fJo
z7`#7cIDKKgqs=IN@0oWJmKRJ(L}e(rE`kSW!Oz9UPe1rPCf2T^H*p-@9?vaZ-6_oQ
z*C1^3S66h(t%+vW*b4%j&i$)P=BYkUw&OV|ta8kVLD#78`wv8L`>cq}H2;d6$Bioc
z6FVjHLyKb#7yhHT=6))}ZC8d%vUNr`a^5BR-%a*xW2l^?&rxU>sx+fxyK=I#>hY{j
zoYTLB;gpBNQU{=hM^R(yCjWFWZ!igcYoEjj9rn+5J**RJIQyT>HlKHW{>Mo^PV#Y*
zkCXg6CW#thfRcnaC)nC=rPyrwBma`LL_4*9*WF@uNwdJ1bZ3_C6Cr+~8prsLR4lir
z#BKUrO1@O9nw-x&Gye}<+=f!K{p_z=GN1P(4rBGxKia_=jJcggh0!0yUL1$fIsI2P
z(IAW(v9yi;pjvm)8iW;pl@24;S)JHWtv||^!iZ&W^t*P<jrBdD6=DAmlcgnkV^7iF
z^pBEcPtirGapr$a&BxSyOwGsCd`!*9)ciYBGhTe)_rC@Bn5K^v^f5L6dsD+v)iyTQ
zPZbvr^XYbz(w^f!q?Y^Sx1M5ERi;0l$O^}%8b}$a{(|A$c6PfDYI5$2c`Ha|s_>oV
z=ehTbR{GMOct#z$(i#$#n#p)nKkl_Qr)fw<ZvW0l!L%~G_7_*Cfuu;&V5guuofcD(
z#U!7)H+*t6y09|Ezq@Yis5o;sI%danhDfDk(1fOv^hl{H^u{s4^Lr2cqljiTPb-Dh
zS1x7l3d()b{%kOSIN|q#Pv92$DAJ#bU)J4gtO>4MR>N=~2v2U0agVBwliwemYV(kr
z*52DCl*kkk)eAx9R7&vkUh0odXVA&cG2GTS6T=;aO72gWsz3Wb@h3(6N}_SW*|+V1
z+=0#8(s#azBsaIqt%BRWmD^8MWfJd@1_xUoEpn8nw29yHkCCb+k>U`)VYsL7sFTtr
zd0yAWJks;@IO>g%KYXwmKQYuDpZ&nNjCjbVi#tlpB(fL#C<w=v<`qY$q0ibxt8$z(
zlp-T#SDjtUb>x4R3{);;+Z7oIg_Ddr20wFp^Z;r5uzYKP5QoJ^kH3qfqA<qx&dMVH
z&s+nzv4@8rbCSLuFfsNOx3fo;3BsXaw(qNEYMe>ZycI?K7rzCX776j3&(1RzXEJ|V
z!GkWF7}?x#VIg}}M}h=@!Y_au73IM+?Ak^se9Um7^(YLut?e}1%6vZ^*JVC?4zSPs
zHl0u~y>Dk@v4VnYY?s?GsKq$C13cW4(zbf`a)!Fi5!$k!F?c793hWXVXJM=$T`PjN
znL=N##z|S|z4dyd5aZ*MIXE~d8ZNFcQ)x@to1%NpTUkU6w}}%;T%v?HVzethn|yBZ
znyrzMk$N^!ce+lDJ3H=HmXYK%(j~Q-G8<v#n&`flSFGPAyY2Dt$Q`e<aXqVRUdMH&
zXf7K#`L-r4zp&5+8J(}|du(G;GLwJ7e%{5XofM|DFT;8u`_fpw(E{EB$8>_Ay#F?g
zrF9YV_4M_P9i?nIo#mg-6*cF3)T4*)6nBvJ)sZE3Kv@^EjkLA3Z|CPX9;r6SP4gu<
zA`>UOxm;A!l%-o@EkZghGLJl6Y(4Ue`a~8=u?@#mlx?PHnhca5OjwWXg)rG2*WA#s
z#PJ2U?8oN|zu8Zb47K6{tE0Wgk86oeF7t_i?dL%_OShh5-Se+m2H~u#677b8R`9c7
z{N<X8$v0=+Vaq*<Xx}x5UOrP<MdGJVE~o>RLy}=aKC!!?pdcxGD#Y2@dG~7!30alu
zhi-0d9l9Q8*Z><GlPut|9Xra2-a`pCg0{i%UbIVcC|A;zXIdjFz!CGsxSeI{F=}s6
z%5GH2P$7NriLPJMS#!oMJEE)v6=4#RI@b}s*p^Uo&$MxugTYPD;zN!}V>IWh>vqll
zl9y;F;|(uz-LQ+RQc6l;r#{EJPh0n#TT>F&y(u1}v%TRHYLz(so~av`L9{&d@=N4!
z6%wvr$0xCj7zM$0?Ag-6S6L3q^~=<3*Ezbm+VCy>J#&6|bSCiC4SdE*5<B@Dx9pR#
z$_6L%TC{SqCsHZxA8HREyB|E51;;o}^8A{mo@CK0VXCTN6=sYgV!YPM2_iJWcOKdO
z3kDY$=qVa`q=RKqHWJ33n?%;zN_gR9`PCek%s(NOK@i-1G|w&7e>&;|Pi7+#N(4vm
zVsJr0Ug_M{05Wl}`pmhkTf4GEtxTo+64t4th*#N;my-Rj%-b-6aZb0GE{}(E%#)#F
z-CS*(!|K-e^Iop0Z@RJNYy>B=b>LQ3LW5|a(HPmIGn5D4yANHS%H&s(SLl4flW<9-
zM&D@uP2@n=1k^Rz$%nJPam(pdbsDp1mrBCrdkGTV>n1xcQ{YfOv#W-jH08RYoHN!s
zH|99Ik?n|Mq{NlFyeh&(kjnFn!Gyu#z`$LQp^lD@rk0i*(;65~uG5L%zGo57mLOtD
z7!unm0Emq#%iG&K04ffvkWB<(v5m0Hrs4osP82(2VXR?tkeY4HYCeq{L+C!O8+D9A
z^(x&C35nwOU(gc0MrMl^H$9GD)ZEr~|B)K8?&|vSMC-v7oMS!brPMnuOIYf=ohkUC
z7Uxqlwc!Y>N*<{xN?U!sBc6Qj!D~C1=#ItauMO?I1sKHkJUtIfUJX*K3aGzE7<r%x
z0J`@`tx8O-KCho^PLkHh8p+D+va+>EVOhp@RYl`7V`KwfWx?(9=7>gns;xwW%}%=e
z!eZCry6*T*z0rlzid)5)JOB^4zytXn=CxPWH~?l~<9K!m4KgDVvvD-iH6ckQ_hQCW
zZKmL?0{g`U%ZQ>ZRC9`lZ+Ub7qyW#%ha7fv+-_;v3*{+{k<g{b?Ivx${qflaG1<SZ
z1;77A@;9<U59aNPiVE>qT9=~z=B!1_KV$HJnzhJo#7S%H@|UZB+}0nr+4%M>ky0TC
zzNu@t<5^s`nCFyg`l_wyU?l8#2y)cCl3KaM@ivu8CboD6yk*W_<w%$st+oV}vb3<M
z6bd)`RYc^upcN4a%ymeUr+|5GrelO0I_-?Me$ICXp9ZgCd3$+9AeEkd$)zE{ZhWyq
zOk<`jtC9`ouSCj?bG$#3ufEpOa$qo@+Oojmt0H#_uI=u|@xIzdZL3ZUMYtd0Jf&mz
zegC!S!Y|CcN@_7=G>NhGyxvVDdO26cQ1+9Q4oMNujN)E0fvecepS%c?>XD_18+NbU
zduN4)4C=;CB~%K8q9^7tyU5a)0ZrY)rPC!LEUGrtvpaD=lp*a4nJK&No*z+dfIs}~
zf|1_3Fp8dDmqH>LXv{UY7P0Ineo@yc!QDS0J?azH?r+_HHGFogQq<^b4ny}VkJzMh
zo|wnkK)B{7y6059{_`9_@n2w4prz}$nDGo*uL(NOJG9(bwa{w<Sa<+VwOz?>ST-P_
z3tM6}4R1vbwS=r;`JEWuVi3XFSfP{+VM$5nF*@5UV;Mq*e6Y#QwHW{pXH}DC-s)_{
z$=-Ns<^bryE0k)|!Li}IRae`$$42(sirWtI)$LSM<JQ8;af_I#$xW2{OdDD^)=!>Z
zw_$uomAC_2F_4pC5%wCRfU3Im4n);og`eA+@Ks)FYAVEC64)r3pptx|`K4(PAwz8L
z%srTBn_dV{Z@6ddh$xtyax{^qswy|FNe{9s1c^ncyN~2d!R1PPdonv{2dfjBD<X%=
zWM9z*71(ZSv1wx=U68I)p{5KjZ#aHbUcWkG>NP?(p>%!@S1G2YuMJ5D)LYeFUGJ6@
z0StBvFYMy0mSTg0_XxYHBH>Q(xXlH6Z<158zi0Hf!)<vDS?L&6pA|E&(Z$A@EANs-
zfXIHKMjU9ksrTK1pH|U_S0gF0hGLJ9zD>hQ$KL8$g?0{~nrFRj(efQEDA$ruj<rvW
z^sVfTF7p;zC9P-A6~&=qzW1Aas5_mdR+7R)DL)3H35k*q7bglT$6XLcf_S}*Sgi%#
zxzWNZ56!Q_P9A!B`MTq!<pU?x=k2t&Kh*^!l#+XmaC_$5FDXDU`2_{e2-dDe3-VSL
z-an9!@hc5VQA)`w&qTCxT`c2N-f~v;xy4yoiFRI#OkA2S7}?K`WgLFBMBBi653o}s
zoI*}df{jb7Z*&3TRL<*J1}SsVia-uYrRXRLywp<YlTVGA$hQ{U?<omtzP*XUg_Mq?
z<?Z!@Aiu1u>%$|4i>e1-tfanVZb+N1uo%`x&4G%c!bZx*QxUB`_|Mf8u)UT<($qnN
z<GmNtzdLwlIWRv0t2tkovi|((oG&uN9?sIUj<}Vck<kpK1V9<OM4rk<z_f{imhrOA
z$|i<#al|3-is5@TO-923_|cl~gdjCVHCkDOq(c*RVyC9zvHeD@{@RRO<UEiVEr_xR
zq9B~yn2GPov&6RWZk%1^B^ym7?E^d1QF*+$<&I}oJxMu^Ko@BHek}%N6?zql+T0ej
zna{-U)gbHyBwn|V3li~OSt~@1k+qhspQ$N;zRx~|+{$DG1ysx{JX7w2@YiWwUsmt)
zOZo|Rvco=M4?YbF41D$Uy#7QnS+N5Gq!`9bc5kBKx+=@N;gQUQ^?hIR8FIlOklogE
zUtWh}b<!Y&!IDT3L=P9mfmzIA5anN}DdJ78u@EJFe#rzY6Ahd;cSZwuq(^aycr)*^
z9o}WZyWHF^*@=r12M~NV8L>#f`IZv`j(7cr@pDQ!Q{@fti{|$mAu2pBU#p70l0eQX
zX0DnrXe$YHo5s+7UEqzq%nhopwD!Y-&hi)cc1SwI6PFD@ne9sTPq)Df)-u%_=xFs<
zAV22~Y|0d<<u<`LH$$=E7}7(WqcvvJ00H{fRZ~3BL^W;HG{`1F;UnU>iaB*uThC%!
z@uAv=@p?2`j_3xEcP=cu3#o@R=9E9w;dXF<0G;#tR)gjJ*BTcGT)kdgZ)c-A_2yUP
z2${^ih5PcrSq)qbulq&=;arOYkG1$rl`<$Kq`AhNc?a?~=%;+^R}!O;r7&g9)DlTo
zG!~RCC^WPMRK66*FsS?C>C+hQ{Ubdupb~i|XlcAJal&1VsOjcRL4%z`Y<!)qWFIo|
zX^d*Xm2?|1e2E*ze)jVAjvUO(4Qjjl13}y#P#V_#P<l#Jr{!~xeb+x<x%aSmxLr2Y
zkERY$nZEi^Sll1D(tHnU3-Ck-x~?CsI&KRU_0E?lz&$iSJUz$q#AFy0lI}F?AZ<bi
z(?Wri3Ic(Q&<aOj;<_8`P`Wc&F&tnS-nT;m<l2k~?&AdxJgDYyBUY|UX2mUUTBtQ(
zXJTr+9`VX7IEp(CDB>P4e6Th1@9$!kIwUlGs=JQ@M4UgLho0)zDFt~%GJ<6Ahd6_r
zMpv{Ch#w1nSCx=dN<DN;Wmk+m#F=d8Bj?k|%bnA~z?2oJ5u0zjTThKVvV<cj_`YZp
zRO55514T1C9fJn_utYix!eAakB%pR6Km*8rk;TD+C?H9#CqGdao%NgA1j`-%5^_FM
z$M8-rImU}xIrf)T<-H5FQFi;@>2SkMC;hF7h6P|v-2uq5E(s$S5ZdSW>KI;^`IX?-
zau$~`WCmHp_CCAV;h*L+JJv3!X$AjY%_^_bAa{9MPCvSP41%zn;IlpOUB`0~&lYD$
z*hc4<Wq`zTw;8Arfgzm{mh6fa7GMj@xAte^uMs8&w@@^fL^^X@V!Bq7d<Jd4&Qk;|
zwvM?w6;g_-^q~4CWy6NF7q8w7=Jy^r`bhBTSnvU*=(FD6;syH<ING0?`^|~P&*pWk
z@C2mCFER-lee=YcU((oA6)o9BA@$pEcS!`Cab^qeRaSGBgARu<Q~-Q6KJ1OFayPkl
z?1tg7*PkFa_0|SoHYD(j@-C@fcJ$R|M1m|qh51eyiVQHY2YyFs1@xF~VW1%oX<Q)w
zX2V7)cg_A^W;l9DWkXafk9ECb<l&qNuxf#mBi+`ZNu|fffq0ql;7SvhtGCb~&IZhL
zzV8ah^~&lkh^>0%fGP;(Q~<q0XRwDB%IRP(8!BmZajU;(JHg9J41z)9RE8{wD6R1W
zqAeDkLQP@(WDRK+0d-#us4LfCrHPA#ij4;}2pC8MB1E{ViBynv>xtp^;`zMdfcm{K
z85;nAv_l~OIg4D@ZG_VDMA|XpfRkSXc%MAb#O)@T5lKi*Oc$fA>VAe5t_3>HLIH<9
z^mvhL@;hU4_6xHH<nAZxGfTLf4J_u!X>$Z8eA0|wq};FBMk93NhQ$swTwLlfh`7!0
zdfQxZ`g^KTq{`G)K7R`7kx<Y8TUiEEs?P~~q)mXr2>P|wnUKlS;P!iBlHUvN^1N<f
zvzr7F@1m*{K?(#jU6J?vogP8^6!~zL3C{s7yJ$!h?aDm%CLVEWrT#UkAhRIA+HnR^
z-^+y?Rf(!eoeAD6`?P&W<G~x}rekoy!A(?>0?P;6$+u0`lz}d|$y=er$Lb8#W>{Gv
zQq+6NwFQ``kV@oZL0x%r#jFwMp;oE~G*T^KGl=4L2Vkqc;o-&ax&%oGznVAs9al(o
zB5971{dtoQ#{912D_)l}AES?t{RpSxX4Q2piy$7(0};ZFv(BGCKggz0&&*wXBh4?S
zya%uKNuE8TZl1Kxqi5};&s{;ckQ_i``O7AXO2JhTmC@OU%zZ1rN1Ticw8sXZa>%=Z
zaekK-Ydo=$Ng^qr@kr7VQ9#0I!R<FvR(b?Mw|g2x8Y-ZPQm7|x&gY?|&m0gB=G5?F
z!!WQq&L^_jeXx~E2Ge8|IcfjK_xRhC6o69;Sk5k`|M#4V$QqR!wx&YdJmO%WR#jT+
zj(AD{w~v-61IO?rPd+vQo&eix2Gp3;SD#_!>R=F=ysCn?#Ng;Nql&@X`6AfM7U;6U
zZiFeLugwyjgb>*s9Y{GEfU<)=AT1q~7z09-w^dt&cCK^uN{&+?>;~tUINboi$!s@J
zUbz3{tgiVB64qXMB*?CQxR7W$wJQ#T1L}QtaVeX*W37$|nxDgowqhVXN0ZEK@M+FT
zsdivZ2DwaT;r%zWiGyzB2C!B=8??%1i^!^}ek2DuE}6Hr_188r62XzdUco3rU)>l0
zo(K&5HCu0W&3UF8vT3Jxq}m{<>27fQYD9D$43B3cHUwa1q;enKMDYXDuFaw2%}-oS
zuMfw!GW3+U;D9?y9496w_~_&5nlgwLOS<VD85wCk{&G!e6yM7+NCuKrkQgJ%l6C8l
zZXq%Zd9GFMtaDM>@L=R^sbWY&7L^ng%552(T+dMOakz=;U;Qdlxeya`IRTep9T_Ay
zAL?iJs=BC!C8X-&VGjE4pQ42|_GQMZv6G0$my%a|Meo<ho)^2y5po%-+Wle!E6vpN
z2KB_-m0)I*`|2|D0VqRy>yQ4Z)O=D~N3yJhZXD^Oq5beG@TR#8&hOQM>KsO##8Z7-
z(;V|k3i1fwPtRP<c15ICgd?B%7vJ%+6f-k3@U`?3#5I63BJ^H#5EUg7O;rlZl}Mce
z1U#Y4kjCV;E1ZlJ_3a)l5inAUl=LD1C?32NS=N+0#+^gEgZ0xULGc&|c2yp?2AeS_
zRtY?M`1LQb72Rj_EkG%>4L5x6;S=eO#9hzaR|T{_*i}W30XpqdsrhM*fg1=^La%!r
z@rnqwy?$^ia^PlKUl9h#2+7GbpMtt?ntss%W;`=t-5agiOdAgxCn{r}-Q?>jr=c%O
zOG^WRppnU;A=Nb?ie5>X-vV-xG~5{NsUG@yX#!%@MbNn({^jH+Qq`G5(+=EPqe3J=
z-68z)i6(ergrw~h1FqPHY)9~kg))hd3gXtsY$z)MxPiXjLgt6=)Y)~z=w@a9TJKL~
zIx!>aeBj)4+vuojzjh;Nr{geb*}#GWV>RaH8nUssHI^XWi2R55*EKhL_!R)Y?7#`?
zb#!!y#>uLEwgk~ms&5ry{|Y>dw+_zdfs;JE4)Gn}rVu!{`jKo&+dAh>XN9Sppq7Gz
z`dp0&K3ew7!S2T5HHQ$h3uK1lqdseemNiF=9x<y~T{SgUb6oh@pQivko{iwt^O4u5
zAZ^GCz==5Y)J9O6R4oyIIlq%p&^#Kx0W6m{F#-H3T2=Ozsa}e%*(ooBHZG6B@CDGM
zTLkWwlf5p}6=HUZ|CLatLR|311`jS_Wlfg?XVtHIAf9r4#6Gg-rXyQR)Zw?KUY!W*
zrCZ^yA&5tq9eKx*Wb8Di9pJPZ8pAX53~sNf-{4jcE>#)b3H}P|_+`xNSWOFHGlL_K
z7w}R2Rj6Qa&L!tDRE4`}!!)lxeY%wsBj?|yQd@ssuoQWz*soeh+nuzR>RWK6=V>6!
z*F;kGlls`9<LKh$AroA$G|<uC=kWIShNjBY=jd}|WRA(vo(YJo507Uon{JbV>LQ;T
zr}5y(Y9(eGvKJ{U`?-;=K8R0@Y}(}zI5jy+c$?xemS_+48lpkqQ*ZRgcD1zRAdLU;
zr&-9XR*X??WHu?sXPG0FsjL8%=NNVhL%g*_(Ds;mF;0{-#xsSta9oD<@ZCoi$H#i7
z$lPM&L&4VH5{R(9Tdqqp(r7@(hP>=WdKE_ZZb#(B+(f+ViA?~tlrFGT59L86r1B}~
zHoWEXdSjq~kfkgv>2q5hfbv>1pNc)L`@+u;4h>DXszk2oYXV%9!cE!@bkd+w+E3;}
zX#BEf)ItejyY;z~Tjd_t>aMO|qx$Z(pfJX^^3__kDzV3_aSRvw>*?1as@<=A@SK~a
z*w#M%wT=x;m7JOHO14AZt00ZbL;2B~R5PsXsTJcoK-o#x_t<sh%>WR5FE<s#b!n*M
zv%T1|N~_MWQ!+6>AE8?@8&}V~ePbL`Px8M53O~LV$G(3g3u&-BJ3E!JHVkG_(f(uK
z#Lt+au8I6Dz>y5$(Bu&tyG+A{DcfYv!D}_OwS7N%j|R)!%FFwP#10<dg!$1zGhvQW
z@O@LLWqcuMl{?snmO>wTv-~I+vny3cdbT1M1QRNlJc4{0Fkr!fK7IOh%A?4*N^U+!
zIz*M+Ai$P7?*3pekFi9LlrTxi+uER@+f{U-K94<FSyO?WUPBY)q>OaMXBBs#idI`M
zJmlnb7Fiy$(m^`*GObIY`6%5I+tko-uNf#=Fg3+YtU6Sio`8x2;cK`6PTX?s+CFCM
z&ZG`ii9pg-wt|T*#nbvc9N1iDD95_Mx2i%+GBHr;51bvtrE%HmI2(GtpAK%BEe+<G
zl4O-7vKkt8%gb&`Is52Q1+Y3+^`vq{nUj-~AUTqc;kNWgPk&)KJ4UJx2@DJ*U9<}6
z$c8??ABTM=?1QciGJYpDHMN7zzQC2FrhWnGIg~GHKKzX7bMWB7YFzZMpF!YfH{9qp
zsTd=D(YjTf<D4<ucF#CJBU{yKZy<=AHbV``xD3^#?|8^85q}v%Ii&^lbdWAFtu^MV
z3sb$QEuL<?vB7nF<*)$>C5<~y%4KR+sjJz3?WmdDR(9}5(q#z~N5MV1hZN&Qi_%N2
zHm#$Qi*Oq+i)PtOe|^Y)TxPIT{-~0aj}i8=>)w4ht50d8O+StUG7#HMfA!gOfSqtr
z@k1BWoq`|x^$S~wBKk4y?J0(HfKVusQ1BQEE_b2#)(4OA`%MI?8Vh)#@ff_bMuqnh
zmd~PCL8?|n>t+gl_ko%f5n_Wjv(x}&lw;NQN&&I#*Ux$U_UW&K6<bO|gwtV{IBk}T
zdDGuEIZHdDTBmO|+1wz~Bd5P%8ZHQ-J0V$3ZVS!jvzw`>HI2*8y%`v6oi*dVKl5`{
asG(rZ2akWaWrqCQaf{35!cF`C{Qm%t++q0u

literal 0
Hc-jL100001

-- 
2.47.3