npm - @digital4better/data - Versions diffs - 1.2.14 → 1.2.16 - Mend

@digital4better/data 1.2.14 → 1.2.16

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 +362 -362
package/data/factor/continent-monthly-green.json +2652 -2652
package/data/factor/continent-monthly.csv +382 -382
package/data/factor/continent-monthly.json +2699 -2699
package/data/factor/continent-yearly-green.csv +39 -39
package/data/factor/continent-yearly-green.json +294 -294
package/data/factor/continent-yearly.csv +39 -39
package/data/factor/continent-yearly.json +306 -306
package/data/factor/country-monthly-green.csv +2350 -2350
package/data/factor/country-monthly-green.json +18954 -18954
package/data/factor/country-monthly.csv +2527 -2527
package/data/factor/country-monthly.json +17358 -17358
package/data/factor/country-yearly-green.csv +353 -353
package/data/factor/country-yearly-green.json +2920 -2920
package/data/factor/country-yearly.csv +353 -353
package/data/factor/country-yearly.json +2764 -2764
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +330 -330
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +342 -342
package/data/factor/subdivision-yearly-green.csv +64 -64
package/data/factor/subdivision-yearly-green.json +296 -296
package/data/factor/subdivision-yearly.csv +53 -53
package/data/factor/subdivision-yearly.json +267 -267
package/data/factor/world-monthly-green.csv +74 -74
package/data/factor/world-monthly-green.json +666 -666
package/data/factor/world-monthly.csv +74 -74
package/data/factor/world-monthly.json +664 -664
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 +62 -62
package/data/mix/continent-monthly-green.csv +218 -218
package/data/mix/continent-monthly-green.json +631 -631
package/data/mix/continent-monthly.csv +218 -218
package/data/mix/continent-monthly.json +789 -789
package/data/mix/continent-yearly-green.csv +28 -28
package/data/mix/continent-yearly-green.json +79 -79
package/data/mix/continent-yearly.csv +28 -28
package/data/mix/continent-yearly.json +113 -113
package/data/mix/country-monthly-green.csv +1507 -1507
package/data/mix/country-monthly-green.json +4351 -4351
package/data/mix/country-monthly.csv +1507 -1507
package/data/mix/country-monthly.json +4932 -4932
package/data/mix/country-yearly-green.csv +210 -210
package/data/mix/country-yearly-green.json +643 -643
package/data/mix/country-yearly.csv +210 -210
package/data/mix/country-yearly.json +966 -966
package/data/mix/subdivision-monthly-green.csv +30 -30
package/data/mix/subdivision-monthly-green.json +42 -42
package/data/mix/subdivision-monthly.csv +30 -30
package/data/mix/subdivision-monthly.json +123 -123
package/data/mix/subdivision-yearly-green.csv +19 -19
package/data/mix/subdivision-yearly-green.json +31 -31
package/data/mix/subdivision-yearly.csv +19 -19
package/data/mix/subdivision-yearly.json +65 -65
package/data/mix/world-monthly-green.csv +71 -71
package/data/mix/world-monthly-green.json +218 -218
package/data/mix/world-monthly.csv +71 -71
package/data/mix/world-monthly.json +195 -195
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +19 -19
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +24 -24
package/package.json +1 -1

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

@@ -46,45 +46,45 @@
   "AF": {
     "2019": {
       "Bioenergy": 0.0316,
-      "Hydro": 0.7959,
-      "Solar": 0.088,
-      "Wind": 0.0845
+      "Hydro": 0.7957,
+      "Solar": 0.0883,
+      "Wind": 0.0844
     },
     "2020": {
       "Bioenergy": 0.0343,
-      "Hydro": 0.7784,
-      "Solar": 0.0966,
-      "Wind": 0.0907
+      "Hydro": 0.778,
+      "Solar": 0.0971,
+      "Wind": 0.0906
     },
     "2021": {
       "Bioenergy": 0.0376,
-      "Hydro": 0.7445,
-      "Solar": 0.1058,
-      "Wind": 0.1121
+      "Hydro": 0.744,
+      "Solar": 0.1064,
+      "Wind": 0.112
     },
     "2022": {
-      "Bioenergy": 0.0398,
-      "Hydro": 0.7202,
-      "Solar": 0.1197,
-      "Wind": 0.1203
+      "Bioenergy": 0.0397,
+      "Hydro": 0.7196,
+      "Solar": 0.1205,
+      "Wind": 0.1202
     },
     "2023": {
-      "Bioenergy": 0.0403,
-      "Hydro": 0.6891,
-      "Solar": 0.1383,
-      "Wind": 0.1323
+      "Bioenergy": 0.0402,
+      "Hydro": 0.6883,
+      "Solar": 0.1395,
+      "Wind": 0.132
     },
     "2024": {
       "Bioenergy": 0.0372,
-      "Hydro": 0.6682,
-      "Solar": 0.1625,
-      "Wind": 0.1321
+      "Hydro": 0.6681,
+      "Solar": 0.1623,
+      "Wind": 0.1324
     },
     "2025": {
-      "Bioenergy": 0.043,
-      "Hydro": 0.6432,
-      "Solar": 0.16,
-      "Wind": 0.1538
+      "Bioenergy": 0.0415,
+      "Hydro": 0.6182,
+      "Solar": 0.1829,
+      "Wind": 0.1574
     }
   },
   "AG": {
@@ -148,7 +148,7 @@
       "Bioenergy": 0.012,
       "Hydro": 0.9285,
       "Solar": 0.0196,
-      "Wind": 0.04
+      "Wind": 0.0399
     },
     "2022": {
       "Bioenergy": 0.012,
@@ -159,8 +159,8 @@
     "2023": {
       "Bioenergy": 0.0109,
       "Hydro": 0.912,
-      "Solar": 0.0278,
-      "Wind": 0.0494
+      "Solar": 0.0277,
+      "Wind": 0.0493
     },
     "2024": {
       "Bioenergy": 0.011,
@@ -169,10 +169,10 @@
       "Wind": 0.0497
     },
     "2025": {
-      "Bioenergy": 0.0109,
-      "Hydro": 0.9172,
-      "Solar": 0.0143,
-      "Wind": 0.0577
+      "Bioenergy": 0.011,
+      "Hydro": 0.9178,
+      "Solar": 0.0187,
+      "Wind": 0.0525
     }
   },
   "AM": {
@@ -203,7 +203,7 @@
     "2023": {
       "Bioenergy": 0.0008,
       "Hydro": 0.8084,
-      "Solar": 0.1877,
+      "Solar": 0.1878,
       "Wind": 0.003
     },
     "2024": {
@@ -267,12 +267,12 @@
     "2019": {
       "Bioenergy": 0.0131,
       "Hydro": 0.8528,
-      "Solar": 0.0188,
+      "Solar": 0.0189,
       "Wind": 0.1153
     },
     "2020": {
       "Bioenergy": 0.0176,
-      "Hydro": 0.7276,
+      "Hydro": 0.7277,
       "Solar": 0.0319,
       "Wind": 0.2228
     },
@@ -290,21 +290,21 @@
     },
     "2023": {
       "Bioenergy": 0.0191,
-      "Hydro": 0.6868,
+      "Hydro": 0.6869,
       "Solar": 0.0566,
       "Wind": 0.2375
     },
     "2024": {
       "Bioenergy": 0.0219,
-      "Hydro": 0.6237,
+      "Hydro": 0.6236,
       "Solar": 0.0717,
-      "Wind": 0.2827
+      "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.6281,
-      "Solar": 0.0885,
-      "Wind": 0.2649
+      "Bioenergy": 0.0235,
+      "Hydro": 0.5668,
+      "Solar": 0.0993,
+      "Wind": 0.3104
     }
   },
   "AS": {
@@ -373,7 +373,7 @@
     "2022": {
       "Bioenergy": 0.0538,
       "Hydro": 0.7153,
-      "Solar": 0.0719,
+      "Solar": 0.0718,
       "Wind": 0.1591
     },
     "2023": {
@@ -383,60 +383,60 @@
       "Wind": 0.1562
     },
     "2024": {
-      "Bioenergy": 0.0305,
-      "Hydro": 0.7023,
-      "Solar": 0.1171,
-      "Wind": 0.1501
+      "Bioenergy": 0.0307,
+      "Hydro": 0.7002,
+      "Solar": 0.1179,
+      "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0516,
-      "Hydro": 0.6687,
-      "Solar": 0.0839,
-      "Wind": 0.1958
+      "Bioenergy": 0.0526,
+      "Hydro": 0.6446,
+      "Solar": 0.1053,
+      "Wind": 0.1975
     }
   },
   "AU": {
     "2019": {
       "Bioenergy": 0.0073,
-      "Hydro": 0.2694,
-      "Solar": 0.3486,
-      "Wind": 0.3746
+      "Hydro": 0.2697,
+      "Solar": 0.3485,
+      "Wind": 0.3745
     },
     "2020": {
       "Bioenergy": 0.0048,
       "Hydro": 0.2427,
-      "Solar": 0.3762,
-      "Wind": 0.3763
+      "Solar": 0.3763,
+      "Wind": 0.3762
     },
     "2021": {
       "Bioenergy": 0.0039,
       "Hydro": 0.2238,
-      "Solar": 0.3988,
-      "Wind": 0.3735
+      "Solar": 0.3991,
+      "Wind": 0.3732
     },
     "2022": {
       "Bioenergy": 0.003,
-      "Hydro": 0.2081,
-      "Solar": 0.4204,
-      "Wind": 0.3685
+      "Hydro": 0.2076,
+      "Solar": 0.4222,
+      "Wind": 0.3672
     },
     "2023": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.1731,
-      "Solar": 0.4724,
-      "Wind": 0.3506
+      "Bioenergy": 0.0037,
+      "Hydro": 0.1725,
+      "Solar": 0.473,
+      "Wind": 0.3508
     },
     "2024": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.1516,
