@digital4better/data 1.2.20 → 1.2.22

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

@@ -4,40 +4,40 @@ Africa,2020,0.0071,0.0988,0.4348,0.3124,0.0032,0.1234,0.0014,0.011,0.0078
 Africa,2021,0.0071,0.0982,0.4352,0.3108,0.0033,0.1239,0.0014,0.0114,0.0087
 Africa,2022,0.0071,0.0958,0.4313,0.3113,0.0029,0.1288,0.0015,0.0121,0.0092
 Africa,2023,0.0071,0.0919,0.436,0.3109,0.0025,0.1267,0.0017,0.0135,0.0097
-Africa,2024,0.0071,0.093,0.4362,0.3095,0.0024,0.1254,0.0016,0.0144,0.0105
-Africa,2025,0.0071,0.0887,0.4336,0.3118,0.004,0.1264,0.0016,0.0158,0.0109
-Asia,2019,0.012,0.3561,0.3592,0.0886,0.024,0.1157,0.0072,0.018,0.0191
-Asia,2020,0.0128,0.3534,0.3561,0.0899,0.0241,0.1149,0.007,0.0206,0.0212
-Asia,2021,0.0139,0.36,0.3457,0.0857,0.0253,0.1112,0.0068,0.0239,0.0275
-Asia,2022,0.0146,0.3582,0.3391,0.0861,0.0257,0.1099,0.0067,0.0286,0.0311
-Asia,2023,0.0149,0.3646,0.3314,0.0806,0.0264,0.106,0.0066,0.0344,0.035
-Asia,2024,0.0147,0.3611,0.3234,0.0838,0.0268,0.1032,0.0065,0.0431,0.0375
-Asia,2025,0.0155,0.3608,0.3245,0.0663,0.0286,0.1063,0.0066,0.0483,0.0431
+Africa,2024,0.0071,0.0931,0.4362,0.3095,0.0024,0.1254,0.0016,0.0144,0.0104
+Africa,2025,0.0072,0.0882,0.4348,0.3128,0.0033,0.1269,0.0016,0.0149,0.0104
+Asia,2019,0.012,0.3559,0.3594,0.0885,0.024,0.1158,0.0072,0.018,0.0191
+Asia,2020,0.0128,0.3532,0.3563,0.0899,0.0241,0.1149,0.007,0.0206,0.0211
+Asia,2021,0.0139,0.3599,0.3459,0.0856,0.0253,0.1113,0.0068,0.0239,0.0275
+Asia,2022,0.0146,0.3581,0.3392,0.086,0.0257,0.1099,0.0067,0.0286,0.031
+Asia,2023,0.0149,0.3643,0.3317,0.0806,0.0264,0.1061,0.0066,0.0344,0.0351
+Asia,2024,0.0147,0.3604,0.3239,0.0837,0.0266,0.1034,0.0065,0.0431,0.0377
+Asia,2025,0.0154,0.358,0.3231,0.0667,0.0285,0.106,0.0066,0.0496,0.0459
 Europe,2019,0.0249,0.1768,0.2591,0.1918,0.199,0.0203,0.017,0.027,0.084
 Europe,2020,0.0264,0.1621,0.2451,0.2044,0.1931,0.0203,0.0179,0.0329,0.0977
 Europe,2021,0.0272,0.1676,0.2496,0.194,0.1959,0.0207,0.0174,0.0353,0.0924
