@digital4better/data 1.2.14 → 1.2.16

package/data/mix/subdivision-yearly-green.json

@@ -31,16 +31,16 @@
       "Wind": 0.5413
     },
     "2024": {
-      "Bioenergy": 0.2089,
-      "Hydro": 0.0822,
-      "Solar": 0.1258,
-      "Wind": 0.583
+      "Bioenergy": 0.2088,
+      "Hydro": 0.0823,
+      "Solar": 0.126,
+      "Wind": 0.5829
     },
     "2025": {
-      "Bioenergy": 0.2156,
+      "Bioenergy": 0.2153,
       "Hydro": 0.065,
       "Solar": 0.0342,
-      "Wind": 0.6851
+      "Wind": 0.6855
     }
   },
   "CA-BC": {
@@ -163,14 +163,14 @@
       "Wind": 0.1273
     },
     "2024": {
-      "Bioenergy": 0.1086,
-      "Hydro": 0.6491,
+      "Bioenergy": 0.1085,
+      "Hydro": 0.6492,
       "Solar": 0.0006,
       "Wind": 0.2417
     },
     "2025": {
-      "Bioenergy": 0.1354,
-      "Hydro": 0.6305,
+      "Bioenergy": 0.1351,
+      "Hydro": 0.6306,
       "Solar": 0.0005,
       "Wind": 0.2337
     }
@@ -252,15 +252,15 @@
     },
     "2024": {
       "Bioenergy": 0.1686,
-      "Hydro": 0.2612,
+      "Hydro": 0.2614,
       "Solar": 0.001,
-      "Wind": 0.5691
+      "Wind": 0.569
     },
     "2025": {
-      "Bioenergy": 0.1933,
-      "Hydro": 0.1558,
+      "Bioenergy": 0.1929,
+      "Hydro": 0.1559,
       "Solar": 0.0008,
-      "Wind": 0.6501
+      "Wind": 0.6504
     }
   },
   "CA-NT": {
@@ -295,14 +295,14 @@
       "Wind": 0.0731
     },
     "2024": {
-      "Bioenergy": 0.1946,
-      "Hydro": 0.6923,
+      "Bioenergy": 0.1947,
+      "Hydro": 0.6922,
       "Solar": 0.0165,
       "Wind": 0.0966
     },
     "2025": {
-      "Bioenergy": 0.1531,
-      "Hydro": 0.7686,
+      "Bioenergy": 0.1528,
+      "Hydro": 0.7689,
       "Solar": 0.0001,
       "Wind": 0.0782
     }
@@ -383,14 +383,14 @@
       "Wind": 0.2276
     },
     "2024": {
-      "Bioenergy": 0.0364,
-      "Hydro": 0.6815,
+      "Bioenergy": 0.0363,
+      "Hydro": 0.6816,
       "Solar": 0.0402,
-      "Wind": 0.242
+      "Wind": 0.2419
     },
     "2025": {
-      "Bioenergy": 0.0374,
-      "Hydro": 0.6577,
+      "Bioenergy": 0.0373,
+      "Hydro": 0.6578,
       "Solar": 0.0139,
       "Wind": 0.291
     }
