@digital4better/data 1.3.43 → 1.3.45

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

@@ -1,36 +1,36 @@
 continent,year,Bioenergy,Coal,Gas,Hydro,Nuclear,Other Fossil,Other Renewables,Solar,Wind
-Africa,2019,0.0062,0.0956,0.4602,0.2954,0.0035,0.1196,0.0014,0.0097,0.0085
+Africa,2019,0.0062,0.0957,0.4601,0.2953,0.0035,0.1196,0.0014,0.0097,0.0085
 Africa,2020,0.0065,0.0988,0.4351,0.3126,0.0032,0.1235,0.0014,0.011,0.0079
-Africa,2021,0.0065,0.0982,0.4355,0.311,0.0033,0.1241,0.0014,0.0114,0.0087
+Africa,2021,0.0065,0.0983,0.4355,0.311,0.0033,0.1241,0.0014,0.0114,0.0087
 Africa,2022,0.0065,0.096,0.4316,0.3114,0.0029,0.129,0.0015,0.0119,0.0092
-Africa,2023,0.0065,0.0924,0.4362,0.311,0.0025,0.1268,0.0017,0.0131,0.0097
-Africa,2024,0.0065,0.0937,0.4367,0.3096,0.0024,0.1254,0.0016,0.0138,0.0104
-Africa,2025,0.0065,0.091,0.437,0.3101,0.0028,0.1253,0.0017,0.0144,0.0112
-Africa,2026,0.0066,0.0848,0.4376,0.3135,0.0041,0.1259,0.0019,0.0149,0.0106
-Asia,2019,0.012,0.3544,0.3592,0.0916,0.0238,0.1155,0.0068,0.0179,0.0188
+Africa,2023,0.0065,0.0923,0.4362,0.3111,0.0025,0.1269,0.0017,0.0131,0.0097
+Africa,2024,0.0065,0.0936,0.4367,0.3096,0.0023,0.1255,0.0016,0.0138,0.0104
+Africa,2025,0.0065,0.0909,0.437,0.3103,0.0028,0.1254,0.0017,0.0144,0.011
+Africa,2026,0.0066,0.0849,0.438,0.3139,0.0041,0.1261,0.0018,0.0148,0.0099
+Asia,2019,0.012,0.3543,0.3592,0.0916,0.0238,0.1155,0.0068,0.0179,0.0188
 Asia,2020,0.0128,0.3517,0.3561,0.093,0.024,0.1144,0.0068,0.0204,0.0208
 Asia,2021,0.0139,0.3584,0.3458,0.0887,0.0252,0.1108,0.0066,0.0237,0.027
 Asia,2022,0.0146,0.3566,0.3392,0.089,0.0255,0.1094,0.0065,0.0285,0.0306
