@digital4better/data 1.2.25 → 1.2.26

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

@@ -12,7 +12,7 @@ AF,2021,0.0148,0.4534,0.0858,0.2922,0.0412,0.0231,0.0038,0.0418,0.044
 AF,2022,0.0161,0.444,0.0817,0.2922,0.041,0.0233,0.004,0.049,0.0488
 AF,2023,0.0164,0.447,0.0778,0.2813,0.0411,0.0213,0.004,0.057,0.054
 AF,2024,0.0158,0.4338,0.0756,0.2845,0.0403,0.0202,0.0041,0.069,0.0566
-AF,2025,0.0162,0.4266,0.0825,0.2558,0.0433,0.0209,0.0041,0.0811,0.0694
+AF,2025,0.0163,0.4288,0.0757,0.2591,0.0437,0.021,0.0042,0.0815,0.0698
 AG,2019,0,0,0,0,0,0.9722,0,0.0278,0
 AG,2020,0,0,0,0,0,0.9722,0,0.0278,0
 AG,2021,0,0,0,0,0,0.9722,0,0.0278,0
@@ -103,7 +103,7 @@ BD,2021,0.0016,0.112,0.6112,0.0196,0.0046,0.239,0.0004,0.0066,0.0049
 BD,2022,0.0019,0.14,0.5194,0.0209,0.0049,0.297,0.0005,0.0095,0.0059
 BD,2023,0.0036,0.2696,0.5054,0.0271,0.0089,0.1551,0.0009,0.0177,0.0116
 BD,2024,0.0032,0.3646,0.4499,0.0281,0.0082,0.1112,0.0008,0.0223,0.0115
-BD,2025,0.0034,0.3585,0.4422,0.0136,0.0092,0.1278,0.0009,0.0296,0.0147
+BD,2025,0.0034,0.359,0.4407,0.0144,0.0093,0.1278,0.0009,0.0297,0.0148
 BE,2019,0.0273,0.0042,0.2705,0.0053,0.4692,0.0877,0.0001,0.0398,0.0959
 BE,2020,0.0289,0.0027,0.289,0.005,0.3959,0.0897,0.0001,0.0515,0.1372
 BE,2021,0.0237,0.0008,0.2064,0.0032,0.515,0.0812,0,0.0501,0.1195
@@ -467,7 +467,7 @@ GE,2021,0.0028,0.0823,0.1828,0.7008,0.0072,0.0013,0.0007,0.0055,0.0165
 GE,2022,0.0023,0.0598,0.2365,0.6751,0.0056,0.0011,0.0005,0.0048,0.0143
 GE,2023,0.0013,0.0338,0.249,0.6963,0.0032,0.0005,0.0003,0.0032,0.0124
 GE,2024,0.0016,0.0405,0.2033,0.731,0.0038,0.0004,0.0004,0.0053,0.0136
-GE,2025,0.005,0.1285,0.2533,0.5458,0.0133,0.0016,0.0013,0.0219,0.0292
+GE,2025,0.0051,0.129,0.2516,0.5466,0.0134,0.0016,0.0013,0.022,0.0293
 GF,2019,0.0104,0,0,0.4271,0,0.5104,0,0.0521,0
 GF,2020,0.0104,0,0,0.4271,0,0.5104,0,0.0521,0
 GF,2021,0.0104,0,0,0.4271,0,0.5104,0,0.0521,0
@@ -565,7 +565,7 @@ HK,2021,0.0077,0.5705,0.343,0.0328,0.0134,0.0061,0.0012,0.0109,0.0143
 HK,2022,0.0081,0.5675,0.3417,0.0328,0.0134,0.0062,0.0013,0.0133,0.0159
 HK,2023,0.0082,0.5685,0.3404,0.0292,0.0134,0.0055,0.0013,0.0159,0.0176
 HK,2024,0.008,0.5642,0.3397,0.0303,0.0131,0.0051,0.0013,0.0198,0.0184
-HK,2025,0.0081,0.5618,0.342,0.0209,0.0141,0.0054,0.0013,0.0237,0.0226
+HK,2025,0.0081,0.5625,0.3397,0.022,0.0142,0.0054,0.0014,0.0238,0.0227
 HN,2019,0.1282,0.0056,0.0055,0.2236,0.0005,0.4382,0.0265,0.0986,0.0732
 HN,2020,0.1283,0.0054,0.0057,0.2238,0.0005,0.4376,0.0265,0.0988,0.0734
 HN,2021,0.1282,0.0053,0.0062,0.223,0.0005,0.4375,0.0265,0.0989,0.0736
@@ -621,7 +621,7 @@ IN,2021,0.0104,0.7291,0.027,0.1092,0.0299,0.0001,0.0015,0.0464,0.0464
 IN,2022,0.0103,0.7299,0.0159,0.1096,0.029,0.0001,0.0016,0.0597,0.044
 IN,2023,0.0087,0.7419,0.0173,0.0874,0.0283,0.0002,0.0016,0.0665,0.0482
 IN,2024,0.0074,0.7357,0.0188,0.0865,0.0303,0.0002,0.0016,0.0741,0.0452
