npm - @digital4better/data - Versions diffs - 1.2.26 → 1.2.28 - Mend

@digital4better/data 1.2.26 → 1.2.28

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 +166 -166
package/data/factor/continent-monthly-green.json +1241 -1241
package/data/factor/continent-monthly.csv +191 -191
package/data/factor/continent-monthly.json +1293 -1293
package/data/factor/continent-yearly-green.csv +22 -22
package/data/factor/continent-yearly-green.json +176 -176
package/data/factor/continent-yearly.csv +25 -25
package/data/factor/continent-yearly.json +166 -166
package/data/factor/country-monthly-green.csv +1184 -1184
package/data/factor/country-monthly-green.json +9937 -9937
package/data/factor/country-monthly.csv +1273 -1273
package/data/factor/country-monthly.json +9498 -9498
package/data/factor/country-yearly-green.csv +201 -201
package/data/factor/country-yearly-green.json +1619 -1619
package/data/factor/country-yearly.csv +202 -202
package/data/factor/country-yearly.json +1485 -1485
package/data/factor/subdivision-monthly-green.csv +100 -100
package/data/factor/subdivision-monthly-green.json +900 -900
package/data/factor/subdivision-monthly.csv +100 -100
package/data/factor/subdivision-monthly.json +900 -900
package/data/factor/subdivision-yearly-green.csv +50 -50
package/data/factor/subdivision-yearly-green.json +450 -450
package/data/factor/subdivision-yearly.csv +50 -50
package/data/factor/subdivision-yearly.json +450 -450
package/data/factor/world-monthly-green.csv +76 -76
package/data/factor/world-monthly-green.json +682 -682
package/data/factor/world-monthly.csv +76 -76
package/data/factor/world-monthly.json +681 -681
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 +58 -58
package/data/mix/continent-monthly-green.csv +124 -124
package/data/mix/continent-monthly-green.json +354 -354
package/data/mix/continent-monthly.csv +124 -124
package/data/mix/continent-monthly.json +576 -576
package/data/mix/continent-yearly-green.csv +13 -13
package/data/mix/continent-yearly-green.json +43 -43
package/data/mix/continent-yearly.csv +13 -13
package/data/mix/continent-yearly.json +53 -53
package/data/mix/country-monthly-green.csv +1001 -1001
package/data/mix/country-monthly-green.json +3327 -3327
package/data/mix/country-monthly.csv +1001 -1001
package/data/mix/country-monthly.json +4059 -4059
package/data/mix/country-yearly-green.csv +116 -116
package/data/mix/country-yearly-green.json +371 -371
package/data/mix/country-yearly.csv +116 -116
package/data/mix/country-yearly.json +465 -465
package/data/mix/subdivision-monthly-green.csv +100 -100
package/data/mix/subdivision-monthly-green.json +354 -354
package/data/mix/subdivision-monthly.csv +100 -100
package/data/mix/subdivision-monthly.json +678 -678
package/data/mix/subdivision-yearly-green.csv +50 -50
package/data/mix/subdivision-yearly-green.json +178 -178
package/data/mix/subdivision-yearly.csv +50 -50
package/data/mix/subdivision-yearly.json +337 -337
package/data/mix/world-monthly-green.csv +75 -75
package/data/mix/world-monthly-green.json +278 -278
package/data/mix/world-monthly.csv +75 -75
package/data/mix/world-monthly.json +381 -381
package/data/mix/world-yearly-green.csv +5 -5
package/data/mix/world-yearly-green.json +17 -17
package/data/mix/world-yearly.csv +5 -5
package/data/mix/world-yearly.json +17 -17
package/package.json +2 -2

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

@@ -46,45 +46,45 @@
   "AF": {
     "2019": {
       "Bioenergy": 0.0316,
-      "Hydro": 0.7957,
+      "Hydro": 0.7956,
       "Solar": 0.0883,
-      "Wind": 0.0844
+      "Wind": 0.0845
     },
     "2020": {
       "Bioenergy": 0.0343,
-      "Hydro": 0.778,
-      "Solar": 0.0971,
+      "Hydro": 0.7782,
+      "Solar": 0.0968,
       "Wind": 0.0907
     },
     "2021": {
-      "Bioenergy": 0.0376,
-      "Hydro": 0.744,
-      "Solar": 0.1064,
-      "Wind": 0.112
+      "Bioenergy": 0.0377,
+      "Hydro": 0.7444,
+      "Solar": 0.1063,
+      "Wind": 0.1116
     },
     "2022": {
       "Bioenergy": 0.0397,
-      "Hydro": 0.7195,
-      "Solar": 0.1206,
-      "Wind": 0.1202
+      "Hydro": 0.7196,
+      "Solar": 0.1204,
+      "Wind": 0.1203
     },
     "2023": {
-      "Bioenergy": 0.0402,
-      "Hydro": 0.6882,
-      "Solar": 0.1394,
-      "Wind": 0.1322
+      "Bioenergy": 0.041,
+      "Hydro": 0.6877,
+      "Solar": 0.1392,
+      "Wind": 0.1321
     },
     "2024": {
-      "Bioenergy": 0.0372,
-      "Hydro": 0.6679,
-      "Solar": 0.162,
-      "Wind": 0.1329
+      "Bioenergy": 0.0379,
+      "Hydro": 0.6675,
+      "Solar": 0.1616,
+      "Wind": 0.133
     },
     "2025": {
-      "Bioenergy": 0.0381,
-      "Hydro": 0.6073,
-      "Solar": 0.191,
-      "Wind": 0.1635
+      "Bioenergy": 0.0397,
+      "Hydro": 0.6128,
+      "Solar": 0.1826,
+      "Wind": 0.1649
     }
   },
   "AG": {
@@ -170,8 +170,8 @@
     },
     "2025": {
       "Bioenergy": 0.0113,
-      "Hydro": 0.9103,
-      "Solar": 0.0304,
+      "Hydro": 0.9104,
+      "Solar": 0.0303,
       "Wind": 0.048
     }
   },
