npm - @digital4better/data - Versions diffs - 1.3.10 → 1.3.12 - Mend

@digital4better/data 1.3.10 → 1.3.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

package/data/factor/continent-monthly-green.csv +143 -143
package/data/factor/continent-monthly-green.json +1211 -1211
package/data/factor/continent-monthly.csv +146 -146
package/data/factor/continent-monthly.json +1207 -1207
package/data/factor/continent-yearly-green.csv +19 -19
package/data/factor/continent-yearly-green.json +162 -162
package/data/factor/continent-yearly.csv +19 -19
package/data/factor/continent-yearly.json +154 -154
package/data/factor/country-monthly-green.csv +1913 -1913
package/data/factor/country-monthly-green.json +15301 -15301
package/data/factor/country-monthly.csv +2149 -2149
package/data/factor/country-monthly.json +14806 -14806
package/data/factor/country-yearly-green.csv +323 -323
package/data/factor/country-yearly-green.json +2439 -2439
package/data/factor/country-yearly.csv +324 -324
package/data/factor/country-yearly.json +2299 -2299
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +294 -294
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +348 -348
package/data/factor/subdivision-yearly-green.csv +62 -62
package/data/factor/subdivision-yearly-green.json +375 -375
package/data/factor/subdivision-yearly.csv +61 -61
package/data/factor/subdivision-yearly.json +305 -305
package/data/factor/world-monthly-green.csv +72 -72
package/data/factor/world-monthly-green.json +627 -627
package/data/factor/world-monthly.csv +72 -72
package/data/factor/world-monthly.json +610 -610
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +58 -58
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +60 -60
package/data/mix/continent-monthly-green.csv +100 -100
package/data/mix/continent-monthly-green.json +295 -295
package/data/mix/continent-monthly.csv +100 -100
package/data/mix/continent-monthly.json +422 -422
package/data/mix/continent-yearly-green.csv +13 -13
package/data/mix/continent-yearly-green.json +33 -33
package/data/mix/continent-yearly.csv +13 -13
package/data/mix/continent-yearly.json +63 -63
package/data/mix/country-monthly-green.csv +1277 -1277
package/data/mix/country-monthly-green.json +3215 -3215
package/data/mix/country-monthly.csv +1277 -1277
package/data/mix/country-monthly.json +4456 -4456
package/data/mix/country-yearly-green.csv +154 -154
package/data/mix/country-yearly-green.json +470 -470
package/data/mix/country-yearly.csv +154 -154
package/data/mix/country-yearly.json +772 -772
package/data/mix/subdivision-monthly-green.csv +24 -24
package/data/mix/subdivision-monthly-green.json +18 -18
package/data/mix/subdivision-monthly.csv +24 -24
package/data/mix/subdivision-monthly.json +75 -75
package/data/mix/subdivision-yearly-green.csv +10 -10
package/data/mix/subdivision-yearly-green.json +21 -21
package/data/mix/subdivision-yearly.csv +10 -10
package/data/mix/subdivision-yearly.json +30 -30
package/data/mix/world-monthly-green.csv +34 -34
package/data/mix/world-monthly-green.json +76 -76
package/data/mix/world-monthly.csv +34 -34
package/data/mix/world-monthly.json +88 -88
package/data/mix/world-yearly-green.csv +2 -2
package/data/mix/world-yearly-green.json +4 -4
package/data/mix/world-yearly.csv +2 -2
package/data/mix/world-yearly.json +8 -8
package/package.json +2 -2

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

@@ -77,14 +77,14 @@
     "2024": {
       "Bioenergy": 0.0379,
       "Hydro": 0.6672,
-      "Solar": 0.1617,
+      "Solar": 0.1618,
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0355,
-      "Hydro": 0.6118,
-      "Solar": 0.1956,
-      "Wind": 0.1571
+      "Bioenergy": 0.0347,
+      "Hydro": 0.6209,
+      "Solar": 0.1972,
+      "Wind": 0.1472
     }
   },
   "AG": {
@@ -154,7 +154,7 @@
       "Bioenergy": 0.0121,
       "Hydro": 0.9185,
       "Solar": 0.024,
-      "Wind": 0.0454
+      "Wind": 0.0453
     },
     "2023": {
       "Bioenergy": 0.0109,
@@ -163,16 +163,16 @@
       "Wind": 0.0494
     },
     "2024": {
-      "Bioenergy": 0.0109,
-      "Hydro": 0.9063,
+      "Bioenergy": 0.011,
+      "Hydro": 0.9064,
       "Solar": 0.0332,
-      "Wind": 0.0496
+      "Wind": 0.0495
     },
     "2025": {
-      "Bioenergy": 0.0107,
-      "Hydro": 0.8997,
-      "Solar": 0.0427,
-      "Wind": 0.0469
+      "Bioenergy": 0.0108,
+      "Hydro": 0.9008,
+      "Solar": 0.0425,
+      "Wind": 0.0459
     }
   },
   "AM": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0263,
-      "Hydro": 0.5766,
-      "Solar": 0.0785,
-      "Wind": 0.3185
+      "Bioenergy": 0.0264,
+      "Hydro": 0.5764,
+      "Solar": 0.0783,
+      "Wind": 0.3189
     }
   },
   "AS": {
@@ -360,7 +360,7 @@
     },
     "2020": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.7845,