-Europe,2022,0.0273,0.1662,0.2525,0.1843,0.1807,0.0207,0.018,0.0453,0.105
-Europe,2023,0.0254,0.1498,0.2379,0.1968,0.1788,0.0197,0.0182,0.0551,0.1182
-Europe,2024,0.0261,0.1417,0.2274,0.204,0.1768,0.0197,0.0179,0.0668,0.1196
-Europe,2025,0.0259,0.1557,0.2594,0.1784,0.177,0.0214,0.017,0.0462,0.1189
+Europe,2022,0.0273,0.1662,0.2526,0.1843,0.1807,0.0207,0.018,0.0453,0.105
+Europe,2023,0.0254,0.1498,0.2379,0.1968,0.1788,0.0198,0.0182,0.0551,0.1182
+Europe,2024,0.0261,0.1416,0.2275,0.204,0.1768,0.0197,0.0179,0.0668,0.1196
+Europe,2025,0.026,0.1548,0.2589,0.1781,0.1768,0.0231,0.017,0.0463,0.1191
 North America,2019,0.0221,0.1784,0.3258,0.1315,0.1421,0.1087,0.0068,0.0234,0.0613
 North America,2020,0.0219,0.1475,0.3417,0.1342,0.1414,0.1075,0.0069,0.0286,0.0702
 North America,2021,0.0215,0.1633,0.3295,0.1277,0.1366,0.1054,0.0068,0.0339,0.0754
 North America,2022,0.0206,0.1492,0.3382,0.1278,0.1323,0.1028,0.0067,0.0396,0.0829
 North America,2023,0.0204,0.1271,0.3645,0.1223,0.1381,0.0911,0.0069,0.0463,0.0835
 North America,2024,0.0198,0.12,0.3693,0.1185,0.1356,0.088,0.0065,0.0553,0.0869
-North America,2025,0.0195,0.137,0.3237,0.1359,0.1348,0.0876,0.0065,0.0526,0.1024
+North America,2025,0.0195,0.137,0.3236,0.1359,0.1348,0.0877,0.0065,0.0526,0.1024
 Oceania,2019,0.0047,0.4124,0.0953,0.1555,0,0.2054,0.0207,0.0528,0.0534
 Oceania,2020,0.0045,0.3994,0.0874,0.155,0,0.2069,0.0209,0.0642,0.0617
 Oceania,2021,0.0045,0.3867,0.0728,0.158,0,0.2068,0.0209,0.0789,0.0715
 Oceania,2022,0.0043,0.3584,0.0786,0.1627,0,0.204,0.0209,0.0917,0.0795
 Oceania,2023,0.0045,0.3505,0.068,0.159,0,0.2028,0.0203,0.1107,0.0844
 Oceania,2024,0.0048,0.3492,0.0711,0.1457,0,0.1993,0.0225,0.1203,0.087
-Oceania,2025,0.0039,0.3431,0.0635,0.1303,0,0.1979,0.0227,0.1491,0.0894
+Oceania,2025,0.0039,0.343,0.064,0.1293,0,0.1976,0.0235,0.1488,0.09
 South America,2019,0.0064,0.0228,0.1905,0.6308,0.0108,0.0999,0.0001,0.0073,0.0313
 South America,2020,0.007,0.0218,0.1879,0.6262,0.0108,0.1014,0.0001,0.0101,0.0346
 South America,2021,0.0061,0.0225,0.2051,0.5956,0.0108,0.1026,0.0002,0.0143,0.0429
 South America,2022,0.0059,0.0142,0.1833,0.6204,0.0096,0.0966,0.0002,0.022,0.0478
 South America,2023,0.0063,0.0131,0.1767,0.6131,0.01,0.0945,0.0002,0.0322,0.0539
-South America,2024,0.0068,0.0135,0.1763,0.5961,0.011,0.093,0.0001,0.0434,0.0598
-South America,2025,0.0039,0.0112,0.1707,0.6132,0.0106,0.0912,0.0001,0.0508,0.0483
+South America,2024,0.0068,0.0135,0.1762,0.5961,0.011,0.0931,0.0001,0.0434,0.0598
+South America,2025,0.004,0.0108,0.1699,0.6124,0.0107,0.0898,0.0001,0.0524,0.0498

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

