@digital4better/data 1.1.31 → 1.1.33

package/data/mix/continent-yearly-green.csv

@@ -4,34 +4,34 @@ Africa,2020,0.0071,0.0988,0.439,0.311,0.0032,0.1208,0.0014,0.0124,0.0062
 Africa,2021,0.0071,0.0982,0.4394,0.3094,0.0034,0.1213,0.0014,0.0129,0.0069
 Africa,2022,0.0071,0.0958,0.4356,0.3097,0.0029,0.1263,0.0016,0.0137,0.0072
 Africa,2023,0.0071,0.0922,0.438,0.3109,0.0025,0.1245,0.0017,0.015,0.008
-Africa,2024,0.0071,0.0894,0.4387,0.3121,0.0025,0.1241,0.0017,0.0164,0.008
+Africa,2024,0.0071,0.0929,0.4382,0.3114,0.0025,0.1243,0.0017,0.0141,0.0077
 Asia,2019,0.0115,0.3613,0.3548,0.1046,0.0223,0.1034,0.0067,0.0175,0.0179
 Asia,2020,0.0123,0.3584,0.3524,0.1057,0.0224,0.1027,0.0065,0.0198,0.0198
 Asia,2021,0.0132,0.3646,0.3427,0.1011,0.0236,0.0998,0.0063,0.0228,0.0258
 Asia,2022,0.0135,0.3632,0.3367,0.1013,0.024,0.0988,0.0063,0.0272,0.0291
 Asia,2023,0.0137,0.369,0.3298,0.0958,0.0247,0.0955,0.0062,0.0325,0.0328
-Asia,2024,0.0144,0.377,0.3262,0.0812,0.0239,0.0966,0.0062,0.0351,0.0394
+Asia,2024,0.0143,0.3737,0.3277,0.0829,0.0245,0.0969,0.0062,0.0359,0.0379
 Europe,2019,0.0226,0.1556,0.3386,0.175,0.1778,0.0173,0.0149,0.024,0.0742
 Europe,2020,0.0238,0.1422,0.3296,0.1855,0.1716,0.0169,0.0157,0.0289,0.0857
 Europe,2021,0.0246,0.1474,0.332,0.1769,0.1742,0.0169,0.0152,0.031,0.0817
 Europe,2022,0.0246,0.1462,0.3367,0.168,0.1602,0.0172,0.0157,0.0392,0.0922
-Europe,2023,0.023,0.1317,0.3259,0.1789,0.1573,0.0165,0.0159,0.0472,0.1037
-Europe,2024,0.0235,0.1303,0.3219,0.186,0.1519,0.0159,0.015,0.0353,0.1202
-North America,2019,0.023,0.1762,0.3278,0.1269,0.1376,0.1193,0.0066,0.023,0.0596
-North America,2020,0.0228,0.1473,0.3424,0.1295,0.1369,0.1181,0.0067,0.028,0.0682
-North America,2021,0.0225,0.1621,0.33,0.1244,0.132,0.1158,0.0066,0.0331,0.0735
-North America,2022,0.0216,0.1494,0.337,0.1241,0.1268,0.1158,0.0065,0.0384,0.0803
-North America,2023,0.021,0.1285,0.3591,0.1163,0.129,0.116,0.0065,0.0442,0.0794
-North America,2024,0.0211,0.1179,0.343,0.1317,0.1318,0.1135,0.0064,0.0405,0.094
+Europe,2023,0.023,0.1317,0.3259,0.179,0.1572,0.0165,0.0159,0.0471,0.1037
+Europe,2024,0.0236,0.1262,0.3168,0.1879,0.1533,0.0159,0.0151,0.0399,0.1214
+North America,2019,0.0236,0.1764,0.325,0.1309,0.1421,0.1106,0.0069,0.0234,0.0613
+North America,2020,0.0234,0.1454,0.3408,0.1337,0.1415,0.1095,0.0069,0.0286,0.0702
+North America,2021,0.0232,0.1612,0.3277,0.1283,0.1362,0.1071,0.0068,0.0337,0.0756
+North America,2022,0.0222,0.1465,0.3363,0.128,0.1308,0.1077,0.0067,0.0392,0.0825
+North America,2023,0.0215,0.1255,0.3587,0.12,0.1332,0.1075,0.0067,0.0452,0.0816
+North America,2024,0.0219,0.1146,0.3398,0.1287,0.1347,0.1089,0.0067,0.0449,0.0999
 Oceania,2019,0.0032,0.4111,0.095,0.1515,0,0.2047,0.0294,0.0521,0.053
 Oceania,2020,0.003,0.3981,0.0872,0.1509,0,0.2063,0.0297,0.0634,0.0613
 Oceania,2021,0.003,0.3855,0.0726,0.154,0,0.2061,0.0297,0.078,0.071
 Oceania,2022,0.0028,0.3575,0.0786,0.1588,0,0.2034,0.0296,0.0903,0.079
 Oceania,2023,0.0031,0.3494,0.0677,0.1553,0,0.2025,0.029,0.1095,0.0837
