npm - @digital4better/data - Versions diffs - 1.2.11 → 1.2.12 - Mend

@digital4better/data 1.2.11 → 1.2.12

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

Files changed (65) hide show

package/data/factor/continent-monthly-green.csv +240 -240
package/data/factor/continent-monthly-green.json +1661 -1661
package/data/factor/continent-monthly.csv +227 -227
package/data/factor/continent-monthly.json +1566 -1566
package/data/factor/continent-yearly-green.csv +28 -28
package/data/factor/continent-yearly-green.json +211 -211
package/data/factor/continent-yearly.csv +27 -27
package/data/factor/continent-yearly.json +198 -198
package/data/factor/country-monthly-green.csv +1283 -1283
package/data/factor/country-monthly-green.json +10971 -10971
package/data/factor/country-monthly.csv +1325 -1325
package/data/factor/country-monthly.json +10122 -10122
package/data/factor/country-yearly-green.csv +225 -225
package/data/factor/country-yearly-green.json +1762 -1762
package/data/factor/country-yearly.csv +228 -228
package/data/factor/country-yearly.json +1735 -1735
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +318 -318
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +351 -351
package/data/factor/subdivision-yearly-green.csv +26 -26
package/data/factor/subdivision-yearly-green.json +197 -197
package/data/factor/subdivision-yearly.csv +26 -26
package/data/factor/subdivision-yearly.json +229 -229
package/data/factor/world-monthly-green.csv +73 -73
package/data/factor/world-monthly-green.json +657 -657
package/data/factor/world-monthly.csv +73 -73
package/data/factor/world-monthly.json +657 -657
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 +154 -154
package/data/mix/continent-monthly-green.json +550 -550
package/data/mix/continent-monthly.csv +154 -154
package/data/mix/continent-monthly.json +1044 -1044
package/data/mix/continent-yearly-green.csv +20 -20
package/data/mix/continent-yearly-green.json +69 -69
package/data/mix/continent-yearly.csv +20 -20
package/data/mix/continent-yearly.json +138 -138
package/data/mix/country-monthly-green.csv +989 -989
package/data/mix/country-monthly-green.json +2953 -2953
package/data/mix/country-monthly.csv +989 -989
package/data/mix/country-monthly.json +4066 -4066
package/data/mix/country-yearly-green.csv +159 -159
package/data/mix/country-yearly-green.json +387 -387
package/data/mix/country-yearly.csv +159 -159
package/data/mix/country-yearly.json +625 -625
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 +87 -87
package/data/mix/subdivision-yearly-green.csv +18 -18
package/data/mix/subdivision-yearly-green.json +17 -17
package/data/mix/subdivision-yearly.csv +18 -18
package/data/mix/subdivision-yearly.json +42 -42
package/data/mix/world-monthly-green.csv +73 -73
package/data/mix/world-monthly-green.json +292 -292
package/data/mix/world-monthly.csv +73 -73
package/data/mix/world-monthly.json +654 -654
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 +62 -62
package/package.json +1 -1

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

@@ -1,90 +1,90 @@
 {
   "AE": {
     "2019": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0049,
+      "Hydro": 0.7721,
+      "Solar": 0.1887,
+      "Wind": 0.0343
     },
     "2020": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0049,
+      "Hydro": 0.7721,
+      "Solar": 0.1887,
+      "Wind": 0.0343
     },
     "2021": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0049,
+      "Hydro": 0.7721,
+      "Solar": 0.1887,
+      "Wind": 0.0343
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0049,
+      "Hydro": 0.7721,
+      "Solar": 0.1887,
+      "Wind": 0.0343
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0049,
+      "Hydro": 0.7721,
+      "Solar": 0.1887,
+      "Wind": 0.0343
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0049,
+      "Hydro": 0.7721,
+      "Solar": 0.1887,
+      "Wind": 0.0343
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0049,
+      "Hydro": 0.7721,
+      "Solar": 0.1887,
+      "Wind": 0.0343
     }
   },
   "AF": {
     "2019": {
-      "Bioenergy": 0.0311,
-      "Hydro": 0.7962,
-      "Solar": 0.0882,
-      "Wind": 0.0846
+      "Bioenergy": 0.0316,
+      "Hydro": 0.7959,
+      "Solar": 0.088,
+      "Wind": 0.0845
     },
     "2020": {
-      "Bioenergy": 0.0339,
-      "Hydro": 0.7785,
-      "Solar": 0.0968,
-      "Wind": 0.0908
+      "Bioenergy": 0.0343,
+      "Hydro": 0.7784,
+      "Solar": 0.0966,
+      "Wind": 0.0907
     },
     "2021": {
-      "Bioenergy": 0.0373,
-      "Hydro": 0.7446,
-      "Solar": 0.106,
-      "Wind": 0.1122
+      "Bioenergy": 0.0376,
+      "Hydro": 0.7445,
+      "Solar": 0.1058,
+      "Wind": 0.1121
     },
     "2022": {
-      "Bioenergy": 0.0393,
-      "Hydro": 0.7203,
-      "Solar": 0.12,
-      "Wind": 0.1204
+      "Bioenergy": 0.0398,
+      "Hydro": 0.7202,
+      "Solar": 0.1197,
+      "Wind": 0.1203
     },
     "2023": {
-      "Bioenergy": 0.0398,
-      "Hydro": 0.6893,
-      "Solar": 0.1385,
+      "Bioenergy": 0.0403,
+      "Hydro": 0.6891,
+      "Solar": 0.1383,
       "Wind": 0.1323
     },
     "2024": {
-      "Bioenergy": 0.0368,
-      "Hydro": 0.6685,
+      "Bioenergy": 0.0372,
+      "Hydro": 0.6682,
       "Solar": 0.1625,
-      "Wind": 0.1322
+      "Wind": 0.1321
     },
     "2025": {
-      "Bioenergy": 0.0427,
-      "Hydro": 0.6449,
-      "Solar": 0.1583,
-      "Wind": 0.1541
+      "Bioenergy": 0.043,
+      "Hydro": 0.6432,
+      "Solar": 0.16,
+      "Wind": 0.1538
     }
   },
   "AG": {
@@ -170,8 +170,8 @@
     },
     "2025": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9171,