-      "Solar": 0.4976,
-      "Wind": 0.3457
+      "Bioenergy": 0.0048,
+      "Hydro": 0.1463,
+      "Solar": 0.5045,
+      "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.1503,
-      "Solar": 0.5564,
-      "Wind": 0.2875
+      "Bioenergy": 0.0027,
+      "Hydro": 0.0974,
+      "Solar": 0.5869,
+      "Wind": 0.3129
     }
   },
   "AW": {
@@ -512,7 +512,7 @@
       "Bioenergy": 0.0011,
       "Hydro": 0.9577,
       "Solar": 0.0379,
-      "Wind": 0.0034
+      "Wind": 0.0033
     },
     "2024": {
       "Bioenergy": 0,
@@ -560,15 +560,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8847,
-      "Solar": 0.0823,
-      "Wind": 0.033
+      "Hydro": 0.9042,
+      "Solar": 0.0663,
+      "Wind": 0.0294
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8665,
-      "Solar": 0.1001,
-      "Wind": 0.0334
+      "Hydro": 0.9678,
+      "Solar": 0.0161,
+      "Wind": 0.0161
     }
   },
   "BB": {
@@ -618,45 +618,45 @@
   "BD": {
     "2019": {
       "Bioenergy": 0.0427,
-      "Hydro": 0.7258,
-      "Solar": 0.1164,
-      "Wind": 0.1152
+      "Hydro": 0.7255,
+      "Solar": 0.1168,
+      "Wind": 0.1151
     },
     "2020": {
-      "Bioenergy": 0.0465,
-      "Hydro": 0.7054,
-      "Solar": 0.125,
+      "Bioenergy": 0.0464,
+      "Hydro": 0.7048,
+      "Solar": 0.1257,
       "Wind": 0.1231
     },
     "2021": {
-      "Bioenergy": 0.0502,
-      "Hydro": 0.6003,
-      "Solar": 0.1994,
-      "Wind": 0.1501
+      "Bioenergy": 0.0501,
+      "Hydro": 0.5998,
+      "Solar": 0.2002,
+      "Wind": 0.1499
     },
     "2022": {
       "Bioenergy": 0.0503,
-      "Hydro": 0.5487,
-      "Solar": 0.2475,
-      "Wind": 0.1534
+      "Hydro": 0.548,
+      "Solar": 0.2485,
+      "Wind": 0.1532
     },
     "2023": {
-      "Bioenergy": 0.0594,
-      "Hydro": 0.4522,
-      "Solar": 0.2942,
-      "Wind": 0.1942
+      "Bioenergy": 0.0592,
+      "Hydro": 0.4513,
+      "Solar": 0.2958,
+      "Wind": 0.1937
     },
     "2024": {
       "Bioenergy": 0.0495,
-      "Hydro": 0.4316,
-      "Solar": 0.3433,
-      "Wind": 0.1757
+      "Hydro": 0.4315,
+      "Solar": 0.3431,
+      "Wind": 0.176
     },
     "2025": {
-      "Bioenergy": 0.0556,
-      "Hydro": 0.2902,
-      "Solar": 0.4554,
-      "Wind": 0.1988
+      "Bioenergy": 0.0649,
+      "Hydro": 0.2476,
+      "Solar": 0.4415,
+      "Wind": 0.2461
     }
   },
   "BE": {
@@ -692,15 +692,15 @@
     },
     "2024": {
       "Bioenergy": 0.0359,
-      "Hydro": 0.0764,
+      "Hydro": 0.0763,
       "Solar": 0.3426,
       "Wind": 0.5451
     },
     "2025": {
-      "Bioenergy": 0.0519,
-      "Hydro": 0.1227,
-      "Solar": 0.1315,
-      "Wind": 0.6938
+      "Bioenergy": 0.0466,
+      "Hydro": 0.0969,
+      "Solar": 0.2073,
+      "Wind": 0.6492
     }
   },
   "BF": {
@@ -781,14 +781,14 @@
     "2024": {
       "Bioenergy": 0.0171,
       "Hydro": 0.32,
-      "Solar": 0.5036,
+      "Solar": 0.5037,
       "Wind": 0.1593
     },
     "2025": {
-      "Bioenergy": 0.0168,
-      "Hydro": 0.2713,
-      "Solar": 0.4916,
-      "Wind": 0.2204
+      "Bioenergy": 0.0152,
+      "Hydro": 0.2847,
+      "Solar": 0.4924,
+      "Wind": 0.2078
     }
   },
   "BH": {
@@ -1050,9 +1050,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8529,
-      "Solar": 0.0882,
-      "Wind": 0.0588
+      "Hydro": 0.8955,
+      "Solar": 0.0747,
+      "Wind": 0.0298
     }
   },
   "BR": {
@@ -1093,10 +1093,10 @@
       "Wind": 0.1713
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.7599,
-      "Solar": 0.1348,
-      "Wind": 0.1013
+      "Bioenergy": 0.0046,
+      "Hydro": 0.7472,
+      "Solar": 0.1327,
+      "Wind": 0.1154
     }
   },
   "BS": {
@@ -1258,7 +1258,7 @@
     },
     "2023": {
       "Bioenergy": 0.4119,
-      "Hydro": 0.3102,
+      "Hydro": 0.3103,
       "Solar": 0.1261,
       "Wind": 0.1517
     },