-Oceania,2024,0.0031,0.3572,0.0662,0.1354,0,0.1974,0.0287,0.1301,0.0821
-South America,2019,0.007,0.0255,0.2113,0.5913,0.0121,0.1095,0.0002,0.0082,0.0351
+Oceania,2024,0.0031,0.3572,0.0664,0.1386,0,0.1999,0.0293,0.126,0.0795
+South America,2019,0.0064,0.0228,0.1907,0.6313,0.0108,0.099,0.0001,0.0073,0.0315
 South America,2020,0.0075,0.024,0.2064,0.5906,0.0119,0.1103,0.0001,0.0111,0.0382
 South America,2021,0.0065,0.0246,0.2244,0.5584,0.0118,0.1113,0.0002,0.0156,0.0472
 South America,2022,0.0063,0.0154,0.2003,0.5863,0.0104,0.1046,0.0002,0.0241,0.0525
-South America,2023,0.0066,0.0142,0.1919,0.5808,0.0109,0.1018,0.0002,0.035,0.0588
-South America,2024,0.0047,0.0153,0.1831,0.5953,0.013,0.0992,0.0002,0.0447,0.0446
+South America,2023,0.0067,0.0142,0.1922,0.5804,0.0109,0.1017,0.0002,0.035,0.0589
+South America,2024,0.005,0.0151,0.1825,0.5943,0.0135,0.0986,0.0002,0.0443,0.0465

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

