npm - @digital4better/data - Versions diffs - 1.2.18 → 1.2.20 - Mend

@digital4better/data 1.2.18 → 1.2.20

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 +175 -175
package/data/factor/continent-monthly-green.json +1564 -1564
package/data/factor/continent-monthly.csv +175 -175
package/data/factor/continent-monthly.json +1559 -1559
package/data/factor/continent-yearly-green.csv +20 -20
package/data/factor/continent-yearly-green.json +180 -180
package/data/factor/continent-yearly.csv +20 -20
package/data/factor/continent-yearly.json +179 -179
package/data/factor/country-monthly-green.csv +1976 -1976
package/data/factor/country-monthly-green.json +15962 -15962
package/data/factor/country-monthly.csv +2017 -2017
package/data/factor/country-monthly.json +14434 -14434
package/data/factor/country-yearly-green.csv +281 -281
package/data/factor/country-yearly-green.json +2292 -2292
package/data/factor/country-yearly.csv +281 -281
package/data/factor/country-yearly.json +2101 -2101
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +336 -336
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +351 -351
package/data/factor/subdivision-yearly-green.csv +63 -63
package/data/factor/subdivision-yearly-green.json +561 -561
package/data/factor/subdivision-yearly.csv +63 -63
package/data/factor/subdivision-yearly.json +553 -553
package/data/factor/world-monthly-green.csv +75 -75
package/data/factor/world-monthly-green.json +675 -675
package/data/factor/world-monthly.csv +75 -75
package/data/factor/world-monthly.json +675 -675
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +63 -63
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +63 -63
package/data/mix/continent-monthly-green.csv +172 -172
package/data/mix/continent-monthly-green.json +595 -595
package/data/mix/continent-monthly.csv +172 -172
package/data/mix/continent-monthly.json +1112 -1112
package/data/mix/continent-yearly-green.csv +20 -20
package/data/mix/continent-yearly-green.json +66 -66
package/data/mix/continent-yearly.csv +20 -20
package/data/mix/continent-yearly.json +132 -132
package/data/mix/country-monthly-green.csv +1277 -1277
package/data/mix/country-monthly-green.json +3694 -3694
package/data/mix/country-monthly.csv +1277 -1277
package/data/mix/country-monthly.json +4661 -4661
package/data/mix/country-yearly-green.csv +169 -169
package/data/mix/country-yearly-green.json +517 -517
package/data/mix/country-yearly.csv +169 -169
package/data/mix/country-yearly.json +821 -821
package/data/mix/subdivision-monthly-green.csv +27 -27
package/data/mix/subdivision-monthly-green.json +51 -51
package/data/mix/subdivision-monthly.csv +27 -27
package/data/mix/subdivision-monthly.json +93 -93
package/data/mix/subdivision-yearly-green.csv +47 -47
package/data/mix/subdivision-yearly-green.json +62 -62
package/data/mix/subdivision-yearly.csv +47 -47
package/data/mix/subdivision-yearly.json +102 -102
package/data/mix/world-monthly-green.csv +75 -75
package/data/mix/world-monthly-green.json +298 -298
package/data/mix/world-monthly.csv +75 -75
package/data/mix/world-monthly.json +667 -667
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +28 -28
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +63 -63
package/package.json +1 -1

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

@@ -1,46 +1,46 @@
 {
   "AE": {
     "2019": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.7721,
-      "Solar": 0.1887,
-      "Wind": 0.0343
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 1,
+      "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.7721,
-      "Solar": 0.1887,
-      "Wind": 0.0343
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 1,
+      "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.7721,
-      "Solar": 0.1887,
-      "Wind": 0.0343
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 1,
+      "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.7721,
-      "Solar": 0.1887,
-      "Wind": 0.0343
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 1,
+      "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.7721,
-      "Solar": 0.1887,
-      "Wind": 0.0343
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 1,
+      "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.7721,
-      "Solar": 0.1887,
-      "Wind": 0.0343
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 1,
+      "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.7721,
-      "Solar": 0.1887,
-      "Wind": 0.0343
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 1,
+      "Wind": 0
     }
   },
   "AF": {
@@ -81,10 +81,10 @@
       "Wind": 0.1324
     },
     "2025": {
-      "Bioenergy": 0.0415,
-      "Hydro": 0.6182,
-      "Solar": 0.1829,
-      "Wind": 0.1574
+      "Bioenergy": 0.04,
+      "Hydro": 0.6165,
+      "Solar": 0.1866,
+      "Wind": 0.1569
     }
   },
   "AG": {
@@ -135,13 +135,13 @@
     "2019": {
       "Bioenergy": 0.0112,
       "Hydro": 0.9356,
-      "Solar": 0.0159,
+      "Solar": 0.016,
       "Wind": 0.0372
     },
     "2020": {
       "Bioenergy": 0.0117,
       "Hydro": 0.9276,
-      "Solar": 0.0185,
+      "Solar": 0.0186,
       "Wind": 0.0422
     },
     "2021": {
@@ -152,27 +152,27 @@
     },
     "2022": {
       "Bioenergy": 0.012,
-      "Hydro": 0.9189,
+      "Hydro": 0.9188,
       "Solar": 0.0237,
       "Wind": 0.0454
     },
     "2023": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.912,
-      "Solar": 0.0277,
-      "Wind": 0.0493
+      "Hydro": 0.9119,
+      "Solar": 0.0278,
+      "Wind": 0.0494
     },
     "2024": {
       "Bioenergy": 0.011,
       "Hydro": 0.907,
-      "Solar": 0.0323,
-      "Wind": 0.0497
+      "Solar": 0.0324,
+      "Wind": 0.0496
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Hydro": 0.9182,
-      "Solar": 0.02,
-      "Wind": 0.0507
+      "Bioenergy": 0.0112,
+      "Hydro": 0.9144,
+      "Solar": 0.0243,
+      "Wind": 0.0501
     }
   },
   "AM": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0235,