-IN,2025,0.0109,0.7236,0.0836,0.0262,0.0288,0.0014,0.0015,0.0919,0.032
+IN,2025,0.0114,0.755,0.011,0.0582,0.032,0.0014,0.0015,0.0959,0.0334
 IQ,2019,0,0.0009,0.5835,0.0425,0.0003,0.3719,0,0.0009,0.0001
 IQ,2020,0,0.0009,0.5835,0.0425,0.0003,0.3719,0,0.0009,0.0001
 IQ,2021,0,0.0009,0.5835,0.0425,0.0003,0.3719,0,0.0009,0.0001
@@ -684,14 +684,14 @@ KG,2021,0.0007,0.1427,0.015,0.8342,0.0019,0.0017,0.0002,0.0015,0.0021
 KG,2022,0.0018,0.1552,0.0167,0.8089,0.0046,0.0022,0.0004,0.0043,0.0059
 KG,2023,0.0016,0.1592,0.0155,0.8071,0.0039,0.0029,0.0004,0.004,0.0054
 KG,2024,0.0019,0.1306,0.0169,0.8151,0.0047,0.017,0.0005,0.0066,0.0067
-KG,2025,0.0016,0.0986,0.0164,0.8396,0.0042,0.0255,0.0004,0.007,0.0068
+KG,2025,0.0016,0.0989,0.0157,0.8399,0.0043,0.0255,0.0004,0.007,0.0068
 KH,2019,0.0122,0.4725,0.0305,0.3854,0.0135,0.0563,0.0014,0.0177,0.0104
 KH,2020,0.0126,0.47,0.0298,0.3862,0.0135,0.0561,0.0012,0.0191,0.0115
 KH,2021,0.0131,0.4694,0.0281,0.3834,0.0135,0.0562,0.0013,0.0206,0.0144
 KH,2022,0.0136,0.4663,0.0268,0.3834,0.0135,0.0562,0.0013,0.0229,0.016
 KH,2023,0.0137,0.4673,0.0255,0.3799,0.0135,0.0555,0.0013,0.0255,0.0177
 KH,2024,0.0135,0.463,0.0248,0.3809,0.0132,0.0552,0.0013,0.0295,0.0186
-KH,2025,0.0136,0.4606,0.0271,0.3715,0.0142,0.0554,0.0014,0.0335,0.0228
+KH,2025,0.0136,0.4613,0.0248,0.3726,0.0144,0.0554,0.0014,0.0336,0.0229
 KI,2019,0,0,0,0,0,0.75,0,0.25,0
 KI,2020,0,0,0,0,0,0.75,0,0.25,0
 KI,2021,0,0,0,0,0,0.75,0,0.25,0
@@ -880,7 +880,7 @@ MO,2021,0.0542,0.4893,0.1725,0.1118,0.0457,0.0375,0.0043,0.0359,0.0488
 MO,2022,0.0557,0.4789,0.168,0.1118,0.0455,0.0377,0.0044,0.0439,0.0542
 MO,2023,0.056,0.4823,0.1637,0.0997,0.0457,0.0354,0.0044,0.0528,0.06
 MO,2024,0.0554,0.4676,0.1613,0.1033,0.0448,0.0342,0.0045,0.0662,0.0629
-MO,2025,0.0558,0.4596,0.1689,0.0714,0.0481,0.035,0.0046,0.0796,0.077
+MO,2025,0.0559,0.462,0.1613,0.075,0.0486,0.0351,0.0046,0.08,0.0775
 MQ,2019,0.1548,0,0,0,0,0.7484,0.0065,0.0581,0.0323
 MQ,2020,0.1548,0,0,0,0,0.7484,0.0065,0.0581,0.0323
 MQ,2021,0.1548,0,0,0,0,0.7484,0.0065,0.0581,0.0323
@@ -1006,7 +1006,7 @@ NP,2021,0.004,0.1192,0.0232,0.8072,0.0111,0.002,0.001,0.019,0.0132
 NP,2022,0.0044,0.1167,0.0221,0.8072,0.0111,0.0021,0.0011,0.021,0.0145
 NP,2023,0.0044,0.1175,0.021,0.8042,0.0111,0.0015,0.0011,0.0232,0.0159
 NP,2024,0.0043,0.1139,0.0205,0.8051,0.0109,0.0012,0.0011,0.0264,0.0166
-NP,2025,0.0044,0.112,0.0223,0.7973,0.0117,0.0014,0.0011,0.0297,0.02
+NP,2025,0.0044,0.1126,0.0205,0.7982,0.0118,0.0014,0.0011,0.0298,0.0201
 NR,2019,0,0,0,0,0,1,0,0,0
 NR,2020,0,0,0,0,0,1,0,0,0
 NR,2021,0,0,0,0,0,1,0,0,0