@@ -31,10 +31,10 @@
       "Wind": 0.0234
     },
     "2024": {
-      "Bioenergy": 0.0206,
-      "Hydro": 0.9083,
-      "Solar": 0.0478,
-      "Wind": 0.0233
+      "Bioenergy": 0.0208,
+      "Hydro": 0.9149,
+      "Solar": 0.0415,
+      "Wind": 0.0227
     }
   },
   "Asia": {
@@ -64,15 +64,15 @@
     },
     "2023": {
       "Bioenergy": 0.0785,
-      "Hydro": 0.5479,
-      "Solar": 0.1859,
+      "Hydro": 0.548,
+      "Solar": 0.1858,
       "Wind": 0.1877
     },
     "2024": {
-      "Bioenergy": 0.0848,
-      "Hydro": 0.4773,
-      "Solar": 0.2062,
-      "Wind": 0.2317
+      "Bioenergy": 0.0835,
+      "Hydro": 0.4849,
+      "Solar": 0.2097,
+      "Wind": 0.2219
     }
   },
   "Europe": {
@@ -102,53 +102,53 @@
     },
     "2023": {
       "Bioenergy": 0.0651,
-      "Hydro": 0.5073,
-      "Solar": 0.1337,
-      "Wind": 0.2939
+      "Hydro": 0.5074,
+      "Solar": 0.1336,
+      "Wind": 0.2938
     },
     "2024": {
-      "Bioenergy": 0.0644,
-      "Hydro": 0.5096,
-      "Solar": 0.0967,
-      "Wind": 0.3293
+      "Bioenergy": 0.0634,
+      "Hydro": 0.504,
+      "Solar": 0.1069,
+      "Wind": 0.3257
     }
   },
   "North America": {
     "2019": {
-      "Bioenergy": 0.0988,
-      "Hydro": 0.5457,
-      "Solar": 0.099,
-      "Wind": 0.2565
+      "Bioenergy": 0.0986,
+      "Hydro": 0.5474,
+      "Solar": 0.0977,
+      "Wind": 0.2563
     },
     "2020": {
-      "Bioenergy": 0.0919,
-      "Hydro": 0.5209,
-      "Solar": 0.1128,
-      "Wind": 0.2744
+      "Bioenergy": 0.0916,
+      "Hydro": 0.5224,
+      "Solar": 0.1116,
+      "Wind": 0.2743
     },
     "2021": {
-      "Bioenergy": 0.0887,
-      "Hydro": 0.4907,
-      "Solar": 0.1305,
-      "Wind": 0.29
+      "Bioenergy": 0.0888,
+      "Hydro": 0.4919,
+      "Solar": 0.1294,
+      "Wind": 0.2899
     },
     "2022": {
-      "Bioenergy": 0.0818,
-      "Hydro": 0.4695,
-      "Solar": 0.1452,
+      "Bioenergy": 0.0815,
+      "Hydro": 0.4708,
+      "Solar": 0.1442,
       "Wind": 0.3036
     },
     "2023": {
-      "Bioenergy": 0.0805,
-      "Hydro": 0.4458,
-      "Solar": 0.1695,
+      "Bioenergy": 0.0801,
+      "Hydro": 0.4471,
+      "Solar": 0.1685,
       "Wind": 0.3042
     },
     "2024": {
-      "Bioenergy": 0.0734,
-      "Hydro": 0.4584,
-      "Solar": 0.1411,
-      "Wind": 0.3272
+      "Bioenergy": 0.074,
+      "Hydro": 0.4359,
+      "Solar": 0.1519,
+      "Wind": 0.3382
     }
   },
   "Oceania": {
@@ -183,21 +183,21 @@
       "Wind": 0.2382
     },
     "2024": {
-      "Bioenergy": 0.0087,
-      "Hydro": 0.3861,
-      "Solar": 0.3711,
-      "Wind": 0.2341
+      "Bioenergy": 0.0089,
+      "Hydro": 0.3992,
+      "Solar": 0.3628,
+      "Wind": 0.2291
     }
   },
   "South America": {
     "2019": {
-      "Bioenergy": 0.0109,
-      "Hydro": 0.9217,
-      "Solar": 0.0127,
-      "Wind": 0.0547
+      "Bioenergy": 0.0095,
+      "Hydro": 0.9331,
+      "Solar": 0.0108,
+      "Wind": 0.0466
     },
     "2020": {
-      "Bioenergy": 0.0116,
+      "Bioenergy": 0.0115,
       "Hydro": 0.9123,
       "Solar": 0.0172,
       "Wind": 0.059
@@ -215,16 +215,16 @@
       "Wind": 0.0784
     },
     "2023": {
-      "Bioenergy": 0.0096,
-      "Hydro": 0.8527,
+      "Bioenergy": 0.0098,
+      "Hydro": 0.8524,
       "Solar": 0.0514,
-      "Wind": 0.0863
+      "Wind": 0.0865
     },
     "2024": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.8637,
-      "Solar": 0.0648,
-      "Wind": 0.0647
+      "Bioenergy": 0.0073,
+      "Hydro": 0.8611,
+      "Solar": 0.0642,
+      "Wind": 0.0674
     }
   }
 }

package/data/mix/continent-yearly.csv