-      "Hydro": 0.5668,
-      "Solar": 0.0993,
-      "Wind": 0.3104
+      "Bioenergy": 0.0234,
+      "Hydro": 0.5628,
+      "Solar": 0.0988,
+      "Wind": 0.3149
     }
   },
   "AS": {
@@ -372,15 +372,15 @@
     },
     "2022": {
       "Bioenergy": 0.0538,
-      "Hydro": 0.7153,
-      "Solar": 0.0718,
+      "Hydro": 0.7152,
+      "Solar": 0.0719,
       "Wind": 0.1591
     },
     "2023": {
       "Bioenergy": 0.0269,
       "Hydro": 0.7237,
       "Solar": 0.0931,
-      "Wind": 0.1562
+      "Wind": 0.1563
     },
     "2024": {
       "Bioenergy": 0.0307,
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.052,
-      "Hydro": 0.642,
-      "Solar": 0.1113,
-      "Wind": 0.1948
+      "Bioenergy": 0.0502,
+      "Hydro": 0.6302,
+      "Solar": 0.1196,
+      "Wind": 0.1999
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0026,
-      "Hydro": 0.0988,
-      "Solar": 0.5824,
-      "Wind": 0.3161
+      "Bioenergy": 0.0027,
+      "Hydro": 0.1031,
+      "Solar": 0.5655,
+      "Wind": 0.3287
     }
   },
   "AW": {
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9678,
-      "Solar": 0.0161,
-      "Wind": 0.0161
+      "Hydro": 0.9434,
+      "Solar": 0.0188,
+      "Wind": 0.0378
     }
   },
   "BB": {
@@ -653,18 +653,18 @@
       "Wind": 0.176
     },
     "2025": {
-      "Bioenergy": 0.0649,
-      "Hydro": 0.2476,
-      "Solar": 0.4415,
-      "Wind": 0.2461
+      "Bioenergy": 0.0597,
+      "Hydro": 0.2377,
+      "Solar": 0.4679,
+      "Wind": 0.2347
     }
   },
   "BE": {
     "2019": {
       "Bioenergy": 0.1622,
-      "Hydro": 0.0314,
+      "Hydro": 0.0313,
       "Solar": 0.2363,
-      "Wind": 0.5701
+      "Wind": 0.5702
     },
     "2020": {
       "Bioenergy": 0.1299,
@@ -686,21 +686,21 @@
     },
     "2023": {
       "Bioenergy": 0.0432,
-      "Hydro": 0.0393,
+      "Hydro": 0.0392,
       "Solar": 0.3077,
       "Wind": 0.6099
     },
     "2024": {
-      "Bioenergy": 0.0359,
-      "Hydro": 0.0763,
-      "Solar": 0.3426,
-      "Wind": 0.5451
+      "Bioenergy": 0.0362,
+      "Hydro": 0.0794,
+      "Solar": 0.3412,
+      "Wind": 0.5432
     },
     "2025": {
-      "Bioenergy": 0.0447,
-      "Hydro": 0.0885,
-      "Solar": 0.2332,
-      "Wind": 0.6336
+      "Bioenergy": 0.0451,
+      "Hydro": 0.0911,
+      "Solar": 0.3215,
+      "Wind": 0.5423
     }
   },
   "BF": {
@@ -780,15 +780,15 @@
     },
     "2024": {
       "Bioenergy": 0.0171,
-      "Hydro": 0.32,
-      "Solar": 0.5037,
-      "Wind": 0.1593
+      "Hydro": 0.3196,
+      "Solar": 0.5031,
+      "Wind": 0.1602
     },
     "2025": {
-      "Bioenergy": 0.0147,
-      "Hydro": 0.2887,
-      "Solar": 0.4926,
-      "Wind": 0.204
+      "Bioenergy": 0.0143,
+      "Hydro": 0.2613,
+      "Solar": 0.5356,
+      "Wind": 0.1888
     }
   },
   "BH": {
@@ -1242,7 +1242,7 @@
       "Bioenergy": 0.2286,
       "Hydro": 0.4047,
       "Solar": 0.152,
-      "Wind": 0.2148
+      "Wind": 0.2147
     },
     "2021": {
       "Bioenergy": 0.2408,
@@ -1258,15 +1258,15 @@
     },
     "2023": {
       "Bioenergy": 0.4119,
-      "Hydro": 0.3103,
+      "Hydro": 0.3102,
       "Solar": 0.1261,
       "Wind": 0.1517
     },
     "2024": {
       "Bioenergy": 0.3889,
-      "Hydro": 0.3021,
-      "Solar": 0.1788,
-      "Wind": 0.1303
+      "Hydro": 0.3019,
+      "Solar": 0.1789,
+      "Wind": 0.1304
     },
     "2025": {
       "Bioenergy": 0.4433,
@@ -1313,10 +1313,10 @@
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.2165,
-      "Hydro": 0.6815,
-      "Solar": 0.0599,
-      "Wind": 0.0421
+      "Bioenergy": 0.2175,
+      "Hydro": 0.6774,
+      "Solar": 0.0597,
+      "Wind": 0.0454
     }
   },
   "CA": {
@@ -1357,10 +1357,10 @@
       "Wind": 0.1147
     },
     "2025": {
-      "Bioenergy": 0.0229,
-      "Hydro": 0.8577,
-      "Solar": 0.0036,
-      "Wind": 0.1159
+      "Bioenergy": 0.0218,
+      "Hydro": 0.8529,
+      "Solar": 0.0048,
+      "Wind": 0.1205
     }
   },
   "CD": {
@@ -1498,45 +1498,45 @@
   "CH": {
     "2019": {
       "Bioenergy": 0.0022,
-      "Hydro": 0.9418,
-      "Solar": 0.0446,
-      "Wind": 0.0114
+      "Hydro": 0.9356,
+      "Solar": 0.0503,
+      "Wind": 0.0119
     },
     "2020": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9396,
-      "Solar": 0.0477,
-      "Wind": 0.011
+      "Hydro": 0.9294,
+      "Solar": 0.0576,
+      "Wind": 0.0112
     },
     "2021": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.9116,
-      "Solar": 0.0616,
-      "Wind": 0.0216
+      "Bioenergy": 0.005,
+      "Hydro": 0.9053,
+      "Solar": 0.0673,
+      "Wind": 0.0224
     },
     "2022": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.8856,
-      "Solar": 0.0834,
+      "Bioenergy": 0.005,
+      "Hydro": 0.8686,
+      "Solar": 0.1006,
       "Wind": 0.0258
     },
     "2023": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.9046,
-      "Solar": 0.0828,
-      "Wind": 0.0109
+      "Hydro": 0.8874,
+      "Solar": 0.0992,
+      "Wind": 0.0119
     },
     "2024": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.9093,