-      "Solar": 0.0144,
+      "Hydro": 0.9172,
+      "Solar": 0.0143,
       "Wind": 0.0577
     }
   },
@@ -617,46 +617,46 @@
   },
   "BD": {
     "2019": {
-      "Bioenergy": 0.0419,
-      "Hydro": 0.7262,
-      "Solar": 0.1167,
-      "Wind": 0.1153
+      "Bioenergy": 0.0427,
+      "Hydro": 0.7258,
+      "Solar": 0.1164,
+      "Wind": 0.1152
     },
     "2020": {
-      "Bioenergy": 0.0459,
-      "Hydro": 0.7056,
-      "Solar": 0.1253,
-      "Wind": 0.1232
+      "Bioenergy": 0.0465,
+      "Hydro": 0.7054,
+      "Solar": 0.125,
+      "Wind": 0.1231
     },
     "2021": {
-      "Bioenergy": 0.0497,
-      "Hydro": 0.6004,
-      "Solar": 0.1998,
-      "Wind": 0.1502
+      "Bioenergy": 0.0502,
+      "Hydro": 0.6003,
+      "Solar": 0.1994,
+      "Wind": 0.1501
     },
     "2022": {
-      "Bioenergy": 0.0497,
-      "Hydro": 0.5488,
-      "Solar": 0.2479,
-      "Wind": 0.1536
+      "Bioenergy": 0.0503,
+      "Hydro": 0.5487,
+      "Solar": 0.2475,
+      "Wind": 0.1534
     },
     "2023": {
-      "Bioenergy": 0.0587,
-      "Hydro": 0.4523,
-      "Solar": 0.2946,
-      "Wind": 0.1943
+      "Bioenergy": 0.0594,
+      "Hydro": 0.4522,
+      "Solar": 0.2942,
+      "Wind": 0.1942
     },
     "2024": {
-      "Bioenergy": 0.0489,
-      "Hydro": 0.4367,
-      "Solar": 0.3388,
-      "Wind": 0.1756
+      "Bioenergy": 0.0495,
+      "Hydro": 0.4316,
+      "Solar": 0.3433,
+      "Wind": 0.1757
     },
     "2025": {
-      "Bioenergy": 0.0538,
-      "Hydro": 0.3714,
-      "Solar": 0.3807,
-      "Wind": 0.1941
+      "Bioenergy": 0.0556,
+      "Hydro": 0.2902,
+      "Solar": 0.4554,
+      "Wind": 0.1988
     }
   },
   "BE": {
@@ -692,15 +692,15 @@
     },
     "2024": {
       "Bioenergy": 0.0359,
-      "Hydro": 0.0766,
-      "Solar": 0.3425,
-      "Wind": 0.5449
+      "Hydro": 0.0764,
+      "Solar": 0.3426,
+      "Wind": 0.5451
     },
     "2025": {
       "Bioenergy": 0.0519,
-      "Hydro": 0.1229,
+      "Hydro": 0.1227,
       "Solar": 0.1315,
-      "Wind": 0.6937
+      "Wind": 0.6938
     }
   },
   "BF": {
@@ -780,8 +780,8 @@
     },
     "2024": {
       "Bioenergy": 0.0171,
-      "Hydro": 0.3201,
-      "Solar": 0.5035,
+      "Hydro": 0.32,
+      "Solar": 0.5036,
       "Wind": 0.1593
     },
     "2025": {
@@ -1308,15 +1308,15 @@
     },
     "2024": {
       "Bioenergy": 0.2235,
-      "Hydro": 0.6679,
+      "Hydro": 0.668,
       "Solar": 0.0549,
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.2176,
+      "Bioenergy": 0.2175,
       "Hydro": 0.6625,
       "Solar": 0.0623,
-      "Wind": 0.0576
+      "Wind": 0.0577
     }
   },
   "CA": {
@@ -1360,7 +1360,7 @@
       "Bioenergy": 0.0242,
       "Hydro": 0.8374,
       "Solar": 0.0054,
-      "Wind": 0.1329
+      "Wind": 0.133
     }
   },
   "CD": {
@@ -1754,9 +1754,9 @@
     },
     "2025": {
       "Bioenergy": 0.0667,
-      "Hydro": 0.3053,
-      "Solar": 0.2639,
-      "Wind": 0.3641
+      "Hydro": 0.3052,
+      "Solar": 0.2641,
+      "Wind": 0.364
     }
   },
   "CO": {
@@ -2151,8 +2151,8 @@
     "2025": {
       "Bioenergy": 0.1831,
       "Hydro": 0.0226,
-      "Solar": 0.0252,
-      "Wind": 0.7691
+      "Solar": 0.0251,
+      "Wind": 0.7692
     }
   },
   "DM": {
@@ -2326,7 +2326,7 @@
     },
     "2025": {
       "Bioenergy": 0.0597,
-      "Hydro": 0.9041,
+      "Hydro": 0.904,
       "Solar": 0.0127,
       "Wind": 0.0236
     }