@@ -429,8 +429,8 @@
     "2024": {
       "Bioenergy": 0.0007,
       "Hydro": 0,
-      "Solar": 0.0559,
-      "Wind": 0.9434
+      "Solar": 0.056,
+      "Wind": 0.9433
     },
     "2025": {
       "Bioenergy": 0.0011,
@@ -515,16 +515,16 @@
       "Wind": 0.3212
     },
     "2024": {
-      "Bioenergy": 0.2418,
+      "Bioenergy": 0.2419,
       "Hydro": 0.3953,
       "Solar": 0.0092,
-      "Wind": 0.3537
+      "Wind": 0.3536
     },
     "2025": {
-      "Bioenergy": 0.1981,
-      "Hydro": 0.4034,
+      "Bioenergy": 0.1978,
+      "Hydro": 0.4036,
       "Solar": 0.0028,
-      "Wind": 0.3957
+      "Wind": 0.3959
     }
   },
   "CA-YT": {

package/data/mix/subdivision-yearly.csv

@@ -4,15 +4,15 @@ CA-AB,2020,0.0708,0.2732,0.516,0.0319,0,0.0365,0.0009,0.0003,0.0703
 CA-AB,2021,0.0693,0.2375,0.5362,0.0284,0,0.0328,0.0012,0.0034,0.0911
 CA-AB,2022,0.063,0.1826,0.5742,0.0298,0,0.0414,0.001,0.0112,0.0968
 CA-AB,2023,0.0593,0.1716,0.5395,0.0254,0,0.0389,0.001,0.0296,0.1348
-CA-AB,2024,0.0572,0.1657,0.5212,0.0225,0,0.0374,0.0017,0.0345,0.1597
-CA-AB,2025,0.0578,0.167,0.525,0.0174,0,0.0377,0.0022,0.0092,0.1837
+CA-AB,2024,0.0572,0.1658,0.5213,0.0225,0,0.0373,0.0017,0.0345,0.1597
+CA-AB,2025,0.0577,0.1675,0.5256,0.0174,0,0.0371,0.0019,0.0092,0.1837
 CA-BC,2019,0.0083,0.0367,0.0524,0.8747,0,0.0043,0.0001,0,0.0235
 CA-BC,2020,0.0062,0.0241,0.0455,0.8794,0,0.0032,0.0001,0,0.0413
 CA-BC,2021,0.0068,0.0232,0.0524,0.8864,0,0.0032,0.0001,0.0001,0.0278
 CA-BC,2022,0.0051,0.0148,0.0466,0.9091,0,0.0034,0.0001,0.0001,0.0209
 CA-BC,2023,0.0069,0.0199,0.0627,0.8754,0,0.0045,0.0001,0.0001,0.0303
 CA-BC,2024,0.0068,0.0198,0.0624,0.876,0,0.0045,0.0002,0.0001,0.0302
-CA-BC,2025,0.0058,0.0168,0.053,0.8919,0,0.0038,0.0002,0,0.0284
+CA-BC,2025,0.0058,0.0169,0.053,0.8919,0,0.0037,0.0002,0,0.0284
 CA-MB,2019,0.0003,0.0011,0.0016,0.9707,0,0.0001,0,0,0.0262
 CA-MB,2020,0.0002,0.0009,0.0017,0.9713,0,0.0001,0,0,0.0258
 CA-MB,2021,0.0003,0.001,0.0023,0.963,0,0.0001,0,0.0001,0.0332
@@ -25,8 +25,8 @@ CA-NB,2020,0.0245,0.0946,0.1787,0.2261,0.3901,0.0126,0.0003,0,0.0731
 CA-NB,2021,0.0296,0.1014,0.2289,0.2124,0.3557,0.014,0.0005,0,0.0574
 CA-NB,2022,0.0293,0.085,0.2673,0.2667,0.2871,0.0192,0.0005,0,0.0449
 CA-NB,2023,0.0309,0.0894,0.281,0.2376,0.301,0.0202,0.0005,0,0.0392
-CA-NB,2024,0.0385,0.1116,0.3509,0.2303,0.1563,0.0252,0.0012,0.0002,0.0857
-CA-NB,2025,0.0405,0.1171,0.3681,0.1888,0.1875,0.0264,0.0015,0.0002,0.07
+CA-NB,2024,0.0385,0.1116,0.3509,0.2304,0.1563,0.0251,0.0012,0.0002,0.0858
+CA-NB,2025,0.0404,0.1174,0.3685,0.1888,0.1875,0.026,0.0013,0.0002,0.07
 CA-NL,2019,0.0033,0.0146,0.0208,0.9554,0,0.0017,0.0001,0,0.0043
 CA-NL,2020,0.003,0.0115,0.0218,0.9577,0,0.0015,0,0,0.0044
 CA-NL,2021,0.0026,0.009,0.0204,0.9629,0,0.0012,0.0001,0,0.0038
@@ -39,35 +39,35 @@ CA-NS,2020,0.0644,0.2486,0.4696,0.0832,0,0.0332,0.0009,0,0.1001
 CA-NS,2021,0.0627,0.2148,0.4849,0.0856,0,0.0296,0.0011,0,0.1212
 CA-NS,2022,0.0546,0.1582,0.4975,0.0993,0,0.0358,0.0009,0,0.1537
 CA-NS,2023,0.0532,0.154,0.484,0.1159,0,0.0349,0.0009,0.0003,0.1569
-CA-NS,2024,0.0537,0.1556,0.4892,0.0832,0,0.0351,0.0016,0.0003,0.1813
-CA-NS,2025,0.0561,0.162,0.5092,0.0452,0,0.0366,0.0021,0.0002,0.1886
+CA-NS,2024,0.0537,0.1556,0.4892,0.0833,0,0.035,0.0016,0.0003,0.1813
+CA-NS,2025,0.056,0.1624,0.5098,0.0452,0,0.036,0.0018,0.0002,0.1886
 CA-NT,2019,0.0526,0.2335,0.333,0.3297,0,0.0272,0.0009,0.0004,0.0227
 CA-NT,2020,0.0474,0.1829,0.3453,0.3698,0,0.0245,0.0006,0.0016,0.028
 CA-NT,2021,0.0471,0.1612,0.3639,0.3793,0,0.0223,0.0009,0.0003,0.025
 CA-NT,2022,0.0464,0.1345,0.423,0.3406,0,0.0305,0.0007,0.0003,0.024
 CA-NT,2023,0.0527,0.1524,0.4792,0.2556,0,0.0345,0.0009,0.0003,0.0243
-CA-NT,2024,0.0561,0.1625,0.5109,0.1996,0,0.0367,0.0017,0.0048,0.0278
-CA-NT,2025,0.0521,0.1505,0.4732,0.2616,0,0.034,0.0019,0,0.0266
+CA-NT,2024,0.0561,0.1625,0.5111,0.1994,0,0.0366,0.0016,0.0048,0.0278
+CA-NT,2025,0.052,0.1509,0.4737,0.2616,0,0.0334,0.0017,0,0.0266
 CA-NU,2019,0.0813,0.3608,0.5145,0,0,0.042,0.0014,0,0
 CA-NU,2020,0.0788,0.3044,0.5749,0,0,0.0407,0.0011,0,0
 CA-NU,2021,0.0791,0.2708,0.6113,0,0,0.0374,0.0014,0,0
 CA-NU,2022,0.0731,0.2118,0.666,0,0,0.048,0.0012,0,0
 CA-NU,2023,0.0731,0.2117,0.6655,0,0,0.0479,0.0012,0.0005,0
-CA-NU,2024,0.073,0.2115,0.6651,0,0,0.0477,0.0022,0.0004,0
-CA-NU,2025,0.0732,0.2115,0.6648,0,0,0.0477,0.0027,0,0
+CA-NU,2024,0.073,0.2116,0.6653,0,0,0.0476,0.0022,0.0004,0
+CA-NU,2025,0.0731,0.212,0.6655,0,0,0.047,0.0024,0,0
 CA-ON,2019,0.0071,0.0314,0.0447,0.2456,0.5781,0.0036,0.0001,0.0154,0.0739
 CA-ON,2020,0.0067,0.0257,0.0486,0.2514,0.5656,0.0034,0.0001,0.0162,0.0823
 CA-ON,2021,0.0083,0.0284,0.0641,0.2381,0.5556,0.0039,0.0001,0.0165,0.085
 CA-ON,2022,0.0088,0.0256,0.0806,0.2577,0.5126,0.0058,0.0001,0.0148,0.094
 CA-ON,2023,0.0107,0.0309,0.0972,0.248,0.5108,0.007,0.0002,0.0147,0.0805
-CA-ON,2024,0.0128,0.037,0.1164,0.2397,0.4862,0.0083,0.0004,0.0141,0.0851
-CA-ON,2025,0.0126,0.0364,0.1144,0.2214,0.5039,0.0082,0.0005,0.0047,0.098
+CA-ON,2024,0.0128,0.037,0.1165,0.2397,0.4861,0.0083,0.0004,0.0141,0.0851
+CA-ON,2025,0.0126,0.0365,0.1145,0.2214,0.5039,0.0081,0.0004,0.0047,0.098
 CA-PE,2019,0.0007,0.0032,0.0046,0,0,0.0004,0,0.0009,0.9902
 CA-PE,2020,0.0007,0.0026,0.0048,0,0,0.0003,0,0.0009,0.9907
 CA-PE,2021,0.0009,0.0029,0.0066,0,0,0.0004,0,0.0009,0.9882
 CA-PE,2022,0.0008,0.0023,0.0074,0,0,0.0005,0,0.0011,0.9879
 CA-PE,2023,0.0008,0.0024,0.0075,0,0,0.0005,0,0.0011,0.9877
-CA-PE,2024,0.0007,0.002,0.0064,0,0,0.0005,0,0.0554,0.935
+CA-PE,2024,0.0007,0.002,0.0064,0,0,0.0005,0,0.0555,0.9349
 CA-PE,2025,0.0011,0.0031,0.0098,0,0,0.0007,0,0.0263,0.959
 CA-QC,2019,0.0008,0.0034,0.0048,0.9372,0,0.0004,0,0,0.0534
 CA-QC,2020,0.0008,0.003,0.0056,0.9379,0,0.0004,0,0,0.0523
@@ -75,21 +75,21 @@ CA-QC,2021,0.0008,0.0026,0.0059,0.9416,0,0.0004,0,0,0.0487
 CA-QC,2022,0.0007,0.002,0.0063,0.9399,0,0.0005,0,0.0001,0.0506
 CA-QC,2023,0.0007,0.0021,0.0066,0.9408,0,0.0005,0,0.0001,0.0492
 CA-QC,2024,0.0009,0.0027,0.0083,0.9278,0,0.0006,0,0.0001,0.0596
-CA-QC,2025,0.0008,0.0023,0.0074,0.9378,0,0.0005,0,0,0.0511
+CA-QC,2025,0.0008,0.0024,0.0074,0.9378,0,0.0005,0,0,0.0511
 CA-SK,2019,0.0665,0.2952,0.421,0.1501,0,0.0344,0.0011,0,0.0317
 CA-SK,2020,0.062,0.2393,0.4519,0.1803,0,0.032,0.0008,0,0.0337
 CA-SK,2021,0.0667,0.2285,0.5158,0.1208,0,0.0316,0.0012,0.0002,0.0352
 CA-SK,2022,0.0582,0.1688,0.5308,0.1362,0,0.0382,0.0009,0.0012,0.0655
 CA-SK,2023,0.0591,0.1712,0.5381,0.1093,0,0.0388,0.001,0.002,0.0806
-CA-SK,2024,0.0594,0.1722,0.5414,0.0972,0,0.0388,0.0018,0.0023,0.0869
-CA-SK,2025,0.0565,0.1631,0.5129,0.115,0,0.0368,0.0021,0.0008,0.1128
+CA-SK,2024,0.0594,0.1722,0.5415,0.0971,0,0.0388,0.0018,0.0023,0.0869
+CA-SK,2025,0.0564,0.1636,0.5134,0.115,0,0.0362,0.0018,0.0008,0.1128
 CA-YT,2019,0.016,0.0709,0.1011,0.8035,0,0.0082,0.0003,0,0
 CA-YT,2020,0.0138,0.0535,0.101,0.8244,0,0.0072,0.0002,0,0
 CA-YT,2021,0.0092,0.0316,0.0714,0.883,0,0.0043,0.0002,0.0002,0
 CA-YT,2022,0.0086,0.025,0.0787,0.8805,0,0.0056,0.0002,0.0013,0
 CA-YT,2023,0.0094,0.0272,0.0855,0.8692,0,0.0062,0.0002,0.0012,0.0011
-CA-YT,2024,0.0154,0.0447,0.1406,0.7775,0,0.0101,0.0005,0.0015,0.0097
-CA-YT,2025,0.0234,0.0677,0.2129,0.6686,0,0.0153,0.0009,0.0005,0.0108
+CA-YT,2024,0.0154,0.0447,0.1404,0.7778,0,0.01,0.0005,0.0015,0.0097
+CA-YT,2025,0.0234,0.0679,0.2131,0.6686,0,0.015,0.0008,0.0005,0.0108
 US-AK,2019,0.0062,0.1125,0.4426,0.2674,0,0.1478,0,0,0.0235
 US-AK,2020,0.0062,0.115,0.4207,0.2811,0,0.1565,0,0,0.0205
 US-AK,2021,0.0058,0.1141,0.4678,0.2561,0,0.1362,0,0,0.02

package/data/mix/subdivision-yearly.json

@@ -57,23 +57,23 @@
     },
     "2024": {
       "Bioenergy": 0.0572,
-      "Coal": 0.1657,
-      "Gas": 0.5212,
+      "Coal": 0.1658,
+      "Gas": 0.5213,
       "Hydro": 0.0225,
       "Nuclear": 0,
-      "Other Fossil": 0.0374,
+      "Other Fossil": 0.0373,
       "Other Renewables": 0.0017,
       "Solar": 0.0345,
       "Wind": 0.1597
     },
     "2025": {
-      "Bioenergy": 0.0578,
-      "Coal": 0.167,
-      "Gas": 0.525,
+      "Bioenergy": 0.0577,
+      "Coal": 0.1675,
+      "Gas": 0.5256,
       "Hydro": 0.0174,
       "Nuclear": 0,
-      "Other Fossil": 0.0377,
-      "Other Renewables": 0.0022,
+      "Other Fossil": 0.0371,
+      "Other Renewables": 0.0019,
       "Solar": 0.0092,
       "Wind": 0.1837
     }