-      "Solar": 0.0846,
-      "Wind": 0.0055
+      "Hydro": 0.8894,
+      "Solar": 0.1031,
+      "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.8931,
-      "Solar": 0.0745,
-      "Wind": 0.0272
+      "Bioenergy": 0.0071,
+      "Hydro": 0.8099,
+      "Solar": 0.146,
+      "Wind": 0.0369
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0345,
-      "Hydro": 0.3728,
-      "Solar": 0.3947,
-      "Wind": 0.198
+      "Bioenergy": 0.0346,
+      "Hydro": 0.3696,
+      "Solar": 0.3922,
+      "Wind": 0.2035
     }
   },
   "CM": {
@@ -1975,8 +1975,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.7999,
-      "Wind": 0.2001
+      "Solar": 0.818,
+      "Wind": 0.182
     }
   },
   "CZ": {
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.3489,
-      "Hydro": 0.2673,
-      "Solar": 0.3068,
-      "Wind": 0.077
+      "Bioenergy": 0.3233,
+      "Hydro": 0.2408,
+      "Solar": 0.3665,
+      "Wind": 0.0694
     }
   },
   "DE": {
@@ -2061,10 +2061,10 @@
       "Wind": 0.4833
     },
     "2025": {
-      "Bioenergy": 0.1749,
-      "Hydro": 0.0782,
-      "Solar": 0.1553,
-      "Wind": 0.5917
+      "Bioenergy": 0.1692,
+      "Hydro": 0.0729,
+      "Solar": 0.2157,
+      "Wind": 0.5422
     }
   },
   "DJ": {
@@ -2143,16 +2143,16 @@
       "Wind": 0.7179
     },
     "2024": {
-      "Bioenergy": 0.1378,
-      "Hydro": 0.0248,
-      "Solar": 0.1358,
-      "Wind": 0.7016
+      "Bioenergy": 0.1375,
+      "Hydro": 0.0247,
+      "Solar": 0.1359,
+      "Wind": 0.7019
     },
     "2025": {
-      "Bioenergy": 0.1979,
-      "Hydro": 0.0342,
-      "Solar": 0.0577,
-      "Wind": 0.7102
+      "Bioenergy": 0.1875,
+      "Hydro": 0.0281,
+      "Solar": 0.0879,
+      "Wind": 0.6964
     }
   },
   "DM": {
@@ -2325,10 +2325,10 @@
       "Wind": 0.0147
     },
     "2025": {
-      "Bioenergy": 0.0006,
-      "Hydro": 0.9774,
-      "Solar": 0.009,
-      "Wind": 0.013
+      "Bioenergy": 0.0007,
+      "Hydro": 0.9768,
+      "Solar": 0.0089,
+      "Wind": 0.0136
     }
   },
   "EE": {
@@ -2340,39 +2340,39 @@
     },
     "2020": {
       "Bioenergy": 0.2352,
-      "Hydro": 0.2299,
-      "Solar": 0.0867,
-      "Wind": 0.4483
+      "Hydro": 0.2298,
+      "Solar": 0.0868,
+      "Wind": 0.4482
     },
     "2021": {
       "Bioenergy": 0.2228,
-      "Hydro": 0.1845,
-      "Solar": 0.1679,
-      "Wind": 0.4247
+      "Hydro": 0.1846,
+      "Solar": 0.168,
+      "Wind": 0.4246
     },
     "2022": {
       "Bioenergy": 0.328,
       "Hydro": 0.0688,
-      "Solar": 0.2529,
+      "Solar": 0.253,
       "Wind": 0.3503
     },
     "2023": {
       "Bioenergy": 0.1797,
       "Hydro": 0.169,
-      "Solar": 0.2782,
-      "Wind": 0.373
+      "Solar": 0.2783,
+      "Wind": 0.3731
     },
     "2024": {
-      "Bioenergy": 0.141,
-      "Hydro": 0.1372,
-      "Solar": 0.3003,
-      "Wind": 0.4215
+      "Bioenergy": 0.1402,
+      "Hydro": 0.1365,
+      "Solar": 0.3042,
+      "Wind": 0.4191
     },
     "2025": {
-      "Bioenergy": 0.2174,
-      "Hydro": 0.1573,
-      "Solar": 0.0662,
-      "Wind": 0.5591
+      "Bioenergy": 0.1862,
+      "Hydro": 0.1266,
+      "Solar": 0.1484,
+      "Wind": 0.5389
     }
   },
   "EG": {
@@ -2408,15 +2408,15 @@
     },
     "2024": {
       "Bioenergy": 0.0042,
-      "Hydro": 0.5835,
-      "Solar": 0.1992,
-      "Wind": 0.213
+      "Hydro": 0.5534,
+      "Solar": 0.2015,
+      "Wind": 0.241
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.5914,
-      "Solar": 0.1948,
-      "Wind": 0.2098
+      "Bioenergy": 0.0043,
+      "Hydro": 0.4853,
+      "Solar": 0.2171,
+      "Wind": 0.2933
     }
   },
   "ER": {
@@ -2501,10 +2501,10 @@
       "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.0259,
-      "Hydro": 0.2877,
-      "Solar": 0.2722,
-      "Wind": 0.4141
+      "Bioenergy": 0.0231,
+      "Hydro": 0.2703,
+      "Solar": 0.2496,
+      "Wind": 0.457
     }
   },
   "ET": {
@@ -2567,11 +2567,11 @@
     "2021": {
       "Bioenergy": 0.2968,
       "Hydro": 0.447,
-      "Solar": 0.0255,
+      "Solar": 0.0256,
       "Wind": 0.2306
     },
     "2022": {
-      "Bioenergy": 0.303,
+      "Bioenergy": 0.3029,
       "Hydro": 0.372,
       "Solar": 0.0239,
       "Wind": 0.3012
@@ -2589,10 +2589,10 @@
       "Wind": 0.4324
     },
     "2025": {
-      "Bioenergy": 0.2098,
-      "Hydro": 0.2661,
-      "Solar": 0.0088,
-      "Wind": 0.5153
+      "Bioenergy": 0.2226,
+      "Hydro": 0.2766,
+      "Solar": 0.0148,
+      "Wind": 0.486
     }
   },
   "FJ": {
@@ -2736,7 +2736,7 @@
     },
     "2020": {
       "Bioenergy": 0.0262,
-      "Hydro": 0.5221,
+      "Hydro": 0.522,
       "Solar": 0.111,
       "Wind": 0.3407
     },