@@ -2364,59 +2364,59 @@
     },
     "2024": {
       "Bioenergy": 0.1409,
-      "Hydro": 0.1377,
-      "Solar": 0.3002,
-      "Wind": 0.4213
+      "Hydro": 0.1373,
+      "Solar": 0.3003,
+      "Wind": 0.4215
     },
     "2025": {
       "Bioenergy": 0.1716,
-      "Hydro": 0.1428,
-      "Solar": 0.0254,
-      "Wind": 0.6602
+      "Hydro": 0.1426,
+      "Solar": 0.0253,
+      "Wind": 0.6604
     }
   },
   "EG": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 0.7371,
-      "Solar": 0.2629,
-      "Wind": 0
+      "Hydro": 0.7362,
+      "Solar": 0.0605,
+      "Wind": 0.2032
     },
     "2020": {
       "Bioenergy": 0,
-      "Hydro": 0.6496,
-      "Solar": 0.3504,
-      "Wind": 0
+      "Hydro": 0.6093,
+      "Solar": 0.1992,
+      "Wind": 0.1916
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.6071,
-      "Solar": 0.3929,
-      "Wind": 0
+      "Hydro": 0.5689,
+      "Solar": 0.2072,
+      "Wind": 0.2239
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 0.6023,
-      "Solar": 0.3977,
-      "Wind": 0
+      "Bioenergy": 0.0046,
+      "Hydro": 0.5724,
+      "Solar": 0.19,
+      "Wind": 0.233
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 0.6548,
-      "Solar": 0.3452,
-      "Wind": 0
+      "Bioenergy": 0.0011,
+      "Hydro": 0.5803,
+      "Solar": 0.2012,
+      "Wind": 0.2174
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0.6771,
-      "Solar": 0.3229,
-      "Wind": 0
+      "Bioenergy": 0.0042,
+      "Hydro": 0.5835,
+      "Solar": 0.1992,
+      "Wind": 0.213
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.6771,
-      "Solar": 0.3229,
-      "Wind": 0
+      "Bioenergy": 0.004,
+      "Hydro": 0.5914,
+      "Solar": 0.1948,
+      "Wind": 0.2098
     }
   },
   "ER": {
@@ -2848,13 +2848,13 @@
     },
     "2024": {
       "Bioenergy": 0.1486,
-      "Hydro": 0.0731,
+      "Hydro": 0.073,
       "Solar": 0.1245,
       "Wind": 0.6538
     },
     "2025": {
       "Bioenergy": 0.1521,
-      "Hydro": 0.068,
+      "Hydro": 0.0679,
       "Solar": 0.0422,
       "Wind": 0.7378
     }