@@ -147,11 +147,11 @@
     },
     "2025": {
       "Bioenergy": 0.0058,
-      "Coal": 0.0168,
+      "Coal": 0.0169,
       "Gas": 0.053,
       "Hydro": 0.8919,
       "Nuclear": 0,
-      "Other Fossil": 0.0038,
+      "Other Fossil": 0.0037,
       "Other Renewables": 0.0002,
       "Solar": 0,
       "Wind": 0.0284
@@ -296,21 +296,21 @@
       "Bioenergy": 0.0385,
       "Coal": 0.1116,
       "Gas": 0.3509,
-      "Hydro": 0.2303,
+      "Hydro": 0.2304,
       "Nuclear": 0.1563,
-      "Other Fossil": 0.0252,
+      "Other Fossil": 0.0251,
       "Other Renewables": 0.0012,
       "Solar": 0.0002,
-      "Wind": 0.0857
+      "Wind": 0.0858
     },
     "2025": {
-      "Bioenergy": 0.0405,
-      "Coal": 0.1171,
-      "Gas": 0.3681,
+      "Bioenergy": 0.0404,
+      "Coal": 0.1174,
+      "Gas": 0.3685,
       "Hydro": 0.1888,
       "Nuclear": 0.1875,
-      "Other Fossil": 0.0264,
-      "Other Renewables": 0.0015,
+      "Other Fossil": 0.026,
+      "Other Renewables": 0.0013,
       "Solar": 0.0002,
       "Wind": 0.07
     }