@@ -2749,7 +2749,7 @@
     "2022": {
       "Bioenergy": 0.038,
       "Hydro": 0.4255,
-      "Solar": 0.1768,
+      "Solar": 0.1769,
       "Wind": 0.3596
     },
     "2023": {
@@ -2760,15 +2760,15 @@
     },
     "2024": {
       "Bioenergy": 0.0227,
-      "Hydro": 0.4665,
-      "Solar": 0.1692,
-      "Wind": 0.3416
+      "Hydro": 0.4659,
+      "Solar": 0.1689,
+      "Wind": 0.3424
     },
     "2025": {
-      "Bioenergy": 0.0212,
-      "Hydro": 0.4924,
-      "Solar": 0.1179,
-      "Wind": 0.3685
+      "Bioenergy": 0.0216,
+      "Hydro": 0.4556,
+      "Solar": 0.1454,
+      "Wind": 0.3774
     }
   },
   "GA": {
@@ -2819,7 +2819,7 @@
     "2019": {
       "Bioenergy": 0.1779,
       "Hydro": 0.0712,
-      "Solar": 0.1231,
+      "Solar": 0.1232,
       "Wind": 0.6278
     },
     "2020": {
@@ -2830,33 +2830,33 @@
     },
     "2021": {
       "Bioenergy": 0.1908,
-      "Hydro": 0.0727,
+      "Hydro": 0.0728,
       "Solar": 0.1187,
       "Wind": 0.6178
     },
     "2022": {
-      "Bioenergy": 0.1387,
-      "Hydro": 0.0396,
-      "Solar": 0.1156,
-      "Wind": 0.7061
+      "Bioenergy": 0.1376,
+      "Hydro": 0.0393,
+      "Solar": 0.1147,
+      "Wind": 0.7085
     },
     "2023": {
-      "Bioenergy": 0.1203,
-      "Hydro": 0.0626,
-      "Solar": 0.1172,
-      "Wind": 0.6999
+      "Bioenergy": 0.1195,
+      "Hydro": 0.0621,
+      "Solar": 0.1165,
+      "Wind": 0.7018
     },
     "2024": {
-      "Bioenergy": 0.1486,
-      "Hydro": 0.073,
-      "Solar": 0.1245,
-      "Wind": 0.6539
+      "Bioenergy": 0.1502,
+      "Hydro": 0.0737,
+      "Solar": 0.1259,
+      "Wind": 0.6501
     },
     "2025": {
-      "Bioenergy": 0.1482,
-      "Hydro": 0.0554,
-      "Solar": 0.0514,
-      "Wind": 0.745
+      "Bioenergy": 0.1617,
+      "Hydro": 0.0729,
+      "Solar": 0.1014,
+      "Wind": 0.664
     }
   },
   "GD": {
@@ -2941,10 +2941,10 @@
       "Wind": 0.0181
     },
     "2025": {
-      "Bioenergy": 0.0113,
-      "Hydro": 0.8865,
-      "Solar": 0.0438,
-      "Wind": 0.0584
+      "Bioenergy": 0.0136,
+      "Hydro": 0.8603,
+      "Solar": 0.0558,
+      "Wind": 0.0703
     }
   },
   "GF": {
@@ -3308,8 +3308,8 @@
     },
     "2020": {
       "Bioenergy": 0.0152,
-      "Hydro": 0.2391,
-      "Solar": 0.2536,
+      "Hydro": 0.239,
+      "Solar": 0.2537,
       "Wind": 0.4921
     },
     "2021": {
@@ -3332,15 +3332,15 @@
     },
     "2024": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.1139,
-      "Solar": 0.4503,
-      "Wind": 0.4344
+      "Hydro": 0.1142,
+      "Solar": 0.4488,
+      "Wind": 0.4355
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.1138,
-      "Solar": 0.4118,
-      "Wind": 0.4745
+      "Bioenergy": 0.0006,
+      "Hydro": 0.0923,
+      "Solar": 0.4328,
+      "Wind": 0.4743
     }
   },
   "GT": {
@@ -3557,10 +3557,10 @@
       "Wind": 0.24
     },
     "2025": {
-      "Bioenergy": 0.1154,
-      "Hydro": 0.2925,
-      "Solar": 0.3013,
-      "Wind": 0.2908
+      "Bioenergy": 0.1119,
+      "Hydro": 0.2924,
+      "Solar": 0.307,
+      "Wind": 0.2887
     }
   },
   "HN": {
@@ -3601,54 +3601,54 @@
       "Wind": 0.141
     },
     "2025": {
-      "Bioenergy": 0.2437,
-      "Hydro": 0.4261,
+      "Bioenergy": 0.2438,
+      "Hydro": 0.4257,
       "Solar": 0.1903,
-      "Wind": 0.14
+      "Wind": 0.1402
     }
   },
   "HR": {
     "2019": {
       "Bioenergy": 0.065,
       "Hydro": 0.6848,
-      "Solar": 0.0331,
+      "Solar": 0.0332,
       "Wind": 0.217
     },
     "2020": {
       "Bioenergy": 0.0708,
-      "Hydro": 0.6455,
+      "Hydro": 0.6454,
       "Solar": 0.034,
       "Wind": 0.2497
     },
     "2021": {
       "Bioenergy": 0.0687,
       "Hydro": 0.6665,
-      "Solar": 0.0296,
-      "Wind": 0.2352
+      "Solar": 0.0297,
+      "Wind": 0.2351
     },
     "2022": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.5617,
-      "Solar": 0.051,
+      "Hydro": 0.5616,
+      "Solar": 0.0511,
       "Wind": 0.3027
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6405,
+      "Hydro": 0.6404,
       "Solar": 0.0511,
       "Wind": 0.2488
     },
     "2024": {
       "Bioenergy": 0.0634,
-      "Hydro": 0.5506,
-      "Solar": 0.1112,
+      "Hydro": 0.5505,
+      "Solar": 0.1113,
       "Wind": 0.2749
     },
     "2025": {
-      "Bioenergy": 0.0668,
-      "Hydro": 0.5313,
-      "Solar": 0.0672,
-      "Wind": 0.3347
+      "Bioenergy": 0.0581,
+      "Hydro": 0.5372,
+      "Solar": 0.0779,
+      "Wind": 0.3268
     }
   },
   "HT": {
@@ -3698,45 +3698,45 @@
   "HU": {
     "2019": {
       "Bioenergy": 0.1795,
-      "Hydro": 0.3172,
-      "Solar": 0.2485,
+      "Hydro": 0.3171,
+      "Solar": 0.2486,
       "Wind": 0.2548
     },
     "2020": {
       "Bioenergy": 0.161,
-      "Hydro": 0.2777,
-      "Solar": 0.3364,
+      "Hydro": 0.2775,
+      "Solar": 0.3365,
       "Wind": 0.2249
     },
     "2021": {
-      "Bioenergy": 0.1476,
-      "Hydro": 0.2312,
+      "Bioenergy": 0.1475,
+      "Hydro": 0.2313,
       "Solar": 0.4303,
       "Wind": 0.1909
     },
     "2022": {
-      "Bioenergy": 0.1386,
+      "Bioenergy": 0.1385,
       "Hydro": 0.187,
       "Solar": 0.49,
-      "Wind": 0.1844
+      "Wind": 0.1845
     },
     "2023": {
-      "Bioenergy": 0.0847,
-      "Hydro": 0.1679,
+      "Bioenergy": 0.0846,
+      "Hydro": 0.1678,
       "Solar": 0.5813,
-      "Wind": 0.1661
+      "Wind": 0.1662
     },
     "2024": {
       "Bioenergy": 0.0807,
       "Hydro": 0.1386,
-      "Solar": 0.644,
-      "Wind": 0.1367
+      "Solar": 0.6441,
+      "Wind": 0.1366
     },
     "2025": {
-      "Bioenergy": 0.1477,
-      "Hydro": 0.1843,
-      "Solar": 0.4894,
-      "Wind": 0.1786
+      "Bioenergy": 0.1426,
+      "Hydro": 0.1651,
+      "Solar": 0.5262,
+      "Wind": 0.1661
     }
   },
   "ID": {
@@ -3777,9 +3777,9 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3551,
-      "Hydro": 0.6194,
-      "Solar": 0.0077,
+      "Bioenergy": 0.355,
+      "Hydro": 0.6193,
+      "Solar": 0.0078,
       "Wind": 0.0179
     }
   },