@@ -1277,8 +1277,8 @@
   },
   "BZ": {
     "2019": {
-      "Bioenergy": 0.2317,
-      "Hydro": 0.7094,
+      "Bioenergy": 0.2316,
+      "Hydro": 0.7095,
       "Solar": 0.0249,
       "Wind": 0.034
     },
@@ -1301,22 +1301,22 @@
       "Wind": 0.0459
     },
     "2023": {
-      "Bioenergy": 0.2237,
-      "Hydro": 0.68,
+      "Bioenergy": 0.2236,
+      "Hydro": 0.6801,
       "Solar": 0.0465,
       "Wind": 0.0498
     },
     "2024": {
-      "Bioenergy": 0.2235,
-      "Hydro": 0.668,
+      "Bioenergy": 0.2236,
+      "Hydro": 0.6679,
       "Solar": 0.0549,
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.2175,
-      "Hydro": 0.6625,
-      "Solar": 0.0623,
-      "Wind": 0.0577
+      "Bioenergy": 0.2165,
+      "Hydro": 0.6815,
+      "Solar": 0.0599,
+      "Wind": 0.0421
     }
   },
   "CA": {
@@ -1351,16 +1351,16 @@
       "Wind": 0.0963
     },
     "2024": {
-      "Bioenergy": 0.0246,
-      "Hydro": 0.8457,
-      "Solar": 0.0136,
-      "Wind": 0.1161
+      "Bioenergy": 0.0244,
+      "Hydro": 0.8476,
+      "Solar": 0.0133,
+      "Wind": 0.1147
     },
     "2025": {
-      "Bioenergy": 0.0242,
-      "Hydro": 0.8374,
-      "Solar": 0.0054,
-      "Wind": 0.133
+      "Bioenergy": 0.0229,
+      "Hydro": 0.8577,
+      "Solar": 0.0036,
+      "Wind": 0.1159
     }
   },
   "CD": {
@@ -1517,7 +1517,7 @@
     "2022": {
       "Bioenergy": 0.0051,
       "Hydro": 0.8856,
-      "Solar": 0.0835,
+      "Solar": 0.0834,
       "Wind": 0.0258
     },
     "2023": {
@@ -1528,15 +1528,15 @@
     },
     "2024": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.9095,
-      "Solar": 0.0844,
+      "Hydro": 0.9093,
+      "Solar": 0.0846,
       "Wind": 0.0055
     },
     "2025": {
-      "Bioenergy": 0.0046,
-      "Hydro": 0.9171,
-      "Solar": 0.0513,
-      "Wind": 0.027
+      "Bioenergy": 0.0051,
+      "Hydro": 0.8993,
+      "Solar": 0.0685,
+      "Wind": 0.0271
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0316,
-      "Hydro": 0.3856,
-      "Solar": 0.3873,
-      "Wind": 0.1955
+      "Bioenergy": 0.0337,
+      "Hydro": 0.3763,
+      "Solar": 0.3926,
+      "Wind": 0.1973
     }
   },
   "CM": {
@@ -1719,23 +1719,23 @@
     "2019": {
       "Bioenergy": 0.0583,
       "Hydro": 0.61,
-      "Solar": 0.1181,
-      "Wind": 0.2136
+      "Solar": 0.118,
+      "Wind": 0.2137
     },
     "2020": {
       "Bioenergy": 0.0639,
-      "Hydro": 0.5852,
+      "Hydro": 0.5853,
       "Solar": 0.1259,
       "Wind": 0.2249
     },
     "2021": {
-      "Bioenergy": 0.0692,
+      "Bioenergy": 0.0691,
       "Hydro": 0.5101,
       "Solar": 0.14,
-      "Wind": 0.2807
+      "Wind": 0.2808
     },
     "2022": {
-      "Bioenergy": 0.0691,
+      "Bioenergy": 0.069,
       "Hydro": 0.4695,
       "Solar": 0.1657,
       "Wind": 0.2957
@@ -1747,16 +1747,16 @@
       "Wind": 0.3149
     },
     "2024": {
-      "Bioenergy": 0.0581,
-      "Hydro": 0.387,
-      "Solar": 0.257,
-      "Wind": 0.2979
+      "Bioenergy": 0.0584,
+      "Hydro": 0.3888,
+      "Solar": 0.2526,
+      "Wind": 0.3002
     },
     "2025": {
-      "Bioenergy": 0.0667,
-      "Hydro": 0.3052,
-      "Solar": 0.2641,
-      "Wind": 0.364
+      "Bioenergy": 0.0584,
+      "Hydro": 0.277,
+      "Solar": 0.303,
+      "Wind": 0.3616
     }
   },
   "CO": {
@@ -1798,8 +1798,8 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9302,
-      "Solar": 0.0679,
+      "Hydro": 0.9332,
+      "Solar": 0.065,
       "Wind": 0.0019
     }
   },
@@ -1830,7 +1830,7 @@
     },
     "2023": {
       "Bioenergy": 0.0053,
-      "Hydro": 0.8432,
+      "Hydro": 0.8433,
       "Solar": 0.0021,
       "Wind": 0.1493
     },
@@ -1841,10 +1841,10 @@
       "Wind": 0.1275
     },
     "2025": {
-      "Bioenergy": 0.0091,
-      "Hydro": 0.8272,
+      "Bioenergy": 0.01,
+      "Hydro": 0.8152,
       "Solar": 0,
-      "Wind": 0.1637
+      "Wind": 0.1748
     }
   },
   "CU": {
@@ -1969,14 +1969,14 @@
     "2024": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8375,
-      "Wind": 0.1625
+      "Solar": 0.8365,
+      "Wind": 0.1635
     },
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8181,
-      "Wind": 0.1819
+      "Solar": 0.7999,
+      "Wind": 0.2001
     }
   },
   "CZ": {
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.3936,
-      "Hydro": 0.3284,
-      "Solar": 0.1636,
-      "Wind": 0.1144
+      "Bioenergy": 0.3597,
+      "Hydro": 0.2821,
+      "Solar": 0.2722,
+      "Wind": 0.086
     }
   },
   "DE": {
@@ -2061,10 +2061,10 @@
       "Wind": 0.4833
     },
     "2025": {
-      "Bioenergy": 0.1594,
-      "Hydro": 0.0708,
-      "Solar": 0.0863,
-      "Wind": 0.6836
+      "Bioenergy": 0.1705,
+      "Hydro": 0.0761,
+      "Solar": 0.1362,
+      "Wind": 0.6172
     }
   },
   "DJ": {
@@ -2149,10 +2149,10 @@
       "Wind": 0.7016
     },
     "2025": {
-      "Bioenergy": 0.1831,
-      "Hydro": 0.0226,
-      "Solar": 0.0251,
-      "Wind": 0.7692
+      "Bioenergy": 0.1939,
+      "Hydro": 0.0309,
+      "Solar": 0.0488,
+      "Wind": 0.7265
     }
   },
   "DM": {
@@ -2319,16 +2319,16 @@
       "Wind": 0.0119
     },
     "2024": {
-      "Bioenergy": 0.0221,
-      "Hydro": 0.9592,
-      "Solar": 0.0039,
+      "Bioenergy": 0.0205,
+      "Hydro": 0.9607,
+      "Solar": 0.0041,
       "Wind": 0.0147
     },
     "2025": {
-      "Bioenergy": 0.0597,
-      "Hydro": 0.904,
-      "Solar": 0.0127,
-      "Wind": 0.0236
+      "Bioenergy": 0.0006,
+      "Hydro": 0.9774,
+      "Solar": 0.009,
+      "Wind": 0.013
     }
   },
   "EE": {
@@ -2353,7 +2353,7 @@
     "2022": {
       "Bioenergy": 0.328,
       "Hydro": 0.0688,
-      "Solar": 0.253,
+      "Solar": 0.2529,
       "Wind": 0.3503
     },
     "2023": {
@@ -2363,16 +2363,16 @@
       "Wind": 0.373
     },
     "2024": {
-      "Bioenergy": 0.1409,
-      "Hydro": 0.1373,
+      "Bioenergy": 0.141,
+      "Hydro": 0.1372,
       "Solar": 0.3003,
       "Wind": 0.4215
     },
     "2025": {
-      "Bioenergy": 0.1716,
-      "Hydro": 0.1426,
-      "Solar": 0.0253,
-      "Wind": 0.6604
+      "Bioenergy": 0.2037,
+      "Hydro": 0.1522,
+      "Solar": 0.0544,
+      "Wind": 0.5897
     }
   },
   "EG": {
@@ -2501,10 +2501,10 @@
       "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.0247,
-      "Hydro": 0.2217,
-      "Solar": 0.1775,
-      "Wind": 0.5761
+      "Bioenergy": 0.0255,
+      "Hydro": 0.2688,
+      "Solar": 0.2503,
+      "Wind": 0.4554
     }
   },
   "ET": {
@@ -2583,16 +2583,16 @@
       "Wind": 0.3475
     },
     "2024": {
-      "Bioenergy": 0.2089,
-      "Hydro": 0.3265,
+      "Bioenergy": 0.2091,
+      "Hydro": 0.3273,
       "Solar": 0.0313,
-      "Wind": 0.4333
+      "Wind": 0.4324
     },
     "2025": {
-      "Bioenergy": 0.2161,
-      "Hydro": 0.2667,
-      "Solar": 0.0046,
-      "Wind": 0.5126
+      "Bioenergy": 0.212,
+      "Hydro": 0.2672,
+      "Solar": 0.0078,
+      "Wind": 0.513
     }
   },
   "FJ": {
@@ -2750,7 +2750,7 @@
       "Bioenergy": 0.038,
       "Hydro": 0.4255,
       "Solar": 0.1768,
-      "Wind": 0.3597
+      "Wind": 0.3596
     },
     "2023": {
       "Bioenergy": 0.0263,
@@ -2765,10 +2765,10 @@
       "Wind": 0.3416
     },
     "2025": {
-      "Bioenergy": 0.0226,
-      "Hydro": 0.4659,
-      "Solar": 0.0792,
-      "Wind": 0.4323
+      "Bioenergy": 0.0216,
+      "Hydro": 0.4852,
+      "Solar": 0.1074,
+      "Wind": 0.3859
     }
   },
   "GA": {
@@ -2842,7 +2842,7 @@
     },
     "2023": {
       "Bioenergy": 0.1203,
-      "Hydro": 0.0625,
+      "Hydro": 0.0626,
       "Solar": 0.1172,
       "Wind": 0.6999
     },