@@ -1202,7 +1202,7 @@ SG,2021,0,0,0.9724,0,0,0.0204,0,0.0072,0
 SG,2022,0.0001,0.0018,0.9565,0.0005,0.0002,0.0289,0,0.0119,0.0002
 SG,2023,0,0.0008,0.9604,0.0001,0.0001,0.022,0,0.0165,0.0001
 SG,2024,0,0.0002,0.9557,0,0,0.0225,0,0.0215,0
-SG,2025,0.0001,0.0022,0.954,0.0003,0.0002,0.0202,0,0.0226,0.0004
+SG,2025,0.0001,0.0022,0.9539,0.0004,0.0002,0.0202,0,0.0226,0.0004
 SH,2019,0,0,0,0,0,1,0,0,0
 SH,2020,0,0,0,0,0,1,0,0,0
 SH,2021,0,0,0,0,0,1,0,0,0
@@ -1314,7 +1314,7 @@ TH,2021,0.067,0.2593,0.5611,0.0427,0.0081,0.0049,0.0007,0.0271,0.0291
 TH,2022,0.0681,0.253,0.5526,0.0522,0.0082,0.0096,0.0008,0.0317,0.0238
 TH,2023,0.0675,0.2153,0.5992,0.0466,0.0074,0.0051,0.0007,0.0319,0.0263
 TH,2024,0.0609,0.2219,0.5978,0.0458,0.0076,0.0019,0.0008,0.0366,0.0268
-TH,2025,0.0637,0.221,0.567,0.0541,0.0076,0.0014,0.0007,0.0515,0.033
+TH,2025,0.0637,0.2214,0.5657,0.0547,0.0077,0.0014,0.0007,0.0516,0.0331
 TJ,2019,0,0.0604,0.0126,0.927,0,0,0,0,0
 TJ,2020,0,0.0702,0.0143,0.9155,0,0,0,0,0
 TJ,2021,0,0.0695,0.0121,0.9184,0,0,0,0,0
@@ -1412,7 +1412,7 @@ UZ,2021,0.0004,0.0704,0.8124,0.1022,0.0011,0.0112,0.0001,0.001,0.0012
 UZ,2022,0.0004,0.0702,0.8123,0.1022,0.0011,0.0112,0.0001,0.0012,0.0013
 UZ,2023,0.0004,0.0703,0.8122,0.1019,0.0011,0.0111,0.0001,0.0014,0.0014
 UZ,2024,0.0004,0.0699,0.8122,0.102,0.0011,0.0111,0.0001,0.0018,0.0015
-UZ,2025,0.0004,0.0697,0.8124,0.1012,0.0011,0.0111,0.0001,0.0021,0.0018
+UZ,2025,0.0004,0.0698,0.8122,0.1013,0.0011,0.0111,0.0001,0.0021,0.0018
 VC,2019,0,0,0,0.1333,0,0.8667,0,0,0
 VC,2020,0,0,0,0.1333,0,0.8667,0,0,0
 VC,2021,0,0,0,0.1333,0,0.8667,0,0,0

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

@@ -81,10 +81,10 @@
       "Wind": 0.1329
     },
     "2025": {
-      "Bioenergy": 0.0383,
-      "Hydro": 0.6055,
-      "Solar": 0.192,
-      "Wind": 0.1642
+      "Bioenergy": 0.0381,
+      "Hydro": 0.6073,
+      "Solar": 0.191,
+      "Wind": 0.1635
     }
   },
   "AG": {
@@ -653,10 +653,10 @@
       "Wind": 0.1767
     },
     "2025": {
-      "Bioenergy": 0.0559,
-      "Hydro": 0.2222,
-      "Solar": 0.4818,
-      "Wind": 0.2401
+      "Bioenergy": 0.0554,
+      "Hydro": 0.2304,
+      "Solar": 0.4762,
+      "Wind": 0.238
     }
   },
   "BE": {
@@ -2942,9 +2942,9 @@
     },
     "2025": {
       "Bioenergy": 0.0084,
-      "Hydro": 0.9067,
-      "Solar": 0.0364,
-      "Wind": 0.0485
+      "Hydro": 0.9065,
+      "Solar": 0.0365,
+      "Wind": 0.0486
     }
   },
   "GF": {
@@ -3557,10 +3557,10 @@
       "Wind": 0.241
     },
     "2025": {
-      "Bioenergy": 0.1077,
-      "Hydro": 0.2779,
-      "Solar": 0.3147,
-      "Wind": 0.2998
+      "Bioenergy": 0.1061,
+      "Hydro": 0.2869,
+      "Solar": 0.3108,
+      "Wind": 0.2962
     }
   },
   "HN": {
@@ -3777,10 +3777,10 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3549,
-      "Hydro": 0.619,
+      "Bioenergy": 0.3548,
+      "Hydro": 0.6191,
       "Solar": 0.008,
-      "Wind": 0.0181
+      "Wind": 0.0182
     }
   },
   "IE": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0676,