@@ -3793,12 +3793,12 @@
     "2020": {
       "Bioenergy": 0.0186,
       "Hydro": 0.1144,
-      "Solar": 0.0097,
+      "Solar": 0.0098,
       "Wind": 0.8573
     },
     "2021": {
       "Bioenergy": 0.0187,
-      "Hydro": 0.112,
+      "Hydro": 0.1121,
       "Solar": 0.0122,
       "Wind": 0.8571
     },
@@ -3816,15 +3816,15 @@
     },
     "2024": {
       "Bioenergy": 0.018,
-      "Hydro": 0.1142,
-      "Solar": 0.0745,
+      "Hydro": 0.1141,
+      "Solar": 0.0746,
       "Wind": 0.7933
     },
     "2025": {
       "Bioenergy": 0.0138,
-      "Hydro": 0.0991,
-      "Solar": 0.0239,
-      "Wind": 0.8633
+      "Hydro": 0.0987,
+      "Solar": 0.0268,
+      "Wind": 0.8606
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0849,
-      "Hydro": 0.2827,
-      "Solar": 0.4336,
-      "Wind": 0.1989
+      "Bioenergy": 0.0755,
+      "Hydro": 0.2806,
+      "Solar": 0.4637,
+      "Wind": 0.1803
     }
   },
   "IQ": {
@@ -4056,7 +4056,7 @@
     },
     "2020": {
       "Bioenergy": 0.1634,
-      "Hydro": 0.425,
+      "Hydro": 0.4249,
       "Solar": 0.22,
       "Wind": 0.1916
     },
@@ -4068,27 +4068,27 @@
     },
     "2022": {
       "Bioenergy": 0.1649,
-      "Hydro": 0.3141,
+      "Hydro": 0.314,
       "Solar": 0.2844,
-      "Wind": 0.2366
+      "Wind": 0.2367
     },
     "2023": {
       "Bioenergy": 0.1325,
-      "Hydro": 0.3582,
-      "Solar": 0.2696,
+      "Hydro": 0.3581,
+      "Solar": 0.2697,
       "Wind": 0.2397
     },
     "2024": {
-      "Bioenergy": 0.1179,
-      "Hydro": 0.3954,
-      "Solar": 0.2806,
-      "Wind": 0.2061
+      "Bioenergy": 0.118,
+      "Hydro": 0.396,
+      "Solar": 0.2809,
+      "Wind": 0.2052
     },
     "2025": {
-      "Bioenergy": 0.1451,
-      "Hydro": 0.3024,
-      "Solar": 0.1993,
-      "Wind": 0.3532
+      "Bioenergy": 0.1463,
+      "Hydro": 0.3023,
+      "Solar": 0.2061,
+      "Wind": 0.3453
     }
   },
   "JM": {
@@ -4261,10 +4261,10 @@
       "Wind": 0.2908
     },
     "2025": {
-      "Bioenergy": 0.0391,
-      "Hydro": 0.5905,
+      "Bioenergy": 0.0389,
+      "Hydro": 0.5732,
       "Solar": 0.0791,
-      "Wind": 0.2913
+      "Wind": 0.3088
     }
   },
   "KG": {
@@ -4305,9 +4305,9 @@
       "Wind": 0.008
     },
     "2025": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.983,
-      "Solar": 0.0076,
+      "Bioenergy": 0.0019,
+      "Hydro": 0.9828,
+      "Solar": 0.0078,
       "Wind": 0.0075
     }
   },
@@ -4349,10 +4349,10 @@
       "Wind": 0.0418
     },
     "2025": {
-      "Bioenergy": 0.0318,
-      "Hydro": 0.8468,
-      "Solar": 0.0725,
-      "Wind": 0.0489
+      "Bioenergy": 0.0313,
+      "Hydro": 0.8459,
+      "Solar": 0.0738,
+      "Wind": 0.049
     }
   },
   "KI": {
@@ -4702,9 +4702,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.5775,
-      "Solar": 0.0636,
-      "Wind": 0.3589
+      "Hydro": 0.5715,
+      "Solar": 0.0871,
+      "Wind": 0.3414
     }
   },
   "LA": {
@@ -4974,89 +4974,89 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.368,
-      "Solar": 0.069,
+      "Hydro": 0.3679,
+      "Solar": 0.0691,
       "Wind": 0.4336
     },
     "2020": {
       "Bioenergy": 0.1268,
-      "Hydro": 0.337,
-      "Solar": 0.0716,
+      "Hydro": 0.3368,
+      "Solar": 0.0718,
       "Wind": 0.4646
     },
     "2021": {
-      "Bioenergy": 0.13,
-      "Hydro": 0.3626,
-      "Solar": 0.0897,
-      "Wind": 0.4177
+      "Bioenergy": 0.1299,
+      "Hydro": 0.3627,
+      "Solar": 0.0898,
+      "Wind": 0.4176
     },
     "2022": {
-      "Bioenergy": 0.1122,
-      "Hydro": 0.3111,
-      "Solar": 0.1392,
+      "Bioenergy": 0.1121,
+      "Hydro": 0.3109,
+      "Solar": 0.1394,
       "Wind": 0.4375
     },
     "2023": {
-      "Bioenergy": 0.0723,
-      "Hydro": 0.2527,
-      "Solar": 0.1668,
+      "Bioenergy": 0.0722,
+      "Hydro": 0.2526,
+      "Solar": 0.167,
       "Wind": 0.5082
     },
     "2024": {
       "Bioenergy": 0.0516,
-      "Hydro": 0.1846,
-      "Solar": 0.2349,
-      "Wind": 0.5289
+      "Hydro": 0.1845,
+      "Solar": 0.2351,
+      "Wind": 0.5288
     },
     "2025": {
-      "Bioenergy": 0.0505,
-      "Hydro": 0.1852,
-      "Solar": 0.1024,
-      "Wind": 0.6619
+      "Bioenergy": 0.0475,
+      "Hydro": 0.1498,
+      "Solar": 0.1303,
+      "Wind": 0.6724
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.149,
-      "Hydro": 0.3872,
-      "Solar": 0.1304,
+      "Hydro": 0.3871,
+      "Solar": 0.1305,
       "Wind": 0.3334
     },
     "2020": {
       "Bioenergy": 0.1646,
-      "Hydro": 0.3501,
-      "Solar": 0.1319,
+      "Hydro": 0.3499,
+      "Solar": 0.1321,
       "Wind": 0.3534
     },
     "2021": {
-      "Bioenergy": 0.1846,
-      "Hydro": 0.344,
-      "Solar": 0.1522,
-      "Wind": 0.3192
+      "Bioenergy": 0.1845,
+      "Hydro": 0.3441,
+      "Solar": 0.1523,
+      "Wind": 0.3191
     },
     "2022": {
-      "Bioenergy": 0.187,
-      "Hydro": 0.2892,
-      "Solar": 0.1948,
+      "Bioenergy": 0.1869,
+      "Hydro": 0.2891,
+      "Solar": 0.1949,
       "Wind": 0.3291
     },
     "2023": {
-      "Bioenergy": 0.1105,
-      "Hydro": 0.2893,
-      "Solar": 0.1987,
+      "Bioenergy": 0.1104,
+      "Hydro": 0.2891,
+      "Solar": 0.1988,
       "Wind": 0.4016
     },
     "2024": {
       "Bioenergy": 0.1385,
-      "Hydro": 0.2936,
-      "Solar": 0.2177,
-      "Wind": 0.3502
+      "Hydro": 0.2935,
+      "Solar": 0.218,
+      "Wind": 0.35
     },
     "2025": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.3286,