@@ -2850,13 +2850,13 @@
       "Bioenergy": 0.1486,
       "Hydro": 0.073,
       "Solar": 0.1245,
-      "Wind": 0.6538
+      "Wind": 0.6539
     },
     "2025": {
-      "Bioenergy": 0.1521,
-      "Hydro": 0.0679,
-      "Solar": 0.0422,
-      "Wind": 0.7378
+      "Bioenergy": 0.1492,
+      "Hydro": 0.0584,
+      "Solar": 0.0492,
+      "Wind": 0.7432
     }
   },
   "GD": {
@@ -2912,19 +2912,19 @@
     },
     "2020": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9702,
-      "Solar": 0.0054,
+      "Hydro": 0.9701,
+      "Solar": 0.0055,
       "Wind": 0.0214
     },
     "2021": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9658,
+      "Hydro": 0.9657,
       "Solar": 0.0076,
       "Wind": 0.0228
     },
     "2022": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.9694,
+      "Hydro": 0.9693,
       "Solar": 0.0068,
       "Wind": 0.0205
     },
@@ -2936,15 +2936,15 @@
     },
     "2024": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.9729,
+      "Hydro": 0.9728,
       "Solar": 0.007,
-      "Wind": 0.018
+      "Wind": 0.0181
     },
     "2025": {
-      "Bioenergy": 0.0066,
-      "Hydro": 0.9323,
-      "Solar": 0.0211,
-      "Wind": 0.0399
+      "Bioenergy": 0.0113,
+      "Hydro": 0.8865,
+      "Solar": 0.0438,
+      "Wind": 0.0584
     }
   },
   "GF": {
@@ -3338,9 +3338,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.1235,
-      "Solar": 0.4045,
-      "Wind": 0.472
+      "Hydro": 0.1163,
+      "Solar": 0.4099,
+      "Wind": 0.4738
     }
   },
   "GT": {
@@ -3522,45 +3522,45 @@
   "HK": {
     "2019": {
       "Bioenergy": 0.1121,
-      "Hydro": 0.581,
-      "Solar": 0.1345,
-      "Wind": 0.1723
+      "Hydro": 0.5807,
+      "Solar": 0.1351,
+      "Wind": 0.1722
     },
     "2020": {
-      "Bioenergy": 0.1127,
-      "Hydro": 0.559,
-      "Solar": 0.1487,
-      "Wind": 0.1795
+      "Bioenergy": 0.1126,
+      "Hydro": 0.5584,
+      "Solar": 0.1497,
+      "Wind": 0.1793
     },
     "2021": {
-      "Bioenergy": 0.1167,
-      "Hydro": 0.4999,
-      "Solar": 0.165,
-      "Wind": 0.2184
+      "Bioenergy": 0.1166,
+      "Hydro": 0.4992,
+      "Solar": 0.1662,
+      "Wind": 0.218
     },
     "2022": {
-      "Bioenergy": 0.1159,
-      "Hydro": 0.4691,
-      "Solar": 0.1877,
-      "Wind": 0.2274
+      "Bioenergy": 0.1157,
+      "Hydro": 0.4682,
+      "Solar": 0.1892,
+      "Wind": 0.2269
     },
     "2023": {
-      "Bioenergy": 0.1159,
-      "Hydro": 0.4137,
-      "Solar": 0.2219,
-      "Wind": 0.2485
+      "Bioenergy": 0.1156,
+      "Hydro": 0.4126,
+      "Solar": 0.224,
+      "Wind": 0.2479
     },
     "2024": {
-      "Bioenergy": 0.1048,
+      "Bioenergy": 0.1047,
       "Hydro": 0.396,
-      "Solar": 0.2595,
-      "Wind": 0.2397
+      "Solar": 0.2592,
+      "Wind": 0.24
     },
     "2025": {
-      "Bioenergy": 0.121,
-      "Hydro": 0.3275,
-      "Solar": 0.2626,
-      "Wind": 0.2889
+      "Bioenergy": 0.1154,
+      "Hydro": 0.2925,
+      "Solar": 0.3013,
+      "Wind": 0.2908
     }
   },
   "HN": {
@@ -3601,10 +3601,10 @@
       "Wind": 0.141
     },
     "2025": {
-      "Bioenergy": 0.2438,
-      "Hydro": 0.4246,
-      "Solar": 0.1905,
-      "Wind": 0.1412
+      "Bioenergy": 0.2437,
+      "Hydro": 0.4261,
+      "Solar": 0.1903,
+      "Wind": 0.14
     }
   },
   "HR": {
@@ -3628,8 +3628,8 @@
     },
     "2022": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.5616,
-      "Solar": 0.0511,
+      "Hydro": 0.5617,
+      "Solar": 0.051,
       "Wind": 0.3027
     },
     "2023": {
@@ -3639,16 +3639,16 @@
       "Wind": 0.2488
     },
     "2024": {
-      "Bioenergy": 0.0633,
+      "Bioenergy": 0.0634,
       "Hydro": 0.5506,
       "Solar": 0.1112,
       "Wind": 0.2749
     },
     "2025": {
-      "Bioenergy": 0.0578,
-      "Hydro": 0.5543,
-      "Solar": 0.0197,
-      "Wind": 0.3683
+      "Bioenergy": 0.064,
+      "Hydro": 0.5345,
+      "Solar": 0.0594,
+      "Wind": 0.342
     }
   },
   "HT": {
@@ -3712,38 +3712,38 @@
       "Bioenergy": 0.1476,
       "Hydro": 0.2312,
       "Solar": 0.4303,
-      "Wind": 0.191
+      "Wind": 0.1909
     },
     "2022": {
-      "Bioenergy": 0.1385,
-      "Hydro": 0.1869,
+      "Bioenergy": 0.1386,
+      "Hydro": 0.187,
       "Solar": 0.49,
-      "Wind": 0.1845
+      "Wind": 0.1844
     },
     "2023": {
       "Bioenergy": 0.0847,
       "Hydro": 0.1679,
       "Solar": 0.5813,
-      "Wind": 0.1662
+      "Wind": 0.1661
     },
     "2024": {
-      "Bioenergy": 0.0802,
-      "Hydro": 0.1379,
-      "Solar": 0.646,
-      "Wind": 0.1359
+      "Bioenergy": 0.0807,
+      "Hydro": 0.1386,
+      "Solar": 0.644,
+      "Wind": 0.1367
     },
     "2025": {
-      "Bioenergy": 0.1381,
-      "Hydro": 0.1934,
-      "Solar": 0.4523,
-      "Wind": 0.2162
+      "Bioenergy": 0.1473,
+      "Hydro": 0.1886,
+      "Solar": 0.4731,
+      "Wind": 0.1911
     }
   },
   "ID": {
     "2019": {
       "Bioenergy": 0.3557,
       "Hydro": 0.6236,
-      "Solar": 0.0049,
+      "Solar": 0.005,
       "Wind": 0.0158
     },
     "2020": {
@@ -3767,7 +3767,7 @@
     "2023": {
       "Bioenergy": 0.3552,
       "Hydro": 0.6212,
-      "Solar": 0.0064,
+      "Solar": 0.0065,
       "Wind": 0.0172
     },
     "2024": {
@@ -3777,10 +3777,10 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3553,
-      "Hydro": 0.62,
-      "Solar": 0.007,
-      "Wind": 0.0177
+      "Bioenergy": 0.3551,
+      "Hydro": 0.6194,
+      "Solar": 0.0077,
+      "Wind": 0.0179
     }
   },
   "IE": {
@@ -3821,10 +3821,10 @@
       "Wind": 0.7933
     },
     "2025": {
-      "Bioenergy": 0.0136,
-      "Hydro": 0.0988,
-      "Solar": 0.02,
-      "Wind": 0.8676
+      "Bioenergy": 0.0137,
+      "Hydro": 0.0989,
+      "Solar": 0.023,
+      "Wind": 0.8644
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0841,
-      "Hydro": 0.3132,
-      "Solar": 0.3922,
-      "Wind": 0.2105
+      "Bioenergy": 0.0849,
+      "Hydro": 0.2827,
+      "Solar": 0.4336,
+      "Wind": 0.1989
     }
   },
   "IQ": {
@@ -4068,14 +4068,14 @@
     },
     "2022": {
       "Bioenergy": 0.1649,
-      "Hydro": 0.314,
+      "Hydro": 0.3141,
       "Solar": 0.2844,
       "Wind": 0.2366
     },
     "2023": {
       "Bioenergy": 0.1325,
-      "Hydro": 0.3581,
-      "Solar": 0.2697,
+      "Hydro": 0.3582,
+      "Solar": 0.2696,
       "Wind": 0.2397
     },
     "2024": {
@@ -4085,10 +4085,10 @@
       "Wind": 0.2061
     },
     "2025": {
-      "Bioenergy": 0.1448,
-      "Hydro": 0.3016,
-      "Solar": 0.1925,
-      "Wind": 0.3611
+      "Bioenergy": 0.1451,
+      "Hydro": 0.3019,
+      "Solar": 0.1978,
+      "Wind": 0.3552
     }
   },
   "JM": {
@@ -4288,13 +4288,13 @@
     },
     "2022": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.9855,