@@ -198,7 +198,7 @@
       "Bioenergy": 0.0006,
       "Hydro": 0.8855,
       "Solar": 0.1117,
-      "Wind": 0.0021
+      "Wind": 0.0022
     },
     "2023": {
       "Bioenergy": 0.0008,
@@ -207,9 +207,9 @@
       "Wind": 0.003
     },
     "2024": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.779,
-      "Solar": 0.2157,
+      "Bioenergy": 0.0012,
+      "Hydro": 0.7789,
+      "Solar": 0.2158,
       "Wind": 0.0042
     },
     "2025": {
@@ -291,7 +291,7 @@
     "2023": {
       "Bioenergy": 0.0191,
       "Hydro": 0.6869,
-      "Solar": 0.0566,
+      "Solar": 0.0565,
       "Wind": 0.2375
     },
     "2024": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.025,
-      "Hydro": 0.5483,
-      "Solar": 0.0958,
-      "Wind": 0.3309
+      "Bioenergy": 0.0257,
+      "Hydro": 0.546,
+      "Solar": 0.0948,
+      "Wind": 0.3335
     }
   },
   "AS": {
@@ -390,9 +390,9 @@
     },
     "2025": {
       "Bioenergy": 0.045,
-      "Hydro": 0.6351,
-      "Solar": 0.1276,
-      "Wind": 0.1924
+      "Hydro": 0.6336,
+      "Solar": 0.1288,
+      "Wind": 0.1926
     }
   },
   "AU": {
@@ -510,8 +510,8 @@
     },
     "2023": {
       "Bioenergy": 0.0011,
-      "Hydro": 0.9577,
-      "Solar": 0.0379,
+      "Hydro": 0.9576,
+      "Solar": 0.038,
       "Wind": 0.0033
     },
     "2024": {
@@ -618,45 +618,45 @@
   "BD": {
     "2019": {
       "Bioenergy": 0.0426,
-      "Hydro": 0.7255,
-      "Solar": 0.1168,
-      "Wind": 0.1151
+      "Hydro": 0.7252,
+      "Solar": 0.117,
+      "Wind": 0.1152
     },
     "2020": {
       "Bioenergy": 0.0464,
-      "Hydro": 0.7048,
-      "Solar": 0.1257,
-      "Wind": 0.1231
+      "Hydro": 0.7045,
+      "Solar": 0.1262,
+      "Wind": 0.1229
     },
     "2021": {
-      "Bioenergy": 0.0501,
-      "Hydro": 0.5997,
+      "Bioenergy": 0.0502,
+      "Hydro": 0.6002,
       "Solar": 0.2002,
-      "Wind": 0.1499
+      "Wind": 0.1494
     },
     "2022": {
-      "Bioenergy": 0.0503,
-      "Hydro": 0.548,
+      "Bioenergy": 0.0502,
+      "Hydro": 0.5478,
       "Solar": 0.2485,
-      "Wind": 0.1532
+      "Wind": 0.1534
     },
     "2023": {
-      "Bioenergy": 0.0592,
-      "Hydro": 0.4512,
-      "Solar": 0.2956,
-      "Wind": 0.1939
+      "Bioenergy": 0.0604,
+      "Hydro": 0.4507,
+      "Solar": 0.2955,
+      "Wind": 0.1934
     },
     "2024": {
-      "Bioenergy": 0.0494,
-      "Hydro": 0.4314,
-      "Solar": 0.3425,
+      "Bioenergy": 0.0503,
+      "Hydro": 0.4308,
+      "Solar": 0.3422,
       "Wind": 0.1767
     },
     "2025": {
-      "Bioenergy": 0.0554,
-      "Hydro": 0.2304,
-      "Solar": 0.4762,
-      "Wind": 0.238
+      "Bioenergy": 0.0579,
+      "Hydro": 0.234,
+      "Solar": 0.4673,
+      "Wind": 0.2408
     }
   },
   "BE": {
@@ -697,10 +697,10 @@
       "Wind": 0.5431
     },
     "2025": {
-      "Bioenergy": 0.0427,
-      "Hydro": 0.087,
-      "Solar": 0.392,
-      "Wind": 0.4783
+      "Bioenergy": 0.0424,
+      "Hydro": 0.0924,
+      "Solar": 0.3891,
+      "Wind": 0.4762
     }
   },
   "BF": {
@@ -1082,7 +1082,7 @@
     },
     "2023": {
       "Bioenergy": 0.0149,
-      "Hydro": 0.7413,
+      "Hydro": 0.7412,
       "Solar": 0.0867,
       "Wind": 0.1571
     },