-      "Solar": 0.1249,
-      "Wind": 0.4123
+      "Bioenergy": 0.1555,
+      "Hydro": 0.2945,
+      "Solar": 0.1765,
+      "Wind": 0.3735
     }
   },
   "LV": {
@@ -5075,32 +5075,32 @@
     "2021": {
       "Bioenergy": 0.147,
       "Hydro": 0.7508,
-      "Solar": 0.0238,
+      "Solar": 0.0239,
       "Wind": 0.0783
     },
     "2022": {
       "Bioenergy": 0.1007,
-      "Hydro": 0.751,
-      "Solar": 0.0401,
-      "Wind": 0.1082
+      "Hydro": 0.7509,
+      "Solar": 0.0402,
+      "Wind": 0.1083
     },
     "2023": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.776,
-      "Solar": 0.0646,
+      "Hydro": 0.7759,
+      "Solar": 0.0647,
       "Wind": 0.1011
     },
     "2024": {
-      "Bioenergy": 0.0746,
-      "Hydro": 0.6909,
-      "Solar": 0.1265,
-      "Wind": 0.1081
+      "Bioenergy": 0.087,
+      "Hydro": 0.681,
+      "Solar": 0.124,
+      "Wind": 0.108
     },
     "2025": {
-      "Bioenergy": 0.0646,
-      "Hydro": 0.8322,
-      "Solar": 0.0414,
-      "Wind": 0.0618
+      "Bioenergy": 0.0921,
+      "Hydro": 0.78,
+      "Solar": 0.06,
+      "Wind": 0.0679
     }
   },
   "LY": {
@@ -5194,7 +5194,7 @@
   "MD": {
     "2019": {
       "Bioenergy": 0.0836,
-      "Hydro": 0.7092,
+      "Hydro": 0.7091,
       "Solar": 0.0349,
       "Wind": 0.1723
     },
@@ -5212,13 +5212,13 @@
     },
     "2022": {
       "Bioenergy": 0.0471,
-      "Hydro": 0.6988,
-      "Solar": 0.0764,
-      "Wind": 0.1776
+      "Hydro": 0.6986,
+      "Solar": 0.0766,
+      "Wind": 0.1777
     },
     "2023": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.8465,
+      "Hydro": 0.8464,
       "Solar": 0.0156,
       "Wind": 0.1267
     },
@@ -5229,10 +5229,10 @@
       "Wind": 0.1776
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.6432,
-      "Solar": 0.3106,
-      "Wind": 0.038
+      "Bioenergy": 0.0084,
+      "Hydro": 0.6411,
+      "Solar": 0.313,
+      "Wind": 0.0375
     }
   },
   "ME": {
@@ -5244,7 +5244,7 @@
     },
     "2020": {
       "Bioenergy": 0.0143,
-      "Hydro": 0.7523,
+      "Hydro": 0.7522,
       "Solar": 0.0175,
       "Wind": 0.2159
     },
@@ -5268,15 +5268,15 @@
     },
     "2024": {
       "Bioenergy": 0.0069,
-      "Hydro": 0.7728,
-      "Solar": 0.0565,
+      "Hydro": 0.7727,
+      "Solar": 0.0566,
       "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.8021,
-      "Solar": 0.0125,
-      "Wind": 0.1771
+      "Bioenergy": 0.0067,
+      "Hydro": 0.7989,
+      "Solar": 0.0121,
+      "Wind": 0.1823
     }
   },
   "MG": {
@@ -5328,11 +5328,11 @@
       "Bioenergy": 0.0676,
       "Hydro": 0.7699,
       "Solar": 0.0192,
-      "Wind": 0.1432
+      "Wind": 0.1433
     },
     "2020": {
       "Bioenergy": 0.0715,
-      "Hydro": 0.7499,
+      "Hydro": 0.7498,
       "Solar": 0.0264,
       "Wind": 0.1522
     },