+      "Hydro": 0.7844,
       "Solar": 0.0362,
       "Wind": 0.1449
     },
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0347,
-      "Hydro": 0.6342,
-      "Solar": 0.1847,
-      "Wind": 0.1463
+      "Bioenergy": 0.0337,
+      "Hydro": 0.6374,
+      "Solar": 0.1801,
+      "Wind": 0.1487
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0027,
-      "Hydro": 0.1398,
-      "Solar": 0.4916,
-      "Wind": 0.366
+      "Bioenergy": 0.0031,
+      "Hydro": 0.1335,
+      "Solar": 0.4885,
+      "Wind": 0.3748
     }
   },
   "AW": {
@@ -560,15 +560,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8973,
+      "Hydro": 0.8972,
       "Solar": 0.0678,
       "Wind": 0.0349
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8783,
-      "Solar": 0.0841,
-      "Wind": 0.0376
+      "Hydro": 0.8683,
+      "Solar": 0.0947,
+      "Wind": 0.037
     }
   },
   "BB": {
@@ -648,15 +648,15 @@
     },
     "2024": {
       "Bioenergy": 0.0504,
-      "Hydro": 0.4305,
-      "Solar": 0.3423,
+      "Hydro": 0.4304,
+      "Solar": 0.3424,
       "Wind": 0.1768
     },
     "2025": {
-      "Bioenergy": 0.0499,
-      "Hydro": 0.2775,
-      "Solar": 0.4511,
-      "Wind": 0.2215
+      "Bioenergy": 0.0467,
+      "Hydro": 0.3251,
+      "Solar": 0.4296,
+      "Wind": 0.1986
     }
   },
   "BE": {
@@ -691,16 +691,16 @@
       "Wind": 0.6097
     },
     "2024": {
-      "Bioenergy": 0.0361,
-      "Hydro": 0.0792,
-      "Solar": 0.3419,
-      "Wind": 0.5428
+      "Bioenergy": 0.0375,
+      "Hydro": 0.08,
+      "Solar": 0.3401,
+      "Wind": 0.5425
     },
     "2025": {
-      "Bioenergy": 0.0351,
-      "Hydro": 0.0764,
-      "Solar": 0.4561,
-      "Wind": 0.4324
+      "Bioenergy": 0.0359,
+      "Hydro": 0.0811,
+      "Solar": 0.463,
+      "Wind": 0.42
     }
   },
   "BF": {
@@ -780,15 +780,15 @@
     },
     "2024": {
       "Bioenergy": 0.0171,
-      "Hydro": 0.3195,
-      "Solar": 0.5033,
-      "Wind": 0.1601
+      "Hydro": 0.3193,
+      "Solar": 0.5028,
+      "Wind": 0.1609
     },
     "2025": {
-      "Bioenergy": 0.0114,
-      "Hydro": 0.2636,
-      "Solar": 0.6108,
-      "Wind": 0.1142
+      "Bioenergy": 0.0112,
+      "Hydro": 0.2559,
+      "Solar": 0.6212,
+      "Wind": 0.1118
     }
   },
   "BH": {
@@ -1089,14 +1089,14 @@
     "2024": {
       "Bioenergy": 0.0153,
       "Hydro": 0.6923,
-      "Solar": 0.1211,
-      "Wind": 0.1713
+      "Solar": 0.12,
+      "Wind": 0.1724
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Hydro": 0.6925,
-      "Solar": 0.1324,
-      "Wind": 0.1639
+      "Bioenergy": 0.011,
+      "Hydro": 0.6889,
+      "Solar": 0.1345,
+      "Wind": 0.1656
     }
   },
   "BS": {
@@ -1270,7 +1270,7 @@
     },
     "2025": {
       "Bioenergy": 0.4565,
-      "Hydro": 0.309,
+      "Hydro": 0.3089,
       "Solar": 0.0781,
       "Wind": 0.1564
     }
@@ -1309,14 +1309,14 @@
     "2024": {
       "Bioenergy": 0.2235,
       "Hydro": 0.6679,
-      "Solar": 0.055,
-      "Wind": 0.0536
+      "Solar": 0.0547,
+      "Wind": 0.0539
     },
     "2025": {
-      "Bioenergy": 0.2198,
-      "Hydro": 0.669,
-      "Solar": 0.0585,
-      "Wind": 0.0527
+      "Bioenergy": 0.2203,
+      "Hydro": 0.6683,
+      "Solar": 0.0578,
+      "Wind": 0.0536
     }
   },
   "CA": {
@@ -1357,10 +1357,10 @@
       "Wind": 0.1145
     },
     "2025": {
-      "Bioenergy": 0.0231,
-      "Hydro": 0.8337,
-      "Solar": 0.0137,
-      "Wind": 0.1295
+      "Bioenergy": 0.0227,
+      "Hydro": 0.8366,
+      "Solar": 0.0151,
+      "Wind": 0.1257
     }
   },
   "CD": {
@@ -1504,39 +1504,39 @@
     },
     "2020": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9295,
-      "Solar": 0.0576,
-      "Wind": 0.0111
+      "Hydro": 0.9263,
+      "Solar": 0.0598,
+      "Wind": 0.0121
     },
     "2021": {
       "Bioenergy": 0.0051,
-      "Hydro": 0.9053,
-      "Solar": 0.0673,
-      "Wind": 0.0223
+      "Hydro": 0.9028,
+      "Solar": 0.0696,
+      "Wind": 0.0225
     },
     "2022": {
       "Bioenergy": 0.005,
-      "Hydro": 0.8685,
-      "Solar": 0.1007,
+      "Hydro": 0.864,
+      "Solar": 0.1051,
       "Wind": 0.0258
     },
     "2023": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.8873,
-      "Solar": 0.0992,
-      "Wind": 0.0118
+      "Hydro": 0.8823,
+      "Solar": 0.1041,
+      "Wind": 0.012
     },
     "2024": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.8894,
-      "Solar": 0.1031,
+      "Hydro": 0.8882,
+      "Solar": 0.1044,
       "Wind": 0.0069
     },
     "2025": {
       "Bioenergy": 0.0026,
-      "Hydro": 0.7821,
-      "Solar": 0.1999,
-      "Wind": 0.0154
+      "Hydro": 0.7848,
+      "Solar": 0.1976,
+      "Wind": 0.015
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0404,
-      "Hydro": 0.4009,
-      "Solar": 0.3404,
-      "Wind": 0.2184
+      "Bioenergy": 0.0402,
+      "Hydro": 0.3869,
+      "Solar": 0.349,
+      "Wind": 0.224
     }
   },
   "CM": {
@@ -1753,10 +1753,10 @@
       "Wind": 0.3
     },
     "2025": {
-      "Bioenergy": 0.0507,
-      "Hydro": 0.3232,
-      "Solar": 0.3104,
-      "Wind": 0.3156
+      "Bioenergy": 0.0512,
+      "Hydro": 0.322,
+      "Solar": 0.3176,
+      "Wind": 0.3092
     }
   },
   "CO": {
@@ -1798,9 +1798,9 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.9396,
-      "Solar": 0.0577,
-      "Wind": 0.0027
+      "Hydro": 0.9377,
+      "Solar": 0.059,
+      "Wind": 0.0032
     }
   },
   "CR": {
@@ -1842,9 +1842,9 @@
     },
     "2025": {
       "Bioenergy": 0.006,
-      "Hydro": 0.8456,
+      "Hydro": 0.8378,
       "Solar": 0.0012,
-      "Wind": 0.1472
+      "Wind": 0.155
     }
   },
   "CU": {
@@ -1975,8 +1975,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8444,
-      "Wind": 0.1556
+      "Solar": 0.8627,
+      "Wind": 0.1373
     }
   },
   "CZ": {
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.2548,
-      "Hydro": 0.1729,
-      "Solar": 0.5131,
-      "Wind": 0.0592
+      "Bioenergy": 0.2631,
+      "Hydro": 0.169,
+      "Solar": 0.5137,
+      "Wind": 0.0542
     }
   },
   "DE": {
@@ -2049,7 +2049,7 @@
       "Wind": 0.4975
     },
     "2023": {
-      "Bioenergy": 0.1587,
+      "Bioenergy": 0.1586,
       "Hydro": 0.0868,
       "Solar": 0.2434,
       "Wind": 0.5111
@@ -2061,9 +2061,9 @@
       "Wind": 0.4786
     },
     "2025": {
-      "Bioenergy": 0.1421,
-      "Hydro": 0.0726,
-      "Solar": 0.3548,
+      "Bioenergy": 0.1422,
+      "Hydro": 0.0725,
+      "Solar": 0.3549,
       "Wind": 0.4305
     }
   },