@@ -2905,19 +2905,19 @@
   },
   "GE": {
     "2019": {
-      "Bioenergy": 0.0027,
-      "Hydro": 0.9722,
+      "Bioenergy": 0.0028,
+      "Hydro": 0.9721,
       "Solar": 0.0051,
       "Wind": 0.02
     },
     "2020": {
-      "Bioenergy": 0.0029,
+      "Bioenergy": 0.003,
       "Hydro": 0.9702,
       "Solar": 0.0054,
       "Wind": 0.0214
     },
     "2021": {
-      "Bioenergy": 0.0038,
+      "Bioenergy": 0.0039,
       "Hydro": 0.9658,
       "Solar": 0.0076,
       "Wind": 0.0228
@@ -2929,7 +2929,7 @@
       "Wind": 0.0205
     },
     "2023": {
-      "Bioenergy": 0.0018,
+      "Bioenergy": 0.0019,
       "Hydro": 0.9763,
       "Solar": 0.0045,
       "Wind": 0.0173
@@ -2942,9 +2942,9 @@
     },
     "2025": {
       "Bioenergy": 0.0066,
-      "Hydro": 0.9329,
-      "Solar": 0.0207,
-      "Wind": 0.0398
+      "Hydro": 0.9323,
+      "Solar": 0.0211,
+      "Wind": 0.0399
     }
   },
   "GF": {
@@ -3521,46 +3521,46 @@
   },
   "HK": {
     "2019": {
-      "Bioenergy": 0.1111,
-      "Hydro": 0.5813,
-      "Solar": 0.1349,
-      "Wind": 0.1726
+      "Bioenergy": 0.1121,
+      "Hydro": 0.581,
+      "Solar": 0.1345,
+      "Wind": 0.1723
     },
     "2020": {
-      "Bioenergy": 0.112,
-      "Hydro": 0.5589,
-      "Solar": 0.1493,
-      "Wind": 0.1798
+      "Bioenergy": 0.1127,
+      "Hydro": 0.559,
+      "Solar": 0.1487,
+      "Wind": 0.1795
     },
     "2021": {
-      "Bioenergy": 0.1161,
-      "Hydro": 0.4998,
-      "Solar": 0.1655,
-      "Wind": 0.2187
+      "Bioenergy": 0.1167,
+      "Hydro": 0.4999,
+      "Solar": 0.165,
+      "Wind": 0.2184
     },
     "2022": {
-      "Bioenergy": 0.115,
-      "Hydro": 0.469,
-      "Solar": 0.1883,
-      "Wind": 0.2277
+      "Bioenergy": 0.1159,
+      "Hydro": 0.4691,
+      "Solar": 0.1877,
+      "Wind": 0.2274
     },
     "2023": {
-      "Bioenergy": 0.1152,
+      "Bioenergy": 0.1159,
       "Hydro": 0.4137,
-      "Solar": 0.2224,
-      "Wind": 0.2488
+      "Solar": 0.2219,
+      "Wind": 0.2485
     },
     "2024": {
-      "Bioenergy": 0.1042,
-      "Hydro": 0.3961,
-      "Solar": 0.2597,
-      "Wind": 0.2401
+      "Bioenergy": 0.1048,
+      "Hydro": 0.396,
+      "Solar": 0.2595,
+      "Wind": 0.2397
     },
     "2025": {
-      "Bioenergy": 0.1212,
-      "Hydro": 0.3274,
-      "Solar": 0.2604,
-      "Wind": 0.2909
+      "Bioenergy": 0.121,
+      "Hydro": 0.3275,
+      "Solar": 0.2626,
+      "Wind": 0.2889
     }
   },
   "HN": {
@@ -3640,15 +3640,15 @@
     },
     "2024": {
       "Bioenergy": 0.0633,
-      "Hydro": 0.5507,
+      "Hydro": 0.5506,
       "Solar": 0.1112,
-      "Wind": 0.2748
+      "Wind": 0.2749
     },
     "2025": {
       "Bioenergy": 0.0578,
       "Hydro": 0.5543,
       "Solar": 0.0197,
-      "Wind": 0.3682
+      "Wind": 0.3683
     }
   },
   "HT": {
@@ -3727,15 +3727,15 @@
       "Wind": 0.1662
     },
     "2024": {
-      "Bioenergy": 0.0801,
-      "Hydro": 0.1382,
-      "Solar": 0.6457,
+      "Bioenergy": 0.0802,
+      "Hydro": 0.1379,
+      "Solar": 0.646,
       "Wind": 0.1359
     },
     "2025": {
       "Bioenergy": 0.1381,
-      "Hydro": 0.1937,
-      "Solar": 0.4521,
+      "Hydro": 0.1934,
+      "Solar": 0.4523,
       "Wind": 0.2162
     }
   },
@@ -3779,7 +3779,7 @@
     "2025": {
       "Bioenergy": 0.3553,
       "Hydro": 0.62,
-      "Solar": 0.0069,
+      "Solar": 0.007,
       "Wind": 0.0177
     }
   },