-      "Hydro": 0.1627,
-      "Solar": 0.5707,
-      "Wind": 0.1989
+      "Bioenergy": 0.0571,
+      "Hydro": 0.2928,
+      "Solar": 0.4822,
+      "Wind": 0.168
     }
   },
   "IQ": {
@@ -4305,8 +4305,8 @@
       "Wind": 0.008
     },
     "2025": {
-      "Bioenergy": 0.0018,
-      "Hydro": 0.9821,
+      "Bioenergy": 0.0019,
+      "Hydro": 0.982,
       "Solar": 0.0082,
       "Wind": 0.0079
     }
@@ -4350,9 +4350,9 @@
     },
     "2025": {
       "Bioenergy": 0.0308,
-      "Hydro": 0.8418,
-      "Solar": 0.0758,
-      "Wind": 0.0516
+      "Hydro": 0.8416,
+      "Solar": 0.0759,
+      "Wind": 0.0517
     }
   },
   "KI": {
@@ -5537,10 +5537,10 @@
       "Wind": 0.2185
     },
     "2025": {
-      "Bioenergy": 0.1965,
-      "Hydro": 0.2516,
-      "Solar": 0.2804,
-      "Wind": 0.2714
+      "Bioenergy": 0.1937,
+      "Hydro": 0.2602,
+      "Solar": 0.2774,
+      "Wind": 0.2686
     }
   },
   "MQ": {
@@ -6329,10 +6329,10 @@
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.9365,
+      "Bioenergy": 0.0052,
+      "Hydro": 0.9363,
       "Solar": 0.0349,
-      "Wind": 0.0235
+      "Wind": 0.0236
     }
   },
   "NR": {
@@ -7562,8 +7562,8 @@
     },
     "2025": {
       "Bioenergy": 0.0036,
-      "Hydro": 0.0144,
-      "Solar": 0.9664,
+      "Hydro": 0.0151,
+      "Solar": 0.9656,
       "Wind": 0.0156
     }
   },
@@ -8265,10 +8265,10 @@
       "Wind": 0.1574
     },
     "2025": {
-      "Bioenergy": 0.3147,
-      "Hydro": 0.2673,
-      "Solar": 0.2548,
-      "Wind": 0.1632
+      "Bioenergy": 0.3136,
+      "Hydro": 0.2693,
+      "Solar": 0.2542,
+      "Wind": 0.1629
     }
   },
   "TJ": {
@@ -8882,9 +8882,9 @@
     },
     "2025": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9591,
