@digital4better/data 1.2.8 → 1.2.10

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

@@ -4,29 +4,29 @@ Africa,2020,0.0071,0.0987,0.4348,0.3127,0.0032,0.1234,0.0014,0.0119,0.0068
 Africa,2021,0.0071,0.0981,0.4351,0.3111,0.0033,0.1239,0.0014,0.0125,0.0074
 Africa,2022,0.0071,0.0958,0.4314,0.3114,0.0029,0.1289,0.0015,0.0133,0.0078
 Africa,2023,0.0071,0.0922,0.4338,0.3126,0.0025,0.1271,0.0017,0.0146,0.0085
-Africa,2024,0.0071,0.0931,0.4333,0.3121,0.0024,0.1259,0.0016,0.0155,0.0091
-Africa,2025,0.0071,0.0911,0.4341,0.3122,0.0024,0.1258,0.0017,0.0165,0.0092
+Africa,2024,0.0071,0.0935,0.4333,0.3119,0.0024,0.1259,0.0016,0.0154,0.009
+Africa,2025,0.0071,0.0917,0.4344,0.3119,0.0024,0.1257,0.0017,0.0164,0.0088
 Asia,2019,0.0115,0.3609,0.3624,0.0924,0.0224,0.1085,0.0068,0.0173,0.0178
-Asia,2020,0.0123,0.3579,0.3599,0.0935,0.0226,0.1078,0.0065,0.0197,0.0198
-Asia,2021,0.0133,0.3642,0.3499,0.0894,0.0237,0.1046,0.0064,0.0227,0.0258
-Asia,2022,0.014,0.3626,0.3435,0.0897,0.0241,0.1034,0.0063,0.0271,0.0292
-Asia,2023,0.0143,0.3685,0.3363,0.0845,0.0249,0.1,0.0062,0.0325,0.0329
-Asia,2024,0.014,0.365,0.3289,0.0874,0.0252,0.0973,0.0061,0.0412,0.035
-Asia,2025,0.0146,0.3786,0.3226,0.0761,0.0269,0.0953,0.006,0.0407,0.0391
+Asia,2020,0.0123,0.358,0.3599,0.0935,0.0226,0.1078,0.0065,0.0197,0.0198
+Asia,2021,0.0133,0.3643,0.3499,0.0893,0.0237,0.1046,0.0064,0.0227,0.0258
+Asia,2022,0.014,0.3627,0.3436,0.0896,0.0241,0.1034,0.0063,0.0271,0.0292
+Asia,2023,0.0143,0.3685,0.3363,0.0844,0.0249,0.1,0.0062,0.0325,0.0329
+Asia,2024,0.0141,0.3651,0.3285,0.0874,0.0252,0.0975,0.0061,0.041,0.0351
+Asia,2025,0.0152,0.3798,0.3194,0.0753,0.0272,0.097,0.006,0.0397,0.0404
 Europe,2019,0.0249,0.1769,0.2591,0.1918,0.1991,0.0203,0.017,0.027,0.084
 Europe,2020,0.0264,0.1621,0.2451,0.2045,0.1931,0.0203,0.0179,0.0328,0.0977
 Europe,2021,0.0272,0.1676,0.2496,0.194,0.1959,0.0207,0.0174,0.0352,0.0924
-Europe,2022,0.0272,0.1662,0.2525,0.1842,0.1807,0.0208,0.018,0.0454,0.1048
-Europe,2023,0.0254,0.1498,0.2376,0.1967,0.1787,0.0199,0.0182,0.0557,0.1181
-Europe,2024,0.026,0.1416,0.2262,0.2058,0.1759,0.0198,0.018,0.0684,0.1183
-Europe,2025,0.0254,0.1564,0.2533,0.1838,0.1759,0.0206,0.0176,0.0323,0.1346
+Europe,2022,0.0273,0.1662,0.2526,0.1843,0.1807,0.0209,0.018,0.0452,0.1049
+Europe,2023,0.0254,0.1499,0.2379,0.1968,0.1789,0.0198,0.0182,0.055,0.1181
+Europe,2024,0.0262,0.141,0.2258,0.2053,0.1768,0.0196,0.018,0.067,0.1203
+Europe,2025,0.0262,0.147,0.2492,0.1839,0.1879,0.0206,0.0166,0.0272,0.1413
 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.1076,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.1203,0.3709,0.1166,0.1359,0.0875,0.0065,0.0553,0.0872