@@ -4,34 +4,34 @@ Africa,2020,0.0071,0.0988,0.439,0.311,0.0032,0.1208,0.0014,0.0124,0.0062
 Africa,2021,0.0071,0.0982,0.4394,0.3094,0.0034,0.1213,0.0014,0.0129,0.0069
 Africa,2022,0.0071,0.0958,0.4356,0.3097,0.0029,0.1263,0.0016,0.0137,0.0072
 Africa,2023,0.0071,0.0922,0.438,0.3109,0.0025,0.1245,0.0017,0.015,0.008
-Africa,2024,0.0071,0.0894,0.4387,0.3121,0.0025,0.1241,0.0017,0.0164,0.008
+Africa,2024,0.0071,0.0929,0.4382,0.3114,0.0025,0.1243,0.0017,0.0141,0.0077
 Asia,2019,0.0115,0.3613,0.3548,0.1046,0.0223,0.1034,0.0067,0.0175,0.0179
 Asia,2020,0.0123,0.3584,0.3524,0.1057,0.0224,0.1027,0.0065,0.0198,0.0198
 Asia,2021,0.0132,0.3646,0.3427,0.1011,0.0236,0.0998,0.0063,0.0228,0.0258
 Asia,2022,0.0135,0.3632,0.3367,0.1013,0.024,0.0988,0.0063,0.0272,0.0291
 Asia,2023,0.0137,0.369,0.3298,0.0958,0.0247,0.0955,0.0062,0.0325,0.0328
-Asia,2024,0.0144,0.377,0.3262,0.0812,0.0239,0.0966,0.0062,0.0351,0.0394
+Asia,2024,0.0143,0.3737,0.3277,0.0829,0.0245,0.0969,0.0062,0.0359,0.0379
 Europe,2019,0.0226,0.1556,0.3386,0.175,0.1778,0.0173,0.0149,0.024,0.0742
 Europe,2020,0.0238,0.1422,0.3296,0.1855,0.1716,0.0169,0.0157,0.0289,0.0857
 Europe,2021,0.0246,0.1474,0.332,0.1769,0.1742,0.0169,0.0152,0.031,0.0817
 Europe,2022,0.0246,0.1462,0.3367,0.168,0.1602,0.0172,0.0157,0.0392,0.0922
-Europe,2023,0.023,0.1317,0.3259,0.1789,0.1573,0.0165,0.0159,0.0472,0.1037
-Europe,2024,0.0235,0.1303,0.3219,0.186,0.1519,0.0159,0.015,0.0353,0.1202
-North America,2019,0.023,0.1762,0.3278,0.1269,0.1376,0.1193,0.0066,0.023,0.0596
-North America,2020,0.0228,0.1473,0.3424,0.1295,0.1369,0.1181,0.0067,0.028,0.0682
-North America,2021,0.0225,0.1621,0.33,0.1244,0.132,0.1158,0.0066,0.0331,0.0735
-North America,2022,0.0216,0.1494,0.337,0.1241,0.1268,0.1158,0.0065,0.0384,0.0803
-North America,2023,0.021,0.1285,0.3591,0.1163,0.129,0.116,0.0065,0.0442,0.0794
-North America,2024,0.0211,0.1179,0.343,0.1317,0.1318,0.1135,0.0064,0.0405,0.094
+Europe,2023,0.023,0.1317,0.3259,0.179,0.1572,0.0165,0.0159,0.0471,0.1037
+Europe,2024,0.0236,0.1262,0.3168,0.1879,0.1533,0.0159,0.0151,0.0399,0.1214
+North America,2019,0.0236,0.1764,0.325,0.1309,0.1421,0.1106,0.0069,0.0234,0.0613
+North America,2020,0.0234,0.1454,0.3408,0.1337,0.1415,0.1095,0.0069,0.0286,0.0702
+North America,2021,0.0232,0.1612,0.3277,0.1283,0.1362,0.1071,0.0068,0.0337,0.0756
+North America,2022,0.0222,0.1465,0.3363,0.128,0.1308,0.1077,0.0067,0.0392,0.0825
+North America,2023,0.0215,0.1255,0.3587,0.12,0.1332,0.1075,0.0067,0.0452,0.0816
+North America,2024,0.0219,0.1146,0.3398,0.1287,0.1347,0.1089,0.0067,0.0449,0.0999
 Oceania,2019,0.0032,0.4111,0.095,0.1515,0,0.2047,0.0294,0.0521,0.053
 Oceania,2020,0.003,0.3981,0.0872,0.1509,0,0.2063,0.0297,0.0634,0.0613
 Oceania,2021,0.003,0.3855,0.0726,0.154,0,0.2061,0.0297,0.078,0.071
 Oceania,2022,0.0028,0.3575,0.0786,0.1588,0,0.2034,0.0296,0.0903,0.079
 Oceania,2023,0.0031,0.3494,0.0677,0.1553,0,0.2025,0.029,0.1095,0.0837