-Asia,2023,0.0151,0.3626,0.3318,0.0835,0.0263,0.1056,0.0064,0.0342,0.0346
-Asia,2024,0.0149,0.3586,0.3241,0.0865,0.0265,0.1029,0.0062,0.0429,0.0373
-Asia,2025,0.015,0.3485,0.3173,0.0873,0.0271,0.101,0.0061,0.0556,0.042
-Asia,2026,0.0159,0.351,0.3215,0.0743,0.0253,0.1014,0.0062,0.0596,0.0447
-Europe,2019,0.0249,0.1774,0.2581,0.1922,0.1988,0.0197,0.0181,0.027,0.0838
-Europe,2020,0.0264,0.1628,0.244,0.2048,0.1928,0.0196,0.0191,0.033,0.0975
-Europe,2021,0.0273,0.168,0.2488,0.1944,0.1954,0.0199,0.0185,0.0356,0.0922
-Europe,2022,0.0275,0.1654,0.2523,0.1844,0.1803,0.0204,0.0191,0.046,0.1047
-Europe,2023,0.0254,0.1482,0.2377,0.1971,0.1785,0.0192,0.0193,0.0565,0.1181
-Europe,2024,0.0259,0.1386,0.2279,0.2044,0.1762,0.0196,0.019,0.0682,0.1201
-Europe,2025,0.0257,0.1359,0.2345,0.1893,0.1751,0.0195,0.0189,0.0829,0.1182
-Europe,2026,0.0266,0.1418,0.2435,0.1866,0.169,0.0204,0.0176,0.0581,0.1363
-North America,2019,0.0212,0.1786,0.327,0.1315,0.1421,0.108,0.0068,0.0234,0.0613
-North America,2020,0.021,0.1489,0.3384,0.1343,0.1415,0.1101,0.0069,0.0286,0.0702
+Asia,2023,0.015,0.3627,0.3318,0.0835,0.0263,0.1056,0.0064,0.0342,0.0346
+Asia,2024,0.015,0.3579,0.3246,0.0866,0.0265,0.1029,0.0062,0.0429,0.0373
+Asia,2025,0.0149,0.3486,0.3173,0.0873,0.0271,0.101,0.0061,0.0556,0.042
+Asia,2026,0.0152,0.3497,0.3227,0.0748,0.0255,0.1018,0.0062,0.0592,0.0448
+Europe,2019,0.0248,0.1773,0.258,0.1924,0.1987,0.0197,0.0181,0.0271,0.0838
+Europe,2020,0.0264,0.1627,0.2439,0.205,0.1928,0.0196,0.0191,0.033,0.0975
+Europe,2021,0.0273,0.1679,0.2488,0.1945,0.1953,0.0199,0.0185,0.0357,0.0922
+Europe,2022,0.0275,0.1653,0.2522,0.1846,0.1802,0.0204,0.0191,0.0461,0.1047
+Europe,2023,0.0254,0.148,0.2374,0.1973,0.1785,0.0193,0.0193,0.0566,0.1181
+Europe,2024,0.0259,0.1384,0.2275,0.2047,0.1761,0.0199,0.019,0.0684,0.1201
+Europe,2025,0.0257,0.1358,0.2342,0.1893,0.1751,0.0198,0.0189,0.083,0.1182
+Europe,2026,0.0267,0.1394,0.2402,0.1895,0.1675,0.0202,0.0178,0.0653,0.1334
+North America,2019,0.0213,0.1786,0.3269,0.1315,0.1421,0.1079,0.0068,0.0234,0.0613
+North America,2020,0.0211,0.1489,0.3384,0.1343,0.1415,0.1101,0.0069,0.0286,0.0702
 North America,2021,0.0208,0.1652,0.3256,0.1277,0.1367,0.1079,0.0068,0.034,0.0755
-North America,2022,0.0199,0.151,0.3383,0.1279,0.1324,0.1012,0.0067,0.0396,0.0829
-North America,2023,0.0196,0.1271,0.3671,0.1224,0.1382,0.0889,0.0069,0.0463,0.0835
-North America,2024,0.0191,0.1205,0.3705,0.1187,0.1357,0.0866,0.0065,0.0554,0.087
-North America,2025,0.0187,0.1304,0.3539,0.1184,0.1328,0.0844,0.0064,0.0675,0.0876
-North America,2026,0.0193,0.116,0.3187,0.1431,0.1326,0.0896,0.0066,0.0659,0.1082
+North America,2022,0.0198,0.151,0.3384,0.1279,0.1324,0.1012,0.0067,0.0396,0.0829
+North America,2023,0.0194,0.1269,0.3677,0.1231,0.138,0.0888,0.0069,0.0464,0.0828
+North America,2024,0.019,0.1188,0.3723,0.1191,0.1356,0.0865,0.0065,0.0556,0.0865
+North America,2025,0.0186,0.1288,0.3552,0.1186,0.1328,0.0844,0.0064,0.0676,0.0876
+North America,2026,0.0189,0.1145,0.3277,0.1388,0.1314,0.0895,0.0066,0.0679,0.1047
 Oceania,2019,0.0047,0.4124,0.0952,0.1555,0,0.2054,0.0207,0.0528,0.0534
 Oceania,2020,0.0045,0.3993,0.0874,0.1549,0,0.2069,0.0209,0.0642,0.0617
 Oceania,2021,0.0045,0.3865,0.0728,0.158,0,0.2068,0.0209,0.0791,0.0715