@@ -1093,10 +1093,10 @@
       "Wind": 0.1713
     },
     "2025": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.7291,
-      "Solar": 0.1379,
-      "Wind": 0.1277
+      "Bioenergy": 0.0063,
+      "Hydro": 0.7294,
+      "Solar": 0.1363,
+      "Wind": 0.1279
     }
   },
   "BS": {
@@ -1313,8 +1313,8 @@
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.217,
-      "Hydro": 0.675,
+      "Bioenergy": 0.2169,
+      "Hydro": 0.6751,
       "Solar": 0.061,
       "Wind": 0.047
     }
@@ -1533,10 +1533,10 @@
       "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.7921,
-      "Solar": 0.1742,
-      "Wind": 0.0284
+      "Bioenergy": 0.0052,
+      "Hydro": 0.7979,
+      "Solar": 0.1688,
+      "Wind": 0.028
     }
   },
   "CI": {
@@ -1718,45 +1718,45 @@
   "CN": {
     "2019": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.61,
-      "Solar": 0.1181,
-      "Wind": 0.2136
+      "Hydro": 0.6098,
+      "Solar": 0.1182,
+      "Wind": 0.2137
     },
     "2020": {
       "Bioenergy": 0.0639,
-      "Hydro": 0.5853,
-      "Solar": 0.1259,
-      "Wind": 0.2249
+      "Hydro": 0.5854,
+      "Solar": 0.1256,
+      "Wind": 0.225
     },
     "2021": {
-      "Bioenergy": 0.0692,
-      "Hydro": 0.5101,
-      "Solar": 0.14,
-      "Wind": 0.2807
+      "Bioenergy": 0.0693,
+      "Hydro": 0.511,
+      "Solar": 0.1398,
+      "Wind": 0.2799
     },
     "2022": {
-      "Bioenergy": 0.069,
+      "Bioenergy": 0.0691,
       "Hydro": 0.4695,
       "Solar": 0.1657,
-      "Wind": 0.2957
+      "Wind": 0.2958
     },
     "2023": {
-      "Bioenergy": 0.0673,
-      "Hydro": 0.4102,
-      "Solar": 0.2076,
-      "Wind": 0.3149
+      "Bioenergy": 0.0691,
+      "Hydro": 0.4093,
+      "Solar": 0.2072,
+      "Wind": 0.3143
     },
     "2024": {
-      "Bioenergy": 0.0585,
-      "Hydro": 0.3885,
-      "Solar": 0.2527,
-      "Wind": 0.3003
+      "Bioenergy": 0.0601,
+      "Hydro": 0.3878,
+      "Solar": 0.2522,
+      "Wind": 0.2999
     },
     "2025": {
-      "Bioenergy": 0.055,
-      "Hydro": 0.2691,
-      "Solar": 0.3042,
-      "Wind": 0.3717
+      "Bioenergy": 0.0562,
+      "Hydro": 0.2765,
+      "Solar": 0.2976,
+      "Wind": 0.3697
     }
   },
   "CO": {
@@ -2062,8 +2062,8 @@
     },
     "2025": {
       "Bioenergy": 0.1636,
-      "Hydro": 0.0717,
-      "Solar": 0.2825,
+      "Hydro": 0.0716,
+      "Solar": 0.2826,
       "Wind": 0.4822
     }
   },
@@ -2149,10 +2149,10 @@
       "Wind": 0.7019
     },
     "2025": {
-      "Bioenergy": 0.1821,
+      "Bioenergy": 0.1811,
       "Hydro": 0.039,
-      "Solar": 0.1305,
-      "Wind": 0.6484
+      "Solar": 0.1284,
+      "Wind": 0.6515
     }
   },
   "DM": {
@@ -2369,10 +2369,10 @@
       "Wind": 0.4191
     },
     "2025": {
-      "Bioenergy": 0.1755,
-      "Hydro": 0.1137,
-      "Solar": 0.2135,
-      "Wind": 0.4974
+      "Bioenergy": 0.1699,
+      "Hydro": 0.1101,
+      "Solar": 0.2382,
+      "Wind": 0.4817
     }
   },
   "EG": {
@@ -2396,8 +2396,8 @@
     },
     "2022": {
       "Bioenergy": 0.0046,
-      "Hydro": 0.5724,
-      "Solar": 0.19,
+      "Hydro": 0.5721,
+      "Solar": 0.1903,
       "Wind": 0.233
     },
     "2023": {
@@ -2407,16 +2407,16 @@
       "Wind": 0.2174
     },
     "2024": {
-      "Bioenergy": 0.0042,
-      "Hydro": 0.5534,
-      "Solar": 0.2015,
-      "Wind": 0.241
+      "Bioenergy": 0.0043,
+      "Hydro": 0.5565,
+      "Solar": 0.204,
+      "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Hydro": 0.4853,
-      "Solar": 0.2171,
-      "Wind": 0.2933
+      "Bioenergy": 0.0053,
+      "Hydro": 0.518,
+      "Solar": 0.2559,
+      "Wind": 0.2208
     }
   },
   "ER": {
@@ -2502,9 +2502,9 @@
     },
     "2025": {
       "Bioenergy": 0.0226,
-      "Hydro": 0.2747,
-      "Solar": 0.2805,
-      "Wind": 0.4222
+      "Hydro": 0.2748,
+      "Solar": 0.281,
+      "Wind": 0.4215
     }
   },
   "ET": {
@@ -2591,7 +2591,7 @@
     "2025": {
       "Bioenergy": 0.2261,
       "Hydro": 0.2733,
-      "Solar": 0.0274,
+      "Solar": 0.0273,
       "Wind": 0.4733
     }
   },