-      "Solar": 0.0052,
+      "Hydro": 0.9854,
+      "Solar": 0.0053,
       "Wind": 0.0071
     },
     "2023": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9867,
+      "Hydro": 0.9866,
       "Solar": 0.0048,
       "Wind": 0.0066
     },
@@ -4306,53 +4306,53 @@
     },
     "2025": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9845,
-      "Solar": 0.0064,
-      "Wind": 0.0072
+      "Hydro": 0.983,
+      "Solar": 0.0076,
+      "Wind": 0.0075
     }
   },
   "KH": {
     "2019": {
       "Bioenergy": 0.0286,
-      "Hydro": 0.9055,
-      "Solar": 0.0415,
+      "Hydro": 0.9054,
+      "Solar": 0.0416,
       "Wind": 0.0244
     },
     "2020": {
       "Bioenergy": 0.0294,
-      "Hydro": 0.8994,
-      "Solar": 0.0444,
+      "Hydro": 0.8992,
+      "Solar": 0.0446,
       "Wind": 0.0268
     },
     "2021": {
-      "Bioenergy": 0.0305,
-      "Hydro": 0.8887,
-      "Solar": 0.0474,
-      "Wind": 0.0335
+      "Bioenergy": 0.0304,
+      "Hydro": 0.8885,
+      "Solar": 0.0476,
+      "Wind": 0.0334
     },
     "2022": {
       "Bioenergy": 0.0312,
-      "Hydro": 0.8798,
-      "Solar": 0.0523,
-      "Wind": 0.0368
+      "Hydro": 0.8796,
+      "Solar": 0.0525,
+      "Wind": 0.0367
     },
     "2023": {
-      "Bioenergy": 0.0314,
-      "Hydro": 0.87,
-      "Solar": 0.0581,
-      "Wind": 0.0406
+      "Bioenergy": 0.0313,
+      "Hydro": 0.8696,
+      "Solar": 0.0585,
+      "Wind": 0.0405
     },
     "2024": {
       "Bioenergy": 0.0305,
       "Hydro": 0.861,
-      "Solar": 0.0668,
-      "Wind": 0.0417
+      "Solar": 0.0667,
+      "Wind": 0.0418
     },
     "2025": {
-      "Bioenergy": 0.0322,
-      "Hydro": 0.8558,
-      "Solar": 0.0648,
-      "Wind": 0.0472
+      "Bioenergy": 0.0318,
+      "Hydro": 0.8468,
+      "Solar": 0.0725,
+      "Wind": 0.0489
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.2757,
-      "Hydro": 0.0541,
-      "Solar": 0.5369,
-      "Wind": 0.1332
+      "Bioenergy": 0.2813,
+      "Hydro": 0.0579,
+      "Solar": 0.5545,
+      "Wind": 0.1063
     }
   },
   "KW": {
@@ -4696,15 +4696,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.639,
-      "Solar": 0.114,
-      "Wind": 0.2471
+      "Hydro": 0.6372,
+      "Solar": 0.1088,
+      "Wind": 0.254
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6377,
-      "Solar": 0.114,
-      "Wind": 0.2483
+      "Hydro": 0.5775,
+      "Solar": 0.0636,
+      "Wind": 0.3589
     }
   },
   "LA": {
@@ -4988,18 +4988,18 @@
       "Bioenergy": 0.13,
       "Hydro": 0.3626,
       "Solar": 0.0897,
-      "Wind": 0.4178
+      "Wind": 0.4177
     },
     "2022": {
       "Bioenergy": 0.1122,
-      "Hydro": 0.311,
-      "Solar": 0.1393,
-      "Wind": 0.4376
+      "Hydro": 0.3111,
+      "Solar": 0.1392,
+      "Wind": 0.4375
     },
     "2023": {
       "Bioenergy": 0.0723,
-      "Hydro": 0.2526,
-      "Solar": 0.1669,
+      "Hydro": 0.2527,
+      "Solar": 0.1668,
       "Wind": 0.5082
     },
     "2024": {
@@ -5009,10 +5009,10 @@
       "Wind": 0.5289
     },
     "2025": {
-      "Bioenergy": 0.0483,
-      "Hydro": 0.1458,
-      "Solar": 0.0486,
-      "Wind": 0.7574
+      "Bioenergy": 0.0498,
+      "Hydro": 0.1731,
+      "Solar": 0.0869,
+      "Wind": 0.6901
     }
   },
   "LU": {
@@ -5029,34 +5029,34 @@
       "Wind": 0.3534
     },
     "2021": {
-      "Bioenergy": 0.1845,
+      "Bioenergy": 0.1846,
       "Hydro": 0.344,
       "Solar": 0.1522,
-      "Wind": 0.3193
+      "Wind": 0.3192
     },
     "2022": {
-      "Bioenergy": 0.1869,
-      "Hydro": 0.2891,
-      "Solar": 0.1949,
+      "Bioenergy": 0.187,
+      "Hydro": 0.2892,
+      "Solar": 0.1948,
       "Wind": 0.3291
     },
     "2023": {
       "Bioenergy": 0.1105,
-      "Hydro": 0.2892,
-      "Solar": 0.1988,
+      "Hydro": 0.2893,
+      "Solar": 0.1987,
       "Wind": 0.4016
     },
     "2024": {
-      "Bioenergy": 0.1384,
-      "Hydro": 0.2937,
+      "Bioenergy": 0.1385,
+      "Hydro": 0.2936,
       "Solar": 0.2177,
       "Wind": 0.3502
     },
     "2025": {
-      "Bioenergy": 0.1759,
-      "Hydro": 0.2883,
-      "Solar": 0.0877,
-      "Wind": 0.448
+      "Bioenergy": 0.1458,
+      "Hydro": 0.3164,
+      "Solar": 0.1154,
+      "Wind": 0.4224
     }
   },
   "LV": {
@@ -5087,20 +5087,20 @@
     "2023": {
       "Bioenergy": 0.0583,
       "Hydro": 0.776,
-      "Solar": 0.0647,
+      "Solar": 0.0646,
       "Wind": 0.1011
     },
     "2024": {
-      "Bioenergy": 0.0745,
-      "Hydro": 0.6908,
+      "Bioenergy": 0.0746,
+      "Hydro": 0.6909,
       "Solar": 0.1265,
       "Wind": 0.1081
     },
     "2025": {
-      "Bioenergy": 0.0535,
-      "Hydro": 0.8529,
-      "Solar": 0.0028,
-      "Wind": 0.0907
+      "Bioenergy": 0.0611,
+      "Hydro": 0.8386,
+      "Solar": 0.0293,
+      "Wind": 0.0709
     }
   },
   "LY": {
@@ -5212,13 +5212,13 @@
     },
     "2022": {
       "Bioenergy": 0.0471,
-      "Hydro": 0.6987,
-      "Solar": 0.0765,
-      "Wind": 0.1777
+      "Hydro": 0.6988,
+      "Solar": 0.0764,
+      "Wind": 0.1776
     },
     "2023": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.8464,
+      "Hydro": 0.8465,
       "Solar": 0.0156,
       "Wind": 0.1267
     },