@@ -2120,20 +2120,20 @@
     },
     "2020": {
       "Bioenergy": 0.1396,
-      "Hydro": 0.06,
+      "Hydro": 0.0599,
       "Solar": 0.069,
       "Wind": 0.7315
     },
     "2021": {
       "Bioenergy": 0.2082,
       "Hydro": 0.0364,
-      "Solar": 0.0695,
+      "Solar": 0.0696,
       "Wind": 0.6859
     },
     "2022": {
       "Bioenergy": 0.1599,
       "Hydro": 0.0183,
-      "Solar": 0.0906,
+      "Solar": 0.0907,
       "Wind": 0.7312
     },
     "2023": {
@@ -2149,10 +2149,10 @@
       "Wind": 0.7017
     },
     "2025": {
-      "Bioenergy": 0.12,
-      "Hydro": 0.04,
-      "Solar": 0.1901,
-      "Wind": 0.6498
+      "Bioenergy": 0.1247,
+      "Hydro": 0.0438,
+      "Solar": 0.199,
+      "Wind": 0.6325
     }
   },
   "DM": {
@@ -2225,22 +2225,22 @@
       "Wind": 0.2946
     },
     "2023": {
-      "Bioenergy": 0.0575,
-      "Hydro": 0.3205,
-      "Solar": 0.3096,
-      "Wind": 0.3123
+      "Bioenergy": 0.0579,
+      "Hydro": 0.3168,
+      "Solar": 0.3113,
+      "Wind": 0.314
     },
     "2024": {
-      "Bioenergy": 0.0523,
-      "Hydro": 0.3539,
-      "Solar": 0.3468,
-      "Wind": 0.247
+      "Bioenergy": 0.0524,
+      "Hydro": 0.3524,
+      "Solar": 0.3476,
+      "Wind": 0.2476
     },
     "2025": {
-      "Bioenergy": 0.0531,
-      "Hydro": 0.3294,
-      "Solar": 0.3863,
-      "Wind": 0.2312
+      "Bioenergy": 0.0474,
+      "Hydro": 0.3322,
+      "Solar": 0.3491,
+      "Wind": 0.2712
     }
   },
   "DZ": {
@@ -2322,7 +2322,7 @@
       "Bioenergy": 0.0205,
       "Hydro": 0.9607,
       "Solar": 0.0041,
-      "Wind": 0.0147
+      "Wind": 0.0148
     },
     "2025": {
       "Bioenergy": 0.0003,
@@ -2351,7 +2351,7 @@
       "Wind": 0.4246
     },
     "2022": {
-      "Bioenergy": 0.328,
+      "Bioenergy": 0.3281,
       "Hydro": 0.0686,
       "Solar": 0.2532,
       "Wind": 0.3501
@@ -2363,16 +2363,16 @@
       "Wind": 0.3726
     },
     "2024": {
-      "Bioenergy": 0.14,
-      "Hydro": 0.1361,
-      "Solar": 0.3054,
-      "Wind": 0.4185
+      "Bioenergy": 0.1396,
+      "Hydro": 0.1358,
+      "Solar": 0.3073,
+      "Wind": 0.4173
     },
     "2025": {
-      "Bioenergy": 0.1354,
-      "Hydro": 0.0972,
-      "Solar": 0.3592,
-      "Wind": 0.4082
+      "Bioenergy": 0.1308,
+      "Hydro": 0.1019,
+      "Solar": 0.3736,
+      "Wind": 0.3937
     }
   },
   "EG": {
@@ -2413,10 +2413,10 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Hydro": 0.4849,
-      "Solar": 0.2215,
-      "Wind": 0.2893
+      "Bioenergy": 0.0037,
+      "Hydro": 0.5017,
+      "Solar": 0.2459,
+      "Wind": 0.2486
     }
   },
   "ER": {
@@ -2501,10 +2501,10 @@
       "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.0231,
-      "Hydro": 0.2424,
-      "Solar": 0.3913,
-      "Wind": 0.3432
+      "Bioenergy": 0.0232,
+      "Hydro": 0.2331,
+      "Solar": 0.3907,
+      "Wind": 0.353
     }
   },
   "ET": {
@@ -2589,10 +2589,10 @@
       "Wind": 0.4323
     },
     "2025": {
-      "Bioenergy": 0.209,
-      "Hydro": 0.3013,
-      "Solar": 0.0469,
-      "Wind": 0.4427
+      "Bioenergy": 0.2143,
+      "Hydro": 0.2983,
+      "Solar": 0.0467,
+      "Wind": 0.4407
     }
   },
   "FJ": {
@@ -2760,15 +2760,15 @@
     },
     "2024": {
       "Bioenergy": 0.0227,
-      "Hydro": 0.4659,
-      "Solar": 0.1689,
-      "Wind": 0.3424
+      "Hydro": 0.4668,
+      "Solar": 0.1691,
+      "Wind": 0.3414
     },
     "2025": {
-      "Bioenergy": 0.0217,
-      "Hydro": 0.4214,
-      "Solar": 0.2341,
-      "Wind": 0.3229
+      "Bioenergy": 0.0213,
+      "Hydro": 0.41,
+      "Solar": 0.2386,
+      "Wind": 0.3301
     }
   },
   "GA": {
@@ -2835,28 +2835,28 @@
       "Wind": 0.6178
     },
     "2022": {
-      "Bioenergy": 0.1376,
-      "Hydro": 0.0393,
-      "Solar": 0.1147,
-      "Wind": 0.7084
+      "Bioenergy": 0.138,
+      "Hydro": 0.0394,
+      "Solar": 0.1151,
+      "Wind": 0.7076
     },
     "2023": {
-      "Bioenergy": 0.1195,
-      "Hydro": 0.0621,
-      "Solar": 0.1168,
-      "Wind": 0.7016
+      "Bioenergy": 0.1196,
+      "Hydro": 0.0622,
+      "Solar": 0.1169,
+      "Wind": 0.7013
     },
     "2024": {
-      "Bioenergy": 0.1501,
-      "Hydro": 0.0736,
-      "Solar": 0.1264,
-      "Wind": 0.6499
+      "Bioenergy": 0.1511,
+      "Hydro": 0.0741,
+      "Solar": 0.1272,
+      "Wind": 0.6476
     },
     "2025": {
-      "Bioenergy": 0.1474,
-      "Hydro": 0.0584,
-      "Solar": 0.1814,
-      "Wind": 0.6128
+      "Bioenergy": 0.1557,
+      "Hydro": 0.0625,
+      "Solar": 0.187,
+      "Wind": 0.5947
     }
   },
   "GD": {
@@ -2941,10 +2941,10 @@
       "Wind": 0.0182
     },
     "2025": {
-      "Bioenergy": 0.0032,
-      "Hydro": 0.9618,
-      "Solar": 0.0124,
-      "Wind": 0.0226
+      "Bioenergy": 0.0031,
+      "Hydro": 0.9626,
+      "Solar": 0.0121,
+      "Wind": 0.0222
     }
   },
   "GF": {
@@ -3309,7 +3309,7 @@
     "2020": {
       "Bioenergy": 0.0152,
       "Hydro": 0.239,
-      "Solar": 0.2536,
+      "Solar": 0.2537,
       "Wind": 0.4921
     },
     "2021": {
@@ -3322,7 +3322,7 @@
       "Bioenergy": 0.0067,
       "Hydro": 0.2032,
       "Solar": 0.2921,
-      "Wind": 0.498
+      "Wind": 0.4979
     },
     "2023": {
       "Bioenergy": 0.0064,
@@ -3338,9 +3338,9 @@
     },
     "2025": {
       "Bioenergy": 0.0011,
-      "Hydro": 0.0932,
-      "Solar": 0.5277,
-      "Wind": 0.378
+      "Hydro": 0.0952,
+      "Solar": 0.5315,
+      "Wind": 0.3722
     }
   },
   "GT": {
@@ -3552,15 +3552,15 @@
     },
     "2024": {
       "Bioenergy": 0.1059,
-      "Hydro": 0.3949,
-      "Solar": 0.2579,
-      "Wind": 0.2413
+      "Hydro": 0.3948,
+      "Solar": 0.258,
+      "Wind": 0.2412
     },
     "2025": {
-      "Bioenergy": 0.0969,
-      "Hydro": 0.3165,
-      "Solar": 0.3107,
-      "Wind": 0.2758
+      "Bioenergy": 0.0946,
+      "Hydro": 0.337,
+      "Solar": 0.3117,
+      "Wind": 0.2567
     }
   },
   "HN": {
@@ -3602,9 +3602,9 @@
     },
     "2025": {
       "Bioenergy": 0.244,
-      "Hydro": 0.4249,
+      "Hydro": 0.4248,
       "Solar": 0.1902,
-      "Wind": 0.1408
+      "Wind": 0.1409
     }
   },
   "HR": {
@@ -3627,28 +3627,28 @@
       "Wind": 0.2351
     },
     "2022": {
-      "Bioenergy": 0.0847,
+      "Bioenergy": 0.0846,
       "Hydro": 0.5612,
-      "Solar": 0.0515,
-      "Wind": 0.3026
+      "Solar": 0.0516,
+      "Wind": 0.3025
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6402,
+      "Hydro": 0.6401,
       "Solar": 0.0515,
       "Wind": 0.2487
     },
     "2024": {
       "Bioenergy": 0.0633,
-      "Hydro": 0.5499,
+      "Hydro": 0.55,
       "Solar": 0.1121,
-      "Wind": 0.2747
+      "Wind": 0.2746
     },
     "2025": {
-      "Bioenergy": 0.0594,
-      "Hydro": 0.482,
-      "Solar": 0.1609,
-      "Wind": 0.2977
+      "Bioenergy": 0.0582,
+      "Hydro": 0.4847,
+      "Solar": 0.1605,
+      "Wind": 0.2966
     }
   },
   "HT": {
@@ -3700,13 +3700,13 @@
       "Bioenergy": 0.1796,
       "Hydro": 0.317,
       "Solar": 0.2486,
-      "Wind": 0.2549
+      "Wind": 0.2548
     },
     "2020": {
       "Bioenergy": 0.1611,
       "Hydro": 0.2775,
       "Solar": 0.3365,
-      "Wind": 0.2248
+      "Wind": 0.2249
     },
     "2021": {
       "Bioenergy": 0.1478,
@@ -3717,12 +3717,12 @@
     "2022": {
       "Bioenergy": 0.1387,
       "Hydro": 0.1865,
-      "Solar": 0.4905,
+      "Solar": 0.4906,
       "Wind": 0.1842
     },
     "2023": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.1676,
+      "Hydro": 0.1675,
       "Solar": 0.5818,
       "Wind": 0.1661
     },