@@ -2766,9 +2766,9 @@
     },
     "2025": {
       "Bioenergy": 0.0218,
-      "Hydro": 0.4377,
-      "Solar": 0.1729,
-      "Wind": 0.3676
+      "Hydro": 0.4381,
+      "Solar": 0.1723,
+      "Wind": 0.3678
     }
   },
   "GA": {
@@ -2853,10 +2853,10 @@
       "Wind": 0.6501
     },
     "2025": {
-      "Bioenergy": 0.1651,
+      "Bioenergy": 0.1652,
       "Hydro": 0.0722,
       "Solar": 0.1417,
-      "Wind": 0.6209
+      "Wind": 0.621
     }
   },
   "GD": {
@@ -2912,39 +2912,39 @@
     },
     "2020": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9701,
-      "Solar": 0.0055,
+      "Hydro": 0.9702,
+      "Solar": 0.0054,
       "Wind": 0.0214
     },
     "2021": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9657,
-      "Solar": 0.0076,
-      "Wind": 0.0228
+      "Hydro": 0.9658,
+      "Solar": 0.0075,
+      "Wind": 0.0229
     },
     "2022": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.9693,
-      "Solar": 0.0068,
-      "Wind": 0.0205
+      "Hydro": 0.9696,
+      "Solar": 0.0066,
+      "Wind": 0.0204
     },
     "2023": {
       "Bioenergy": 0.0019,
-      "Hydro": 0.9763,
-      "Solar": 0.0046,
-      "Wind": 0.0173
+      "Hydro": 0.9764,
+      "Solar": 0.0044,
+      "Wind": 0.0174
     },
     "2024": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.9728,
-      "Solar": 0.007,
+      "Hydro": 0.973,
+      "Solar": 0.0068,
       "Wind": 0.0181
     },
     "2025": {
-      "Bioenergy": 0.0084,
-      "Hydro": 0.9065,
-      "Solar": 0.0365,
-      "Wind": 0.0486
+      "Bioenergy": 0.0087,
+      "Hydro": 0.9082,
+      "Solar": 0.0345,
+      "Wind": 0.0487
     }
   },
   "GF": {
@@ -3338,9 +3338,9 @@
     },
     "2025": {
       "Bioenergy": 0.0022,
-      "Hydro": 0.0913,
-      "Solar": 0.4688,
-      "Wind": 0.4377
+      "Hydro": 0.0923,
+      "Solar": 0.463,
+      "Wind": 0.4425
     }
   },
   "GT": {
@@ -3522,45 +3522,45 @@
   "HK": {
     "2019": {
       "Bioenergy": 0.1121,
-      "Hydro": 0.5807,
+      "Hydro": 0.5806,
       "Solar": 0.135,
-      "Wind": 0.1722
+      "Wind": 0.1723
     },
     "2020": {
-      "Bioenergy": 0.1126,
-      "Hydro": 0.5584,
-      "Solar": 0.1497,
+      "Bioenergy": 0.1127,
+      "Hydro": 0.5587,
+      "Solar": 0.1492,
       "Wind": 0.1794
     },
     "2021": {
-      "Bioenergy": 0.1166,
-      "Hydro": 0.4992,
-      "Solar": 0.1662,
-      "Wind": 0.2181
+      "Bioenergy": 0.1167,
+      "Hydro": 0.4997,
+      "Solar": 0.1661,
+      "Wind": 0.2175
     },
     "2022": {
-      "Bioenergy": 0.1157,
-      "Hydro": 0.4682,
-      "Solar": 0.1892,
-      "Wind": 0.2269
+      "Bioenergy": 0.1156,
+      "Hydro": 0.4683,
+      "Solar": 0.189,
+      "Wind": 0.2271
     },
     "2023": {
-      "Bioenergy": 0.1156,
-      "Hydro": 0.4125,
-      "Solar": 0.2238,
-      "Wind": 0.2482
+      "Bioenergy": 0.1169,
+      "Hydro": 0.4119,
+      "Solar": 0.2233,
+      "Wind": 0.2479
     },
     "2024": {
-      "Bioenergy": 0.1046,
-      "Hydro": 0.3958,
-      "Solar": 0.2586,
-      "Wind": 0.241
+      "Bioenergy": 0.1058,
+      "Hydro": 0.3954,
+      "Solar": 0.2577,
+      "Wind": 0.2411
     },
     "2025": {
-      "Bioenergy": 0.1061,
-      "Hydro": 0.2869,
-      "Solar": 0.3108,
-      "Wind": 0.2962
+      "Bioenergy": 0.11,
+      "Hydro": 0.2922,
+      "Solar": 0.2972,
+      "Wind": 0.3006
     }
   },
   "HN": {
@@ -3602,7 +3602,7 @@
     },
     "2025": {
       "Bioenergy": 0.2438,
-      "Hydro": 0.4255,
+      "Hydro": 0.4256,
       "Solar": 0.1904,
       "Wind": 0.1403
     }
@@ -3646,8 +3646,8 @@
     },
     "2025": {
       "Bioenergy": 0.0572,
-      "Hydro": 0.5314,
-      "Solar": 0.0915,
+      "Hydro": 0.5315,
+      "Solar": 0.0914,
       "Wind": 0.3199
     }
   },