@@ -3816,15 +3816,15 @@
     },
     "2024": {
       "Bioenergy": 0.018,
-      "Hydro": 0.1143,
+      "Hydro": 0.1142,
       "Solar": 0.0745,
-      "Wind": 0.7932
+      "Wind": 0.7933
     },
     "2025": {
       "Bioenergy": 0.0136,
-      "Hydro": 0.0989,
+      "Hydro": 0.0988,
       "Solar": 0.02,
-      "Wind": 0.8675
+      "Wind": 0.8676
     }
   },
   "IL": {
@@ -4080,15 +4080,15 @@
     },
     "2024": {
       "Bioenergy": 0.1179,
-      "Hydro": 0.3955,
+      "Hydro": 0.3954,
       "Solar": 0.2806,
-      "Wind": 0.206
+      "Wind": 0.2061
     },
     "2025": {
       "Bioenergy": 0.1448,
-      "Hydro": 0.3017,
+      "Hydro": 0.3016,
       "Solar": 0.1925,
-      "Wind": 0.361
+      "Wind": 0.3611
     }
   },
   "JM": {
@@ -4211,16 +4211,16 @@
       "Wind": 0.0693
     },
     "2024": {
-      "Bioenergy": 0.2141,
-      "Hydro": 0.2811,
-      "Solar": 0.4402,
-      "Wind": 0.0645
+      "Bioenergy": 0.2152,
+      "Hydro": 0.2787,
+      "Solar": 0.4382,
+      "Wind": 0.0679
     },
     "2025": {
-      "Bioenergy": 0.26,
-      "Hydro": 0.2433,
-      "Solar": 0.4204,
-      "Wind": 0.0763
+      "Bioenergy": 0.2742,
+      "Hydro": 0.211,
+      "Solar": 0.4216,
+      "Wind": 0.0932
     }
   },
   "KE": {
@@ -4255,16 +4255,16 @@
       "Wind": 0.3659
     },
     "2024": {
-      "Bioenergy": 0.023,
-      "Hydro": 0.6079,
-      "Solar": 0.0758,
-      "Wind": 0.2933
+      "Bioenergy": 0.0245,
+      "Hydro": 0.6091,
+      "Solar": 0.0755,
+      "Wind": 0.2908
     },
     "2025": {
-      "Bioenergy": 0.0206,
-      "Hydro": 0.5752,
-      "Solar": 0.0823,
-      "Wind": 0.3219
+      "Bioenergy": 0.0391,
+      "Hydro": 0.5905,
+      "Solar": 0.0791,
+      "Wind": 0.2913
     }
   },
   "KG": {
@@ -4300,59 +4300,59 @@
     },
     "2024": {
       "Bioenergy": 0.0023,
-      "Hydro": 0.9818,
+      "Hydro": 0.9817,
       "Solar": 0.008,
       "Wind": 0.008
     },
     "2025": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9846,
-      "Solar": 0.0063,
-      "Wind": 0.0071
+      "Hydro": 0.9845,
+      "Solar": 0.0064,
+      "Wind": 0.0072
     }
   },
   "KH": {
     "2019": {
-      "Bioenergy": 0.0285,
-      "Hydro": 0.9056,
+      "Bioenergy": 0.0286,
+      "Hydro": 0.9055,
       "Solar": 0.0415,
       "Wind": 0.0244
     },
     "2020": {
-      "Bioenergy": 0.0293,
+      "Bioenergy": 0.0294,
       "Hydro": 0.8994,
-      "Solar": 0.0445,
+      "Solar": 0.0444,
       "Wind": 0.0268
     },
     "2021": {
-      "Bioenergy": 0.0303,
+      "Bioenergy": 0.0305,
       "Hydro": 0.8887,
-      "Solar": 0.0475,
+      "Solar": 0.0474,
       "Wind": 0.0335
     },
     "2022": {
-      "Bioenergy": 0.031,
-      "Hydro": 0.8799,
+      "Bioenergy": 0.0312,
+      "Hydro": 0.8798,
       "Solar": 0.0523,
       "Wind": 0.0368
     },
     "2023": {
-      "Bioenergy": 0.0312,
+      "Bioenergy": 0.0314,
       "Hydro": 0.87,
-      "Solar": 0.0582,
+      "Solar": 0.0581,
       "Wind": 0.0406
     },
     "2024": {
-      "Bioenergy": 0.0304,
-      "Hydro": 0.8612,
-      "Solar": 0.0667,
+      "Bioenergy": 0.0305,
+      "Hydro": 0.861,
+      "Solar": 0.0668,
       "Wind": 0.0417
     },
     "2025": {
-      "Bioenergy": 0.0321,
-      "Hydro": 0.8567,
-      "Solar": 0.0641,
-      "Wind": 0.0471
+      "Bioenergy": 0.0322,
+      "Hydro": 0.8558,
+      "Solar": 0.0648,
+      "Wind": 0.0472
     }
   },
   "KI": {
@@ -4563,16 +4563,16 @@
       "Wind": 0.0694
     },
     "2024": {
-      "Bioenergy": 0.2355,
-      "Hydro": 0.0815,
-      "Solar": 0.623,
-      "Wind": 0.06
+      "Bioenergy": 0.2363,
+      "Hydro": 0.0813,
+      "Solar": 0.6186,
+      "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.2672,
-      "Hydro": 0.0549,
-      "Solar": 0.5955,
-      "Wind": 0.0824
+      "Bioenergy": 0.2757,
+      "Hydro": 0.0541,
+      "Solar": 0.5369,
+      "Wind": 0.1332
     }
   },
   "KW": {
@@ -4696,15 +4696,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.6402,
-      "Solar": 0.1091,
-      "Wind": 0.2507
+      "Hydro": 0.639,
+      "Solar": 0.114,
+      "Wind": 0.2471
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6517,
-      "Solar": 0.058,
-      "Wind": 0.2902
+      "Hydro": 0.6377,
+      "Solar": 0.114,
+      "Wind": 0.2483
     }
   },
   "LA": {
@@ -5004,15 +5004,15 @@
     },
     "2024": {
       "Bioenergy": 0.0516,
-      "Hydro": 0.1849,
+      "Hydro": 0.1846,
       "Solar": 0.2349,
-      "Wind": 0.5287
+      "Wind": 0.5289
     },
     "2025": {
       "Bioenergy": 0.0483,
-      "Hydro": 0.1459,
+      "Hydro": 0.1458,
       "Solar": 0.0486,
-      "Wind": 0.7572
+      "Wind": 0.7574
     }
   },
   "LU": {
@@ -5047,16 +5047,16 @@
       "Wind": 0.4016
     },
     "2024": {
-      "Bioenergy": 0.1383,
-      "Hydro": 0.2942,
-      "Solar": 0.2176,
-      "Wind": 0.3499
+      "Bioenergy": 0.1384,
+      "Hydro": 0.2937,
+      "Solar": 0.2177,
+      "Wind": 0.3502
     },
     "2025": {
-      "Bioenergy": 0.1758,
-      "Hydro": 0.2886,
-      "Solar": 0.0878,
-      "Wind": 0.4478
+      "Bioenergy": 0.1759,
+      "Hydro": 0.2883,
+      "Solar": 0.0877,
+      "Wind": 0.448
     }
   },
   "LV": {
@@ -5092,7 +5092,7 @@
     },
     "2024": {
       "Bioenergy": 0.0745,
-      "Hydro": 0.6909,
+      "Hydro": 0.6908,
       "Solar": 0.1265,
       "Wind": 0.1081
     },