@@ -3730,13 +3730,13 @@
       "Bioenergy": 0.0805,
       "Hydro": 0.1383,
       "Solar": 0.6449,
-      "Wind": 0.1363
+      "Wind": 0.1362
     },
     "2025": {
-      "Bioenergy": 0.0995,
-      "Hydro": 0.0971,
-      "Solar": 0.7084,
-      "Wind": 0.095
+      "Bioenergy": 0.0997,
+      "Hydro": 0.0952,
+      "Solar": 0.7093,
+      "Wind": 0.0957
     }
   },
   "ID": {
@@ -3777,10 +3777,10 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3544,
-      "Hydro": 0.6192,
-      "Solar": 0.0083,
-      "Wind": 0.0181
+      "Bioenergy": 0.3543,
+      "Hydro": 0.6194,
+      "Solar": 0.0084,
+      "Wind": 0.0179
     }
   },
   "IE": {
@@ -3799,7 +3799,7 @@
     "2021": {
       "Bioenergy": 0.0187,
       "Hydro": 0.112,
-      "Solar": 0.0122,
+      "Solar": 0.0123,
       "Wind": 0.857
     },
     "2022": {
@@ -3816,15 +3816,15 @@
     },
     "2024": {
       "Bioenergy": 0.018,
-      "Hydro": 0.1139,
+      "Hydro": 0.114,
       "Solar": 0.0753,
       "Wind": 0.7928
     },
     "2025": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.1049,
-      "Solar": 0.1094,
-      "Wind": 0.7672
+      "Bioenergy": 0.0195,
+      "Hydro": 0.1083,
+      "Solar": 0.1234,
+      "Wind": 0.7487
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0346,
-      "Hydro": 0.3154,
-      "Solar": 0.424,
-      "Wind": 0.226
+      "Bioenergy": 0.0316,
+      "Hydro": 0.3288,
+      "Solar": 0.3913,
+      "Wind": 0.2484
     }
   },
   "IQ": {
@@ -4080,15 +4080,15 @@
     },
     "2024": {
       "Bioenergy": 0.1179,
-      "Hydro": 0.3956,
-      "Solar": 0.2814,
-      "Wind": 0.2051
+      "Hydro": 0.3957,
+      "Solar": 0.2813,
+      "Wind": 0.205
     },
     "2025": {
-      "Bioenergy": 0.1052,
-      "Hydro": 0.3408,
-      "Solar": 0.3397,
-      "Wind": 0.2143
+      "Bioenergy": 0.1142,
+      "Hydro": 0.2848,
+      "Solar": 0.3686,
+      "Wind": 0.2324
     }
   },
   "JM": {
@@ -4217,10 +4217,10 @@
       "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.2218,
-      "Hydro": 0.2823,
-      "Solar": 0.4006,
-      "Wind": 0.0953
+      "Bioenergy": 0.2181,
+      "Hydro": 0.2786,
+      "Solar": 0.4158,
+      "Wind": 0.0875
     }
   },
   "KE": {
@@ -4261,10 +4261,10 @@
       "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0603,
-      "Hydro": 0.5641,
-      "Solar": 0.0786,
-      "Wind": 0.297
+      "Bioenergy": 0.0594,
+      "Hydro": 0.595,
+      "Solar": 0.0773,
+      "Wind": 0.2683
     }
   },
   "KG": {
@@ -4306,9 +4306,9 @@
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9815,
-      "Solar": 0.0088,
-      "Wind": 0.0079
+      "Hydro": 0.9818,
+      "Solar": 0.009,
+      "Wind": 0.0075
     }
   },
   "KH": {
@@ -4349,10 +4349,10 @@
       "Wind": 0.0421
     },
     "2025": {
-      "Bioenergy": 0.03,
-      "Hydro": 0.8402,
-      "Solar": 0.0788,
-      "Wind": 0.051
+      "Bioenergy": 0.0298,
+      "Hydro": 0.8425,
+      "Solar": 0.0797,
+      "Wind": 0.0481
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.1983,
-      "Hydro": 0.0619,
-      "Solar": 0.6709,
-      "Wind": 0.0689
+      "Bioenergy": 0.1944,
+      "Hydro": 0.0626,
+      "Solar": 0.6773,
+      "Wind": 0.0657
     }
   },
   "KW": {
@@ -4702,9 +4702,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6059,
-      "Solar": 0.1194,
-      "Wind": 0.2747
+      "Hydro": 0.6099,
+      "Solar": 0.1199,
+      "Wind": 0.2702
     }
   },
   "LA": {
@@ -4974,14 +4974,14 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.3678,
-      "Solar": 0.069,
+      "Hydro": 0.3679,
+      "Solar": 0.0689,
       "Wind": 0.4338
     },
     "2020": {
       "Bioenergy": 0.1269,
       "Hydro": 0.3368,
-      "Solar": 0.0716,
+      "Solar": 0.0717,
       "Wind": 0.4647
     },
     "2021": {
@@ -4993,70 +4993,70 @@
     "2022": {
       "Bioenergy": 0.1125,
       "Hydro": 0.3102,
-      "Solar": 0.1404,
-      "Wind": 0.437
+      "Solar": 0.1405,
+      "Wind": 0.4369
     },
     "2023": {
       "Bioenergy": 0.0722,
-      "Hydro": 0.252,
+      "Hydro": 0.2519,
       "Solar": 0.1684,
-      "Wind": 0.5075
+      "Wind": 0.5074
     },
     "2024": {
-      "Bioenergy": 0.0514,
+      "Bioenergy": 0.0515,
       "Hydro": 0.1841,
       "Solar": 0.2363,
-      "Wind": 0.5282
+      "Wind": 0.5281
     },
     "2025": {
-      "Bioenergy": 0.0304,
-      "Hydro": 0.0964,
-      "Solar": 0.2925,
-      "Wind": 0.5808
+      "Bioenergy": 0.0327,
+      "Hydro": 0.1068,
+      "Solar": 0.3046,
+      "Wind": 0.5559
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.149,
-      "Hydro": 0.387,
+      "Hydro": 0.3871,
       "Solar": 0.1304,
       "Wind": 0.3335
     },
     "2020": {
       "Bioenergy": 0.1647,
       "Hydro": 0.3499,
-      "Solar": 0.1319,
-      "Wind": 0.3534
+      "Solar": 0.132,
+      "Wind": 0.3535
     },
     "2021": {
       "Bioenergy": 0.1848,
       "Hydro": 0.3436,
-      "Solar": 0.1526,
+      "Solar": 0.1527,
       "Wind": 0.3189
     },
     "2022": {
       "Bioenergy": 0.1871,
       "Hydro": 0.2883,
-      "Solar": 0.196,
-      "Wind": 0.3286
+      "Solar": 0.1961,
+      "Wind": 0.3285
     },
     "2023": {
       "Bioenergy": 0.1103,
       "Hydro": 0.2882,
-      "Solar": 0.2007,
+      "Solar": 0.2008,
       "Wind": 0.4008
     },
     "2024": {
-      "Bioenergy": 0.138,
-      "Hydro": 0.2925,
+      "Bioenergy": 0.1381,
+      "Hydro": 0.2926,
       "Solar": 0.2203,
-      "Wind": 0.3491
+      "Wind": 0.3489
     },
     "2025": {
-      "Bioenergy": 0.1322,
-      "Hydro": 0.2394,
-      "Solar": 0.3103,
-      "Wind": 0.3181
+      "Bioenergy": 0.127,
+      "Hydro": 0.2406,
+      "Solar": 0.3139,
+      "Wind": 0.3184
     }
   },
   "LV": {
@@ -5074,33 +5074,33 @@
     },
     "2021": {
       "Bioenergy": 0.1471,
-      "Hydro": 0.7507,
+      "Hydro": 0.7506,
       "Solar": 0.024,
       "Wind": 0.0783
     },
     "2022": {
-      "Bioenergy": 0.1008,
-      "Hydro": 0.7504,
+      "Bioenergy": 0.1007,
+      "Hydro": 0.7505,
       "Solar": 0.0407,
       "Wind": 0.1081
     },
     "2023": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.7751,