@@ -3728,14 +3728,14 @@
     },
     "2024": {
       "Bioenergy": 0.0807,
-      "Hydro": 0.1386,
+      "Hydro": 0.1387,
       "Solar": 0.6441,
       "Wind": 0.1366
     },
     "2025": {
       "Bioenergy": 0.13,
-      "Hydro": 0.1336,
-      "Solar": 0.6005,
+      "Hydro": 0.1337,
+      "Solar": 0.6004,
       "Wind": 0.1359
     }
   },
@@ -3756,7 +3756,7 @@
       "Bioenergy": 0.3555,
       "Hydro": 0.6225,
       "Solar": 0.0055,
-      "Wind": 0.0166
+      "Wind": 0.0165
     },
     "2022": {
       "Bioenergy": 0.3552,
@@ -3777,9 +3777,9 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3548,
-      "Hydro": 0.6191,
-      "Solar": 0.008,
+      "Bioenergy": 0.3549,
+      "Hydro": 0.6192,
+      "Solar": 0.0077,
       "Wind": 0.0182
     }
   },
@@ -3823,8 +3823,8 @@
     "2025": {
       "Bioenergy": 0.0165,
       "Hydro": 0.1171,
-      "Solar": 0.0439,
-      "Wind": 0.8225
+      "Solar": 0.0438,
+      "Wind": 0.8226
     }
   },
   "IL": {
@@ -3880,8 +3880,8 @@
     },
     "2020": {
       "Bioenergy": 0.0486,
-      "Hydro": 0.5506,
-      "Solar": 0.1973,
+      "Hydro": 0.5505,
+      "Solar": 0.1974,
       "Wind": 0.2035
     },
     "2021": {
@@ -4081,13 +4081,13 @@
     "2024": {
       "Bioenergy": 0.118,
       "Hydro": 0.396,
-      "Solar": 0.2809,
+      "Solar": 0.2808,
       "Wind": 0.2052
     },
     "2025": {
       "Bioenergy": 0.1454,
-      "Hydro": 0.3022,
-      "Solar": 0.212,
+      "Hydro": 0.3023,
+      "Solar": 0.2118,
       "Wind": 0.3405
     }
   },
@@ -4211,16 +4211,16 @@
       "Wind": 0.0693
     },
     "2024": {
-      "Bioenergy": 0.2152,
-      "Hydro": 0.2787,
-      "Solar": 0.4382,
-      "Wind": 0.0679
+      "Bioenergy": 0.214,
+      "Hydro": 0.281,
+      "Solar": 0.4333,
+      "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.2742,
-      "Hydro": 0.211,
-      "Solar": 0.4216,
-      "Wind": 0.0932
+      "Bioenergy": 0.2688,
+      "Hydro": 0.2194,
+      "Solar": 0.3975,
+      "Wind": 0.1143
     }
   },
   "KE": {
@@ -4261,10 +4261,10 @@
       "Wind": 0.2854
     },
     "2025": {
-      "Bioenergy": 0.0578,
-      "Hydro": 0.5123,
-      "Solar": 0.0788,
-      "Wind": 0.3512
+      "Bioenergy": 0.0661,
+      "Hydro": 0.5302,
+      "Solar": 0.0773,
+      "Wind": 0.3265
     }
   },
   "KG": {
@@ -4289,25 +4289,25 @@
     "2022": {
       "Bioenergy": 0.0021,
       "Hydro": 0.9854,
-      "Solar": 0.0053,
-      "Wind": 0.0071
+      "Solar": 0.0052,
+      "Wind": 0.0073
     },
     "2023": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.9866,
-      "Solar": 0.0049,
+      "Bioenergy": 0.0021,
+      "Hydro": 0.9868,
+      "Solar": 0.0046,
       "Wind": 0.0065
     },
     "2024": {
       "Bioenergy": 0.0023,
       "Hydro": 0.9817,
-      "Solar": 0.008,
+      "Solar": 0.0079,
       "Wind": 0.008
     },
     "2025": {
       "Bioenergy": 0.0019,
-      "Hydro": 0.982,
-      "Solar": 0.0082,
+      "Hydro": 0.9824,
+      "Solar": 0.0077,
       "Wind": 0.0079
     }
   },