@@ -5344,8 +5344,8 @@
     },
     "2022": {
       "Bioenergy": 0.042,
-      "Hydro": 0.7829,
-      "Solar": 0.0418,
+      "Hydro": 0.7827,
+      "Solar": 0.0419,
       "Wind": 0.1333
     },
     "2023": {
@@ -5356,15 +5356,15 @@
     },
     "2024": {
       "Bioenergy": 0.0541,
-      "Hydro": 0.6824,
+      "Hydro": 0.6827,
       "Solar": 0.1418,
-      "Wind": 0.1217
+      "Wind": 0.1213
     },
     "2025": {
-      "Bioenergy": 0.0565,
-      "Hydro": 0.6702,
-      "Solar": 0.0681,
-      "Wind": 0.2052
+      "Bioenergy": 0.0564,
+      "Hydro": 0.6646,
+      "Solar": 0.1099,
+      "Wind": 0.169
     }
   },
   "ML": {
@@ -5537,10 +5537,10 @@
       "Wind": 0.2176
     },
     "2025": {
-      "Bioenergy": 0.2057,
-      "Hydro": 0.2642,
-      "Solar": 0.2676,
-      "Wind": 0.2626
+      "Bioenergy": 0.2017,
+      "Hydro": 0.2644,
+      "Solar": 0.2729,
+      "Wind": 0.261
     }
   },
   "MQ": {
@@ -5678,45 +5678,45 @@
   "MT": {
     "2019": {
       "Bioenergy": 0.0877,
-      "Hydro": 0.5232,
-      "Solar": 0.1021,
+      "Hydro": 0.5231,
+      "Solar": 0.1022,
       "Wind": 0.287
     },
     "2020": {
       "Bioenergy": 0.0851,
-      "Hydro": 0.5121,
-      "Solar": 0.1024,
+      "Hydro": 0.5119,
+      "Solar": 0.1026,
       "Wind": 0.3004
     },
     "2021": {
       "Bioenergy": 0.0898,
       "Hydro": 0.498,
-      "Solar": 0.1106,
-      "Wind": 0.3017
+      "Solar": 0.1108,
+      "Wind": 0.3015
     },
     "2022": {
       "Bioenergy": 0.0561,
-      "Hydro": 0.2887,
-      "Solar": 0.4496,
-      "Wind": 0.2056
+      "Hydro": 0.2886,
+      "Solar": 0.4497,
+      "Wind": 0.2057
     },
     "2023": {
       "Bioenergy": 0.0248,
-      "Hydro": 0.1545,
+      "Hydro": 0.1544,
       "Solar": 0.7047,
-      "Wind": 0.116
+      "Wind": 0.1161
     },
     "2024": {
-      "Bioenergy": 0.03,
-      "Hydro": 0.1923,
-      "Solar": 0.6445,
-      "Wind": 0.1332
+      "Bioenergy": 0.0301,
+      "Hydro": 0.1921,
+      "Solar": 0.6448,
+      "Wind": 0.1331
     },
     "2025": {
       "Bioenergy": 0.0459,
-      "Hydro": 0.2607,
-      "Solar": 0.4827,
-      "Wind": 0.2107
+      "Hydro": 0.2557,
+      "Solar": 0.493,
+      "Wind": 0.2055
     }
   },
   "MU": {
@@ -5890,9 +5890,9 @@
     },
     "2025": {
       "Bioenergy": 0.0023,
-      "Hydro": 0.2829,
-      "Solar": 0.2675,
-      "Wind": 0.4474
+      "Hydro": 0.283,
+      "Solar": 0.2674,
+      "Wind": 0.4473
     }
   },
   "MY": {
@@ -5933,9 +5933,9 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1071,
-      "Hydro": 0.8095,
-      "Solar": 0.0834,
+      "Bioenergy": 0.1073,
+      "Hydro": 0.8076,
+      "Solar": 0.0851,
       "Wind": 0
     }
   },
@@ -6197,10 +6197,10 @@
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.398,
-      "Hydro": 0.2099,
-      "Solar": 0.0315,
-      "Wind": 0.3607
+      "Bioenergy": 0.3987,
+      "Hydro": 0.2076,
+      "Solar": 0.0313,
+      "Wind": 0.3624
     }
   },
   "NL": {
@@ -6212,7 +6212,7 @@
     },
     "2020": {
       "Bioenergy": 0.2457,
-      "Hydro": 0.0078,
+      "Hydro": 0.0079,
       "Solar": 0.2638,
       "Wind": 0.4827
     },
@@ -6220,7 +6220,7 @@
       "Bioenergy": 0.248,
       "Hydro": 0.0162,
       "Solar": 0.2893,
-      "Wind": 0.4465
+      "Wind": 0.4464
     },
     "2022": {
       "Bioenergy": 0.1866,
@@ -6241,10 +6241,10 @@
       "Wind": 0.5327
     },
     "2025": {
-      "Bioenergy": 0.1753,
-      "Hydro": 0.0023,
-      "Solar": 0.2079,
-      "Wind": 0.6145
+      "Bioenergy": 0.1737,
+      "Hydro": 0.0022,
+      "Solar": 0.2909,
+      "Wind": 0.5331
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9183,
+      "Hydro": 0.9124,
       "Solar": 0,
-      "Wind": 0.0817
+      "Wind": 0.0876
     }
   },
   "NP": {
@@ -6329,10 +6329,10 @@
       "Wind": 0.0194
     },
     "2025": {
-      "Bioenergy": 0.0055,
-      "Hydro": 0.9388,
-      "Solar": 0.0334,
-      "Wind": 0.0223
+      "Bioenergy": 0.0053,
+      "Hydro": 0.9383,
+      "Solar": 0.034,
+      "Wind": 0.0224
     }
   },
   "NR": {
@@ -6769,10 +6769,10 @@
       "Wind": 0.055
     },
     "2025": {
-      "Bioenergy": 0.0221,
-      "Hydro": 0.3947,
-      "Solar": 0.5257,
-      "Wind": 0.0576
+      "Bioenergy": 0.0202,
+      "Hydro": 0.3613,
+      "Solar": 0.575,
+      "Wind": 0.0435
     }
   },
   "PL": {
@@ -6803,20 +6803,20 @@
     "2023": {
       "Bioenergy": 0.0544,
       "Hydro": 0.0656,
-      "Solar": 0.3309,
+      "Solar": 0.331,
       "Wind": 0.549
     },
     "2024": {
-      "Bioenergy": 0.0524,
-      "Hydro": 0.0538,
-      "Solar": 0.38,
-      "Wind": 0.5138
+      "Bioenergy": 0.0521,
+      "Hydro": 0.0528,
+      "Solar": 0.3773,
+      "Wind": 0.5179
     },
     "2025": {
-      "Bioenergy": 0.0825,
-      "Hydro": 0.0422,
-      "Solar": 0.2526,
-      "Wind": 0.6226
+      "Bioenergy": 0.0745,
+      "Hydro": 0.0386,
+      "Solar": 0.2957,
+      "Wind": 0.5912
     }
   },
   "PM": {
@@ -6903,8 +6903,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.5,
-      "Wind": 0.5
+      "Solar": 0.332,
+      "Wind": 0.668
     }
   },
   "PS": {
@@ -6962,7 +6962,7 @@
       "Bioenergy": 0.1187,
       "Hydro": 0.3923,
       "Solar": 0.0514,
-      "Wind": 0.4377
+      "Wind": 0.4376
     },
     "2021": {
       "Bioenergy": 0.1225,
@@ -6973,26 +6973,26 @@
     "2022": {
       "Bioenergy": 0.1292,
       "Hydro": 0.2462,
-      "Solar": 0.1204,
-      "Wind": 0.5042
+      "Solar": 0.1205,
+      "Wind": 0.5041
     },
     "2023": {
       "Bioenergy": 0.0942,
-      "Hydro": 0.3453,
+      "Hydro": 0.3452,
       "Solar": 0.1427,
       "Wind": 0.4179
     },
     "2024": {
       "Bioenergy": 0.0862,
-      "Hydro": 0.3544,
-      "Solar": 0.1672,
-      "Wind": 0.3922
+      "Hydro": 0.3543,
+      "Solar": 0.1675,
+      "Wind": 0.3921
     },
     "2025": {
-      "Bioenergy": 0.0686,
-      "Hydro": 0.4734,
-      "Solar": 0.1022,
-      "Wind": 0.3558
+      "Bioenergy": 0.0644,
+      "Hydro": 0.4433,
+      "Solar": 0.1034,
+      "Wind": 0.3888
     }
   },
   "PY": {
@@ -7162,13 +7162,13 @@
       "Bioenergy": 0.0206,
       "Hydro": 0.5592,
       "Solar": 0.1665,
-      "Wind": 0.2538
+      "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0307,
-      "Hydro": 0.5147,
-      "Solar": 0.1341,
-      "Wind": 0.3205
+      "Bioenergy": 0.0292,
+      "Hydro": 0.5082,
+      "Solar": 0.1526,
+      "Wind": 0.3099
     }
   },
   "RS": {
@@ -7186,15 +7186,15 @@
     },
     "2021": {
       "Bioenergy": 0.0246,
-      "Hydro": 0.8694,
+      "Hydro": 0.8693,
       "Solar": 0.0049,
       "Wind": 0.1012
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.8244,
+      "Hydro": 0.8243,
       "Solar": 0.0176,
-      "Wind": 0.1263
+      "Wind": 0.1264
     },
     "2023": {
       "Bioenergy": 0.0184,
@@ -7204,15 +7204,15 @@
     },
     "2024": {
       "Bioenergy": 0.0253,
-      "Hydro": 0.8483,
+      "Hydro": 0.8486,
       "Solar": 0.0162,
-      "Wind": 0.1102
+      "Wind": 0.11
     },
     "2025": {
-      "Bioenergy": 0.022,
-      "Hydro": 0.8281,
-      "Solar": 0.0007,
-      "Wind": 0.1492
+      "Bioenergy": 0.0243,
+      "Hydro": 0.8362,
+      "Solar": 0.0012,
+      "Wind": 0.1382
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.0057,
-      "Hydro": 0.9627,
-      "Solar": 0.0014,
-      "Wind": 0.0301
+      "Bioenergy": 0.0058,
+      "Hydro": 0.9658,
+      "Solar": 0.0038,
+      "Wind": 0.0246
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.358
     },
     "2025": {
-      "Bioenergy": 0.0624,
-      "Hydro": 0.594,
-      "Solar": 0.0026,
-      "Wind": 0.341
+      "Bioenergy": 0.0591,
+      "Hydro": 0.5705,
+      "Solar": 0.0063,
+      "Wind": 0.364
     }
   },
   "SG": {
@@ -7632,7 +7632,7 @@
     },
     "2022": {
       "Bioenergy": 0.0298,
-      "Hydro": 0.8048,
+      "Hydro": 0.8047,
       "Solar": 0.1212,
       "Wind": 0.0443
     },