@@ -32,59 +32,59 @@
     },
     "2024": {
       "Bioenergy": 0.0207,
-      "Hydro": 0.9062,
-      "Solar": 0.0422,
-      "Wind": 0.0309
+      "Hydro": 0.9065,
+      "Solar": 0.0423,
+      "Wind": 0.0305
     },
     "2025": {
-      "Bioenergy": 0.0207,
-      "Hydro": 0.9021,
-      "Solar": 0.0458,
-      "Wind": 0.0314
+      "Bioenergy": 0.0208,
+      "Hydro": 0.9059,
+      "Solar": 0.0433,
+      "Wind": 0.03
     }
   },
   "Asia": {
     "2019": {
       "Bioenergy": 0.0872,
       "Hydro": 0.6434,
-      "Solar": 0.1308,
-      "Wind": 0.1386
+      "Solar": 0.1309,
+      "Wind": 0.1385
     },
     "2020": {
-      "Bioenergy": 0.0888,
-      "Hydro": 0.6222,
+      "Bioenergy": 0.0889,
+      "Hydro": 0.6223,
       "Solar": 0.1425,
-      "Wind": 0.1465
+      "Wind": 0.1464
     },
     "2021": {
       "Bioenergy": 0.0919,
-      "Hydro": 0.5675,
+      "Hydro": 0.5676,
       "Solar": 0.1581,
-      "Wind": 0.1825
+      "Wind": 0.1824
     },
     "2022": {
-      "Bioenergy": 0.0911,
-      "Hydro": 0.5366,
+      "Bioenergy": 0.0912,
+      "Hydro": 0.5367,
       "Solar": 0.1785,
       "Wind": 0.1937
     },
     "2023": {
-      "Bioenergy": 0.0903,
-      "Hydro": 0.4888,
-      "Solar": 0.2086,
-      "Wind": 0.2123
+      "Bioenergy": 0.0904,
+      "Hydro": 0.4886,
+      "Solar": 0.2085,
+      "Wind": 0.2126
     },
     "2024": {
       "Bioenergy": 0.082,
-      "Hydro": 0.4681,
-      "Solar": 0.2406,
-      "Wind": 0.2094
+      "Hydro": 0.4671,
+      "Solar": 0.2404,
+      "Wind": 0.2105
     },
     "2025": {
-      "Bioenergy": 0.0894,
-      "Hydro": 0.3827,
-      "Solar": 0.2788,
-      "Wind": 0.2491
+      "Bioenergy": 0.087,
+      "Hydro": 0.3754,
+      "Solar": 0.2791,
+      "Wind": 0.2585
     }
   },
   "Europe": {
@@ -125,10 +125,10 @@
       "Wind": 0.2871
     },
     "2025": {
-      "Bioenergy": 0.0702,
-      "Hydro": 0.4828,
-      "Solar": 0.1252,
-      "Wind": 0.3219
+      "Bioenergy": 0.0703,
+      "Hydro": 0.4821,
+      "Solar": 0.1253,
+      "Wind": 0.3223
     }
   },
   "North America": {
@@ -169,10 +169,10 @@
       "Wind": 0.3097
     },
     "2025": {
-      "Bioenergy": 0.0629,
-      "Hydro": 0.4378,
-      "Solar": 0.1695,
-      "Wind": 0.3299
+      "Bioenergy": 0.063,
+      "Hydro": 0.4377,
+      "Solar": 0.1696,
+      "Wind": 0.3298
     }
   },
   "Oceania": {
@@ -214,9 +214,9 @@
     },
     "2025": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.3495,
+      "Hydro": 0.3475,
       "Solar": 0.4001,
-      "Wind": 0.2399
+      "Wind": 0.2419
     }
   },
   "South America": {
@@ -257,10 +257,10 @@
       "Wind": 0.0847
     },
     "2025": {
-      "Bioenergy": 0.0055,
-      "Hydro": 0.8561,
-      "Solar": 0.0709,
-      "Wind": 0.0674
+      "Bioenergy": 0.0056,
+      "Hydro": 0.8521,
+      "Solar": 0.0729,
+      "Wind": 0.0694
     }
   }
 }

package/data/mix/continent-yearly.csv