@@ -4320,39 +4320,39 @@
     },
     "2020": {
       "Bioenergy": 0.0294,
-      "Hydro": 0.8992,
-      "Solar": 0.0446,
+      "Hydro": 0.8993,
+      "Solar": 0.0445,
       "Wind": 0.0268
     },
     "2021": {
-      "Bioenergy": 0.0304,
-      "Hydro": 0.8885,
+      "Bioenergy": 0.0305,
+      "Hydro": 0.8886,
       "Solar": 0.0476,
-      "Wind": 0.0334
+      "Wind": 0.0333
     },
     "2022": {
       "Bioenergy": 0.0312,
       "Hydro": 0.8796,
-      "Solar": 0.0526,
+      "Solar": 0.0525,
       "Wind": 0.0367
     },
     "2023": {
-      "Bioenergy": 0.0313,
-      "Hydro": 0.8696,
-      "Solar": 0.0585,
+      "Bioenergy": 0.0316,
+      "Hydro": 0.8694,
+      "Solar": 0.0584,
       "Wind": 0.0406
     },
     "2024": {
-      "Bioenergy": 0.0305,
-      "Hydro": 0.8609,
-      "Solar": 0.0667,
+      "Bioenergy": 0.0307,
+      "Hydro": 0.8607,
+      "Solar": 0.0665,
       "Wind": 0.042
     },
     "2025": {
-      "Bioenergy": 0.0308,
-      "Hydro": 0.8416,
-      "Solar": 0.0759,
-      "Wind": 0.0517
+      "Bioenergy": 0.0313,
+      "Hydro": 0.844,
+      "Solar": 0.0729,
+      "Wind": 0.0518
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.2319,
+      "Bioenergy": 0.2176,
       "Hydro": 0.0452,
-      "Solar": 0.612,
-      "Wind": 0.1109
+      "Solar": 0.6486,
+      "Wind": 0.0887
     }
   },
   "KW": {
@@ -4702,9 +4702,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.5707,
-      "Solar": 0.0905,
-      "Wind": 0.3388
+      "Hydro": 0.5444,
+      "Solar": 0.105,
+      "Wind": 0.3506
     }
   },
   "LA": {
@@ -5010,7 +5010,7 @@
     },
     "2025": {
       "Bioenergy": 0.0404,
-      "Hydro": 0.1244,
+      "Hydro": 0.1245,
       "Solar": 0.1902,
       "Wind": 0.6449
     }
@@ -5050,13 +5050,13 @@
       "Bioenergy": 0.1385,
       "Hydro": 0.2936,
       "Solar": 0.218,
-      "Wind": 0.3499
+      "Wind": 0.35
     },
     "2025": {
-      "Bioenergy": 0.1494,
-      "Hydro": 0.2749,
-      "Solar": 0.2273,
-      "Wind": 0.3484
+      "Bioenergy": 0.1477,
+      "Hydro": 0.2718,
+      "Solar": 0.2243,
+      "Wind": 0.3562
     }
   },
   "LV": {
@@ -5097,10 +5097,10 @@
       "Wind": 0.1081
     },
     "2025": {
-      "Bioenergy": 0.0903,
-      "Hydro": 0.7336,
-      "Solar": 0.1028,
-      "Wind": 0.0733
+      "Bioenergy": 0.1006,
+      "Hydro": 0.7159,
+      "Solar": 0.1125,
+      "Wind": 0.071
     }
   },
   "LY": {
@@ -5223,16 +5223,16 @@
       "Wind": 0.1268
     },
     "2024": {
-      "Bioenergy": 0.0124,
-      "Hydro": 0.6423,
-      "Solar": 0.1677,
-      "Wind": 0.1776
+      "Bioenergy": 0.0168,
+      "Hydro": 0.6,
+      "Solar": 0.1112,
+      "Wind": 0.2721
     },
     "2025": {
-      "Bioenergy": 0.0085,
-      "Hydro": 0.6394,
-      "Solar": 0.3161,
-      "Wind": 0.036
+      "Bioenergy": 0.0355,
+      "Hydro": 0.5529,
+      "Solar": 0.0849,
+      "Wind": 0.3267
     }
   },
   "ME": {
@@ -5274,9 +5274,9 @@
     },
     "2025": {
       "Bioenergy": 0.0149,
-      "Hydro": 0.7384,
-      "Solar": 0.0474,
-      "Wind": 0.1994
+      "Hydro": 0.7386,
+      "Solar": 0.047,
+      "Wind": 0.1995
     }
   },
   "MG": {
@@ -5357,14 +5357,14 @@
     "2024": {
       "Bioenergy": 0.0541,
       "Hydro": 0.6827,
-      "Solar": 0.1419,
+      "Solar": 0.1418,
       "Wind": 0.1213
     },
     "2025": {
-      "Bioenergy": 0.0561,
-      "Hydro": 0.6596,
-      "Solar": 0.1212,
-      "Wind": 0.1632
+      "Bioenergy": 0.035,
+      "Hydro": 0.6329,
+      "Solar": 0.1417,
+      "Wind": 0.1903
     }
   },
   "ML": {
@@ -5502,45 +5502,45 @@
   "MO": {
     "2019": {
       "Bioenergy": 0.2208,
-      "Hydro": 0.5132,
+      "Hydro": 0.5131,
       "Solar": 0.1138,
-      "Wind": 0.1522
+      "Wind": 0.1523
     },
     "2020": {
-      "Bioenergy": 0.2155,
-      "Hydro": 0.4969,
-      "Solar": 0.128,
-      "Wind": 0.1596
+      "Bioenergy": 0.2157,
+      "Hydro": 0.4971,
+      "Solar": 0.1276,
+      "Wind": 0.1597
     },
     "2021": {
-      "Bioenergy": 0.2162,
-      "Hydro": 0.4458,
-      "Solar": 0.1433,
-      "Wind": 0.1947
+      "Bioenergy": 0.2164,
+      "Hydro": 0.4462,
+      "Solar": 0.1432,
+      "Wind": 0.1942
     },
     "2022": {
       "Bioenergy": 0.2098,
       "Hydro": 0.4209,
-      "Solar": 0.1653,
-      "Wind": 0.204
+      "Solar": 0.1651,
+      "Wind": 0.2042
     },
     "2023": {
-      "Bioenergy": 0.2087,
-      "Hydro": 0.3713,
-      "Solar": 0.1967,
-      "Wind": 0.2234
+      "Bioenergy": 0.2098,
+      "Hydro": 0.3708,
+      "Solar": 0.1962,
+      "Wind": 0.2232
     },
     "2024": {
-      "Bioenergy": 0.1925,
-      "Hydro": 0.3589,
-      "Solar": 0.23,
-      "Wind": 0.2185
+      "Bioenergy": 0.1935,
+      "Hydro": 0.3585,
+      "Solar": 0.2293,
+      "Wind": 0.2186
     },
     "2025": {
-      "Bioenergy": 0.1937,
-      "Hydro": 0.2602,
-      "Solar": 0.2774,
-      "Wind": 0.2686
+      "Bioenergy": 0.1984,
+      "Hydro": 0.2646,
+      "Solar": 0.2647,
+      "Wind": 0.2722
     }
   },
   "MQ": {
@@ -5709,14 +5709,14 @@
     "2024": {
       "Bioenergy": 0.0301,
       "Hydro": 0.1921,
-      "Solar": 0.6447,
+      "Solar": 0.6446,
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0368,
-      "Hydro": 0.2074,
-      "Solar": 0.5979,
-      "Wind": 0.1579
+      "Bioenergy": 0.0337,
+      "Hydro": 0.1903,
+      "Solar": 0.6328,
+      "Wind": 0.1433
     }
   },
   "MU": {
@@ -6197,8 +6197,8 @@
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.3983,
-      "Hydro": 0.2072,
+      "Bioenergy": 0.3982,
+      "Hydro": 0.2073,
       "Solar": 0.0319,
       "Wind": 0.3626
     }
@@ -6294,13 +6294,13 @@
   "NP": {
     "2019": {
       "Bioenergy": 0.0038,
-      "Hydro": 0.9646,
+      "Hydro": 0.9645,
       "Solar": 0.0199,
       "Wind": 0.0117
     },
     "2020": {
       "Bioenergy": 0.0043,
-      "Hydro": 0.9617,
+      "Hydro": 0.9618,
       "Solar": 0.0212,
       "Wind": 0.0128
     },
@@ -6311,27 +6311,27 @@
       "Wind": 0.0156
     },
     "2022": {
-      "Bioenergy": 0.0052,
+      "Bioenergy": 0.0051,
       "Hydro": 0.953,
       "Solar": 0.0248,
       "Wind": 0.0171
     },
     "2023": {
-      "Bioenergy": 0.0052,
-      "Hydro": 0.9487,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.9486,
       "Solar": 0.0273,
       "Wind": 0.0187
     },
     "2024": {
-      "Bioenergy": 0.005,
+      "Bioenergy": 0.0051,
       "Hydro": 0.9445,
-      "Solar": 0.031,
+      "Solar": 0.0309,
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.0052,
-      "Hydro": 0.9363,
-      "Solar": 0.0349,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.9374,
+      "Solar": 0.0336,
       "Wind": 0.0236
     }
   },