@@ -5229,10 +5229,10 @@
       "Wind": 0.1776
     },
     "2025": {
-      "Bioenergy": 0.0081,
-      "Hydro": 0.6425,
-      "Solar": 0.3062,
-      "Wind": 0.0432
+      "Bioenergy": 0.0082,
+      "Hydro": 0.6428,
+      "Solar": 0.3097,
+      "Wind": 0.0393
     }
   },
   "ME": {
@@ -5273,10 +5273,10 @@
       "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0073,
-      "Hydro": 0.787,
-      "Solar": 0.0074,
-      "Wind": 0.1983
+      "Bioenergy": 0.008,
+      "Hydro": 0.7978,
+      "Solar": 0.0113,
+      "Wind": 0.1829
     }
   },
   "MG": {
@@ -5344,8 +5344,8 @@
     },
     "2022": {
       "Bioenergy": 0.042,
-      "Hydro": 0.7828,
-      "Solar": 0.0419,
+      "Hydro": 0.7829,
+      "Solar": 0.0418,
       "Wind": 0.1333
     },
     "2023": {
@@ -5355,16 +5355,16 @@
       "Wind": 0.0855
     },
     "2024": {
-      "Bioenergy": 0.0515,
-      "Hydro": 0.6853,
-      "Solar": 0.139,
-      "Wind": 0.1242
+      "Bioenergy": 0.0541,
+      "Hydro": 0.6824,
+      "Solar": 0.1418,
+      "Wind": 0.1217
     },
     "2025": {
-      "Bioenergy": 0.069,
-      "Hydro": 0.6097,
-      "Solar": 0.1196,
-      "Wind": 0.2016
+      "Bioenergy": 0.0564,
+      "Hydro": 0.6693,
+      "Solar": 0.0655,
+      "Wind": 0.2087
     }
   },
   "ML": {
@@ -5501,46 +5501,46 @@
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.2209,
-      "Hydro": 0.5135,
-      "Solar": 0.1133,
-      "Wind": 0.1523
+      "Bioenergy": 0.2208,
+      "Hydro": 0.5132,
+      "Solar": 0.1138,
+      "Wind": 0.1522
     },
     "2020": {
-      "Bioenergy": 0.2158,
-      "Hydro": 0.4974,
-      "Solar": 0.1271,
-      "Wind": 0.1597
+      "Bioenergy": 0.2155,
+      "Hydro": 0.4969,
+      "Solar": 0.128,
+      "Wind": 0.1596
     },
     "2021": {
-      "Bioenergy": 0.2164,
-      "Hydro": 0.4463,
-      "Solar": 0.1422,
-      "Wind": 0.195
+      "Bioenergy": 0.2162,
+      "Hydro": 0.4458,
+      "Solar": 0.1433,
+      "Wind": 0.1947
     },
     "2022": {
-      "Bioenergy": 0.2101,
-      "Hydro": 0.4217,
-      "Solar": 0.1639,
-      "Wind": 0.2044
+      "Bioenergy": 0.2098,
+      "Hydro": 0.4209,
+      "Solar": 0.1653,
+      "Wind": 0.204
     },
     "2023": {
-      "Bioenergy": 0.2092,
-      "Hydro": 0.3723,
-      "Solar": 0.1949,
-      "Wind": 0.2237
+      "Bioenergy": 0.2087,
+      "Hydro": 0.3714,
+      "Solar": 0.1968,
+      "Wind": 0.2231
     },
     "2024": {
-      "Bioenergy": 0.1928,
-      "Hydro": 0.359,
-      "Solar": 0.2308,
-      "Wind": 0.2173
+      "Bioenergy": 0.1927,
+      "Hydro": 0.3591,
+      "Solar": 0.2306,
+      "Wind": 0.2176
     },
     "2025": {
-      "Bioenergy": 0.2137,
-      "Hydro": 0.2948,
-      "Solar": 0.2316,
-      "Wind": 0.26
+      "Bioenergy": 0.2057,
+      "Hydro": 0.2642,
+      "Solar": 0.2676,
+      "Wind": 0.2626
     }
   },
   "MQ": {
@@ -5690,33 +5690,33 @@
     },
     "2021": {
       "Bioenergy": 0.0898,
-      "Hydro": 0.4979,
+      "Hydro": 0.498,
       "Solar": 0.1106,
       "Wind": 0.3017
     },
     "2022": {
       "Bioenergy": 0.0561,
-      "Hydro": 0.2886,
-      "Solar": 0.4497,
+      "Hydro": 0.2887,
+      "Solar": 0.4496,
       "Wind": 0.2056
     },
     "2023": {
       "Bioenergy": 0.0248,
       "Hydro": 0.1545,
       "Solar": 0.7047,
-      "Wind": 0.1161
+      "Wind": 0.116
     },
     "2024": {
-      "Bioenergy": 0.0293,
-      "Hydro": 0.1886,
-      "Solar": 0.6529,
-      "Wind": 0.1292
+      "Bioenergy": 0.03,
+      "Hydro": 0.1923,
+      "Solar": 0.6445,
+      "Wind": 0.1332
     },
     "2025": {
-      "Bioenergy": 0.0319,
-      "Hydro": 0.1829,
-      "Solar": 0.616,
-      "Wind": 0.1692
+      "Bioenergy": 0.0457,
+      "Hydro": 0.2591,
+      "Solar": 0.4773,
+      "Wind": 0.2179
     }
   },
   "MU": {
@@ -5927,15 +5927,15 @@
       "Wind": 0.0001
     },
     "2024": {
-      "Bioenergy": 0.1099,
+      "Bioenergy": 0.11,
       "Hydro": 0.8136,
-      "Solar": 0.0764,
+      "Solar": 0.0763,
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1006,
-      "Hydro": 0.8277,
-      "Solar": 0.0717,
+      "Bioenergy": 0.106,
+      "Hydro": 0.8137,
+      "Solar": 0.0803,
       "Wind": 0
     }
   },
@@ -6180,27 +6180,27 @@
     },
     "2022": {
       "Bioenergy": 0.4021,
-      "Hydro": 0.2096,
+      "Hydro": 0.2097,
       "Solar": 0.0233,
       "Wind": 0.3649
     },
     "2023": {
-      "Bioenergy": 0.4023,
+      "Bioenergy": 0.4022,
       "Hydro": 0.2051,
       "Solar": 0.0263,
       "Wind": 0.3664
     },
     "2024": {
       "Bioenergy": 0.4021,
-      "Hydro": 0.201,
+      "Hydro": 0.2009,
       "Solar": 0.0294,
-      "Wind": 0.3675
+      "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.3984,
-      "Hydro": 0.2026,
-      "Solar": 0.0324,
-      "Wind": 0.3666
+      "Bioenergy": 0.398,
+      "Hydro": 0.2099,
+      "Solar": 0.0315,
+      "Wind": 0.3607
     }
   },
   "NL": {
@@ -6217,34 +6217,34 @@
       "Wind": 0.4827
     },
     "2021": {
-      "Bioenergy": 0.2463,
-      "Hydro": 0.0161,
-      "Solar": 0.2874,
-      "Wind": 0.4502
+      "Bioenergy": 0.248,
+      "Hydro": 0.0162,
+      "Solar": 0.2893,
+      "Wind": 0.4465
     },
     "2022": {
-      "Bioenergy": 0.1827,
-      "Hydro": 0.0034,
-      "Solar": 0.3574,
-      "Wind": 0.4565
+      "Bioenergy": 0.1866,
+      "Hydro": 0.0035,
+      "Solar": 0.3536,
+      "Wind": 0.4563
     },
     "2023": {
-      "Bioenergy": 0.1214,
+      "Bioenergy": 0.122,
       "Hydro": 0.0026,
-      "Solar": 0.3495,
-      "Wind": 0.5266
+      "Solar": 0.3466,
+      "Wind": 0.5288
     },
     "2024": {
-      "Bioenergy": 0.1026,
-      "Hydro": 0.0033,
-      "Solar": 0.3613,
-      "Wind": 0.5328
+      "Bioenergy": 0.104,
+      "Hydro": 0.0034,
+      "Solar": 0.3599,
+      "Wind": 0.5327
     },
     "2025": {
-      "Bioenergy": 0.2009,
-      "Hydro": 0,
-      "Solar": 0.1151,
-      "Wind": 0.684
+      "Bioenergy": 0.1792,
+      "Hydro": 0.0023,
+      "Solar": 0.1894,
+      "Wind": 0.6291
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9154,
+      "Hydro": 0.9175,
       "Solar": 0,
-      "Wind": 0.0846
+      "Wind": 0.0825
     }
   },
   "NP": {
@@ -6300,39 +6300,39 @@
     },
     "2020": {
       "Bioenergy": 0.0043,
-      "Hydro": 0.9618,
+      "Hydro": 0.9617,
       "Solar": 0.0212,
       "Wind": 0.0128
     },
     "2021": {
       "Bioenergy": 0.0047,
-      "Hydro": 0.9572,
-      "Solar": 0.0225,
+      "Hydro": 0.9571,
+      "Solar": 0.0226,
       "Wind": 0.0156
     },
     "2022": {
       "Bioenergy": 0.0052,
-      "Hydro": 0.9531,
-      "Solar": 0.0247,
+      "Hydro": 0.953,
+      "Solar": 0.0248,
       "Wind": 0.0171
     },
     "2023": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.9489,