-Oceania,2024,0.0031,0.3572,0.0662,0.1354,0,0.1974,0.0287,0.1301,0.0821
-South America,2019,0.007,0.0255,0.2113,0.5913,0.0121,0.1095,0.0002,0.0082,0.0351
+Oceania,2024,0.0031,0.3572,0.0664,0.1386,0,0.1999,0.0293,0.126,0.0795
+South America,2019,0.0064,0.0228,0.1907,0.6313,0.0108,0.099,0.0001,0.0073,0.0315
 South America,2020,0.0075,0.024,0.2064,0.5906,0.0119,0.1103,0.0001,0.0111,0.0382
 South America,2021,0.0065,0.0246,0.2244,0.5584,0.0118,0.1113,0.0002,0.0156,0.0472
 South America,2022,0.0063,0.0154,0.2003,0.5863,0.0104,0.1046,0.0002,0.0241,0.0525
-South America,2023,0.0066,0.0142,0.1919,0.5808,0.0109,0.1018,0.0002,0.035,0.0588
-South America,2024,0.0047,0.0153,0.1831,0.5953,0.013,0.0992,0.0002,0.0447,0.0446
+South America,2023,0.0067,0.0142,0.1922,0.5804,0.0109,0.1017,0.0002,0.035,0.0589
+South America,2024,0.005,0.0151,0.1825,0.5943,0.0135,0.0986,0.0002,0.0443,0.0465

package/data/mix/continent-yearly.json