@@ -4,40 +4,40 @@ Africa,2020,0.0071,0.0988,0.4348,0.3124,0.0032,0.1234,0.0014,0.011,0.0078
 Africa,2021,0.0071,0.0982,0.4352,0.3108,0.0033,0.1239,0.0014,0.0114,0.0087
 Africa,2022,0.0071,0.0958,0.4313,0.3113,0.0029,0.1288,0.0015,0.0121,0.0092
 Africa,2023,0.0071,0.0919,0.436,0.3109,0.0025,0.1267,0.0017,0.0135,0.0097
-Africa,2024,0.0071,0.093,0.4362,0.3095,0.0024,0.1254,0.0016,0.0144,0.0105
-Africa,2025,0.0071,0.0887,0.4336,0.3118,0.004,0.1264,0.0016,0.0158,0.0109
-Asia,2019,0.012,0.3561,0.3592,0.0886,0.024,0.1157,0.0072,0.018,0.0191
-Asia,2020,0.0128,0.3534,0.3561,0.0899,0.0241,0.1149,0.007,0.0206,0.0212
-Asia,2021,0.0139,0.36,0.3457,0.0857,0.0253,0.1112,0.0068,0.0239,0.0275
-Asia,2022,0.0146,0.3582,0.3391,0.0861,0.0257,0.1099,0.0067,0.0286,0.0311
-Asia,2023,0.0149,0.3646,0.3314,0.0806,0.0264,0.106,0.0066,0.0344,0.035
-Asia,2024,0.0147,0.3611,0.3234,0.0838,0.0268,0.1032,0.0065,0.0431,0.0375
-Asia,2025,0.0155,0.3608,0.3245,0.0663,0.0286,0.1063,0.0066,0.0483,0.0431
+Africa,2024,0.0071,0.0931,0.4362,0.3095,0.0024,0.1254,0.0016,0.0144,0.0104
+Africa,2025,0.0072,0.0882,0.4348,0.3128,0.0033,0.1269,0.0016,0.0149,0.0104
+Asia,2019,0.012,0.3559,0.3594,0.0885,0.024,0.1158,0.0072,0.018,0.0191
+Asia,2020,0.0128,0.3532,0.3563,0.0899,0.0241,0.1149,0.007,0.0206,0.0211
+Asia,2021,0.0139,0.3599,0.3459,0.0856,0.0253,0.1113,0.0068,0.0239,0.0275
+Asia,2022,0.0146,0.3581,0.3392,0.086,0.0257,0.1099,0.0067,0.0286,0.031
+Asia,2023,0.0149,0.3643,0.3317,0.0806,0.0264,0.1061,0.0066,0.0344,0.0351
+Asia,2024,0.0147,0.3604,0.3239,0.0837,0.0266,0.1034,0.0065,0.0431,0.0377
+Asia,2025,0.0154,0.358,0.3231,0.0667,0.0285,0.106,0.0066,0.0496,0.0459
 Europe,2019,0.0249,0.1768,0.2591,0.1918,0.199,0.0203,0.017,0.027,0.084
 Europe,2020,0.0264,0.1621,0.2451,0.2044,0.1931,0.0203,0.0179,0.0329,0.0977
 Europe,2021,0.0272,0.1676,0.2496,0.194,0.1959,0.0207,0.0174,0.0353,0.0924
-Europe,2022,0.0273,0.1662,0.2525,0.1843,0.1807,0.0207,0.018,0.0453,0.105
-Europe,2023,0.0254,0.1498,0.2379,0.1968,0.1788,0.0197,0.0182,0.0551,0.1182
-Europe,2024,0.0261,0.1417,0.2274,0.204,0.1768,0.0197,0.0179,0.0668,0.1196
-Europe,2025,0.0259,0.1557,0.2594,0.1784,0.177,0.0214,0.017,0.0462,0.1189
+Europe,2022,0.0273,0.1662,0.2526,0.1843,0.1807,0.0207,0.018,0.0453,0.105
+Europe,2023,0.0254,0.1498,0.2379,0.1968,0.1788,0.0198,0.0182,0.0551,0.1182
+Europe,2024,0.0261,0.1416,0.2275,0.204,0.1768,0.0197,0.0179,0.0668,0.1196
+Europe,2025,0.026,0.1548,0.2589,0.1781,0.1768,0.0231,0.017,0.0463,0.1191
 North America,2019,0.0221,0.1784,0.3258,0.1315,0.1421,0.1087,0.0068,0.0234,0.0613
 North America,2020,0.0219,0.1475,0.3417,0.1342,0.1414,0.1075,0.0069,0.0286,0.0702
 North America,2021,0.0215,0.1633,0.3295,0.1277,0.1366,0.1054,0.0068,0.0339,0.0754
 North America,2022,0.0206,0.1492,0.3382,0.1278,0.1323,0.1028,0.0067,0.0396,0.0829
 North America,2023,0.0204,0.1271,0.3645,0.1223,0.1381,0.0911,0.0069,0.0463,0.0835
 North America,2024,0.0198,0.12,0.3693,0.1185,0.1356,0.088,0.0065,0.0553,0.0869