-      "Solar": 0.0272,
+      "Bioenergy": 0.0052,
+      "Hydro": 0.9487,
+      "Solar": 0.0273,
       "Wind": 0.0187
     },
     "2024": {
       "Bioenergy": 0.005,
       "Hydro": 0.9446,
       "Solar": 0.031,
-      "Wind": 0.0193
+      "Wind": 0.0194
     },
     "2025": {
-      "Bioenergy": 0.0056,
-      "Hydro": 0.9429,
-      "Solar": 0.03,
-      "Wind": 0.0215
+      "Bioenergy": 0.0055,
+      "Hydro": 0.9388,
+      "Solar": 0.0334,
+      "Wind": 0.0223
     }
   },
   "NR": {
@@ -6461,10 +6461,10 @@
       "Wind": 0.1407
     },
     "2025": {
-      "Bioenergy": 0.0048,
-      "Hydro": 0.8879,
+      "Bioenergy": 0.0026,
+      "Hydro": 0.8857,
       "Solar": 0,
-      "Wind": 0.1073
+      "Wind": 0.1117
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0103,
-      "Hydro": 0.876,
-      "Solar": 0.031,
-      "Wind": 0.0827
+      "Bioenergy": 0.0097,
+      "Hydro": 0.8906,
+      "Solar": 0.0291,
+      "Wind": 0.0706
     }
   },
   "PF": {
@@ -6719,60 +6719,60 @@
       "Wind": 0.085
     },
     "2024": {
-      "Bioenergy": 0.0581,
-      "Hydro": 0.6675,
-      "Solar": 0.2156,
-      "Wind": 0.0587
+      "Bioenergy": 0.0657,
+      "Hydro": 0.645,
+      "Solar": 0.2172,
+      "Wind": 0.0721
     },
     "2025": {
-      "Bioenergy": 0.0419,
-      "Hydro": 0.7714,
-      "Solar": 0.1565,
-      "Wind": 0.0302
+      "Bioenergy": 0.0879,
+      "Hydro": 0.6418,
+      "Solar": 0.1698,
+      "Wind": 0.1005
     }
   },
   "PK": {
     "2019": {
-      "Bioenergy": 0.0159,
-      "Hydro": 0.8887,
-      "Solar": 0.0174,
-      "Wind": 0.0781
+      "Bioenergy": 0.0152,
+      "Hydro": 0.8483,
+      "Solar": 0.062,
+      "Wind": 0.0746
     },
     "2020": {
-      "Bioenergy": 0.0147,
-      "Hydro": 0.9074,
-      "Solar": 0.0159,
-      "Wind": 0.062
+      "Bioenergy": 0.0137,
+      "Hydro": 0.8421,
+      "Solar": 0.0868,
+      "Wind": 0.0575
     },
     "2021": {
-      "Bioenergy": 0.0167,
-      "Hydro": 0.8856,
-      "Solar": 0.0172,
-      "Wind": 0.0806
+      "Bioenergy": 0.0148,
+      "Hydro": 0.7875,
+      "Solar": 0.126,
+      "Wind": 0.0717
     },
     "2022": {
-      "Bioenergy": 0.0216,
-      "Hydro": 0.8444,
-      "Solar": 0.0216,
-      "Wind": 0.1123
+      "Bioenergy": 0.0184,
+      "Hydro": 0.7188,
+      "Solar": 0.1671,
+      "Wind": 0.0956
     },
     "2023": {
-      "Bioenergy": 0.017,
-      "Hydro": 0.8613,
-      "Solar": 0.0235,
-      "Wind": 0.0982
+      "Bioenergy": 0.0137,
+      "Hydro": 0.6929,
+      "Solar": 0.2144,
+      "Wind": 0.079
     },
     "2024": {
-      "Bioenergy": 0.0183,
-      "Hydro": 0.8764,
-      "Solar": 0.0262,
-      "Wind": 0.0791
+      "Bioenergy": 0.0127,
+      "Hydro": 0.6099,
+      "Solar": 0.3223,
+      "Wind": 0.055
     },
     "2025": {
-      "Bioenergy": 0.0451,
-      "Hydro": 0.8016,
-      "Solar": 0.036,
-      "Wind": 0.1172
+      "Bioenergy": 0.0221,
+      "Hydro": 0.3947,
+      "Solar": 0.5257,
+      "Wind": 0.0576
     }
   },
   "PL": {
@@ -6803,7 +6803,7 @@
     "2023": {
       "Bioenergy": 0.0544,
       "Hydro": 0.0656,
-      "Solar": 0.331,
+      "Solar": 0.3309,
       "Wind": 0.549
     },
     "2024": {
@@ -6813,10 +6813,10 @@
       "Wind": 0.5138
     },
     "2025": {
-      "Bioenergy": 0.0655,
-      "Hydro": 0.0379,
-      "Solar": 0.1084,
-      "Wind": 0.7882
+      "Bioenergy": 0.0775,
+      "Hydro": 0.0409,
+      "Solar": 0.2102,
+      "Wind": 0.6714
     }
   },
   "PM": {
@@ -6978,7 +6978,7 @@
     },
     "2023": {
       "Bioenergy": 0.0942,
-      "Hydro": 0.3452,
+      "Hydro": 0.3453,
       "Solar": 0.1427,
       "Wind": 0.4179
     },
@@ -6989,10 +6989,10 @@
       "Wind": 0.3922
     },
     "2025": {
-      "Bioenergy": 0.0702,
-      "Hydro": 0.3538,
-      "Solar": 0.0782,
-      "Wind": 0.4979
+      "Bioenergy": 0.0688,
+      "Hydro": 0.441,
+      "Solar": 0.0979,
+      "Wind": 0.3923
     }
   },
   "PY": {
@@ -7165,10 +7165,10 @@
       "Wind": 0.2538
     },
     "2025": {
-      "Bioenergy": 0.0327,
-      "Hydro": 0.5646,
-      "Solar": 0.0629,
-      "Wind": 0.3398
+      "Bioenergy": 0.0309,
+      "Hydro": 0.5205,
+      "Solar": 0.1271,
+      "Wind": 0.3215
     }
   },
   "RS": {
@@ -7186,13 +7186,13 @@
     },
     "2021": {
       "Bioenergy": 0.0246,
-      "Hydro": 0.8693,
+      "Hydro": 0.8694,
       "Solar": 0.0049,
       "Wind": 0.1012
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.8243,
+      "Hydro": 0.8244,
       "Solar": 0.0176,
       "Wind": 0.1263
     },
@@ -7209,10 +7209,10 @@
       "Wind": 0.1102
     },
     "2025": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.8607,