-North America,2025,0.0201,0.1368,0.354,0.1133,0.1495,0.0843,0.0065,0.0401,0.0953
+North America,2024,0.0198,0.1202,0.3698,0.1177,0.1356,0.0879,0.0065,0.0553,0.0871
+North America,2025,0.0187,0.1621,0.3434,0.1131,0.1396,0.0826,0.006,0.0427,0.0916
 Oceania,2019,0.0047,0.4123,0.0953,0.1555,0,0.2053,0.0207,0.0528,0.0535
 Oceania,2020,0.0045,0.3993,0.0875,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.0208,0.0789,0.0716
@@ -39,5 +39,5 @@ 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.1764,0.596,0.011,0.0931,0.0001,0.0434,0.0598
-South America,2025,0.0049,0.0127,0.1691,0.5951,0.0072,0.0932,0.0001,0.0542,0.0636
+South America,2024,0.0068,0.0135,0.1763,0.596,0.011,0.0931,0.0001,0.0434,0.0598
+South America,2025,0.0042,0.0093,0.1624,0.6242,0.0098,0.0914,0.0001,0.0539,0.0448

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

@@ -32,15 +32,15 @@
     },
     "2024": {
       "Bioenergy": 0.0206,
-      "Hydro": 0.9079,
-      "Solar": 0.045,
-      "Wind": 0.0266
+      "Hydro": 0.9084,
+      "Solar": 0.0447,
+      "Wind": 0.0263
     },
     "2025": {
       "Bioenergy": 0.0205,
-      "Hydro": 0.9049,
-      "Solar": 0.0479,
-      "Wind": 0.0268
+      "Hydro": 0.9064,
+      "Solar": 0.0475,
+      "Wind": 0.0256
     }
   },
   "Asia": {
@@ -58,33 +58,33 @@
     },
     "2021": {
       "Bioenergy": 0.088,
-      "Hydro": 0.5912,
-      "Solar": 0.1502,
-      "Wind": 0.1706
+      "Hydro": 0.591,
+      "Solar": 0.1503,
+      "Wind": 0.1707
     },
     "2022": {
       "Bioenergy": 0.0876,
-      "Hydro": 0.5607,
-      "Solar": 0.1696,
-      "Wind": 0.1822
+      "Hydro": 0.5604,
+      "Solar": 0.1697,
+      "Wind": 0.1823
     },
     "2023": {
-      "Bioenergy": 0.087,
-      "Hydro": 0.5148,
-      "Solar": 0.1977,
-      "Wind": 0.2004
+      "Bioenergy": 0.0871,
+      "Hydro": 0.5146,
+      "Solar": 0.1978,
+      "Wind": 0.2005
     },
     "2024": {
-      "Bioenergy": 0.0788,
-      "Hydro": 0.4924,
-      "Solar": 0.2318,
-      "Wind": 0.197
+      "Bioenergy": 0.0792,
+      "Hydro": 0.492,
+      "Solar": 0.2308,
+      "Wind": 0.1979
     },
     "2025": {
-      "Bioenergy": 0.0856,
-      "Hydro": 0.4465,
-      "Solar": 0.2386,
-      "Wind": 0.2294
+      "Bioenergy": 0.0889,
+      "Hydro": 0.4413,
+      "Solar": 0.2329,
+      "Wind": 0.237
     }
   },
   "Europe": {
@@ -107,28 +107,28 @@
       "Wind": 0.265
     },
     "2022": {
-      "Bioenergy": 0.0753,
-      "Hydro": 0.5093,
-      "Solar": 0.1256,
-      "Wind": 0.2898
+      "Bioenergy": 0.0754,
+      "Hydro": 0.5095,
+      "Solar": 0.1251,
+      "Wind": 0.29
     },
     "2023": {
-      "Bioenergy": 0.0641,
-      "Hydro": 0.497,
-      "Solar": 0.1406,
-      "Wind": 0.2983
+      "Bioenergy": 0.0643,
+      "Hydro": 0.4978,
+      "Solar": 0.1391,
+      "Wind": 0.2988
     },
     "2024": {
-      "Bioenergy": 0.0622,
-      "Hydro": 0.4917,
-      "Solar": 0.1635,
-      "Wind": 0.2826
+      "Bioenergy": 0.0625,
+      "Hydro": 0.4902,
+      "Solar": 0.16,
+      "Wind": 0.2873
     },
     "2025": {
-      "Bioenergy": 0.0674,
-      "Hydro": 0.4888,
-      "Solar": 0.0859,
-      "Wind": 0.3579
+      "Bioenergy": 0.0691,
+      "Hydro": 0.4858,
+      "Solar": 0.0718,
+      "Wind": 0.3733
     }
   },
   "North America": {
@@ -163,16 +163,16 @@
       "Wind": 0.3064
     },
     "2024": {
-      "Bioenergy": 0.071,
-      "Hydro": 0.4181,
-      "Solar": 0.1982,
-      "Wind": 0.3127
+      "Bioenergy": 0.0707,
+      "Hydro": 0.4205,
+      "Solar": 0.1977,
+      "Wind": 0.311
     },
     "2025": {
-      "Bioenergy": 0.0747,
-      "Hydro": 0.4217,
-      "Solar": 0.1492,
-      "Wind": 0.3545
+      "Bioenergy": 0.0703,
+      "Hydro": 0.4251,
+      "Solar": 0.1604,
+      "Wind": 0.3442
     }
   },
   "Oceania": {
@@ -257,10 +257,10 @@
       "Wind": 0.0847
     },
     "2025": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.8291,