-North America,2025,0.0195,0.137,0.3237,0.1359,0.1348,0.0876,0.0065,0.0526,0.1024
+North America,2025,0.0195,0.137,0.3236,0.1359,0.1348,0.0877,0.0065,0.0526,0.1024
 Oceania,2019,0.0047,0.4124,0.0953,0.1555,0,0.2054,0.0207,0.0528,0.0534
 Oceania,2020,0.0045,0.3994,0.0874,0.155,0,0.2069,0.0209,0.0642,0.0617
 Oceania,2021,0.0045,0.3867,0.0728,0.158,0,0.2068,0.0209,0.0789,0.0715
 Oceania,2022,0.0043,0.3584,0.0786,0.1627,0,0.204,0.0209,0.0917,0.0795
 Oceania,2023,0.0045,0.3505,0.068,0.159,0,0.2028,0.0203,0.1107,0.0844
 Oceania,2024,0.0048,0.3492,0.0711,0.1457,0,0.1993,0.0225,0.1203,0.087
-Oceania,2025,0.0039,0.3431,0.0635,0.1303,0,0.1979,0.0227,0.1491,0.0894
+Oceania,2025,0.0039,0.343,0.064,0.1293,0,0.1976,0.0235,0.1488,0.09
 South America,2019,0.0064,0.0228,0.1905,0.6308,0.0108,0.0999,0.0001,0.0073,0.0313
 South America,2020,0.007,0.0218,0.1879,0.6262,0.0108,0.1014,0.0001,0.0101,0.0346
 South America,2021,0.0061,0.0225,0.2051,0.5956,0.0108,0.1026,0.0002,0.0143,0.0429
 South America,2022,0.0059,0.0142,0.1833,0.6204,0.0096,0.0966,0.0002,0.022,0.0478
 South America,2023,0.0063,0.0131,0.1767,0.6131,0.01,0.0945,0.0002,0.0322,0.0539
-South America,2024,0.0068,0.0135,0.1763,0.5961,0.011,0.093,0.0001,0.0434,0.0598
-South America,2025,0.0039,0.0112,0.1707,0.6132,0.0106,0.0912,0.0001,0.0508,0.0483
+South America,2024,0.0068,0.0135,0.1762,0.5961,0.011,0.0931,0.0001,0.0434,0.0598
+South America,2025,0.004,0.0108,0.1699,0.6124,0.0107,0.0898,0.0001,0.0524,0.0498

package/data/mix/continent-yearly.json