@@ -5224,7 +5224,7 @@
     },
     "2024": {
       "Bioenergy": 0.0124,
-      "Hydro": 0.6424,
+      "Hydro": 0.6423,
       "Solar": 0.1677,
       "Wind": 0.1776
     },
@@ -5356,9 +5356,9 @@
     },
     "2024": {
       "Bioenergy": 0.0515,
-      "Hydro": 0.6854,
+      "Hydro": 0.6853,
       "Solar": 0.139,
-      "Wind": 0.1241
+      "Wind": 0.1242
     },
     "2025": {
       "Bioenergy": 0.069,
@@ -5501,46 +5501,46 @@
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.2201,
-      "Hydro": 0.5137,
-      "Solar": 0.1137,
-      "Wind": 0.1526
+      "Bioenergy": 0.2209,
+      "Hydro": 0.5135,
+      "Solar": 0.1133,
+      "Wind": 0.1523
     },
     "2020": {
-      "Bioenergy": 0.2152,
-      "Hydro": 0.4973,
-      "Solar": 0.1276,
-      "Wind": 0.1599
+      "Bioenergy": 0.2158,
+      "Hydro": 0.4974,
+      "Solar": 0.1271,
+      "Wind": 0.1597
     },
     "2021": {
-      "Bioenergy": 0.2159,
-      "Hydro": 0.4462,
-      "Solar": 0.1427,
-      "Wind": 0.1952
+      "Bioenergy": 0.2164,
+      "Hydro": 0.4463,
+      "Solar": 0.1422,
+      "Wind": 0.195
     },
     "2022": {
-      "Bioenergy": 0.2094,
-      "Hydro": 0.4215,
-      "Solar": 0.1644,
-      "Wind": 0.2047
+      "Bioenergy": 0.2101,
+      "Hydro": 0.4217,
+      "Solar": 0.1639,
+      "Wind": 0.2044
     },
     "2023": {
-      "Bioenergy": 0.2085,
-      "Hydro": 0.3722,
-      "Solar": 0.1953,
-      "Wind": 0.2239
+      "Bioenergy": 0.2092,
+      "Hydro": 0.3723,
+      "Solar": 0.1949,
+      "Wind": 0.2237
     },
     "2024": {
-      "Bioenergy": 0.1924,
+      "Bioenergy": 0.1928,
       "Hydro": 0.359,
-      "Solar": 0.231,
-      "Wind": 0.2176
+      "Solar": 0.2308,
+      "Wind": 0.2173
     },
     "2025": {
-      "Bioenergy": 0.2148,
-      "Hydro": 0.2944,
-      "Solar": 0.2293,
-      "Wind": 0.2615
+      "Bioenergy": 0.2137,
+      "Hydro": 0.2948,
+      "Solar": 0.2316,
+      "Wind": 0.26
     }
   },
   "MQ": {
@@ -5708,15 +5708,15 @@
     },
     "2024": {
       "Bioenergy": 0.0293,
-      "Hydro": 0.1889,
-      "Solar": 0.6526,
+      "Hydro": 0.1886,
+      "Solar": 0.6529,
       "Wind": 0.1292
     },
     "2025": {
-      "Bioenergy": 0.0318,
-      "Hydro": 0.1831,
-      "Solar": 0.6157,
-      "Wind": 0.1693
+      "Bioenergy": 0.0319,
+      "Hydro": 0.1829,
+      "Solar": 0.616,
+      "Wind": 0.1692
     }
   },
   "MU": {
@@ -5889,53 +5889,53 @@
       "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0.0045,
-      "Hydro": 0.3023,
-      "Solar": 0.28,
-      "Wind": 0.4133
+      "Bioenergy": 0.0023,
+      "Hydro": 0.2829,
+      "Solar": 0.2675,
+      "Wind": 0.4474
     }
   },
   "MY": {
     "2019": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.9095,
-      "Solar": 0.0508,
-      "Wind": 0
+      "Bioenergy": 0.1357,
+      "Hydro": 0.8439,
+      "Solar": 0.0203,
+      "Wind": 0.0001
     },
     "2020": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.9095,