-      "Solar": 0.0755,
-      "Wind": 0.0886
+      "Bioenergy": 0.0058,
+      "Hydro": 0.8585,
+      "Solar": 0.0741,
+      "Wind": 0.0617
     }
   }
 }

package/data/mix/continent-yearly.csv

@@ -4,29 +4,29 @@ Africa,2020,0.0071,0.0987,0.4348,0.3127,0.0032,0.1234,0.0014,0.0119,0.0068
 Africa,2021,0.0071,0.0981,0.4351,0.3111,0.0033,0.1239,0.0014,0.0125,0.0074
 Africa,2022,0.0071,0.0958,0.4314,0.3114,0.0029,0.1289,0.0015,0.0133,0.0078
 Africa,2023,0.0071,0.0922,0.4338,0.3126,0.0025,0.1271,0.0017,0.0146,0.0085
-Africa,2024,0.0071,0.0931,0.4333,0.3121,0.0024,0.1259,0.0016,0.0155,0.0091
-Africa,2025,0.0071,0.0911,0.4341,0.3122,0.0024,0.1258,0.0017,0.0165,0.0092
+Africa,2024,0.0071,0.0935,0.4333,0.3119,0.0024,0.1259,0.0016,0.0154,0.009
+Africa,2025,0.0071,0.0917,0.4344,0.3119,0.0024,0.1257,0.0017,0.0164,0.0088
 Asia,2019,0.0115,0.3609,0.3624,0.0924,0.0224,0.1085,0.0068,0.0173,0.0178