@@ -57,104 +57,104 @@
     },
     "2024": {
       "Bioenergy": 0.0071,
-      "Coal": 0.093,
+      "Coal": 0.0931,
       "Gas": 0.4362,
       "Hydro": 0.3095,
       "Nuclear": 0.0024,
       "Other Fossil": 0.1254,
       "Other Renewables": 0.0016,
       "Solar": 0.0144,
-      "Wind": 0.0105
+      "Wind": 0.0104
     },
     "2025": {
-      "Bioenergy": 0.0071,
-      "Coal": 0.0887,
-      "Gas": 0.4336,
-      "Hydro": 0.3118,
-      "Nuclear": 0.004,
-      "Other Fossil": 0.1264,
+      "Bioenergy": 0.0072,
+      "Coal": 0.0882,
+      "Gas": 0.4348,
+      "Hydro": 0.3128,
+      "Nuclear": 0.0033,
+      "Other Fossil": 0.1269,
       "Other Renewables": 0.0016,
-      "Solar": 0.0158,
-      "Wind": 0.0109
+      "Solar": 0.0149,
+      "Wind": 0.0104
     }
   },
   "Asia": {
     "2019": {
       "Bioenergy": 0.012,
-      "Coal": 0.3561,
-      "Gas": 0.3592,
-      "Hydro": 0.0886,
+      "Coal": 0.3559,
+      "Gas": 0.3594,
+      "Hydro": 0.0885,
       "Nuclear": 0.024,
-      "Other Fossil": 0.1157,
+      "Other Fossil": 0.1158,
       "Other Renewables": 0.0072,
       "Solar": 0.018,
       "Wind": 0.0191
     },
     "2020": {
       "Bioenergy": 0.0128,
-      "Coal": 0.3534,
-      "Gas": 0.3561,
+      "Coal": 0.3532,
+      "Gas": 0.3563,
       "Hydro": 0.0899,
       "Nuclear": 0.0241,
       "Other Fossil": 0.1149,
       "Other Renewables": 0.007,
       "Solar": 0.0206,
-      "Wind": 0.0212
+      "Wind": 0.0211
     },
     "2021": {
       "Bioenergy": 0.0139,
-      "Coal": 0.36,
-      "Gas": 0.3457,
-      "Hydro": 0.0857,
+      "Coal": 0.3599,
+      "Gas": 0.3459,
+      "Hydro": 0.0856,
       "Nuclear": 0.0253,
-      "Other Fossil": 0.1112,
+      "Other Fossil": 0.1113,
       "Other Renewables": 0.0068,
       "Solar": 0.0239,
       "Wind": 0.0275
     },
     "2022": {
       "Bioenergy": 0.0146,
-      "Coal": 0.3582,
-      "Gas": 0.3391,
-      "Hydro": 0.0861,
+      "Coal": 0.3581,
+      "Gas": 0.3392,
+      "Hydro": 0.086,
       "Nuclear": 0.0257,
       "Other Fossil": 0.1099,
       "Other Renewables": 0.0067,
       "Solar": 0.0286,
-      "Wind": 0.0311
+      "Wind": 0.031
     },
     "2023": {
       "Bioenergy": 0.0149,
-      "Coal": 0.3646,
-      "Gas": 0.3314,
+      "Coal": 0.3643,
+      "Gas": 0.3317,
       "Hydro": 0.0806,
       "Nuclear": 0.0264,
-      "Other Fossil": 0.106,
+      "Other Fossil": 0.1061,
       "Other Renewables": 0.0066,
       "Solar": 0.0344,
-      "Wind": 0.035
+      "Wind": 0.0351
     },
     "2024": {
       "Bioenergy": 0.0147,
-      "Coal": 0.3611,
-      "Gas": 0.3234,
-      "Hydro": 0.0838,
-      "Nuclear": 0.0268,
-      "Other Fossil": 0.1032,
+      "Coal": 0.3604,
+      "Gas": 0.3239,
+      "Hydro": 0.0837,
+      "Nuclear": 0.0266,
+      "Other Fossil": 0.1034,
       "Other Renewables": 0.0065,
       "Solar": 0.0431,
-      "Wind": 0.0375
+      "Wind": 0.0377
     },
     "2025": {
-      "Bioenergy": 0.0155,
-      "Coal": 0.3608,
-      "Gas": 0.3245,
-      "Hydro": 0.0663,
-      "Nuclear": 0.0286,
-      "Other Fossil": 0.1063,
+      "Bioenergy": 0.0154,
+      "Coal": 0.358,
+      "Gas": 0.3231,
+      "Hydro": 0.0667,
+      "Nuclear": 0.0285,
+      "Other Fossil": 0.106,
       "Other Renewables": 0.0066,
-      "Solar": 0.0483,
-      "Wind": 0.0431
+      "Solar": 0.0496,
+      "Wind": 0.0459
     }
   },
   "Europe": {
@@ -194,7 +194,7 @@
     "2022": {
       "Bioenergy": 0.0273,
       "Coal": 0.1662,
-      "Gas": 0.2525,
+      "Gas": 0.2526,
       "Hydro": 0.1843,
       "Nuclear": 0.1807,
       "Other Fossil": 0.0207,
@@ -208,15 +208,15 @@
       "Gas": 0.2379,
       "Hydro": 0.1968,
       "Nuclear": 0.1788,
-      "Other Fossil": 0.0197,
+      "Other Fossil": 0.0198,
       "Other Renewables": 0.0182,
       "Solar": 0.0551,
       "Wind": 0.1182
     },
     "2024": {
       "Bioenergy": 0.0261,
-      "Coal": 0.1417,
-      "Gas": 0.2274,
+      "Coal": 0.1416,
+      "Gas": 0.2275,
       "Hydro": 0.204,
       "Nuclear": 0.1768,
       "Other Fossil": 0.0197,
@@ -225,15 +225,15 @@
       "Wind": 0.1196
     },
     "2025": {
-      "Bioenergy": 0.0259,
-      "Coal": 0.1557,
-      "Gas": 0.2594,
-      "Hydro": 0.1784,
-      "Nuclear": 0.177,
-      "Other Fossil": 0.0214,
+      "Bioenergy": 0.026,
+      "Coal": 0.1548,
+      "Gas": 0.2589,
+      "Hydro": 0.1781,
+      "Nuclear": 0.1768,
+      "Other Fossil": 0.0231,
       "Other Renewables": 0.017,
-      "Solar": 0.0462,
-      "Wind": 0.1189
+      "Solar": 0.0463,
+      "Wind": 0.1191
     }
   },
   "North America": {
@@ -306,10 +306,10 @@
     "2025": {
       "Bioenergy": 0.0195,
       "Coal": 0.137,
-      "Gas": 0.3237,
+      "Gas": 0.3236,
       "Hydro": 0.1359,
       "Nuclear": 0.1348,
-      "Other Fossil": 0.0876,
+      "Other Fossil": 0.0877,
       "Other Renewables": 0.0065,
       "Solar": 0.0526,
       "Wind": 0.1024
@@ -384,14 +384,14 @@
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Coal": 0.3431,
-      "Gas": 0.0635,
-      "Hydro": 0.1303,
+      "Coal": 0.343,
+      "Gas": 0.064,
+      "Hydro": 0.1293,
       "Nuclear": 0,
-      "Other Fossil": 0.1979,
-      "Other Renewables": 0.0227,
-      "Solar": 0.1491,
-      "Wind": 0.0894
+      "Other Fossil": 0.1976,
+      "Other Renewables": 0.0235,
+      "Solar": 0.1488,
+      "Wind": 0.09
     }
   },
   "South America": {
@@ -453,24 +453,24 @@
     "2024": {
       "Bioenergy": 0.0068,
       "Coal": 0.0135,
-      "Gas": 0.1763,
+      "Gas": 0.1762,
       "Hydro": 0.5961,
       "Nuclear": 0.011,
-      "Other Fossil": 0.093,
+      "Other Fossil": 0.0931,
       "Other Renewables": 0.0001,
       "Solar": 0.0434,
       "Wind": 0.0598
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.0112,
-      "Gas": 0.1707,
-      "Hydro": 0.6132,
-      "Nuclear": 0.0106,
-      "Other Fossil": 0.0912,
+      "Bioenergy": 0.004,
+      "Coal": 0.0108,
+      "Gas": 0.1699,
+      "Hydro": 0.6124,
+      "Nuclear": 0.0107,
+      "Other Fossil": 0.0898,
       "Other Renewables": 0.0001,
-      "Solar": 0.0508,
-      "Wind": 0.0483
+      "Solar": 0.0524,
+      "Wind": 0.0498
     }
   }
 }