-      "Solar": 0.0019,
-      "Wind": 0.1162
+      "Bioenergy": 0.0218,
+      "Hydro": 0.8369,
+      "Solar": 0.0011,
+      "Wind": 0.1403
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Hydro": 0.9648,
-      "Solar": 0.0029,
-      "Wind": 0.0273
+      "Bioenergy": 0.0057,
+      "Hydro": 0.9627,
+      "Solar": 0.0014,
+      "Wind": 0.0301
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.358
     },
     "2025": {
-      "Bioenergy": 0.0532,
-      "Hydro": 0.5645,
-      "Solar": 0.0008,
-      "Wind": 0.3815
+      "Bioenergy": 0.0599,
+      "Hydro": 0.586,
+      "Solar": 0.0022,
+      "Wind": 0.3519
     }
   },
   "SG": {
@@ -7545,7 +7545,7 @@
     "2022": {
       "Bioenergy": 0.0051,
       "Hydro": 0.0377,
-      "Solar": 0.9437,
+      "Solar": 0.9438,
       "Wind": 0.0135
     },
     "2023": {
@@ -7632,7 +7632,7 @@
     },
     "2022": {
       "Bioenergy": 0.0298,
-      "Hydro": 0.8047,
+      "Hydro": 0.8048,
       "Solar": 0.1212,
       "Wind": 0.0443
     },
@@ -7649,10 +7649,10 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0294,
-      "Hydro": 0.9412,
-      "Solar": 0.0294,
-      "Wind": 0
+      "Bioenergy": 0.0293,
+      "Hydro": 0.7948,
+      "Solar": 0.171,
+      "Wind": 0.005
     }
   },
   "SK": {
@@ -7676,8 +7676,8 @@
     },
     "2022": {
       "Bioenergy": 0.1474,
-      "Hydro": 0.712,
-      "Solar": 0.1129,
+      "Hydro": 0.7121,
+      "Solar": 0.1128,
       "Wind": 0.0277
     },
     "2023": {
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.1943,
-      "Hydro": 0.7781,
-      "Solar": 0.0276,
+      "Bioenergy": 0.194,
+      "Hydro": 0.7306,
+      "Solar": 0.0754,
       "Wind": 0
     }
   },
@@ -8231,44 +8231,44 @@
     "2019": {
       "Bioenergy": 0.392,
       "Hydro": 0.2899,
-      "Solar": 0.1796,
+      "Solar": 0.1797,
       "Wind": 0.1384
     },
     "2020": {
-      "Bioenergy": 0.4078,
-      "Hydro": 0.2641,
-      "Solar": 0.1875,
-      "Wind": 0.1407
+      "Bioenergy": 0.4077,
+      "Hydro": 0.264,
+      "Solar": 0.1877,
+      "Wind": 0.1406
     },
     "2021": {
-      "Bioenergy": 0.4041,
-      "Hydro": 0.2573,
-      "Solar": 0.1631,
+      "Bioenergy": 0.404,
+      "Hydro": 0.2572,
+      "Solar": 0.1634,
       "Wind": 0.1755
     },
     "2022": {
-      "Bioenergy": 0.3873,
-      "Hydro": 0.2974,
-      "Solar": 0.18,
+      "Bioenergy": 0.3872,
+      "Hydro": 0.2972,
+      "Solar": 0.1803,
       "Wind": 0.1353
     },
     "2023": {
-      "Bioenergy": 0.392,
-      "Hydro": 0.2707,
-      "Solar": 0.1846,
-      "Wind": 0.1527
+      "Bioenergy": 0.3918,
+      "Hydro": 0.2705,
+      "Solar": 0.185,
+      "Wind": 0.1526
     },
     "2024": {
-      "Bioenergy": 0.3607,
-      "Hydro": 0.2668,
-      "Solar": 0.2199,
-      "Wind": 0.1526
+      "Bioenergy": 0.3586,
+      "Hydro": 0.27,
+      "Solar": 0.2152,
+      "Wind": 0.1562
     },
     "2025": {
-      "Bioenergy": 0.3561,
-      "Hydro": 0.2307,
-      "Solar": 0.224,
-      "Wind": 0.1892
+      "Bioenergy": 0.3492,
+      "Hydro": 0.2717,
+      "Solar": 0.1901,
+      "Wind": 0.1889
     }
   },
   "TJ": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0768,
-      "Hydro": 0.4996,
-      "Solar": 0.1297,
-      "Wind": 0.2939
+      "Bioenergy": 0.0709,
+      "Hydro": 0.45,
+      "Solar": 0.1837,
+      "Wind": 0.2954
     }
   },
   "TT": {
@@ -8787,16 +8787,16 @@
       "Wind": 0.4495
     },
     "2024": {
-      "Bioenergy": 0.0446,
-      "Hydro": 0.227,
-      "Solar": 0.2904,
-      "Wind": 0.438
+      "Bioenergy": 0.0447,
+      "Hydro": 0.2267,
+      "Solar": 0.291,
+      "Wind": 0.4377
     },
     "2025": {
-      "Bioenergy": 0.0452,
-      "Hydro": 0.2441,
-      "Solar": 0.2311,
-      "Wind": 0.4797
+      "Bioenergy": 0.0441,
+      "Hydro": 0.2366,
+      "Solar": 0.2516,
+      "Wind": 0.4678
     }
   },
   "UY": {
@@ -8837,54 +8837,54 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1651,
-      "Hydro": 0.423,
-      "Solar": 0.0553,
-      "Wind": 0.3566
+      "Bioenergy": 0.1539,
+      "Hydro": 0.4419,
+      "Solar": 0.0542,
+      "Wind": 0.3499
     }
   },
   "UZ": {
     "2019": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9813,
+      "Hydro": 0.9812,
       "Solar": 0.0078,
-      "Wind": 0.008
+      "Wind": 0.0079
     },
     "2020": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.9791,
+      "Hydro": 0.979,
       "Solar": 0.0089,
       "Wind": 0.0088
     },
     "2021": {
       "Bioenergy": 0.0037,
-      "Hydro": 0.9754,
-      "Solar": 0.0099,
+      "Hydro": 0.9753,
+      "Solar": 0.01,
       "Wind": 0.011
     },
     "2022": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9722,
-      "Solar": 0.0116,
+      "Hydro": 0.9721,
+      "Solar": 0.0117,
       "Wind": 0.0122
     },
     "2023": {
       "Bioenergy": 0.0041,
-      "Hydro": 0.9689,
-      "Solar": 0.0136,
-      "Wind": 0.0135
+      "Hydro": 0.9687,
+      "Solar": 0.0137,
+      "Wind": 0.0134
     },
     "2024": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9655,
+      "Hydro": 0.9654,
       "Solar": 0.0167,
-      "Wind": 0.0139
+      "Wind": 0.014
     },
     "2025": {
-      "Bioenergy": 0.0044,
-      "Hydro": 0.9642,
-      "Solar": 0.0158,
-      "Wind": 0.0156
+      "Bioenergy": 0.0043,
+      "Hydro": 0.961,
+      "Solar": 0.0185,
+      "Wind": 0.0163
     }
   },
   "VC": {
@@ -9096,15 +9096,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.7228,
-      "Solar": 0.196,
-      "Wind": 0.0812
+      "Hydro": 0.7159,
+      "Solar": 0.1989,
+      "Wind": 0.0852
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.796,
-      "Solar": 0.1513,
-      "Wind": 0.0527
+      "Hydro": 0.5659,
+      "Solar": 0.2488,
+      "Wind": 0.1853
     }
   },
   "VU": {
@@ -9227,16 +9227,16 @@
       "Wind": 0.4644
     },
     "2024": {
-      "Bioenergy": 0.0252,
-      "Hydro": 0.4001,
-      "Solar": 0.0407,
-      "Wind": 0.534
+      "Bioenergy": 0.0281,
+      "Hydro": 0.3913,
+      "Solar": 0.0416,
+      "Wind": 0.539
     },
     "2025": {
-      "Bioenergy": 0.0502,
-      "Hydro": 0.4025,
-      "Solar": 0.0511,
-      "Wind": 0.4962
+      "Bioenergy": 0.0479,
+      "Hydro": 0.4,
+      "Solar": 0.0673,
+      "Wind": 0.4848
     }
   },
   "YE": {
@@ -9287,25 +9287,25 @@
     "2019": {
       "Bioenergy": 0,
       "Hydro": 0.0558,
-      "Solar": 0.4002,
-      "Wind": 0.5439
+      "Solar": 0.4001,
+      "Wind": 0.544
     },
     "2020": {
       "Bioenergy": 0,
       "Hydro": 0.0571,
-      "Solar": 0.4394,
-      "Wind": 0.5035
+      "Solar": 0.4395,
+      "Wind": 0.5034
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.0937,
+      "Hydro": 0.0936,
       "Solar": 0.4126,
-      "Wind": 0.4937
+      "Wind": 0.4938
     },
     "2022": {
       "Bioenergy": 0,
       "Hydro": 0.1352,
-      "Solar": 0.4461,
+      "Solar": 0.4462,
       "Wind": 0.4187
     },
     "2023": {
@@ -9322,9 +9322,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0191,
-      "Solar": 0.6907,
-      "Wind": 0.2902
+      "Hydro": 0.0188,
+      "Solar": 0.6824,
+      "Wind": 0.2989
     }
   },
   "ZM": {