@@ -6462,9 +6462,9 @@
     },
     "2025": {
       "Bioenergy": 0.0014,
-      "Hydro": 0.8621,
+      "Hydro": 0.8634,
       "Solar": 0,
-      "Wind": 0.1365
+      "Wind": 0.1352
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Hydro": 0.8814,
-      "Solar": 0.0298,
-      "Wind": 0.0811
+      "Bioenergy": 0.0075,
+      "Hydro": 0.8776,
+      "Solar": 0.0315,
+      "Wind": 0.0835
     }
   },
   "PF": {
@@ -6725,10 +6725,10 @@
       "Wind": 0.0721
     },
     "2025": {
-      "Bioenergy": 0.0879,
-      "Hydro": 0.6418,
-      "Solar": 0.1698,
-      "Wind": 0.1005
+      "Bioenergy": 0.0749,
+      "Hydro": 0.6111,
+      "Solar": 0.242,
+      "Wind": 0.072
     }
   },
   "PK": {
@@ -6989,10 +6989,10 @@
       "Wind": 0.3921
     },
     "2025": {
-      "Bioenergy": 0.0648,
-      "Hydro": 0.4456,
-      "Solar": 0.1152,
-      "Wind": 0.3744
+      "Bioenergy": 0.0647,
+      "Hydro": 0.4463,
+      "Solar": 0.1131,
+      "Wind": 0.376
     }
   },
   "PY": {
@@ -7167,8 +7167,8 @@
     "2025": {
       "Bioenergy": 0.0259,
       "Hydro": 0.5101,
-      "Solar": 0.1773,
-      "Wind": 0.2867
+      "Solar": 0.1772,
+      "Wind": 0.2868
     }
   },
   "RS": {
@@ -7518,9 +7518,9 @@
     },
     "2025": {
       "Bioenergy": 0.0588,
-      "Hydro": 0.5765,
+      "Hydro": 0.5766,
       "Solar": 0.0112,
-      "Wind": 0.3534
+      "Wind": 0.3533
     }
   },
   "SG": {
@@ -7543,14 +7543,14 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.0377,
-      "Solar": 0.9438,
-      "Wind": 0.0135
+      "Bioenergy": 0.005,
+      "Hydro": 0.0376,
+      "Solar": 0.9442,
+      "Wind": 0.0132
     },
     "2023": {
       "Bioenergy": 0.0019,
-      "Hydro": 0.0076,
+      "Hydro": 0.0077,
       "Solar": 0.9842,
       "Wind": 0.0062
     },