@@ -38,12 +38,12 @@ Oceania,2022,0.0043,0.3584,0.0786,0.1627,0,0.2039,0.0209,0.0917,0.0795
 Oceania,2023,0.0045,0.3504,0.0676,0.1592,0,0.203,0.0203,0.1109,0.0842
 Oceania,2024,0.0048,0.3492,0.0711,0.1457,0,0.1994,0.0225,0.1204,0.087
 Oceania,2025,0.0043,0.3324,0.0644,0.1436,0,0.1973,0.0235,0.1331,0.1013
-Oceania,2026,0.0052,0.3282,0.0505,0.1416,0,0.1967,0.024,0.1574,0.0964
+Oceania,2026,0.0051,0.324,0.0514,0.1416,0,0.1991,0.0244,0.1553,0.0991
 South America,2019,0.0265,0.0222,0.1941,0.6123,0.0105,0.0969,0.0001,0.0071,0.0304
 South America,2020,0.0285,0.0212,0.1917,0.6066,0.0105,0.0981,0.0001,0.0098,0.0335
 South America,2021,0.0275,0.0218,0.2023,0.5813,0.0106,0.1006,0.0001,0.014,0.0419
 South America,2022,0.0262,0.0137,0.1813,0.6064,0.0093,0.0946,0.0002,0.0215,0.0467
-South America,2023,0.0269,0.013,0.1751,0.5985,0.0098,0.0925,0.0002,0.0315,0.0527
-South America,2024,0.0269,0.0133,0.1767,0.5808,0.0107,0.0908,0.0001,0.0425,0.0583
-South America,2025,0.0257,0.0128,0.1746,0.5727,0.0108,0.0888,0.0001,0.0514,0.063
-South America,2026,0.0204,0.0144,0.1759,0.5862,0.0076,0.0901,0.0001,0.0584,0.0469
+South America,2023,0.0269,0.0129,0.1751,0.5985,0.0098,0.0925,0.0002,0.0315,0.0527
+South America,2024,0.0269,0.0134,0.1766,0.5808,0.0107,0.0907,0.0001,0.0425,0.0583
+South America,2025,0.0257,0.0124,0.1751,0.5727,0.0108,0.0888,0.0001,0.0514,0.063
+South America,2026,0.0205,0.0119,0.1778,0.5864,0.0076,0.0895,0,0.0571,0.0492

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