+      "Hydro": 0.775,
       "Solar": 0.0657,
       "Wind": 0.101
     },
     "2024": {
-      "Bioenergy": 0.0869,
-      "Hydro": 0.6804,
-      "Solar": 0.1248,
-      "Wind": 0.108
+      "Bioenergy": 0.0897,
+      "Hydro": 0.679,
+      "Solar": 0.1241,
+      "Wind": 0.1073
     },
     "2025": {
-      "Bioenergy": 0.0842,
-      "Hydro": 0.7084,
-      "Solar": 0.1492,
-      "Wind": 0.0582
+      "Bioenergy": 0.0834,
+      "Hydro": 0.6974,
+      "Solar": 0.1569,
+      "Wind": 0.0624
     }
   },
   "LY": {
@@ -5185,10 +5185,10 @@
       "Wind": 0.7701
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.0874,
-      "Solar": 0.1002,
-      "Wind": 0.8124
+      "Bioenergy": 0.0006,
+      "Hydro": 0.123,
+      "Solar": 0.1244,
+      "Wind": 0.7519
     }
   },
   "MD": {
@@ -5200,7 +5200,7 @@
     },
     "2020": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.9174,
+      "Hydro": 0.9173,
       "Solar": 0.0099,
       "Wind": 0.0596
     },