@@ -57,14 +57,14 @@
     },
     "2024": {
       "Bioenergy": 0.0071,
-      "Coal": 0.0894,
-      "Gas": 0.4387,
-      "Hydro": 0.3121,
+      "Coal": 0.0929,
+      "Gas": 0.4382,
+      "Hydro": 0.3114,
       "Nuclear": 0.0025,
-      "Other Fossil": 0.1241,
+      "Other Fossil": 0.1243,
       "Other Renewables": 0.0017,
-      "Solar": 0.0164,
-      "Wind": 0.008
+      "Solar": 0.0141,
+      "Wind": 0.0077
     }
   },
   "Asia": {
@@ -124,15 +124,15 @@
       "Wind": 0.0328
     },
     "2024": {
-      "Bioenergy": 0.0144,
-      "Coal": 0.377,
-      "Gas": 0.3262,
-      "Hydro": 0.0812,
-      "Nuclear": 0.0239,
-      "Other Fossil": 0.0966,
+      "Bioenergy": 0.0143,
+      "Coal": 0.3737,
+      "Gas": 0.3277,
+      "Hydro": 0.0829,
+      "Nuclear": 0.0245,
+      "Other Fossil": 0.0969,
       "Other Renewables": 0.0062,
-      "Solar": 0.0351,
-      "Wind": 0.0394
+      "Solar": 0.0359,
+      "Wind": 0.0379
     }
   },
   "Europe": {
@@ -184,91 +184,91 @@
       "Bioenergy": 0.023,
       "Coal": 0.1317,
       "Gas": 0.3259,
-      "Hydro": 0.1789,
-      "Nuclear": 0.1573,
+      "Hydro": 0.179,
+      "Nuclear": 0.1572,
       "Other Fossil": 0.0165,
       "Other Renewables": 0.0159,
-      "Solar": 0.0472,
+      "Solar": 0.0471,
       "Wind": 0.1037
     },
     "2024": {
-      "Bioenergy": 0.0235,
-      "Coal": 0.1303,
-      "Gas": 0.3219,
-      "Hydro": 0.186,
-      "Nuclear": 0.1519,
+      "Bioenergy": 0.0236,
+      "Coal": 0.1262,
+      "Gas": 0.3168,
+      "Hydro": 0.1879,
+      "Nuclear": 0.1533,
       "Other Fossil": 0.0159,
-      "Other Renewables": 0.015,
-      "Solar": 0.0353,
-      "Wind": 0.1202
+      "Other Renewables": 0.0151,
+      "Solar": 0.0399,
+      "Wind": 0.1214
     }
   },
   "North America": {
     "2019": {
-      "Bioenergy": 0.023,
-      "Coal": 0.1762,
-      "Gas": 0.3278,
-      "Hydro": 0.1269,
-      "Nuclear": 0.1376,
-      "Other Fossil": 0.1193,
-      "Other Renewables": 0.0066,
-      "Solar": 0.023,
-      "Wind": 0.0596
+      "Bioenergy": 0.0236,
+      "Coal": 0.1764,
+      "Gas": 0.325,
+      "Hydro": 0.1309,
+      "Nuclear": 0.1421,
+      "Other Fossil": 0.1106,
+      "Other Renewables": 0.0069,
+      "Solar": 0.0234,
+      "Wind": 0.0613
     },
     "2020": {
-      "Bioenergy": 0.0228,
-      "Coal": 0.1473,
-      "Gas": 0.3424,
-      "Hydro": 0.1295,
-      "Nuclear": 0.1369,
-      "Other Fossil": 0.1181,
-      "Other Renewables": 0.0067,
-      "Solar": 0.028,
-      "Wind": 0.0682
+      "Bioenergy": 0.0234,
+      "Coal": 0.1454,
+      "Gas": 0.3408,
+      "Hydro": 0.1337,
+      "Nuclear": 0.1415,
+      "Other Fossil": 0.1095,
+      "Other Renewables": 0.0069,
+      "Solar": 0.0286,
+      "Wind": 0.0702
     },
     "2021": {
-      "Bioenergy": 0.0225,
-      "Coal": 0.1621,
-      "Gas": 0.33,
-      "Hydro": 0.1244,
-      "Nuclear": 0.132,
-      "Other Fossil": 0.1158,
-      "Other Renewables": 0.0066,
-      "Solar": 0.0331,
-      "Wind": 0.0735
+      "Bioenergy": 0.0232,
+      "Coal": 0.1612,
+      "Gas": 0.3277,
+      "Hydro": 0.1283,
+      "Nuclear": 0.1362,
+      "Other Fossil": 0.1071,
+      "Other Renewables": 0.0068,
+      "Solar": 0.0337,
+      "Wind": 0.0756
     },
     "2022": {
-      "Bioenergy": 0.0216,
-      "Coal": 0.1494,
-      "Gas": 0.337,
-      "Hydro": 0.1241,
-      "Nuclear": 0.1268,
-      "Other Fossil": 0.1158,
-      "Other Renewables": 0.0065,
-      "Solar": 0.0384,
-      "Wind": 0.0803
+      "Bioenergy": 0.0222,
+      "Coal": 0.1465,
+      "Gas": 0.3363,
+      "Hydro": 0.128,
+      "Nuclear": 0.1308,
+      "Other Fossil": 0.1077,
+      "Other Renewables": 0.0067,
+      "Solar": 0.0392,
+      "Wind": 0.0825
     },
     "2023": {
-      "Bioenergy": 0.021,
-      "Coal": 0.1285,
-      "Gas": 0.3591,
-      "Hydro": 0.1163,
-      "Nuclear": 0.129,
-      "Other Fossil": 0.116,
-      "Other Renewables": 0.0065,
-      "Solar": 0.0442,
-      "Wind": 0.0794
+      "Bioenergy": 0.0215,
+      "Coal": 0.1255,
+      "Gas": 0.3587,
+      "Hydro": 0.12,
+      "Nuclear": 0.1332,
+      "Other Fossil": 0.1075,
+      "Other Renewables": 0.0067,
+      "Solar": 0.0452,
+      "Wind": 0.0816
     },
     "2024": {
-      "Bioenergy": 0.0211,
-      "Coal": 0.1179,
-      "Gas": 0.343,
-      "Hydro": 0.1317,
-      "Nuclear": 0.1318,
-      "Other Fossil": 0.1135,
-      "Other Renewables": 0.0064,
-      "Solar": 0.0405,
-      "Wind": 0.094
+      "Bioenergy": 0.0219,
+      "Coal": 0.1146,
+      "Gas": 0.3398,
+      "Hydro": 0.1287,
+      "Nuclear": 0.1347,
+      "Other Fossil": 0.1089,
+      "Other Renewables": 0.0067,
+      "Solar": 0.0449,
+      "Wind": 0.0999
     }
   },
   "Oceania": {
@@ -330,26 +330,26 @@
     "2024": {
       "Bioenergy": 0.0031,
       "Coal": 0.3572,
-      "Gas": 0.0662,
-      "Hydro": 0.1354,
+      "Gas": 0.0664,
+      "Hydro": 0.1386,
       "Nuclear": 0,
-      "Other Fossil": 0.1974,
-      "Other Renewables": 0.0287,
-      "Solar": 0.1301,
-      "Wind": 0.0821
+      "Other Fossil": 0.1999,
+      "Other Renewables": 0.0293,
+      "Solar": 0.126,
+      "Wind": 0.0795
     }
   },
   "South America": {
     "2019": {
-      "Bioenergy": 0.007,
-      "Coal": 0.0255,
-      "Gas": 0.2113,
-      "Hydro": 0.5913,
-      "Nuclear": 0.0121,
-      "Other Fossil": 0.1095,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0082,
-      "Wind": 0.0351
+      "Bioenergy": 0.0064,
+      "Coal": 0.0228,
+      "Gas": 0.1907,
+      "Hydro": 0.6313,
+      "Nuclear": 0.0108,
+      "Other Fossil": 0.099,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0073,
+      "Wind": 0.0315
     },
     "2020": {
       "Bioenergy": 0.0075,
@@ -385,26 +385,26 @@
       "Wind": 0.0525
     },
     "2023": {
-      "Bioenergy": 0.0066,
+      "Bioenergy": 0.0067,
       "Coal": 0.0142,
-      "Gas": 0.1919,
-      "Hydro": 0.5808,
+      "Gas": 0.1922,
+      "Hydro": 0.5804,
       "Nuclear": 0.0109,
-      "Other Fossil": 0.1018,
+      "Other Fossil": 0.1017,
       "Other Renewables": 0.0002,
       "Solar": 0.035,
-      "Wind": 0.0588
+      "Wind": 0.0589
     },
     "2024": {
-      "Bioenergy": 0.0047,
-      "Coal": 0.0153,
-      "Gas": 0.1831,
-      "Hydro": 0.5953,
-      "Nuclear": 0.013,
-      "Other Fossil": 0.0992,
+      "Bioenergy": 0.005,
+      "Coal": 0.0151,
+      "Gas": 0.1825,
+      "Hydro": 0.5943,
+      "Nuclear": 0.0135,
+      "Other Fossil": 0.0986,
       "Other Renewables": 0.0002,
-      "Solar": 0.0447,
-      "Wind": 0.0446
+      "Solar": 0.0443,
+      "Wind": 0.0465
     }
   }
 }