-Asia,2020,0.0123,0.3579,0.3599,0.0935,0.0226,0.1078,0.0065,0.0197,0.0198
-Asia,2021,0.0133,0.3642,0.3499,0.0894,0.0237,0.1046,0.0064,0.0227,0.0258
-Asia,2022,0.014,0.3626,0.3435,0.0897,0.0241,0.1034,0.0063,0.0271,0.0292
-Asia,2023,0.0143,0.3685,0.3363,0.0845,0.0249,0.1,0.0062,0.0325,0.0329
-Asia,2024,0.014,0.365,0.3289,0.0874,0.0252,0.0973,0.0061,0.0412,0.035
-Asia,2025,0.0146,0.3786,0.3226,0.0761,0.0269,0.0953,0.006,0.0407,0.0391
+Asia,2020,0.0123,0.358,0.3599,0.0935,0.0226,0.1078,0.0065,0.0197,0.0198
+Asia,2021,0.0133,0.3643,0.3499,0.0893,0.0237,0.1046,0.0064,0.0227,0.0258
+Asia,2022,0.014,0.3627,0.3436,0.0896,0.0241,0.1034,0.0063,0.0271,0.0292
+Asia,2023,0.0143,0.3685,0.3363,0.0844,0.0249,0.1,0.0062,0.0325,0.0329
+Asia,2024,0.0141,0.3651,0.3285,0.0874,0.0252,0.0975,0.0061,0.041,0.0351
+Asia,2025,0.0152,0.3798,0.3194,0.0753,0.0272,0.097,0.006,0.0397,0.0404
 Europe,2019,0.0249,0.1769,0.2591,0.1918,0.1991,0.0203,0.017,0.027,0.084
 Europe,2020,0.0264,0.1621,0.2451,0.2045,0.1931,0.0203,0.0179,0.0328,0.0977
 Europe,2021,0.0272,0.1676,0.2496,0.194,0.1959,0.0207,0.0174,0.0352,0.0924
-Europe,2022,0.0272,0.1662,0.2525,0.1842,0.1807,0.0208,0.018,0.0454,0.1048
-Europe,2023,0.0254,0.1498,0.2376,0.1967,0.1787,0.0199,0.0182,0.0557,0.1181
-Europe,2024,0.026,0.1416,0.2262,0.2058,0.1759,0.0198,0.018,0.0684,0.1183
-Europe,2025,0.0254,0.1564,0.2533,0.1838,0.1759,0.0206,0.0176,0.0323,0.1346
+Europe,2022,0.0273,0.1662,0.2526,0.1843,0.1807,0.0209,0.018,0.0452,0.1049
+Europe,2023,0.0254,0.1499,0.2379,0.1968,0.1789,0.0198,0.0182,0.055,0.1181
+Europe,2024,0.0262,0.141,0.2258,0.2053,0.1768,0.0196,0.018,0.067,0.1203
+Europe,2025,0.0262,0.147,0.2492,0.1839,0.1879,0.0206,0.0166,0.0272,0.1413
 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.1076,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.1203,0.3709,0.1166,0.1359,0.0875,0.0065,0.0553,0.0872
-North America,2025,0.0201,0.1368,0.354,0.1133,0.1495,0.0843,0.0065,0.0401,0.0953
+North America,2024,0.0198,0.1202,0.3698,0.1177,0.1356,0.0879,0.0065,0.0553,0.0871
+North America,2025,0.0187,0.1621,0.3434,0.1131,0.1396,0.0826,0.006,0.0427,0.0916
 Oceania,2019,0.0047,0.4123,0.0953,0.1555,0,0.2053,0.0207,0.0528,0.0535
 Oceania,2020,0.0045,0.3993,0.0875,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.0208,0.0789,0.0716
@@ -39,5 +39,5 @@ 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.1764,0.596,0.011,0.0931,0.0001,0.0434,0.0598
-South America,2025,0.0049,0.0127,0.1691,0.5951,0.0072,0.0932,0.0001,0.0542,0.0636
+South America,2024,0.0068,0.0135,0.1763,0.596,0.011,0.0931,0.0001,0.0434,0.0598
+South America,2025,0.0042,0.0093,0.1624,0.6242,0.0098,0.0914,0.0001,0.0539,0.0448

package/data/mix/continent-yearly.json