-      "Solar": 0.0508,
+      "Bioenergy": 0.1078,
+      "Hydro": 0.8651,
+      "Solar": 0.027,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.9095,
-      "Solar": 0.0508,
-      "Wind": 0
+      "Bioenergy": 0.1108,
+      "Hydro": 0.858,
+      "Solar": 0.0311,
+      "Wind": 0.0001
     },
     "2022": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.9095,
-      "Solar": 0.0508,
+      "Bioenergy": 0.1133,
+      "Hydro": 0.8438,
+      "Solar": 0.0428,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.9095,
-      "Solar": 0.0508,
-      "Wind": 0
+      "Bioenergy": 0.1133,
+      "Hydro": 0.8311,
+      "Solar": 0.0555,
+      "Wind": 0.0001
     },
     "2024": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.9095,
-      "Solar": 0.0508,
-      "Wind": 0
+      "Bioenergy": 0.1099,
+      "Hydro": 0.8136,
+      "Solar": 0.0764,
+      "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.9095,
-      "Solar": 0.0508,
+      "Bioenergy": 0.1006,
+      "Hydro": 0.8277,
+      "Solar": 0.0717,
       "Wind": 0
     }
   },
@@ -6197,7 +6197,7 @@
       "Wind": 0.3675
     },
     "2025": {
-      "Bioenergy": 0.3985,
+      "Bioenergy": 0.3984,
       "Hydro": 0.2026,
       "Solar": 0.0324,
       "Wind": 0.3666
@@ -6299,7 +6299,7 @@
       "Wind": 0.0117
     },
     "2020": {
-      "Bioenergy": 0.0042,
+      "Bioenergy": 0.0043,
       "Hydro": 0.9618,
       "Solar": 0.0212,
       "Wind": 0.0128
@@ -6311,27 +6311,27 @@
       "Wind": 0.0156
     },
     "2022": {
-      "Bioenergy": 0.0051,
+      "Bioenergy": 0.0052,
       "Hydro": 0.9531,
       "Solar": 0.0247,
       "Wind": 0.0171
     },
     "2023": {
-      "Bioenergy": 0.0052,
+      "Bioenergy": 0.0053,
       "Hydro": 0.9489,
       "Solar": 0.0272,
       "Wind": 0.0187
     },
     "2024": {
       "Bioenergy": 0.005,
-      "Hydro": 0.9447,
+      "Hydro": 0.9446,
       "Solar": 0.031,
       "Wind": 0.0193
     },
     "2025": {
-      "Bioenergy": 0.0055,
-      "Hydro": 0.9433,
-      "Solar": 0.0297,
+      "Bioenergy": 0.0056,
+      "Hydro": 0.9429,
+      "Solar": 0.03,
       "Wind": 0.0215
     }
   },
@@ -6461,10 +6461,10 @@
       "Wind": 0.1407
     },
     "2025": {
-      "Bioenergy": 0.0084,
-      "Hydro": 0.8404,
+      "Bioenergy": 0.0048,
+      "Hydro": 0.8879,
       "Solar": 0,
-      "Wind": 0.1512
+      "Wind": 0.1073
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0105,
-      "Hydro": 0.8556,
-      "Solar": 0.0368,
-      "Wind": 0.0971
+      "Bioenergy": 0.0103,
+      "Hydro": 0.876,
+      "Solar": 0.031,
+      "Wind": 0.0827
     }
   },
   "PF": {
@@ -6897,8 +6897,8 @@
     "2024": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.559,
-      "Wind": 0.441
+      "Solar": 0.5591,
+      "Wind": 0.4409
     },
     "2025": {
       "Bioenergy": 0,
@@ -6984,7 +6984,7 @@
     },
     "2024": {
       "Bioenergy": 0.0862,
-      "Hydro": 0.3545,
+      "Hydro": 0.3544,
       "Solar": 0.1672,
       "Wind": 0.3922
     },
@@ -7210,7 +7210,7 @@
     },
     "2025": {
       "Bioenergy": 0.0213,
-      "Hydro": 0.8606,
+      "Hydro": 0.8607,
       "Solar": 0.0019,
       "Wind": 0.1162
     }
@@ -7247,16 +7247,16 @@
       "Wind": 0.0218
     },
     "2024": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9602,