@@ -7561,10 +7561,10 @@
       "Wind": 0.0013
     },
     "2025": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.0151,
-      "Solar": 0.9656,
-      "Wind": 0.0156
+      "Bioenergy": 0.0037,
+      "Hydro": 0.0149,
+      "Solar": 0.9661,
+      "Wind": 0.0153
     }
   },
   "SH": {
@@ -8230,45 +8230,45 @@
   "TH": {
     "2019": {
       "Bioenergy": 0.392,
-      "Hydro": 0.2899,
+      "Hydro": 0.2898,
       "Solar": 0.1797,
-      "Wind": 0.1384
+      "Wind": 0.1385
     },
     "2020": {
       "Bioenergy": 0.4077,
       "Hydro": 0.264,
-      "Solar": 0.1877,
+      "Solar": 0.1878,
       "Wind": 0.1406
     },
     "2021": {
-      "Bioenergy": 0.404,
+      "Bioenergy": 0.4041,
       "Hydro": 0.2572,
-      "Solar": 0.1634,
-      "Wind": 0.1755
+      "Solar": 0.1635,
+      "Wind": 0.1752
     },
     "2022": {
-      "Bioenergy": 0.3872,
-      "Hydro": 0.2972,
-      "Solar": 0.1804,
+      "Bioenergy": 0.3871,
+      "Hydro": 0.2971,
+      "Solar": 0.1806,
       "Wind": 0.1353
     },
     "2023": {
-      "Bioenergy": 0.3918,
-      "Hydro": 0.2705,
+      "Bioenergy": 0.392,
+      "Hydro": 0.2703,
       "Solar": 0.185,
       "Wind": 0.1527
     },
     "2024": {
-      "Bioenergy": 0.3582,
-      "Hydro": 0.2692,
+      "Bioenergy": 0.3584,
+      "Hydro": 0.269,
       "Solar": 0.2152,
       "Wind": 0.1574
     },
     "2025": {
-      "Bioenergy": 0.3136,
-      "Hydro": 0.2693,
-      "Solar": 0.2542,
-      "Wind": 0.1629
+      "Bioenergy": 0.315,
+      "Hydro": 0.2703,
+      "Solar": 0.2513,
+      "Wind": 0.1634
     }
   },
   "TJ": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0607,
-      "Hydro": 0.4654,
-      "Solar": 0.2121,
-      "Wind": 0.2618
+      "Bioenergy": 0.0613,
+      "Hydro": 0.4699,
+      "Solar": 0.2046,
+      "Wind": 0.2643
     }
   },
   "TT": {
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0381,
-      "Hydro": 0.2199,
-      "Solar": 0.2799,
-      "Wind": 0.4622
+      "Bioenergy": 0.038,
+      "Hydro": 0.2198,
+      "Solar": 0.2801,
+      "Wind": 0.4621
     }
   },
   "UY": {
@@ -8846,9 +8846,9 @@
   "UZ": {
     "2019": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9813,
+      "Hydro": 0.9812,
       "Solar": 0.0078,
-      "Wind": 0.0079
+      "Wind": 0.008
     },
     "2020": {
       "Bioenergy": 0.0033,
@@ -8858,7 +8858,7 @@
     },
     "2021": {
       "Bioenergy": 0.0037,
-      "Hydro": 0.9753,
+      "Hydro": 0.9754,
       "Solar": 0.01,
       "Wind": 0.011
     },
@@ -8869,21 +8869,21 @@
       "Wind": 0.0122
     },
     "2023": {
-      "Bioenergy": 0.0041,
+      "Bioenergy": 0.0042,
       "Hydro": 0.9687,
       "Solar": 0.0137,
       "Wind": 0.0135
     },
     "2024": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9654,
+      "Bioenergy": 0.004,
+      "Hydro": 0.9653,
       "Solar": 0.0166,
-      "Wind": 0.014
+      "Wind": 0.0141
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9589,
-      "Solar": 0.0197,
+      "Bioenergy": 0.0042,
+      "Hydro": 0.9598,
+      "Solar": 0.0187,
       "Wind": 0.0173
     }
   },
@@ -9234,9 +9234,9 @@
     },
     "2025": {
       "Bioenergy": 0.0535,
-      "Hydro": 0.3987,
-      "Solar": 0.1255,
-      "Wind": 0.4223
+      "Hydro": 0.399,
+      "Solar": 0.1249,
+      "Wind": 0.4225
     }
   },
   "YE": {
@@ -9316,15 +9316,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.0344,
-      "Solar": 0.6221,
-      "Wind": 0.3435
+      "Hydro": 0.0345,
+      "Solar": 0.6205,
+      "Wind": 0.345
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0217,
-      "Solar": 0.6643,
-      "Wind": 0.3139
+      "Hydro": 0.0281,
+      "Solar": 0.6671,
+      "Wind": 0.3048
     }
   },
   "ZM": {