@@ -57,25 +57,25 @@
     },
     "2024": {
       "Bioenergy": 0.0071,
-      "Coal": 0.0931,
+      "Coal": 0.0935,
       "Gas": 0.4333,
-      "Hydro": 0.3121,
+      "Hydro": 0.3119,
       "Nuclear": 0.0024,
       "Other Fossil": 0.1259,
       "Other Renewables": 0.0016,
-      "Solar": 0.0155,
-      "Wind": 0.0091
+      "Solar": 0.0154,
+      "Wind": 0.009
     },
     "2025": {
       "Bioenergy": 0.0071,
-      "Coal": 0.0911,
-      "Gas": 0.4341,
-      "Hydro": 0.3122,
+      "Coal": 0.0917,
+      "Gas": 0.4344,
+      "Hydro": 0.3119,
       "Nuclear": 0.0024,
-      "Other Fossil": 0.1258,
+      "Other Fossil": 0.1257,
       "Other Renewables": 0.0017,
-      "Solar": 0.0165,
-      "Wind": 0.0092
+      "Solar": 0.0164,
+      "Wind": 0.0088
     }
   },
   "Asia": {
@@ -92,7 +92,7 @@
     },
     "2020": {
       "Bioenergy": 0.0123,
-      "Coal": 0.3579,
+      "Coal": 0.358,
       "Gas": 0.3599,
       "Hydro": 0.0935,
       "Nuclear": 0.0226,
@@ -103,9 +103,9 @@
     },
     "2021": {
       "Bioenergy": 0.0133,
-      "Coal": 0.3642,
+      "Coal": 0.3643,
       "Gas": 0.3499,
-      "Hydro": 0.0894,
+      "Hydro": 0.0893,
       "Nuclear": 0.0237,
       "Other Fossil": 0.1046,
       "Other Renewables": 0.0064,
@@ -114,9 +114,9 @@
     },
     "2022": {
       "Bioenergy": 0.014,
-      "Coal": 0.3626,
-      "Gas": 0.3435,
-      "Hydro": 0.0897,
+      "Coal": 0.3627,
+      "Gas": 0.3436,
+      "Hydro": 0.0896,
       "Nuclear": 0.0241,
       "Other Fossil": 0.1034,
       "Other Renewables": 0.0063,
@@ -127,7 +127,7 @@
       "Bioenergy": 0.0143,
       "Coal": 0.3685,
       "Gas": 0.3363,
-      "Hydro": 0.0845,
+      "Hydro": 0.0844,
       "Nuclear": 0.0249,
       "Other Fossil": 0.1,
       "Other Renewables": 0.0062,
@@ -135,26 +135,26 @@
       "Wind": 0.0329
     },
     "2024": {
-      "Bioenergy": 0.014,
-      "Coal": 0.365,
-      "Gas": 0.3289,
+      "Bioenergy": 0.0141,
+      "Coal": 0.3651,
+      "Gas": 0.3285,
       "Hydro": 0.0874,
       "Nuclear": 0.0252,
-      "Other Fossil": 0.0973,
+      "Other Fossil": 0.0975,
       "Other Renewables": 0.0061,
-      "Solar": 0.0412,
-      "Wind": 0.035
+      "Solar": 0.041,
+      "Wind": 0.0351
     },
     "2025": {
-      "Bioenergy": 0.0146,
-      "Coal": 0.3786,
-      "Gas": 0.3226,
-      "Hydro": 0.0761,
-      "Nuclear": 0.0269,
-      "Other Fossil": 0.0953,
+      "Bioenergy": 0.0152,
+      "Coal": 0.3798,
+      "Gas": 0.3194,
+      "Hydro": 0.0753,
+      "Nuclear": 0.0272,
+      "Other Fossil": 0.097,
       "Other Renewables": 0.006,
-      "Solar": 0.0407,
-      "Wind": 0.0391
+      "Solar": 0.0397,
+      "Wind": 0.0404
     }
   },
   "Europe": {
@@ -192,48 +192,48 @@
       "Wind": 0.0924
     },
     "2022": {
-      "Bioenergy": 0.0272,
+      "Bioenergy": 0.0273,
       "Coal": 0.1662,
-      "Gas": 0.2525,
-      "Hydro": 0.1842,
+      "Gas": 0.2526,
+      "Hydro": 0.1843,
       "Nuclear": 0.1807,
-      "Other Fossil": 0.0208,
+      "Other Fossil": 0.0209,
       "Other Renewables": 0.018,
-      "Solar": 0.0454,
-      "Wind": 0.1048
+      "Solar": 0.0452,
+      "Wind": 0.1049
     },
     "2023": {
       "Bioenergy": 0.0254,
-      "Coal": 0.1498,
-      "Gas": 0.2376,
-      "Hydro": 0.1967,
-      "Nuclear": 0.1787,
-      "Other Fossil": 0.0199,
+      "Coal": 0.1499,
+      "Gas": 0.2379,
+      "Hydro": 0.1968,
+      "Nuclear": 0.1789,
+      "Other Fossil": 0.0198,
       "Other Renewables": 0.0182,
-      "Solar": 0.0557,
+      "Solar": 0.055,
       "Wind": 0.1181
     },
     "2024": {
-      "Bioenergy": 0.026,
-      "Coal": 0.1416,
-      "Gas": 0.2262,
-      "Hydro": 0.2058,
-      "Nuclear": 0.1759,
-      "Other Fossil": 0.0198,
+      "Bioenergy": 0.0262,
+      "Coal": 0.141,
+      "Gas": 0.2258,
+      "Hydro": 0.2053,
+      "Nuclear": 0.1768,
+      "Other Fossil": 0.0196,
       "Other Renewables": 0.018,
-      "Solar": 0.0684,
-      "Wind": 0.1183
+      "Solar": 0.067,
+      "Wind": 0.1203
     },
     "2025": {
-      "Bioenergy": 0.0254,
-      "Coal": 0.1564,
-      "Gas": 0.2533,
-      "Hydro": 0.1838,
-      "Nuclear": 0.1759,
+      "Bioenergy": 0.0262,
+      "Coal": 0.147,
+      "Gas": 0.2492,
+      "Hydro": 0.1839,
+      "Nuclear": 0.1879,
       "Other Fossil": 0.0206,
-      "Other Renewables": 0.0176,
-      "Solar": 0.0323,
-      "Wind": 0.1346
+      "Other Renewables": 0.0166,
+      "Solar": 0.0272,
+      "Wind": 0.1413
     }
   },
   "North America": {
@@ -294,25 +294,25 @@
     },
     "2024": {
       "Bioenergy": 0.0198,
-      "Coal": 0.1203,
-      "Gas": 0.3709,
-      "Hydro": 0.1166,
-      "Nuclear": 0.1359,
-      "Other Fossil": 0.0875,
+      "Coal": 0.1202,
+      "Gas": 0.3698,
+      "Hydro": 0.1177,
+      "Nuclear": 0.1356,
+      "Other Fossil": 0.0879,
       "Other Renewables": 0.0065,
       "Solar": 0.0553,
-      "Wind": 0.0872
+      "Wind": 0.0871
     },
     "2025": {
-      "Bioenergy": 0.0201,
-      "Coal": 0.1368,
-      "Gas": 0.354,
-      "Hydro": 0.1133,
-      "Nuclear": 0.1495,
-      "Other Fossil": 0.0843,
-      "Other Renewables": 0.0065,
-      "Solar": 0.0401,
-      "Wind": 0.0953
+      "Bioenergy": 0.0187,
+      "Coal": 0.1621,
+      "Gas": 0.3434,
+      "Hydro": 0.1131,
+      "Nuclear": 0.1396,
+      "Other Fossil": 0.0826,
+      "Other Renewables": 0.006,
+      "Solar": 0.0427,
+      "Wind": 0.0916
     }
   },
   "Oceania": {
@@ -453,7 +453,7 @@
     "2024": {
       "Bioenergy": 0.0068,
       "Coal": 0.0135,
-      "Gas": 0.1764,
+      "Gas": 0.1763,
       "Hydro": 0.596,
       "Nuclear": 0.011,
       "Other Fossil": 0.0931,
@@ -462,15 +462,15 @@
       "Wind": 0.0598
     },
     "2025": {
-      "Bioenergy": 0.0049,
-      "Coal": 0.0127,
-      "Gas": 0.1691,
-      "Hydro": 0.5951,
-      "Nuclear": 0.0072,
-      "Other Fossil": 0.0932,
+      "Bioenergy": 0.0042,
+      "Coal": 0.0093,
+      "Gas": 0.1624,
+      "Hydro": 0.6242,
+      "Nuclear": 0.0098,
+      "Other Fossil": 0.0914,
       "Other Renewables": 0.0001,
-      "Solar": 0.0542,
-      "Wind": 0.0636
+      "Solar": 0.0539,
+      "Wind": 0.0448
     }
   }
 }