@@ -5213,8 +5213,8 @@
     "2022": {
       "Bioenergy": 0.0475,
       "Hydro": 0.6975,
-      "Solar": 0.0777,
-      "Wind": 0.1773
+      "Solar": 0.0778,
+      "Wind": 0.1772
     },
     "2023": {
       "Bioenergy": 0.0113,
@@ -5226,13 +5226,13 @@
       "Bioenergy": 0.0123,
       "Hydro": 0.6419,
       "Solar": 0.1683,
-      "Wind": 0.1775
+      "Wind": 0.1774
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Hydro": 0.6347,
-      "Solar": 0.322,
-      "Wind": 0.0353
+      "Hydro": 0.635,
+      "Solar": 0.3224,
+      "Wind": 0.0346
     }
   },
   "ME": {
@@ -5245,7 +5245,7 @@
     "2020": {
       "Bioenergy": 0.0143,
       "Hydro": 0.7524,
-      "Solar": 0.0174,
+      "Solar": 0.0175,
       "Wind": 0.2159
     },
     "2021": {
@@ -5264,19 +5264,19 @@
       "Bioenergy": 0.0013,
       "Hydro": 0.8431,
       "Solar": 0.005,
-      "Wind": 0.1507
+      "Wind": 0.1506
     },
     "2024": {
       "Bioenergy": 0.0069,
-      "Hydro": 0.7722,
+      "Hydro": 0.7723,
       "Solar": 0.0571,
       "Wind": 0.1637
     },
     "2025": {
-      "Bioenergy": 0.0214,
-      "Hydro": 0.6294,
-      "Solar": 0.1252,
-      "Wind": 0.224
+      "Bioenergy": 0.0227,
+      "Hydro": 0.6094,
+      "Solar": 0.1504,
+      "Wind": 0.2175
     }
   },
   "MG": {
@@ -5331,7 +5331,7 @@
       "Wind": 0.1433
     },
     "2020": {
-      "Bioenergy": 0.0716,
+      "Bioenergy": 0.0715,
       "Hydro": 0.75,
       "Solar": 0.0263,
       "Wind": 0.1521
@@ -5343,10 +5343,10 @@
       "Wind": 0.1367
     },
     "2022": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.7822,
-      "Solar": 0.0424,
-      "Wind": 0.1332
+      "Bioenergy": 0.0421,
+      "Hydro": 0.7823,
+      "Solar": 0.0425,
+      "Wind": 0.1331
     },
     "2023": {
       "Bioenergy": 0.0466,
@@ -5356,15 +5356,15 @@
     },
     "2024": {
       "Bioenergy": 0.054,
-      "Hydro": 0.6825,
+      "Hydro": 0.6826,
       "Solar": 0.1423,
       "Wind": 0.1212
     },
     "2025": {
-      "Bioenergy": 0.029,
-      "Hydro": 0.6148,
-      "Solar": 0.1685,
-      "Wind": 0.1877
+      "Bioenergy": 0.0292,
+      "Hydro": 0.6155,
+      "Solar": 0.1689,
+      "Wind": 0.1864
     }
   },
   "ML": {
@@ -5531,16 +5531,16 @@
       "Wind": 0.2231
     },
     "2024": {
-      "Bioenergy": 0.1937,
+      "Bioenergy": 0.1936,
       "Hydro": 0.3581,
-      "Solar": 0.2294,
+      "Solar": 0.2295,
       "Wind": 0.2188
     },
     "2025": {
-      "Bioenergy": 0.1799,
-      "Hydro": 0.2889,
-      "Solar": 0.2794,
-      "Wind": 0.2518
+      "Bioenergy": 0.1766,
+      "Hydro": 0.308,
+      "Solar": 0.2808,
+      "Wind": 0.2346
     }
   },
   "MQ": {
@@ -5680,43 +5680,43 @@
       "Bioenergy": 0.0877,
       "Hydro": 0.5231,
       "Solar": 0.102,
-      "Wind": 0.2872
+      "Wind": 0.2871
     },
     "2020": {
       "Bioenergy": 0.0852,
-      "Hydro": 0.5121,
-      "Solar": 0.1023,
+      "Hydro": 0.512,
+      "Solar": 0.1024,
       "Wind": 0.3005
     },
     "2021": {
       "Bioenergy": 0.0903,
-      "Hydro": 0.4973,
+      "Hydro": 0.4972,
       "Solar": 0.1114,
       "Wind": 0.301
     },
     "2022": {
       "Bioenergy": 0.0564,
-      "Hydro": 0.2877,
-      "Solar": 0.4507,
-      "Wind": 0.2052
+      "Hydro": 0.2876,
+      "Solar": 0.4509,
+      "Wind": 0.205
     },
     "2023": {
       "Bioenergy": 0.0248,
       "Hydro": 0.1541,
-      "Solar": 0.7051,
+      "Solar": 0.7052,
       "Wind": 0.116
     },
     "2024": {
       "Bioenergy": 0.0299,
       "Hydro": 0.1915,
-      "Solar": 0.6458,
-      "Wind": 0.1329
+      "Solar": 0.6459,
+      "Wind": 0.1327
     },
     "2025": {
-      "Bioenergy": 0.0275,
-      "Hydro": 0.1701,
-      "Solar": 0.6809,
-      "Wind": 0.1214
+      "Bioenergy": 0.0263,
+      "Hydro": 0.1595,
+      "Solar": 0.7011,
+      "Wind": 0.1131
     }
   },
   "MU": {
@@ -5889,10 +5889,10 @@
       "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.3538,
-      "Solar": 0.312,
-      "Wind": 0.3321
+      "Bioenergy": 0.0015,
+      "Hydro": 0.3707,
+      "Solar": 0.292,
+      "Wind": 0.3359
     }
   },
   "MY": {
@@ -5933,9 +5933,9 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1098,
-      "Hydro": 0.8075,
-      "Solar": 0.0826,
+      "Bioenergy": 0.109,
+      "Hydro": 0.8082,
+      "Solar": 0.0828,
       "Wind": 0
     }
   },