@@ -454,21 +454,21 @@
       "Bioenergy": 0.0537,
       "Coal": 0.1556,
       "Gas": 0.4892,
-      "Hydro": 0.0832,
+      "Hydro": 0.0833,
       "Nuclear": 0,
-      "Other Fossil": 0.0351,
+      "Other Fossil": 0.035,
       "Other Renewables": 0.0016,
       "Solar": 0.0003,
       "Wind": 0.1813
     },
     "2025": {
-      "Bioenergy": 0.0561,
-      "Coal": 0.162,
-      "Gas": 0.5092,
+      "Bioenergy": 0.056,
+      "Coal": 0.1624,
+      "Gas": 0.5098,
       "Hydro": 0.0452,
       "Nuclear": 0,
-      "Other Fossil": 0.0366,
-      "Other Renewables": 0.0021,
+      "Other Fossil": 0.036,
+      "Other Renewables": 0.0018,
       "Solar": 0.0002,
       "Wind": 0.1886
     }
@@ -532,22 +532,22 @@
     "2024": {
       "Bioenergy": 0.0561,
       "Coal": 0.1625,
-      "Gas": 0.5109,
-      "Hydro": 0.1996,
+      "Gas": 0.5111,
+      "Hydro": 0.1994,
       "Nuclear": 0,
-      "Other Fossil": 0.0367,
-      "Other Renewables": 0.0017,
+      "Other Fossil": 0.0366,
+      "Other Renewables": 0.0016,
       "Solar": 0.0048,
       "Wind": 0.0278
     },
     "2025": {
-      "Bioenergy": 0.0521,
-      "Coal": 0.1505,
-      "Gas": 0.4732,
+      "Bioenergy": 0.052,
+      "Coal": 0.1509,
+      "Gas": 0.4737,
       "Hydro": 0.2616,
       "Nuclear": 0,
-      "Other Fossil": 0.034,
-      "Other Renewables": 0.0019,
+      "Other Fossil": 0.0334,
+      "Other Renewables": 0.0017,
       "Solar": 0,
       "Wind": 0.0266
     }