@@ -2,8 +2,8 @@
   "Africa": {
     "2019": {
       "Bioenergy": 0.0193,
-      "Hydro": 0.9238,
-      "Solar": 0.0304,
+      "Hydro": 0.9237,
+      "Solar": 0.0305,
       "Wind": 0.0265
     },
     "2020": {
@@ -14,7 +14,7 @@
     },
     "2021": {
       "Bioenergy": 0.0192,
-      "Hydro": 0.9215,
+      "Hydro": 0.9214,
       "Solar": 0.0336,
       "Wind": 0.0257
     },
@@ -38,15 +38,15 @@
     },
     "2025": {
       "Bioenergy": 0.019,
-      "Hydro": 0.9064,
+      "Hydro": 0.9068,
       "Solar": 0.042,
-      "Wind": 0.0326
+      "Wind": 0.0322
     },
     "2026": {
-      "Bioenergy": 0.0191,
-      "Hydro": 0.907,
-      "Solar": 0.0432,
-      "Wind": 0.0307
+      "Bioenergy": 0.0192,
+      "Hydro": 0.9095,
+      "Solar": 0.0428,
+      "Wind": 0.0286
     }
   },
   "Asia": {
@@ -66,7 +66,7 @@
       "Bioenergy": 0.0905,
       "Hydro": 0.5789,
       "Solar": 0.1546,
-      "Wind": 0.1761
+      "Wind": 0.176
     },
     "2022": {
       "Bioenergy": 0.0899,
@@ -75,92 +75,92 @@
       "Wind": 0.1881
     },
     "2023": {
-      "Bioenergy": 0.0901,
-      "Hydro": 0.499,
+      "Bioenergy": 0.0898,
+      "Hydro": 0.4992,
       "Solar": 0.2043,
-      "Wind": 0.2066
+      "Wind": 0.2067
     },
     "2024": {
-      "Bioenergy": 0.082,
-      "Hydro": 0.4765,
-      "Solar": 0.2362,
-      "Wind": 0.2053
+      "Bioenergy": 0.0827,
+      "Hydro": 0.4762,
+      "Solar": 0.236,
+      "Wind": 0.2051
     },
     "2025": {
-      "Bioenergy": 0.0748,
+      "Bioenergy": 0.0745,
       "Hydro": 0.4369,
-      "Solar": 0.2783,
-      "Wind": 0.21
+      "Solar": 0.2784,
+      "Wind": 0.2101
     },
     "2026": {
-      "Bioenergy": 0.0819,
-      "Hydro": 0.382,
-      "Solar": 0.3061,
-      "Wind": 0.2299
+      "Bioenergy": 0.0785,
+      "Hydro": 0.3854,
+      "Solar": 0.3051,
+      "Wind": 0.231
     }
   },
   "Europe": {
     "2019": {
-      "Bioenergy": 0.0758,
-      "Hydro": 0.5861,
+      "Bioenergy": 0.0757,
+      "Hydro": 0.5864,
       "Solar": 0.0825,
-      "Wind": 0.2556
+      "Wind": 0.2554
     },
     "2020": {
-      "Bioenergy": 0.0729,
-      "Hydro": 0.5662,
-      "Solar": 0.0911,
-      "Wind": 0.2697
+      "Bioenergy": 0.0728,
+      "Hydro": 0.5664,
+      "Solar": 0.0912,
+      "Wind": 0.2695
     },
     "2021": {
       "Bioenergy": 0.078,
-      "Hydro": 0.5562,
+      "Hydro": 0.5564,
       "Solar": 0.102,
-      "Wind": 0.2638
+      "Wind": 0.2636
     },
     "2022": {
-      "Bioenergy": 0.0758,
-      "Hydro": 0.5086,
-      "Solar": 0.1268,
-      "Wind": 0.2888
+      "Bioenergy": 0.0757,
+      "Hydro": 0.5087,
+      "Solar": 0.127,
+      "Wind": 0.2886
     },
     "2023": {
-      "Bioenergy": 0.064,
+      "Bioenergy": 0.0639,
       "Hydro": 0.4964,
-      "Solar": 0.1422,
-      "Wind": 0.2974
+      "Solar": 0.1425,
+      "Wind": 0.2972
     },
     "2024": {
-      "Bioenergy": 0.0619,
-      "Hydro": 0.4883,
-      "Solar": 0.1629,
-      "Wind": 0.2869
+      "Bioenergy": 0.0618,
+      "Hydro": 0.4884,
+      "Solar": 0.1631,
+      "Wind": 0.2866
     },
     "2025": {
-      "Bioenergy": 0.0618,
-      "Hydro": 0.4549,
-      "Solar": 0.1993,
+      "Bioenergy": 0.0617,
+      "Hydro": 0.4548,
+      "Solar": 0.1994,
       "Wind": 0.284
     },
     "2026": {
-      "Bioenergy": 0.0652,
-      "Hydro": 0.4578,
-      "Solar": 0.1426,
-      "Wind": 0.3344
+      "Bioenergy": 0.0643,
+      "Hydro": 0.4567,
+      "Solar": 0.1574,
+      "Wind": 0.3216
     }
   },
   "North America": {
     "2019": {
-      "Bioenergy": 0.0895,
-      "Hydro": 0.5538,
-      "Solar": 0.0986,
-      "Wind": 0.2582
+      "Bioenergy": 0.0898,
+      "Hydro": 0.5536,
+      "Solar": 0.0985,
+      "Wind": 0.2581
     },
     "2020": {
-      "Bioenergy": 0.0828,
-      "Hydro": 0.5284,
-      "Solar": 0.1126,
-      "Wind": 0.2763
+      "Bioenergy": 0.0831,
+      "Hydro": 0.5282,
+      "Solar": 0.1125,
+      "Wind": 0.2762
     },
     "2021": {
       "Bioenergy": 0.0806,
@@ -169,34 +169,34 @@
       "Wind": 0.2926
     },
     "2022": {
-      "Bioenergy": 0.0735,
-      "Hydro": 0.4731,
+      "Bioenergy": 0.0732,
+      "Hydro": 0.4732,
       "Solar": 0.1466,
-      "Wind": 0.3069
+      "Wind": 0.307
     },
     "2023": {
-      "Bioenergy": 0.0721,
-      "Hydro": 0.4502,
-      "Solar": 0.1704,
-      "Wind": 0.3073
+      "Bioenergy": 0.0713,
+      "Hydro": 0.453,
+      "Solar": 0.1708,
+      "Wind": 0.3048
     },
     "2024": {
-      "Bioenergy": 0.0682,
-      "Hydro": 0.4237,
-      "Solar": 0.1977,
-      "Wind": 0.3104
+      "Bioenergy": 0.0677,
+      "Hydro": 0.4249,
+      "Solar": 0.1986,
+      "Wind": 0.3088
     },
     "2025": {
-      "Bioenergy": 0.064,
-      "Hydro": 0.4053,
-      "Solar": 0.2309,
-      "Wind": 0.2998
+      "Bioenergy": 0.0635,
+      "Hydro": 0.4057,
+      "Solar": 0.2313,
+      "Wind": 0.2994
     },
     "2026": {
-      "Bioenergy": 0.0573,
-      "Hydro": 0.4252,
-      "Solar": 0.1958,
-      "Wind": 0.3216
+      "Bioenergy": 0.0571,
+      "Hydro": 0.4204,
+      "Solar": 0.2056,
+      "Wind": 0.3169
     }
   },
   "Oceania": {
@@ -243,10 +243,10 @@
       "Wind": 0.265
     },
     "2026": {
-      "Bioenergy": 0.0131,
-      "Hydro": 0.3533,
-      "Solar": 0.3929,
-      "Wind": 0.2407
+      "Bioenergy": 0.0126,
+      "Hydro": 0.353,
+      "Solar": 0.3873,
+      "Wind": 0.2471
     }
   },
   "South America": {
@@ -294,9 +294,9 @@
     },
     "2026": {
       "Bioenergy": 0.0287,
-      "Hydro": 0.8234,
-      "Solar": 0.082,
-      "Wind": 0.0659
+      "Hydro": 0.8223,
+      "Solar": 0.08,
+      "Wind": 0.0689
     }
   }
 }