@@ -6193,19 +6193,19 @@
     "2024": {
       "Bioenergy": 0.4021,
       "Hydro": 0.201,
-      "Solar": 0.0294,
-      "Wind": 0.3675
+      "Solar": 0.0293,
+      "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.3998,
-      "Hydro": 0.2036,
-      "Solar": 0.0309,
-      "Wind": 0.3657
+      "Bioenergy": 0.4002,
+      "Hydro": 0.203,
+      "Solar": 0.0306,
+      "Wind": 0.3662
     }
   },
   "NL": {
     "2019": {
-      "Bioenergy": 0.2235,
+      "Bioenergy": 0.2236,
       "Hydro": 0.0255,
       "Solar": 0.2425,
       "Wind": 0.5085
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9166,
+      "Hydro": 0.9211,
       "Solar": 0,
-      "Wind": 0.0834
+      "Wind": 0.0789
     }
   },
   "NP": {
@@ -6329,10 +6329,10 @@
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Hydro": 0.9351,
-      "Solar": 0.0364,
-      "Wind": 0.0235
+      "Bioenergy": 0.0049,
+      "Hydro": 0.936,
+      "Solar": 0.0368,
+      "Wind": 0.0222
     }
   },
   "NR": {
@@ -6462,9 +6462,9 @@
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.8593,
+      "Hydro": 0.8683,
       "Solar": 0,
-      "Wind": 0.14
+      "Wind": 0.1311
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0078,
-      "Hydro": 0.8657,
-      "Solar": 0.0366,
-      "Wind": 0.0899
+      "Bioenergy": 0.0079,
+      "Hydro": 0.8647,
+      "Solar": 0.038,
+      "Wind": 0.0894
     }
   },
   "PF": {
@@ -6752,27 +6752,27 @@
     },
     "2022": {
       "Bioenergy": 0.0184,
-      "Hydro": 0.7188,
-      "Solar": 0.1671,
+      "Hydro": 0.7187,
+      "Solar": 0.1673,
       "Wind": 0.0956
     },
     "2023": {
       "Bioenergy": 0.0137,
-      "Hydro": 0.6929,
-      "Solar": 0.2144,
-      "Wind": 0.079
+      "Hydro": 0.6916,
+      "Solar": 0.2158,
+      "Wind": 0.0789
     },
     "2024": {
       "Bioenergy": 0.0127,
-      "Hydro": 0.6099,
-      "Solar": 0.3223,
-      "Wind": 0.055
+      "Hydro": 0.6083,
+      "Solar": 0.3242,
+      "Wind": 0.0549
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Hydro": 0.4763,
-      "Solar": 0.4612,
-      "Wind": 0.0542
+      "Bioenergy": 0.008,
+      "Hydro": 0.4904,
+      "Solar": 0.4447,
+      "Wind": 0.0569
     }
   },
   "PL": {
@@ -6807,16 +6807,16 @@
       "Wind": 0.5489
     },
     "2024": {
-      "Bioenergy": 0.052,
-      "Hydro": 0.0527,
-      "Solar": 0.3774,
+      "Bioenergy": 0.0521,
+      "Hydro": 0.0524,
+      "Solar": 0.3778,
       "Wind": 0.5178
     },
     "2025": {
-      "Bioenergy": 0.0617,
-      "Hydro": 0.034,
-      "Solar": 0.4437,
-      "Wind": 0.4605
+      "Bioenergy": 0.0599,
+      "Hydro": 0.0359,
+      "Solar": 0.4563,
+      "Wind": 0.4479
     }
   },
   "PM": {
@@ -6972,8 +6972,8 @@
     },
     "2022": {
       "Bioenergy": 0.127,
-      "Hydro": 0.2419,
-      "Solar": 0.1356,
+      "Hydro": 0.2418,
+      "Solar": 0.1357,
       "Wind": 0.4954
     },
     "2023": {
@@ -6983,16 +6983,16 @@
       "Wind": 0.4026
     },
     "2024": {
-      "Bioenergy": 0.0826,
-      "Hydro": 0.3398,
-      "Solar": 0.2014,
-      "Wind": 0.3762
+      "Bioenergy": 0.0835,
+      "Hydro": 0.3395,
+      "Solar": 0.2011,
+      "Wind": 0.3759
     },
     "2025": {
-      "Bioenergy": 0.0684,
-      "Hydro": 0.385,
-      "Solar": 0.2237,
-      "Wind": 0.323
+      "Bioenergy": 0.068,
+      "Hydro": 0.3735,
+      "Solar": 0.2265,
+      "Wind": 0.332
     }
   },
   "PY": {
@@ -7165,10 +7165,10 @@
       "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.4982,
-      "Solar": 0.2452,
-      "Wind": 0.2358
+      "Bioenergy": 0.0222,
+      "Hydro": 0.4896,
+      "Solar": 0.2483,
+      "Wind": 0.2398
     }
   },
   "RS": {
@@ -7193,7 +7193,7 @@
     "2022": {
       "Bioenergy": 0.0318,
       "Hydro": 0.824,
-      "Solar": 0.0178,
+      "Solar": 0.0179,
       "Wind": 0.1263
     },
     "2023": {
@@ -7203,16 +7203,16 @@
       "Wind": 0.0716
     },
     "2024": {
-      "Bioenergy": 0.0252,
-      "Hydro": 0.8482,
-      "Solar": 0.0166,
-      "Wind": 0.11
+      "Bioenergy": 0.025,
+      "Hydro": 0.8495,
+      "Solar": 0.0164,
+      "Wind": 0.109
     },
     "2025": {
-      "Bioenergy": 0.0292,
-      "Hydro": 0.8267,
-      "Solar": 0.0153,
-      "Wind": 0.1288
+      "Bioenergy": 0.0293,
+      "Hydro": 0.8298,
+      "Solar": 0.0116,
+      "Wind": 0.1292
     }
   },
   "RU": {
@@ -7254,9 +7254,9 @@
     },
     "2025": {
       "Bioenergy": 0.0041,
-      "Hydro": 0.9634,
-      "Solar": 0.0109,
-      "Wind": 0.0216
+      "Hydro": 0.9626,
+      "Solar": 0.0113,
+      "Wind": 0.022
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.3508
     },
     "2025": {
-      "Bioenergy": 0.0519,
-      "Hydro": 0.5498,
-      "Solar": 0.0494,
-      "Wind": 0.3489
+      "Bioenergy": 0.0514,
+      "Hydro": 0.5705,
+      "Solar": 0.046,
+      "Wind": 0.3321
     }
   },
   "SG": {
@@ -7561,10 +7561,10 @@
       "Wind": 0.0013
     },
     "2025": {
-      "Bioenergy": 0.0034,
-      "Hydro": 0.017,
-      "Solar": 0.9648,
-      "Wind": 0.0148
+      "Bioenergy": 0.0036,
+      "Hydro": 0.0211,
+      "Solar": 0.9602,
+      "Wind": 0.0152
     }
   },
   "SH": {
@@ -7649,9 +7649,9 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0214,
-      "Hydro": 0.7324,
-      "Solar": 0.245,
+      "Bioenergy": 0.0211,
+      "Hydro": 0.715,
+      "Solar": 0.2628,
       "Wind": 0.0011
     }
   },
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.2063,
-      "Hydro": 0.6402,
-      "Solar": 0.1535,
+      "Bioenergy": 0.2052,
+      "Hydro": 0.6483,
+      "Solar": 0.1465,
       "Wind": 0
     }
   },