@@ -610,23 +610,23 @@
     },
     "2024": {
       "Bioenergy": 0.073,
-      "Coal": 0.2115,
-      "Gas": 0.6651,
+      "Coal": 0.2116,
+      "Gas": 0.6653,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0477,
+      "Other Fossil": 0.0476,
       "Other Renewables": 0.0022,
       "Solar": 0.0004,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0732,
-      "Coal": 0.2115,
-      "Gas": 0.6648,
+      "Bioenergy": 0.0731,
+      "Coal": 0.212,
+      "Gas": 0.6655,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0477,
-      "Other Renewables": 0.0027,
+      "Other Fossil": 0.047,
+      "Other Renewables": 0.0024,
       "Solar": 0,
       "Wind": 0
     }
@@ -690,9 +690,9 @@
     "2024": {
       "Bioenergy": 0.0128,
       "Coal": 0.037,
-      "Gas": 0.1164,
+      "Gas": 0.1165,
       "Hydro": 0.2397,
-      "Nuclear": 0.4862,
+      "Nuclear": 0.4861,
       "Other Fossil": 0.0083,
       "Other Renewables": 0.0004,
       "Solar": 0.0141,
@@ -700,12 +700,12 @@
     },
     "2025": {
       "Bioenergy": 0.0126,
-      "Coal": 0.0364,
-      "Gas": 0.1144,
+      "Coal": 0.0365,
+      "Gas": 0.1145,
       "Hydro": 0.2214,
       "Nuclear": 0.5039,
-      "Other Fossil": 0.0082,
-      "Other Renewables": 0.0005,
+      "Other Fossil": 0.0081,
+      "Other Renewables": 0.0004,
       "Solar": 0.0047,
       "Wind": 0.098
     }