package/data/mix/continent-yearly.csv

@@ -1,36 +1,36 @@
 continent,year,Bioenergy,Coal,Gas,Hydro,Nuclear,Other Fossil,Other Renewables,Solar,Wind
-Africa,2019,0.0062,0.0956,0.4602,0.2954,0.0035,0.1196,0.0014,0.0097,0.0085
+Africa,2019,0.0062,0.0957,0.4601,0.2953,0.0035,0.1196,0.0014,0.0097,0.0085
 Africa,2020,0.0065,0.0988,0.4351,0.3126,0.0032,0.1235,0.0014,0.011,0.0079
-Africa,2021,0.0065,0.0982,0.4355,0.311,0.0033,0.1241,0.0014,0.0114,0.0087
+Africa,2021,0.0065,0.0983,0.4355,0.311,0.0033,0.1241,0.0014,0.0114,0.0087
 Africa,2022,0.0065,0.096,0.4316,0.3114,0.0029,0.129,0.0015,0.0119,0.0092
-Africa,2023,0.0065,0.0924,0.4362,0.311,0.0025,0.1268,0.0017,0.0131,0.0097
-Africa,2024,0.0065,0.0937,0.4367,0.3096,0.0024,0.1254,0.0016,0.0138,0.0104
-Africa,2025,0.0065,0.091,0.437,0.3101,0.0028,0.1253,0.0017,0.0144,0.0112
-Africa,2026,0.0066,0.0848,0.4376,0.3135,0.0041,0.1259,0.0019,0.0149,0.0106
-Asia,2019,0.012,0.3544,0.3592,0.0916,0.0238,0.1155,0.0068,0.0179,0.0188
+Africa,2023,0.0065,0.0923,0.4362,0.3111,0.0025,0.1269,0.0017,0.0131,0.0097
+Africa,2024,0.0065,0.0936,0.4367,0.3096,0.0023,0.1255,0.0016,0.0138,0.0104
+Africa,2025,0.0065,0.0909,0.437,0.3103,0.0028,0.1254,0.0017,0.0144,0.011
+Africa,2026,0.0066,0.0849,0.438,0.3139,0.0041,0.1261,0.0018,0.0148,0.0099
+Asia,2019,0.012,0.3543,0.3592,0.0916,0.0238,0.1155,0.0068,0.0179,0.0188
 Asia,2020,0.0128,0.3517,0.3561,0.093,0.024,0.1144,0.0068,0.0204,0.0208
 Asia,2021,0.0139,0.3584,0.3458,0.0887,0.0252,0.1108,0.0066,0.0237,0.027
 Asia,2022,0.0146,0.3566,0.3392,0.089,0.0255,0.1094,0.0065,0.0285,0.0306