@@ -7649,10 +7649,10 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.03,
-      "Hydro": 0.7701,
-      "Solar": 0.1931,
-      "Wind": 0.0068
+      "Bioenergy": 0.0239,
+      "Hydro": 0.7303,
+      "Solar": 0.243,
+      "Wind": 0.0028
     }
   },
   "SK": {
@@ -7676,8 +7676,8 @@
     },
     "2022": {
       "Bioenergy": 0.1474,
-      "Hydro": 0.7121,
-      "Solar": 0.1128,
+      "Hydro": 0.712,
+      "Solar": 0.1129,
       "Wind": 0.0277
     },
     "2023": {
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.1939,
-      "Hydro": 0.7136,
-      "Solar": 0.0925,
+      "Bioenergy": 0.1962,
+      "Hydro": 0.7052,
+      "Solar": 0.0986,
       "Wind": 0
     }
   },
@@ -8259,16 +8259,16 @@
       "Wind": 0.1526
     },
     "2024": {
-      "Bioenergy": 0.3586,
-      "Hydro": 0.27,
-      "Solar": 0.2152,
-      "Wind": 0.1562
+      "Bioenergy": 0.3583,
+      "Hydro": 0.2692,
+      "Solar": 0.2154,
+      "Wind": 0.1571
     },
     "2025": {
-      "Bioenergy": 0.3492,
-      "Hydro": 0.2717,
-      "Solar": 0.1901,
-      "Wind": 0.1889
+      "Bioenergy": 0.392,
+      "Hydro": 0.278,
+      "Solar": 0.1857,
+      "Wind": 0.1443
     }
   },
   "TJ": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0699,
-      "Hydro": 0.4404,
-      "Solar": 0.1897,
-      "Wind": 0.3
+      "Bioenergy": 0.0672,
+      "Hydro": 0.4478,
+      "Solar": 0.1933,
+      "Wind": 0.2917
     }
   },
   "TT": {
@@ -8788,15 +8788,15 @@
     },
     "2024": {
       "Bioenergy": 0.0447,
-      "Hydro": 0.2267,
-      "Solar": 0.291,
-      "Wind": 0.4377
+      "Hydro": 0.2265,
+      "Solar": 0.2911,
+      "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0435,
-      "Hydro": 0.2352,
-      "Solar": 0.2565,
-      "Wind": 0.4648
+      "Bioenergy": 0.0396,
+      "Hydro": 0.2219,
+      "Solar": 0.2613,
+      "Wind": 0.4772
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.15,
-      "Hydro": 0.4478,
-      "Solar": 0.0539,
-      "Wind": 0.3484
+      "Bioenergy": 0.154,
+      "Hydro": 0.4431,
+      "Solar": 0.0532,
+      "Wind": 0.3497
     }
   },
   "UZ": {
@@ -8881,9 +8881,9 @@
       "Wind": 0.014
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Hydro": 0.961,
-      "Solar": 0.0185,
+      "Bioenergy": 0.0042,
+      "Hydro": 0.9606,
+      "Solar": 0.0189,
       "Wind": 0.0163
     }
   },
@@ -9216,27 +9216,27 @@
     },
     "2022": {
       "Bioenergy": 0.0263,
-      "Hydro": 0.3311,
+      "Hydro": 0.331,
       "Solar": 0.0178,
       "Wind": 0.6249
     },
     "2023": {
       "Bioenergy": 0.0235,
-      "Hydro": 0.472,
-      "Solar": 0.0401,
+      "Hydro": 0.4719,
+      "Solar": 0.0402,
       "Wind": 0.4644
     },
     "2024": {
-      "Bioenergy": 0.0281,
-      "Hydro": 0.3913,
-      "Solar": 0.0416,
-      "Wind": 0.539
+      "Bioenergy": 0.0282,
+      "Hydro": 0.3922,
+      "Solar": 0.0417,
+      "Wind": 0.5378
     },
     "2025": {
       "Bioenergy": 0.0481,
-      "Hydro": 0.4017,
-      "Solar": 0.0728,
-      "Wind": 0.4774
+      "Hydro": 0.3941,
+      "Solar": 0.0904,
+      "Wind": 0.4674
     }
   },
   "YE": {