@@ -774,8 +774,8 @@
       "Nuclear": 0,
       "Other Fossil": 0.0005,
       "Other Renewables": 0,
-      "Solar": 0.0554,
-      "Wind": 0.935
+      "Solar": 0.0555,
+      "Wind": 0.9349
     },
     "2025": {
       "Bioenergy": 0.0011,
@@ -858,7 +858,7 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Coal": 0.0023,
+      "Coal": 0.0024,
       "Gas": 0.0074,
       "Hydro": 0.9378,
       "Nuclear": 0,
@@ -927,8 +927,8 @@
     "2024": {
       "Bioenergy": 0.0594,
       "Coal": 0.1722,
-      "Gas": 0.5414,
-      "Hydro": 0.0972,
+      "Gas": 0.5415,
+      "Hydro": 0.0971,
       "Nuclear": 0,
       "Other Fossil": 0.0388,
       "Other Renewables": 0.0018,
@@ -936,13 +936,13 @@
       "Wind": 0.0869
     },
     "2025": {
-      "Bioenergy": 0.0565,
-      "Coal": 0.1631,
-      "Gas": 0.5129,
+      "Bioenergy": 0.0564,
+      "Coal": 0.1636,
+      "Gas": 0.5134,
       "Hydro": 0.115,
       "Nuclear": 0,
-      "Other Fossil": 0.0368,
-      "Other Renewables": 0.0021,
+      "Other Fossil": 0.0362,
+      "Other Renewables": 0.0018,
       "Solar": 0.0008,
       "Wind": 0.1128
     }
@@ -1006,22 +1006,22 @@
     "2024": {
       "Bioenergy": 0.0154,
       "Coal": 0.0447,
-      "Gas": 0.1406,
-      "Hydro": 0.7775,
+      "Gas": 0.1404,
+      "Hydro": 0.7778,
       "Nuclear": 0,
-      "Other Fossil": 0.0101,
+      "Other Fossil": 0.01,
       "Other Renewables": 0.0005,
       "Solar": 0.0015,
       "Wind": 0.0097
     },
     "2025": {
       "Bioenergy": 0.0234,
-      "Coal": 0.0677,
-      "Gas": 0.2129,
+      "Coal": 0.0679,
+      "Gas": 0.2131,
       "Hydro": 0.6686,
       "Nuclear": 0,
-      "Other Fossil": 0.0153,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.015,
+      "Other Renewables": 0.0008,
       "Solar": 0.0005,
       "Wind": 0.0108
     }