-Asia,2023,0.0151,0.3626,0.3318,0.0835,0.0263,0.1056,0.0064,0.0342,0.0346
-Asia,2024,0.0149,0.3586,0.3241,0.0865,0.0265,0.1029,0.0062,0.0429,0.0373
-Asia,2025,0.015,0.3485,0.3173,0.0873,0.0271,0.101,0.0061,0.0556,0.042
-Asia,2026,0.0159,0.351,0.3215,0.0743,0.0253,0.1014,0.0062,0.0596,0.0447
-Europe,2019,0.0249,0.1774,0.2581,0.1922,0.1988,0.0197,0.0181,0.027,0.0838
-Europe,2020,0.0264,0.1628,0.244,0.2048,0.1928,0.0196,0.0191,0.033,0.0975
-Europe,2021,0.0273,0.168,0.2488,0.1944,0.1954,0.0199,0.0185,0.0356,0.0922
-Europe,2022,0.0275,0.1654,0.2523,0.1844,0.1803,0.0204,0.0191,0.046,0.1047
-Europe,2023,0.0254,0.1482,0.2377,0.1971,0.1785,0.0192,0.0193,0.0565,0.1181
-Europe,2024,0.0259,0.1386,0.2279,0.2044,0.1762,0.0196,0.019,0.0682,0.1201
-Europe,2025,0.0257,0.1359,0.2345,0.1893,0.1751,0.0195,0.0189,0.0829,0.1182
-Europe,2026,0.0266,0.1418,0.2435,0.1866,0.169,0.0204,0.0176,0.0581,0.1363
-North America,2019,0.0212,0.1786,0.327,0.1315,0.1421,0.108,0.0068,0.0234,0.0613
-North America,2020,0.021,0.1489,0.3384,0.1343,0.1415,0.1101,0.0069,0.0286,0.0702
+Asia,2023,0.015,0.3627,0.3318,0.0835,0.0263,0.1056,0.0064,0.0342,0.0346
+Asia,2024,0.015,0.3579,0.3246,0.0866,0.0265,0.1029,0.0062,0.0429,0.0373
+Asia,2025,0.0149,0.3486,0.3173,0.0873,0.0271,0.101,0.0061,0.0556,0.042
+Asia,2026,0.0152,0.3497,0.3227,0.0748,0.0255,0.1018,0.0062,0.0592,0.0448
+Europe,2019,0.0248,0.1773,0.258,0.1924,0.1987,0.0197,0.0181,0.0271,0.0838
+Europe,2020,0.0264,0.1627,0.2439,0.205,0.1928,0.0196,0.0191,0.033,0.0975
+Europe,2021,0.0273,0.1679,0.2488,0.1945,0.1953,0.0199,0.0185,0.0357,0.0922
+Europe,2022,0.0275,0.1653,0.2522,0.1846,0.1802,0.0204,0.0191,0.0461,0.1047
+Europe,2023,0.0254,0.148,0.2374,0.1973,0.1785,0.0193,0.0193,0.0566,0.1181
+Europe,2024,0.0259,0.1384,0.2275,0.2047,0.1761,0.0199,0.019,0.0684,0.1201
+Europe,2025,0.0257,0.1358,0.2342,0.1893,0.1751,0.0198,0.0189,0.083,0.1182
+Europe,2026,0.0267,0.1394,0.2402,0.1895,0.1675,0.0202,0.0178,0.0653,0.1334
+North America,2019,0.0213,0.1786,0.3269,0.1315,0.1421,0.1079,0.0068,0.0234,0.0613
+North America,2020,0.0211,0.1489,0.3384,0.1343,0.1415,0.1101,0.0069,0.0286,0.0702
 North America,2021,0.0208,0.1652,0.3256,0.1277,0.1367,0.1079,0.0068,0.034,0.0755