-      "Solar": 0.0196,
-      "Wind": 0.0172
+      "Hydro": 0.9589,
+      "Solar": 0.0197,
+      "Wind": 0.0173
     }
   },
   "VC": {

package/data/mix/country-yearly.csv

@@ -12,7 +12,7 @@ AF,2021,0.0148,0.4534,0.0858,0.2922,0.0412,0.0231,0.0038,0.0418,0.044
 AF,2022,0.0161,0.444,0.0817,0.2922,0.041,0.0233,0.004,0.049,0.0488
 AF,2023,0.0164,0.447,0.0778,0.2813,0.0411,0.0213,0.004,0.057,0.054
 AF,2024,0.0158,0.4338,0.0756,0.2845,0.0403,0.0202,0.0041,0.069,0.0566
-AF,2025,0.0162,0.4266,0.0825,0.2558,0.0433,0.0209,0.0041,0.0811,0.0694
+AF,2025,0.0163,0.4288,0.0757,0.2591,0.0437,0.021,0.0042,0.0815,0.0698
 AG,2019,0,0,0,0,0,0.9722,0,0.0278,0
 AG,2020,0,0,0,0,0,0.9722,0,0.0278,0
 AG,2021,0,0,0,0,0,0.9722,0,0.0278,0
@@ -103,7 +103,7 @@ BD,2021,0.0016,0.112,0.6112,0.0196,0.0046,0.239,0.0004,0.0066,0.0049
 BD,2022,0.0019,0.14,0.5194,0.0209,0.0049,0.297,0.0005,0.0095,0.0059
 BD,2023,0.0036,0.2696,0.5054,0.0271,0.0089,0.1551,0.0009,0.0177,0.0116
 BD,2024,0.0032,0.3646,0.4499,0.0281,0.0082,0.1112,0.0008,0.0223,0.0115
-BD,2025,0.0034,0.3585,0.4422,0.0136,0.0092,0.1278,0.0009,0.0296,0.0147
+BD,2025,0.0034,0.359,0.4407,0.0144,0.0093,0.1278,0.0009,0.0297,0.0148
 BE,2019,0.0273,0.0042,0.2705,0.0053,0.4692,0.0877,0.0001,0.0398,0.0959
 BE,2020,0.0289,0.0027,0.289,0.005,0.3959,0.0897,0.0001,0.0515,0.1372
 BE,2021,0.0237,0.0008,0.2064,0.0032,0.515,0.0812,0,0.0501,0.1195
@@ -467,7 +467,7 @@ GE,2021,0.0028,0.0823,0.1828,0.7008,0.0072,0.0013,0.0007,0.0055,0.0165
 GE,2022,0.0023,0.0598,0.2365,0.6751,0.0056,0.0011,0.0005,0.0048,0.0143
 GE,2023,0.0013,0.0338,0.249,0.6963,0.0032,0.0005,0.0003,0.0032,0.0124
 GE,2024,0.0016,0.0405,0.2033,0.731,0.0038,0.0004,0.0004,0.0053,0.0136
-GE,2025,0.005,0.1285,0.2533,0.5458,0.0133,0.0016,0.0013,0.0219,0.0292
+GE,2025,0.0051,0.129,0.2516,0.5466,0.0134,0.0016,0.0013,0.022,0.0293
 GF,2019,0.0104,0,0,0.4271,0,0.5104,0,0.0521,0
 GF,2020,0.0104,0,0,0.4271,0,0.5104,0,0.0521,0
 GF,2021,0.0104,0,0,0.4271,0,0.5104,0,0.0521,0
@@ -565,7 +565,7 @@ HK,2021,0.0077,0.5705,0.343,0.0328,0.0134,0.0061,0.0012,0.0109,0.0143
 HK,2022,0.0081,0.5675,0.3417,0.0328,0.0134,0.0062,0.0013,0.0133,0.0159
 HK,2023,0.0082,0.5685,0.3404,0.0292,0.0134,0.0055,0.0013,0.0159,0.0176
 HK,2024,0.008,0.5642,0.3397,0.0303,0.0131,0.0051,0.0013,0.0198,0.0184
-HK,2025,0.0081,0.5618,0.342,0.0209,0.0141,0.0054,0.0013,0.0237,0.0226
+HK,2025,0.0081,0.5625,0.3397,0.022,0.0142,0.0054,0.0014,0.0238,0.0227
 HN,2019,0.1282,0.0056,0.0055,0.2236,0.0005,0.4382,0.0265,0.0986,0.0732
 HN,2020,0.1283,0.0054,0.0057,0.2238,0.0005,0.4376,0.0265,0.0988,0.0734
 HN,2021,0.1282,0.0053,0.0062,0.223,0.0005,0.4375,0.0265,0.0989,0.0736
@@ -621,7 +621,7 @@ IN,2021,0.0104,0.7291,0.027,0.1092,0.0299,0.0001,0.0015,0.0464,0.0464
 IN,2022,0.0103,0.7299,0.0159,0.1096,0.029,0.0001,0.0016,0.0597,0.044
 IN,2023,0.0087,0.7419,0.0173,0.0874,0.0283,0.0002,0.0016,0.0665,0.0482
 IN,2024,0.0074,0.7357,0.0188,0.0865,0.0303,0.0002,0.0016,0.0741,0.0452
-IN,2025,0.0109,0.7236,0.0836,0.0262,0.0288,0.0014,0.0015,0.0919,0.032
+IN,2025,0.0114,0.755,0.011,0.0582,0.032,0.0014,0.0015,0.0959,0.0334
 IQ,2019,0,0.0009,0.5835,0.0425,0.0003,0.3719,0,0.0009,0.0001
 IQ,2020,0,0.0009,0.5835,0.0425,0.0003,0.3719,0,0.0009,0.0001
 IQ,2021,0,0.0009,0.5835,0.0425,0.0003,0.3719,0,0.0009,0.0001
@@ -684,14 +684,14 @@ KG,2021,0.0007,0.1427,0.015,0.8342,0.0019,0.0017,0.0002,0.0015,0.0021
 KG,2022,0.0018,0.1552,0.0167,0.8089,0.0046,0.0022,0.0004,0.0043,0.0059
 KG,2023,0.0016,0.1592,0.0155,0.8071,0.0039,0.0029,0.0004,0.004,0.0054
 KG,2024,0.0019,0.1306,0.0169,0.8151,0.0047,0.017,0.0005,0.0066,0.0067
-KG,2025,0.0016,0.0986,0.0164,0.8396,0.0042,0.0255,0.0004,0.007,0.0068
+KG,2025,0.0016,0.0989,0.0157,0.8399,0.0043,0.0255,0.0004,0.007,0.0068
 KH,2019,0.0122,0.4725,0.0305,0.3854,0.0135,0.0563,0.0014,0.0177,0.0104
 KH,2020,0.0126,0.47,0.0298,0.3862,0.0135,0.0561,0.0012,0.0191,0.0115
 KH,2021,0.0131,0.4694,0.0281,0.3834,0.0135,0.0562,0.0013,0.0206,0.0144
 KH,2022,0.0136,0.4663,0.0268,0.3834,0.0135,0.0562,0.0013,0.0229,0.016
 KH,2023,0.0137,0.4673,0.0255,0.3799,0.0135,0.0555,0.0013,0.0255,0.0177
 KH,2024,0.0135,0.463,0.0248,0.3809,0.0132,0.0552,0.0013,0.0295,0.0186
-KH,2025,0.0136,0.4606,0.0271,0.3715,0.0142,0.0554,0.0014,0.0335,0.0228
+KH,2025,0.0136,0.4613,0.0248,0.3726,0.0144,0.0554,0.0014,0.0336,0.0229
 KI,2019,0,0,0,0,0,0.75,0,0.25,0
 KI,2020,0,0,0,0,0,0.75,0,0.25,0
 KI,2021,0,0,0,0,0,0.75,0,0.25,0
@@ -880,7 +880,7 @@ MO,2021,0.0542,0.4893,0.1725,0.1118,0.0457,0.0375,0.0043,0.0359,0.0488
 MO,2022,0.0557,0.4789,0.168,0.1118,0.0455,0.0377,0.0044,0.0439,0.0542
 MO,2023,0.056,0.4823,0.1637,0.0997,0.0457,0.0354,0.0044,0.0528,0.06
 MO,2024,0.0554,0.4676,0.1613,0.1033,0.0448,0.0342,0.0045,0.0662,0.0629
-MO,2025,0.0558,0.4596,0.1689,0.0714,0.0481,0.035,0.0046,0.0796,0.077
+MO,2025,0.0559,0.462,0.1613,0.075,0.0486,0.0351,0.0046,0.08,0.0775
 MQ,2019,0.1548,0,0,0,0,0.7484,0.0065,0.0581,0.0323
 MQ,2020,0.1548,0,0,0,0,0.7484,0.0065,0.0581,0.0323
 MQ,2021,0.1548,0,0,0,0,0.7484,0.0065,0.0581,0.0323
@@ -1006,7 +1006,7 @@ NP,2021,0.004,0.1192,0.0232,0.8072,0.0111,0.002,0.001,0.019,0.0132
 NP,2022,0.0044,0.1167,0.0221,0.8072,0.0111,0.0021,0.0011,0.021,0.0145
 NP,2023,0.0044,0.1175,0.021,0.8042,0.0111,0.0015,0.0011,0.0232,0.0159
 NP,2024,0.0043,0.1139,0.0205,0.8051,0.0109,0.0012,0.0011,0.0264,0.0166
-NP,2025,0.0044,0.112,0.0223,0.7973,0.0117,0.0014,0.0011,0.0297,0.02
+NP,2025,0.0044,0.1126,0.0205,0.7982,0.0118,0.0014,0.0011,0.0298,0.0201
 NR,2019,0,0,0,0,0,1,0,0,0
 NR,2020,0,0,0,0,0,1,0,0,0
 NR,2021,0,0,0,0,0,1,0,0,0
@@ -1202,7 +1202,7 @@ SG,2021,0,0,0.9724,0,0,0.0204,0,0.0072,0
 SG,2022,0.0001,0.0018,0.9565,0.0005,0.0002,0.0289,0,0.0119,0.0002
 SG,2023,0,0.0008,0.9604,0.0001,0.0001,0.022,0,0.0165,0.0001
 SG,2024,0,0.0002,0.9557,0,0,0.0225,0,0.0215,0
-SG,2025,0.0001,0.0022,0.954,0.0003,0.0002,0.0202,0,0.0226,0.0004
+SG,2025,0.0001,0.0022,0.9539,0.0004,0.0002,0.0202,0,0.0226,0.0004
 SH,2019,0,0,0,0,0,1,0,0,0
 SH,2020,0,0,0,0,0,1,0,0,0
 SH,2021,0,0,0,0,0,1,0,0,0
@@ -1314,7 +1314,7 @@ TH,2021,0.067,0.2593,0.5611,0.0427,0.0081,0.0049,0.0007,0.0271,0.0291
 TH,2022,0.0681,0.253,0.5526,0.0522,0.0082,0.0096,0.0008,0.0317,0.0238
 TH,2023,0.0675,0.2153,0.5992,0.0466,0.0074,0.0051,0.0007,0.0319,0.0263
 TH,2024,0.0609,0.2219,0.5978,0.0458,0.0076,0.0019,0.0008,0.0366,0.0268
-TH,2025,0.0637,0.221,0.567,0.0541,0.0076,0.0014,0.0007,0.0515,0.033
+TH,2025,0.0637,0.2214,0.5657,0.0547,0.0077,0.0014,0.0007,0.0516,0.0331
 TJ,2019,0,0.0604,0.0126,0.927,0,0,0,0,0
 TJ,2020,0,0.0702,0.0143,0.9155,0,0,0,0,0
 TJ,2021,0,0.0695,0.0121,0.9184,0,0,0,0,0
@@ -1412,7 +1412,7 @@ UZ,2021,0.0004,0.0704,0.8124,0.1022,0.0011,0.0112,0.0001,0.001,0.0012
 UZ,2022,0.0004,0.0702,0.8123,0.1022,0.0011,0.0112,0.0001,0.0012,0.0013
 UZ,2023,0.0004,0.0703,0.8122,0.1019,0.0011,0.0111,0.0001,0.0014,0.0014
 UZ,2024,0.0004,0.0699,0.8122,0.102,0.0011,0.0111,0.0001,0.0018,0.0015
-UZ,2025,0.0004,0.0697,0.8124,0.1012,0.0011,0.0111,0.0001,0.0021,0.0018
+UZ,2025,0.0004,0.0698,0.8122,0.1013,0.0011,0.0111,0.0001,0.0021,0.0018
 VC,2019,0,0,0,0.1333,0,0.8667,0,0,0
 VC,2020,0,0,0,0.1333,0,0.8667,0,0,0
 VC,2021,0,0,0,0.1333,0,0.8667,0,0,0

package/data/mix/country-yearly.json

@@ -146,15 +146,15 @@
       "Wind": 0.0566
     },
     "2025": {
-      "Bioenergy": 0.0162,
-      "Coal": 0.4266,
-      "Gas": 0.0825,
-      "Hydro": 0.2558,
-      "Nuclear": 0.0433,
-      "Other Fossil": 0.0209,
-      "Other Renewables": 0.0041,
-      "Solar": 0.0811,
-      "Wind": 0.0694
+      "Bioenergy": 0.0163,
+      "Coal": 0.4288,
+      "Gas": 0.0757,
+      "Hydro": 0.2591,
+      "Nuclear": 0.0437,
+      "Other Fossil": 0.021,
+      "Other Renewables": 0.0042,
+      "Solar": 0.0815,
+      "Wind": 0.0698
     }
   },
   "AG": {
@@ -1174,14 +1174,14 @@
     },
     "2025": {
       "Bioenergy": 0.0034,
-      "Coal": 0.3585,
-      "Gas": 0.4422,
-      "Hydro": 0.0136,
-      "Nuclear": 0.0092,
+      "Coal": 0.359,
+      "Gas": 0.4407,
+      "Hydro": 0.0144,
+      "Nuclear": 0.0093,
       "Other Fossil": 0.1278,
       "Other Renewables": 0.0009,
-      "Solar": 0.0296,
-      "Wind": 0.0147
+      "Solar": 0.0297,
+      "Wind": 0.0148
     }
   },
   "BE": {
@@ -5281,15 +5281,15 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Coal": 0.1285,
-      "Gas": 0.2533,
-      "Hydro": 0.5458,
-      "Nuclear": 0.0133,
+      "Bioenergy": 0.0051,
+      "Coal": 0.129,
+      "Gas": 0.2516,
+      "Hydro": 0.5466,
+      "Nuclear": 0.0134,
       "Other Fossil": 0.0016,
       "Other Renewables": 0.0013,
-      "Solar": 0.0219,
-      "Wind": 0.0292
+      "Solar": 0.022,
+      "Wind": 0.0293
     }
   },
   "GF": {
@@ -6388,14 +6388,14 @@
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Coal": 0.5618,
-      "Gas": 0.342,
-      "Hydro": 0.0209,
-      "Nuclear": 0.0141,
+      "Coal": 0.5625,
+      "Gas": 0.3397,
+      "Hydro": 0.022,
+      "Nuclear": 0.0142,
       "Other Fossil": 0.0054,
-      "Other Renewables": 0.0013,
-      "Solar": 0.0237,
-      "Wind": 0.0226
+      "Other Renewables": 0.0014,
+      "Solar": 0.0238,
+      "Wind": 0.0227
     }
   },
   "HN": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0109,