@@ -7998,13 +7998,13 @@
       "Bioenergy": 0.1322,
       "Hydro": 0.533,
       "Solar": 0.2982,
-      "Wind": 0.0366
+      "Wind": 0.0367
     },
     "2025": {
-      "Bioenergy": 0.2818,
-      "Hydro": 0.333,
-      "Solar": 0.29,
-      "Wind": 0.0951
+      "Bioenergy": 0.282,
+      "Hydro": 0.3328,
+      "Solar": 0.2899,
+      "Wind": 0.0953
     }
   },
   "SY": {
@@ -8259,16 +8259,16 @@
       "Wind": 0.1527
     },
     "2024": {
-      "Bioenergy": 0.3585,
+      "Bioenergy": 0.3584,
       "Hydro": 0.2688,
       "Solar": 0.2152,
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.3087,
-      "Hydro": 0.2582,
-      "Solar": 0.2956,
-      "Wind": 0.1375
+      "Bioenergy": 0.3074,
+      "Hydro": 0.263,
+      "Solar": 0.2959,
+      "Wind": 0.1338
     }
   },
   "TJ": {
@@ -8310,9 +8310,9 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Hydro": 0.9959,
-      "Solar": 0.0019,
-      "Wind": 0.0017
+      "Hydro": 0.996,
+      "Solar": 0.002,
+      "Wind": 0.0016
     }
   },
   "TL": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2512
     },
     "2025": {
-      "Bioenergy": 0.0556,
-      "Hydro": 0.4368,
-      "Solar": 0.2521,
-      "Wind": 0.2554
+      "Bioenergy": 0.0554,
+      "Hydro": 0.4435,
+      "Solar": 0.2503,
+      "Wind": 0.2509
     }
   },
   "TT": {
@@ -8617,10 +8617,10 @@
       "Wind": 0.3484
     },
     "2025": {
-      "Bioenergy": 0.0074,
-      "Hydro": 0.1726,
-      "Solar": 0.443,
-      "Wind": 0.377
+      "Bioenergy": 0.0076,
+      "Hydro": 0.1736,
+      "Solar": 0.4536,
+      "Wind": 0.3652
     }
   },
   "TZ": {
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0374,
-      "Hydro": 0.219,
-      "Solar": 0.3339,
-      "Wind": 0.4096
+      "Bioenergy": 0.0381,
+      "Hydro": 0.2162,
+      "Solar": 0.3381,
+      "Wind": 0.4077
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1405,
-      "Hydro": 0.4805,
-      "Solar": 0.0409,
-      "Wind": 0.3381
+      "Bioenergy": 0.1454,
+      "Hydro": 0.4738,
+      "Solar": 0.0407,
+      "Wind": 0.3401
     }
   },
   "UZ": {
@@ -8881,10 +8881,10 @@
       "Wind": 0.0141
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9579,
-      "Solar": 0.0209,
-      "Wind": 0.0172
+      "Bioenergy": 0.0038,
+      "Hydro": 0.9586,
+      "Solar": 0.0213,
+      "Wind": 0.0163
     }
   },
   "VC": {
@@ -9102,9 +9102,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6305,
-      "Solar": 0.2624,
-      "Wind": 0.1071
+      "Hydro": 0.6724,
+      "Solar": 0.2203,
+      "Wind": 0.1074
     }
   },
   "VU": {
@@ -9216,27 +9216,27 @@
     },
     "2022": {
       "Bioenergy": 0.0265,
-      "Hydro": 0.3307,
+      "Hydro": 0.3308,
       "Solar": 0.0182,
       "Wind": 0.6245
     },
     "2023": {
       "Bioenergy": 0.0236,
-      "Hydro": 0.4714,
+      "Hydro": 0.4715,
       "Solar": 0.041,
       "Wind": 0.464
     },
     "2024": {
       "Bioenergy": 0.0279,
-      "Hydro": 0.3915,
+      "Hydro": 0.3916,
       "Solar": 0.0435,
-      "Wind": 0.5372
+      "Wind": 0.5371
     },
     "2025": {
-      "Bioenergy": 0.0333,
-      "Hydro": 0.4311,
-      "Solar": 0.1019,
-      "Wind": 0.4337
+      "Bioenergy": 0.0359,
+      "Hydro": 0.4384,
+      "Solar": 0.1072,
+      "Wind": 0.4185
     }
   },
   "YE": {
@@ -9322,9 +9322,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0716,
-      "Solar": 0.6003,
-      "Wind": 0.3281
+      "Hydro": 0.0634,
+      "Solar": 0.5925,
+      "Wind": 0.3441
     }
   },
   "ZM": {