-North America,2022,0.0199,0.151,0.3383,0.1279,0.1324,0.1012,0.0067,0.0396,0.0829
-North America,2023,0.0196,0.1271,0.3671,0.1224,0.1382,0.0889,0.0069,0.0463,0.0835
-North America,2024,0.0191,0.1205,0.3705,0.1187,0.1357,0.0866,0.0065,0.0554,0.087
-North America,2025,0.0187,0.1304,0.3539,0.1184,0.1328,0.0844,0.0064,0.0675,0.0876
-North America,2026,0.0193,0.116,0.3187,0.1431,0.1326,0.0896,0.0066,0.0659,0.1082
+North America,2022,0.0198,0.151,0.3384,0.1279,0.1324,0.1012,0.0067,0.0396,0.0829
+North America,2023,0.0194,0.1269,0.3677,0.1231,0.138,0.0888,0.0069,0.0464,0.0828
+North America,2024,0.019,0.1188,0.3723,0.1191,0.1356,0.0865,0.0065,0.0556,0.0865
+North America,2025,0.0186,0.1288,0.3552,0.1186,0.1328,0.0844,0.0064,0.0676,0.0876
+North America,2026,0.0189,0.1145,0.3277,0.1388,0.1314,0.0895,0.0066,0.0679,0.1047
 Oceania,2019,0.0047,0.4124,0.0952,0.1555,0,0.2054,0.0207,0.0528,0.0534
 Oceania,2020,0.0045,0.3993,0.0874,0.1549,0,0.2069,0.0209,0.0642,0.0617
 Oceania,2021,0.0045,0.3865,0.0728,0.158,0,0.2068,0.0209,0.0791,0.0715
@@ -38,12 +38,12 @@ Oceania,2022,0.0043,0.3584,0.0786,0.1627,0,0.2039,0.0209,0.0917,0.0795
 Oceania,2023,0.0045,0.3504,0.0676,0.1592,0,0.203,0.0203,0.1109,0.0842
 Oceania,2024,0.0048,0.3492,0.0711,0.1457,0,0.1994,0.0225,0.1204,0.087
 Oceania,2025,0.0043,0.3324,0.0644,0.1436,0,0.1973,0.0235,0.1331,0.1013
-Oceania,2026,0.0052,0.3282,0.0505,0.1416,0,0.1967,0.024,0.1574,0.0964
+Oceania,2026,0.0051,0.324,0.0514,0.1416,0,0.1991,0.0244,0.1553,0.0991
 South America,2019,0.0265,0.0222,0.1941,0.6123,0.0105,0.0969,0.0001,0.0071,0.0304
 South America,2020,0.0285,0.0212,0.1917,0.6066,0.0105,0.0981,0.0001,0.0098,0.0335
 South America,2021,0.0275,0.0218,0.2023,0.5813,0.0106,0.1006,0.0001,0.014,0.0419
 South America,2022,0.0262,0.0137,0.1813,0.6064,0.0093,0.0946,0.0002,0.0215,0.0467
-South America,2023,0.0269,0.013,0.1751,0.5985,0.0098,0.0925,0.0002,0.0315,0.0527
-South America,2024,0.0269,0.0133,0.1767,0.5808,0.0107,0.0908,0.0001,0.0425,0.0583
-South America,2025,0.0257,0.0128,0.1746,0.5727,0.0108,0.0888,0.0001,0.0514,0.063
-South America,2026,0.0204,0.0144,0.1759,0.5862,0.0076,0.0901,0.0001,0.0584,0.0469
+South America,2023,0.0269,0.0129,0.1751,0.5985,0.0098,0.0925,0.0002,0.0315,0.0527
+South America,2024,0.0269,0.0134,0.1766,0.5808,0.0107,0.0907,0.0001,0.0425,0.0583
+South America,2025,0.0257,0.0124,0.1751,0.5727,0.0108,0.0888,0.0001,0.0514,0.063
+South America,2026,0.0205,0.0119,0.1778,0.5864,0.0076,0.0895,0,0.0571,0.0492