-      "Solar": 0.0121,
-      "Wind": 0.0239
+      "Bioenergy": 0.004,
+      "Hydro": 0.9608,
+      "Solar": 0.0109,
+      "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.0041,
-      "Hydro": 0.9593,
-      "Solar": 0.0128,
-      "Wind": 0.0239
+      "Bioenergy": 0.005,
+      "Hydro": 0.9648,
+      "Solar": 0.0029,
+      "Wind": 0.0273
     }
   },
   "RW": {
@@ -7543,15 +7543,15 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.005,
-      "Hydro": 0.0378,
-      "Solar": 0.9438,
+      "Bioenergy": 0.0051,
+      "Hydro": 0.0377,
+      "Solar": 0.9437,
       "Wind": 0.0135
     },
     "2023": {
       "Bioenergy": 0.0019,
       "Hydro": 0.0076,
-      "Solar": 0.9843,
+      "Solar": 0.9842,
       "Wind": 0.0062
     },
     "2024": {
@@ -8229,46 +8229,46 @@
   },
   "TH": {
     "2019": {
-      "Bioenergy": 0.3919,
+      "Bioenergy": 0.392,
       "Hydro": 0.2899,
-      "Solar": 0.1797,
-      "Wind": 0.1385
+      "Solar": 0.1796,
+      "Wind": 0.1384
     },
     "2020": {
-      "Bioenergy": 0.4077,
-      "Hydro": 0.264,
-      "Solar": 0.1876,
+      "Bioenergy": 0.4078,
+      "Hydro": 0.2641,
+      "Solar": 0.1875,
       "Wind": 0.1407
     },
     "2021": {
-      "Bioenergy": 0.404,
+      "Bioenergy": 0.4041,
       "Hydro": 0.2573,
-      "Solar": 0.1632,
-      "Wind": 0.1756
+      "Solar": 0.1631,
+      "Wind": 0.1755
     },
     "2022": {
-      "Bioenergy": 0.3871,
+      "Bioenergy": 0.3873,
       "Hydro": 0.2974,
-      "Solar": 0.1801,
-      "Wind": 0.1354
+      "Solar": 0.18,
+      "Wind": 0.1353
     },
     "2023": {
-      "Bioenergy": 0.3919,
+      "Bioenergy": 0.392,
       "Hydro": 0.2707,
-      "Solar": 0.1847,
+      "Solar": 0.1846,
       "Wind": 0.1527
     },
     "2024": {
       "Bioenergy": 0.3607,
       "Hydro": 0.2668,
       "Solar": 0.2199,
-      "Wind": 0.1527
+      "Wind": 0.1526
     },
     "2025": {
-      "Bioenergy": 0.3568,
-      "Hydro": 0.2304,
-      "Solar": 0.2233,
-      "Wind": 0.1894
+      "Bioenergy": 0.3561,
+      "Hydro": 0.2307,
+      "Solar": 0.224,
+      "Wind": 0.1892
     }
   },
   "TJ": {
@@ -8794,9 +8794,9 @@
     },
     "2025": {
       "Bioenergy": 0.0452,
-      "Hydro": 0.2445,
-      "Solar": 0.2296,
-      "Wind": 0.4808
+      "Hydro": 0.2441,
+      "Solar": 0.2311,
+      "Wind": 0.4797
     }
   },
   "UY": {
@@ -8837,7 +8837,7 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1652,
+      "Bioenergy": 0.1651,
       "Hydro": 0.423,
       "Solar": 0.0553,
       "Wind": 0.3566
@@ -8845,7 +8845,7 @@
   },
   "UZ": {
     "2019": {
-      "Bioenergy": 0.0029,
+      "Bioenergy": 0.003,
       "Hydro": 0.9813,
       "Solar": 0.0078,
       "Wind": 0.008
@@ -8869,7 +8869,7 @@
       "Wind": 0.0122
     },
     "2023": {
-      "Bioenergy": 0.004,
+      "Bioenergy": 0.0041,
       "Hydro": 0.9689,
       "Solar": 0.0136,
       "Wind": 0.0135
@@ -8881,9 +8881,9 @@
       "Wind": 0.0139
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Hydro": 0.9645,
-      "Solar": 0.0155,
+      "Bioenergy": 0.0044,
+      "Hydro": 0.9642,
+      "Solar": 0.0158,
       "Wind": 0.0156
     }
   },
@@ -9227,16 +9227,16 @@
       "Wind": 0.4644
     },
     "2024": {
-      "Bioenergy": 0.0251,
-      "Hydro": 0.4008,
+      "Bioenergy": 0.0252,
+      "Hydro": 0.4001,
       "Solar": 0.0407,
-      "Wind": 0.5334
+      "Wind": 0.534
     },
     "2025": {
-      "Bioenergy": 0.0501,
-      "Hydro": 0.4027,
-      "Solar": 0.0512,
-      "Wind": 0.496
+      "Bioenergy": 0.0502,
+      "Hydro": 0.4025,
+      "Solar": 0.0511,
+      "Wind": 0.4962
     }
   },
   "YE": {
@@ -9316,15 +9316,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.0346,
-      "Solar": 0.6196,
-      "Wind": 0.3458
+      "Hydro": 0.0345,
+      "Solar": 0.6205,
+      "Wind": 0.345
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0192,
-      "Solar": 0.6844,
-      "Wind": 0.2963
+      "Hydro": 0.0191,
+      "Solar": 0.6907,
+      "Wind": 0.2902
     }
   },
   "ZM": {