-      "Coal": 0.7236,
-      "Gas": 0.0836,
-      "Hydro": 0.0262,
-      "Nuclear": 0.0288,
+      "Bioenergy": 0.0114,
+      "Coal": 0.755,
+      "Gas": 0.011,
+      "Hydro": 0.0582,
+      "Nuclear": 0.032,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0015,
-      "Solar": 0.0919,
-      "Wind": 0.032
+      "Solar": 0.0959,
+      "Wind": 0.0334
     }
   },
   "IQ": {
@@ -7731,10 +7731,10 @@
     },
     "2025": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0986,
-      "Gas": 0.0164,
-      "Hydro": 0.8396,
-      "Nuclear": 0.0042,
+      "Coal": 0.0989,
+      "Gas": 0.0157,
+      "Hydro": 0.8399,
+      "Nuclear": 0.0043,
       "Other Fossil": 0.0255,
       "Other Renewables": 0.0004,
       "Solar": 0.007,
@@ -7810,14 +7810,14 @@
     },
     "2025": {
       "Bioenergy": 0.0136,
-      "Coal": 0.4606,
-      "Gas": 0.0271,
-      "Hydro": 0.3715,
-      "Nuclear": 0.0142,
+      "Coal": 0.4613,
+      "Gas": 0.0248,
+      "Hydro": 0.3726,
+      "Nuclear": 0.0144,
       "Other Fossil": 0.0554,
       "Other Renewables": 0.0014,
-      "Solar": 0.0335,
-      "Wind": 0.0228
+      "Solar": 0.0336,
+      "Wind": 0.0229
     }
   },
   "KI": {
@@ -9942,15 +9942,15 @@
       "Wind": 0.0629
     },
     "2025": {
-      "Bioenergy": 0.0558,
-      "Coal": 0.4596,
-      "Gas": 0.1689,
-      "Hydro": 0.0714,
-      "Nuclear": 0.0481,
-      "Other Fossil": 0.035,
+      "Bioenergy": 0.0559,
+      "Coal": 0.462,
+      "Gas": 0.1613,
+      "Hydro": 0.075,
+      "Nuclear": 0.0486,
+      "Other Fossil": 0.0351,
       "Other Renewables": 0.0046,
-      "Solar": 0.0796,
-      "Wind": 0.077
+      "Solar": 0.08,
+      "Wind": 0.0775
     }
   },
   "MQ": {
@@ -11365,14 +11365,14 @@
     },
     "2025": {
       "Bioenergy": 0.0044,
-      "Coal": 0.112,
-      "Gas": 0.0223,
-      "Hydro": 0.7973,
-      "Nuclear": 0.0117,
+      "Coal": 0.1126,
+      "Gas": 0.0205,
+      "Hydro": 0.7982,
+      "Nuclear": 0.0118,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0011,
-      "Solar": 0.0297,
-      "Wind": 0.02
+      "Solar": 0.0298,
+      "Wind": 0.0201
     }
   },
   "NR": {
@@ -13578,8 +13578,8 @@
     "2025": {
       "Bioenergy": 0.0001,
       "Coal": 0.0022,
-      "Gas": 0.954,
-      "Hydro": 0.0003,
+      "Gas": 0.9539,
+      "Hydro": 0.0004,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0202,
       "Other Renewables": 0,
@@ -14841,14 +14841,14 @@
     },
     "2025": {
       "Bioenergy": 0.0637,
-      "Coal": 0.221,
-      "Gas": 0.567,
-      "Hydro": 0.0541,
-      "Nuclear": 0.0076,
+      "Coal": 0.2214,
+      "Gas": 0.5657,
+      "Hydro": 0.0547,
+      "Nuclear": 0.0077,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0007,
-      "Solar": 0.0515,
-      "Wind": 0.033
+      "Solar": 0.0516,
+      "Wind": 0.0331
     }
   },
   "TJ": {
@@ -15947,9 +15947,9 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0697,
-      "Gas": 0.8124,
-      "Hydro": 0.1012,
+      "Coal": 0.0698,
+      "Gas": 0.8122,
+      "Hydro": 0.1013,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,

package/data/mix/world-monthly-green.csv

@@ -73,5 +73,5 @@ period,Bioenergy,Coal,Gas,Hydro,Nuclear,Other Fossil,Other Renewables,Solar,Wind
 2024-12,0.0161,0.278,0.3129,0.1353,0.0583,0.0937,0.007,0.0386,0.06
 2025-01,0.0158,0.2676,0.3191,0.1357,0.0583,0.0949,0.0071,0.043,0.0586
 2025-02,0.0158,0.2686,0.3199,0.1366,0.0538,0.0972,0.0072,0.0461,0.0548
-2025-03,0.0153,0.2626,0.313,0.1347,0.0547,0.0957,0.0071,0.0547,0.0622
-2025-04,0.0154,0.2621,0.3136,0.1364,0.052,0.096,0.0071,0.0582,0.0592
+2025-03,0.0154,0.2634,0.3084,0.1374,0.055,0.096,0.0071,0.0549,0.0624
+2025-04,0.0155,0.2629,0.3089,0.1392,0.0523,0.0963,0.0072,0.0584,0.0594

package/data/mix/world-monthly-green.json

@@ -444,15 +444,15 @@
     "Wind": 0.2164
   },
   "2025-03": {
-    "Bioenergy": 0.0574,
-    "Hydro": 0.5045,
-    "Solar": 0.2051,
-    "Wind": 0.233
+    "Bioenergy": 0.057,
+    "Hydro": 0.5087,
+    "Solar": 0.2034,
+    "Wind": 0.231
   },
   "2025-04": {
-    "Bioenergy": 0.0573,
-    "Hydro": 0.5068,
-    "Solar": 0.2161,
-    "Wind": 0.2198
+    "Bioenergy": 0.0568,
+    "Hydro": 0.511,
+    "Solar": 0.2142,
+    "Wind": 0.218
   }
 }

package/data/mix/world-monthly.csv

@@ -73,5 +73,5 @@ period,Bioenergy,Coal,Gas,Hydro,Nuclear,Other Fossil,Other Renewables,Solar,Wind
 2024-12,0.0161,0.278,0.3129,0.1353,0.0583,0.0937,0.007,0.0386,0.06
 2025-01,0.0158,0.2676,0.3191,0.1357,0.0583,0.0949,0.0071,0.043,0.0586
 2025-02,0.0158,0.2686,0.3199,0.1366,0.0538,0.0972,0.0072,0.0461,0.0548
-2025-03,0.0153,0.2626,0.313,0.1347,0.0547,0.0957,0.0071,0.0547,0.0622
-2025-04,0.0154,0.2621,0.3136,0.1364,0.052,0.096,0.0071,0.0582,0.0592
+2025-03,0.0154,0.2634,0.3084,0.1374,0.055,0.096,0.0071,0.0549,0.0624
+2025-04,0.0155,0.2629,0.3089,0.1392,0.0523,0.0963,0.0072,0.0584,0.0594