npm - @digital4better/data - Versions diffs - 1.1.71 → 1.1.72 - Mend

@digital4better/data 1.1.71 → 1.1.72

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 +153 -153
package/data/factor/continent-monthly-green.json +1330 -1330
package/data/factor/continent-monthly.csv +168 -168
package/data/factor/continent-monthly.json +1319 -1319
package/data/factor/continent-yearly-green.csv +17 -17
package/data/factor/continent-yearly-green.json +149 -149
package/data/factor/continent-yearly.csv +17 -17
package/data/factor/continent-yearly.json +132 -132
package/data/factor/country-monthly-green.csv +2025 -2025
package/data/factor/country-monthly-green.json +16732 -16732
package/data/factor/country-monthly.csv +2122 -2122
package/data/factor/country-monthly.json +14218 -14218
package/data/factor/country-yearly-green.csv +285 -285
package/data/factor/country-yearly-green.json +2620 -2620
package/data/factor/country-yearly.csv +289 -289
package/data/factor/country-yearly.json +1957 -1957
package/data/factor/subdivision-monthly-green.csv +52 -52
package/data/factor/subdivision-monthly-green.json +451 -451
package/data/factor/subdivision-monthly.csv +52 -52
package/data/factor/subdivision-monthly.json +467 -467
package/data/factor/subdivision-yearly-green.csv +16 -16
package/data/factor/subdivision-yearly-green.json +119 -119
package/data/factor/subdivision-yearly.csv +19 -19
package/data/factor/subdivision-yearly.json +122 -122
package/data/factor/world-monthly-green.csv +72 -72
package/data/factor/world-monthly-green.json +647 -647
package/data/factor/world-monthly.csv +72 -72
package/data/factor/world-monthly.json +646 -646
package/data/factor/world-yearly-green.csv +6 -6
package/data/factor/world-yearly-green.json +54 -54
package/data/factor/world-yearly.csv +6 -6
package/data/factor/world-yearly.json +54 -54
package/data/mix/continent-monthly-green.csv +114 -114
package/data/mix/continent-monthly-green.json +387 -387
package/data/mix/continent-monthly.csv +114 -114
package/data/mix/continent-monthly.json +502 -502
package/data/mix/continent-yearly-green.csv +12 -12
package/data/mix/continent-yearly-green.json +40 -40
package/data/mix/continent-yearly.csv +12 -12
package/data/mix/continent-yearly.json +64 -64
package/data/mix/country-monthly-green.csv +1380 -1380
package/data/mix/country-monthly-green.json +4534 -4534
package/data/mix/country-monthly.csv +1380 -1380
package/data/mix/country-monthly.json +4648 -4648
package/data/mix/country-yearly-green.csv +159 -159
package/data/mix/country-yearly-green.json +560 -560
package/data/mix/country-yearly.csv +159 -159
package/data/mix/country-yearly.json +709 -709
package/data/mix/subdivision-monthly-green.csv +41 -41
package/data/mix/subdivision-monthly-green.json +84 -84
package/data/mix/subdivision-monthly.csv +41 -41
package/data/mix/subdivision-monthly.json +130 -130
package/data/mix/subdivision-yearly-green.csv +11 -11
package/data/mix/subdivision-yearly-green.json +20 -20
package/data/mix/subdivision-yearly.csv +11 -11
package/data/mix/subdivision-yearly.json +46 -46
package/data/mix/world-monthly-green.csv +40 -40
package/data/mix/world-monthly-green.json +178 -178
package/data/mix/world-monthly.csv +40 -40
package/data/mix/world-monthly.json +102 -102
package/data/mix/world-yearly-green.csv +6 -6
package/data/mix/world-yearly-green.json +16 -16
package/data/mix/world-yearly.csv +6 -6
package/data/mix/world-yearly.json +14 -14
package/package.json +1 -1

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

@@ -40,14 +40,14 @@
   "AF": {
     "2019": {
       "Bioenergy": 0.0372,
-      "Hydro": 0.7612,
-      "Solar": 0.1004,
+      "Hydro": 0.7611,
+      "Solar": 0.1005,
       "Wind": 0.1012
     },
     "2020": {
       "Bioenergy": 0.0404,
-      "Hydro": 0.7413,
-      "Solar": 0.1103,
+      "Hydro": 0.7412,
+      "Solar": 0.1104,
       "Wind": 0.1081
     },
     "2021": {
@@ -65,14 +65,14 @@
     "2023": {
       "Bioenergy": 0.0472,
       "Hydro": 0.6373,
-      "Solar": 0.159,
-      "Wind": 0.1565
+      "Solar": 0.1591,
+      "Wind": 0.1564
     },
     "2024": {
-      "Bioenergy": 0.0417,
-      "Hydro": 0.6198,
-      "Solar": 0.1864,
-      "Wind": 0.1521
+      "Bioenergy": 0.0427,
+      "Hydro": 0.6166,
+      "Solar": 0.1863,
+      "Wind": 0.1544
     }
   },
   "AG": {
@@ -116,39 +116,39 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.9357,
+      "Hydro": 0.9356,
       "Solar": 0.0159,
       "Wind": 0.0372
     },
     "2020": {
       "Bioenergy": 0.0117,
-      "Hydro": 0.9277,
-      "Solar": 0.0185,
+      "Hydro": 0.9276,
+      "Solar": 0.0186,
       "Wind": 0.0422
     },
     "2021": {
       "Bioenergy": 0.012,
-      "Hydro": 0.9286,
-      "Solar": 0.0194,
+      "Hydro": 0.9285,
+      "Solar": 0.0196,
       "Wind": 0.04
     },
     "2022": {
       "Bioenergy": 0.012,
-      "Hydro": 0.919,
-      "Solar": 0.0236,
+      "Hydro": 0.9188,
+      "Solar": 0.0238,
       "Wind": 0.0454
     },
     "2023": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.912,
-      "Solar": 0.0277,
-      "Wind": 0.0494
+      "Hydro": 0.9117,
+      "Solar": 0.0281,
+      "Wind": 0.0493
     },
     "2024": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9077,
-      "Solar": 0.0327,
-      "Wind": 0.0486
+      "Hydro": 0.9068,
+      "Solar": 0.0326,
+      "Wind": 0.0496
     }
   },
   "AM": {
@@ -259,10 +259,10 @@
       "Wind": 0.2375
     },
     "2024": {
-      "Bioenergy": 0.0231,
-      "Hydro": 0.6211,
-      "Solar": 0.0707,
-      "Wind": 0.2851
+      "Bioenergy": 0.0219,
+      "Hydro": 0.6193,
+      "Solar": 0.0721,
+      "Wind": 0.2867
     }
   },
   "AS": {
@@ -305,40 +305,40 @@
   },
   "AT": {
     "2019": {
-      "Bioenergy": 0.0438,
-      "Hydro": 0.7814,
-      "Solar": 0.0148,
-      "Wind": 0.1601
+      "Bioenergy": 0.043,
+      "Hydro": 0.7687,
+      "Solar": 0.0309,
+      "Wind": 0.1574
     },
     "2020": {
-      "Bioenergy": 0.0352,
-      "Hydro": 0.8,
-      "Solar": 0.0169,
-      "Wind": 0.1478
+      "Bioenergy": 0.0345,
+      "Hydro": 0.7844,
+      "Solar": 0.0362,
+      "Wind": 0.1449
     },
     "2021": {
-      "Bioenergy": 0.0341,
-      "Hydro": 0.7886,
-      "Solar": 0.0212,
-      "Wind": 0.156
+      "Bioenergy": 0.0331,
+      "Hydro": 0.765,
+      "Solar": 0.0506,
+      "Wind": 0.1513
     },
     "2022": {
-      "Bioenergy": 0.0561,
-      "Hydro": 0.7455,
-      "Solar": 0.0325,
-      "Wind": 0.1658
+      "Bioenergy": 0.0529,
+      "Hydro": 0.7039,
+      "Solar": 0.0866,
+      "Wind": 0.1566
     },
     "2023": {
-      "Bioenergy": 0.0279,
-      "Hydro": 0.7491,
-      "Solar": 0.0611,
-      "Wind": 0.1619
+      "Bioenergy": 0.026,
+      "Hydro": 0.6998,
+      "Solar": 0.1232,
+      "Wind": 0.151
     },
     "2024": {
-      "Bioenergy": 0.0307,
-      "Hydro": 0.7043,
-      "Solar": 0.118,
-      "Wind": 0.147
+      "Bioenergy": 0.0296,
+      "Hydro": 0.6772,
+      "Solar": 0.1478,
+      "Wind": 0.1454
     }
   },
   "AU": {
@@ -560,13 +560,13 @@
       "Bioenergy": 0.0591,
       "Hydro": 0.4497,
       "Solar": 0.2958,
-      "Wind": 0.1954
+      "Wind": 0.1953
     },
     "2024": {
-      "Bioenergy": 0.0471,
-      "Hydro": 0.4608,
-      "Solar": 0.3201,
-      "Wind": 0.1719
+      "Bioenergy": 0.0484,
+      "Hydro": 0.4476,
+      "Solar": 0.3292,
+      "Wind": 0.1748
     }
   },
   "BE": {
@@ -574,7 +574,7 @@
       "Bioenergy": 0.1622,
       "Hydro": 0.0314,
       "Solar": 0.2363,
-      "Wind": 0.5702
+      "Wind": 0.5701
     },
     "2020": {
       "Bioenergy": 0.1299,
@@ -586,7 +586,7 @@
       "Bioenergy": 0.1204,
       "Hydro": 0.0162,
       "Solar": 0.2548,
-      "Wind": 0.6086
+      "Wind": 0.6085
     },
     "2022": {
       "Bioenergy": 0.0988,
@@ -595,16 +595,16 @@
       "Wind": 0.5695
     },
     "2023": {
-      "Bioenergy": 0.0432,
+      "Bioenergy": 0.0431,
       "Hydro": 0.0393,
-      "Solar": 0.3077,
-      "Wind": 0.6099
+      "Solar": 0.3078,
+      "Wind": 0.6098
     },
     "2024": {
-      "Bioenergy": 0.0368,
-      "Hydro": 0.0813,
-      "Solar": 0.3509,
-      "Wind": 0.531
+      "Bioenergy": 0.0358,
+      "Hydro": 0.0771,
+      "Solar": 0.3426,
+      "Wind": 0.5445
     }
   },
   "BF": {
@@ -677,10 +677,10 @@
       "Wind": 0.1937
     },
     "2024": {
-      "Bioenergy": 0.0179,
-      "Hydro": 0.3204,
-      "Solar": 0.5056,
-      "Wind": 0.156
+      "Bioenergy": 0.0171,
+      "Hydro": 0.3202,
+      "Solar": 0.5035,
+      "Wind": 0.1592
     }
   },
   "BH": {
@@ -905,10 +905,10 @@
       "Wind": 0.1489
     },
     "2024": {
-      "Bioenergy": 0.0324,
-      "Hydro": 0.7325,
-      "Solar": 0.0946,
-      "Wind": 0.1405
+      "Bioenergy": 0.0267,
+      "Hydro": 0.746,
+      "Solar": 0.0936,
+      "Wind": 0.1337
     }
   },
   "BR": {
@@ -943,10 +943,10 @@
       "Wind": 0.1571
     },
     "2024": {
-      "Bioenergy": 0.0166,
-      "Hydro": 0.6846,
-      "Solar": 0.1225,
-      "Wind": 0.1762
+      "Bioenergy": 0.016,
+      "Hydro": 0.6904,
+      "Solar": 0.1208,
+      "Wind": 0.1728
     }
   },
   "BS": {
@@ -1133,10 +1133,10 @@
       "Wind": 0.0498
     },
     "2024": {
-      "Bioenergy": 0.2248,
-      "Hydro": 0.6656,
-      "Solar": 0.0556,
-      "Wind": 0.0539
+      "Bioenergy": 0.2239,
+      "Hydro": 0.6668,
+      "Solar": 0.0554,
+      "Wind": 0.0538
     }
   },
   "CA": {
@@ -1171,10 +1171,10 @@
       "Wind": 0.0963
     },
     "2024": {
-      "Bioenergy": 0.0253,
-      "Hydro": 0.8497,
-      "Solar": 0.0162,
-      "Wind": 0.1089
+      "Bioenergy": 0.0248,
+      "Hydro": 0.8419,
+      "Solar": 0.0151,
+      "Wind": 0.1182
     }
   },
   "CD": {
@@ -1305,7 +1305,7 @@
       "Wind": 0.011
     },
     "2021": {
-      "Bioenergy": 0.0052,
+      "Bioenergy": 0.0051,
       "Hydro": 0.9116,
       "Solar": 0.0616,
       "Wind": 0.0216
@@ -1313,20 +1313,20 @@
     "2022": {
       "Bioenergy": 0.0051,
       "Hydro": 0.8856,
-      "Solar": 0.0834,
+      "Solar": 0.0835,
       "Wind": 0.0258
     },
     "2023": {
       "Bioenergy": 0.0016,
       "Hydro": 0.9046,
-      "Solar": 0.0828,
+      "Solar": 0.0829,
       "Wind": 0.0109
     },
     "2024": {
-      "Bioenergy": 0.0002,
-      "Hydro": 0.9126,
-      "Solar": 0.0841,
-      "Wind": 0.0031
+      "Bioenergy": 0.0006,
+      "Hydro": 0.911,
+      "Solar": 0.0831,
+      "Wind": 0.0054
     }
   },
   "CI": {
@@ -1437,10 +1437,10 @@
       "Wind": 0.1891
     },
     "2024": {
-      "Bioenergy": 0.0331,
-      "Hydro": 0.4691,
-      "Solar": 0.3104,
-      "Wind": 0.1874
+      "Bioenergy": 0.033,
+      "Hydro": 0.462,
+      "Solar": 0.3163,
+      "Wind": 0.1887
     }
   },
   "CM": {
@@ -1484,7 +1484,7 @@
   "CN": {
     "2019": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.6101,
+      "Hydro": 0.61,
       "Solar": 0.1181,
       "Wind": 0.2136
     },
@@ -1509,14 +1509,14 @@
     "2023": {
       "Bioenergy": 0.0673,
       "Hydro": 0.4102,
-      "Solar": 0.2076,
-      "Wind": 0.3149
+      "Solar": 0.2077,
+      "Wind": 0.3148
     },
     "2024": {
-      "Bioenergy": 0.0563,
-      "Hydro": 0.3976,
-      "Solar": 0.2555,
-      "Wind": 0.2906
+      "Bioenergy": 0.0578,
+      "Hydro": 0.3893,
+      "Solar": 0.2567,
+      "Wind": 0.2963
     }
   },
   "CO": {
@@ -1552,9 +1552,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9386,
-      "Solar": 0.0586,
-      "Wind": 0.0028
+      "Hydro": 0.9413,
+      "Solar": 0.0562,
+      "Wind": 0.0024
     }
   },
   "CR": {
@@ -1589,10 +1589,10 @@
       "Wind": 0.1493
     },
     "2024": {
-      "Bioenergy": 0.0044,
-      "Hydro": 0.8757,
+      "Bioenergy": 0.0054,
+      "Hydro": 0.8647,
       "Solar": 0.0025,
-      "Wind": 0.1174
+      "Wind": 0.1275
     }
   },
   "CU": {
@@ -1741,10 +1741,10 @@
       "Wind": 0.0905
     },
     "2024": {
-      "Bioenergy": 0.236,
-      "Hydro": 0.2643,
-      "Solar": 0.4241,
-      "Wind": 0.0756
+      "Bioenergy": 0.2367,
+      "Hydro": 0.271,
+      "Solar": 0.418,
+      "Wind": 0.0743
     }
   },
   "DE": {
@@ -1773,16 +1773,16 @@
       "Wind": 0.499
     },
     "2023": {
-      "Bioenergy": 0.1601,
+      "Bioenergy": 0.16,
       "Hydro": 0.0877,
-      "Solar": 0.237,
-      "Wind": 0.5153
+      "Solar": 0.2371,
+      "Wind": 0.5152
     },
     "2024": {
-      "Bioenergy": 0.1552,
-      "Hydro": 0.1026,
-      "Solar": 0.266,
-      "Wind": 0.4762
+      "Bioenergy": 0.1537,
+      "Hydro": 0.1009,
+      "Solar": 0.2622,
+      "Wind": 0.4832
     }
   },
   "DJ": {
@@ -1827,38 +1827,38 @@
     "2019": {
       "Bioenergy": 0.1705,
       "Hydro": 0.0484,
-      "Solar": 0.0547,
+      "Solar": 0.0548,
       "Wind": 0.7263
     },
     "2020": {
       "Bioenergy": 0.1396,
       "Hydro": 0.06,
-      "Solar": 0.0689,
+      "Solar": 0.069,
       "Wind": 0.7315
     },
     "2021": {
       "Bioenergy": 0.2082,
       "Hydro": 0.0364,
-      "Solar": 0.0694,
-      "Wind": 0.686
+      "Solar": 0.0695,
+      "Wind": 0.6859
     },
     "2022": {
       "Bioenergy": 0.1599,
       "Hydro": 0.0183,
-      "Solar": 0.0905,
+      "Solar": 0.0906,
       "Wind": 0.7313
     },
     "2023": {
       "Bioenergy": 0.1389,
-      "Hydro": 0.0233,
-      "Solar": 0.12,
-      "Wind": 0.7178
+      "Hydro": 0.0232,
+      "Solar": 0.1201,
+      "Wind": 0.7177
     },
     "2024": {
-      "Bioenergy": 0.1399,
-      "Hydro": 0.027,
-      "Solar": 0.1398,
-      "Wind": 0.6933
+      "Bioenergy": 0.1378,
+      "Hydro": 0.025,
+      "Solar": 0.1359,
+      "Wind": 0.7014
     }
   },
   "DM": {
@@ -2015,40 +2015,40 @@
   },
   "EE": {
     "2019": {
-      "Bioenergy": 0.3153,
+      "Bioenergy": 0.3152,
       "Hydro": 0.1962,
-      "Solar": 0.0373,
+      "Solar": 0.0376,
       "Wind": 0.4511
     },
     "2020": {
-      "Bioenergy": 0.2352,
-      "Hydro": 0.2301,
-      "Solar": 0.0865,
-      "Wind": 0.4483
+      "Bioenergy": 0.2351,
+      "Hydro": 0.2299,
+      "Solar": 0.0867,
+      "Wind": 0.4482
     },
     "2021": {
-      "Bioenergy": 0.2229,
-      "Hydro": 0.1847,
-      "Solar": 0.1676,
-      "Wind": 0.4248
+      "Bioenergy": 0.2228,
+      "Hydro": 0.1846,
+      "Solar": 0.1679,
+      "Wind": 0.4247
     },
     "2022": {
       "Bioenergy": 0.328,
-      "Hydro": 0.0689,
-      "Solar": 0.2528,
-      "Wind": 0.3503
+      "Hydro": 0.0688,
+      "Solar": 0.253,
+      "Wind": 0.3502
     },
     "2023": {
-      "Bioenergy": 0.1797,
-      "Hydro": 0.1693,
-      "Solar": 0.2781,
-      "Wind": 0.3729
+      "Bioenergy": 0.1795,
+      "Hydro": 0.1691,
+      "Solar": 0.2787,
+      "Wind": 0.3726
     },
     "2024": {
-      "Bioenergy": 0.1364,
-      "Hydro": 0.1408,
-      "Solar": 0.3088,
-      "Wind": 0.414
+      "Bioenergy": 0.1406,
+      "Hydro": 0.1384,
+      "Solar": 0.3004,
+      "Wind": 0.4206
     }
   },
   "EG": {
@@ -2130,13 +2130,13 @@
   "ES": {
     "2019": {
       "Bioenergy": 0.0316,
-      "Hydro": 0.2826,
+      "Hydro": 0.2825,
       "Solar": 0.1486,
       "Wind": 0.5372
     },
     "2020": {
       "Bioenergy": 0.0355,
-      "Hydro": 0.308,
+      "Hydro": 0.3079,
       "Solar": 0.1792,
       "Wind": 0.4773
     },
@@ -2159,10 +2159,10 @@
       "Wind": 0.4554
     },
     "2024": {
-      "Bioenergy": 0.0227,
-      "Hydro": 0.2123,
+      "Bioenergy": 0.0228,
+      "Hydro": 0.2112,
       "Solar": 0.3751,
-      "Wind": 0.3899
+      "Wind": 0.3909
     }
   },
   "ET": {
@@ -2207,26 +2207,26 @@
     "2019": {
       "Bioenergy": 0.3458,
       "Hydro": 0.429,
-      "Solar": 0.0209,
+      "Solar": 0.021,
       "Wind": 0.2043
     },
     "2020": {
       "Bioenergy": 0.268,
       "Hydro": 0.4815,
-      "Solar": 0.0226,
+      "Solar": 0.0227,
       "Wind": 0.2278
     },
     "2021": {
       "Bioenergy": 0.2968,
-      "Hydro": 0.4471,
-      "Solar": 0.0254,
-      "Wind": 0.2307
+      "Hydro": 0.447,
+      "Solar": 0.0256,
+      "Wind": 0.2306
     },
     "2022": {
       "Bioenergy": 0.303,
-      "Hydro": 0.3721,
-      "Solar": 0.0238,
-      "Wind": 0.3012
+      "Hydro": 0.372,
+      "Solar": 0.024,
+      "Wind": 0.3011
     },
     "2023": {
       "Bioenergy": 0.2569,
@@ -2235,10 +2235,10 @@
       "Wind": 0.3475
     },
     "2024": {
-      "Bioenergy": 0.2038,
-      "Hydro": 0.3395,
-      "Solar": 0.0309,
-      "Wind": 0.4258
+      "Bioenergy": 0.2046,
+      "Hydro": 0.333,
+      "Solar": 0.0316,
+      "Wind": 0.4308
     }
   },
   "FJ": {
@@ -2366,7 +2366,7 @@
       "Bioenergy": 0.0262,
       "Hydro": 0.5221,
       "Solar": 0.111,
-      "Wind": 0.3408
+      "Wind": 0.3407
     },
     "2021": {
       "Bioenergy": 0.0293,
@@ -2375,10 +2375,10 @@
       "Wind": 0.3296
     },
     "2022": {
-      "Bioenergy": 0.0381,
+      "Bioenergy": 0.038,
       "Hydro": 0.4255,
-      "Solar": 0.1768,
-      "Wind": 0.3597
+      "Solar": 0.1769,
+      "Wind": 0.3596
     },
     "2023": {
       "Bioenergy": 0.0263,
@@ -2387,10 +2387,10 @@
       "Wind": 0.3923
     },
     "2024": {
-      "Bioenergy": 0.0232,
-      "Hydro": 0.4645,
-      "Solar": 0.1744,
-      "Wind": 0.3379
+      "Bioenergy": 0.0227,
+      "Hydro": 0.4665,
+      "Solar": 0.1692,
+      "Wind": 0.3416
     }
   },
   "GA": {
@@ -2447,7 +2447,7 @@
     "2021": {
       "Bioenergy": 0.1908,
       "Hydro": 0.0728,
-      "Solar": 0.1186,
+      "Solar": 0.1187,
       "Wind": 0.6178
     },
     "2022": {
@@ -2459,14 +2459,14 @@
     "2023": {
       "Bioenergy": 0.1203,
       "Hydro": 0.0626,
-      "Solar": 0.1172,
-      "Wind": 0.6999
+      "Solar": 0.1173,
+      "Wind": 0.6998
     },
     "2024": {
-      "Bioenergy": 0.1586,
-      "Hydro": 0.0753,
-      "Solar": 0.1271,
-      "Wind": 0.639
+      "Bioenergy": 0.1493,
+      "Hydro": 0.0737,
+      "Solar": 0.1205,
+      "Wind": 0.6565
     }
   },
   "GD": {
@@ -2528,7 +2528,7 @@
     },
     "2022": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.9693,
+      "Hydro": 0.9694,
       "Solar": 0.0068,
       "Wind": 0.0206
     },
@@ -2539,10 +2539,10 @@
       "Wind": 0.0173
     },
     "2024": {
-      "Bioenergy": 0.0019,
-      "Hydro": 0.9739,
-      "Solar": 0.0069,
-      "Wind": 0.0173
+      "Bioenergy": 0.0021,
+      "Hydro": 0.9724,
+      "Solar": 0.0073,
+      "Wind": 0.0182
     }
   },
   "GF": {
@@ -2852,39 +2852,39 @@
   "GR": {
     "2019": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.2966,
-      "Solar": 0.253,
+      "Hydro": 0.2965,
+      "Solar": 0.2531,
       "Wind": 0.4325
     },
     "2020": {
       "Bioenergy": 0.0152,
       "Hydro": 0.2391,
-      "Solar": 0.2535,
+      "Solar": 0.2536,
       "Wind": 0.4921
     },
     "2021": {
       "Bioenergy": 0.0062,
       "Hydro": 0.2723,
-      "Solar": 0.2385,
-      "Wind": 0.483
+      "Solar": 0.2386,
+      "Wind": 0.4829
     },
     "2022": {
       "Bioenergy": 0.0067,
-      "Hydro": 0.2034,
-      "Solar": 0.2919,
+      "Hydro": 0.2033,
+      "Solar": 0.292,
       "Wind": 0.498
     },
     "2023": {
       "Bioenergy": 0.0064,
-      "Hydro": 0.1881,
-      "Solar": 0.3609,
-      "Wind": 0.4447
+      "Hydro": 0.188,
+      "Solar": 0.361,
+      "Wind": 0.4446
     },
     "2024": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.1116,
-      "Solar": 0.4548,
-      "Wind": 0.4322
+      "Bioenergy": 0.0014,
+      "Hydro": 0.114,
+      "Solar": 0.4503,
+      "Wind": 0.4343
     }
   },
   "GT": {
@@ -3049,7 +3049,7 @@
     "2020": {
       "Bioenergy": 0.1122,
       "Hydro": 0.5581,
-      "Solar": 0.1495,
+      "Solar": 0.1496,
       "Wind": 0.1801
     },
     "2021": {
@@ -3067,14 +3067,14 @@
     "2023": {
       "Bioenergy": 0.1159,
       "Hydro": 0.4102,
-      "Solar": 0.2235,
-      "Wind": 0.2504
+      "Solar": 0.2236,
+      "Wind": 0.2503
     },
     "2024": {
-      "Bioenergy": 0.101,
-      "Hydro": 0.4044,
-      "Solar": 0.2597,
-      "Wind": 0.2348
+      "Bioenergy": 0.1036,
+      "Hydro": 0.3957,
+      "Solar": 0.2608,
+      "Wind": 0.2398
     }
   },
   "HN": {
@@ -3110,7 +3110,7 @@
     },
     "2024": {
       "Bioenergy": 0.2443,
-      "Hydro": 0.4243,
+      "Hydro": 0.4244,
       "Solar": 0.1902,
       "Wind": 0.1411
     }
@@ -3118,39 +3118,39 @@
   "HR": {
     "2019": {
       "Bioenergy": 0.0651,
-      "Hydro": 0.6849,
-      "Solar": 0.033,
+      "Hydro": 0.6848,
+      "Solar": 0.0331,
       "Wind": 0.217
     },
     "2020": {
       "Bioenergy": 0.0708,
-      "Hydro": 0.6456,
-      "Solar": 0.0339,
+      "Hydro": 0.6455,
+      "Solar": 0.034,
       "Wind": 0.2497
     },
     "2021": {
       "Bioenergy": 0.0687,
-      "Hydro": 0.6666,
-      "Solar": 0.0295,
+      "Hydro": 0.6665,
+      "Solar": 0.0297,
       "Wind": 0.2352
     },
     "2022": {
-      "Bioenergy": 0.085,
-      "Hydro": 0.5642,
-      "Solar": 0.0468,
-      "Wind": 0.304
+      "Bioenergy": 0.0849,
+      "Hydro": 0.564,
+      "Solar": 0.0471,
+      "Wind": 0.3039
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.64,
-      "Solar": 0.0519,
-      "Wind": 0.2486
+      "Hydro": 0.6398,
+      "Solar": 0.0521,
+      "Wind": 0.2485
     },
     "2024": {
-      "Bioenergy": 0.0635,
-      "Hydro": 0.5473,
-      "Solar": 0.1161,
-      "Wind": 0.2731
+      "Bioenergy": 0.0631,
+      "Hydro": 0.5497,
+      "Solar": 0.113,
+      "Wind": 0.2741
     }
   },
   "HT": {
@@ -3193,40 +3193,40 @@
   },
   "HU": {
     "2019": {
-      "Bioenergy": 0.1796,
-      "Hydro": 0.3173,
-      "Solar": 0.2482,
-      "Wind": 0.2549
+      "Bioenergy": 0.1795,
+      "Hydro": 0.3172,
+      "Solar": 0.2485,
+      "Wind": 0.2548
     },
     "2020": {
       "Bioenergy": 0.1611,
-      "Hydro": 0.2778,
-      "Solar": 0.3361,
+      "Hydro": 0.2777,
+      "Solar": 0.3363,
       "Wind": 0.2249
     },
     "2021": {
       "Bioenergy": 0.1476,
-      "Hydro": 0.2313,
-      "Solar": 0.4299,
-      "Wind": 0.1911
+      "Hydro": 0.2312,
+      "Solar": 0.4302,
+      "Wind": 0.191
     },
     "2022": {
-      "Bioenergy": 0.1386,
-      "Hydro": 0.1872,
-      "Solar": 0.4897,
-      "Wind": 0.1845
+      "Bioenergy": 0.1385,
+      "Hydro": 0.187,
+      "Solar": 0.4901,
+      "Wind": 0.1843
     },
     "2023": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.1682,
-      "Solar": 0.581,
-      "Wind": 0.1661
+      "Hydro": 0.168,
+      "Solar": 0.5814,
+      "Wind": 0.166
     },
     "2024": {
-      "Bioenergy": 0.0783,
+      "Bioenergy": 0.0798,
       "Hydro": 0.1386,
-      "Solar": 0.6512,
-      "Wind": 0.1319
+      "Solar": 0.6463,
+      "Wind": 0.1353
     }
   },
   "ID": {
@@ -3261,9 +3261,9 @@
       "Wind": 0.0172
     },
     "2024": {
-      "Bioenergy": 0.3547,
-      "Hydro": 0.6208,
-      "Solar": 0.0073,
+      "Bioenergy": 0.3548,
+      "Hydro": 0.6207,
+      "Solar": 0.0072,
       "Wind": 0.0173
     }
   },
@@ -3271,38 +3271,38 @@
     "2019": {
       "Bioenergy": 0.024,
       "Hydro": 0.1223,
-      "Solar": 0.0091,
+      "Solar": 0.0092,
       "Wind": 0.8445
     },
     "2020": {
       "Bioenergy": 0.0186,
       "Hydro": 0.1144,
-      "Solar": 0.0097,
-      "Wind": 0.8573
+      "Solar": 0.0098,
+      "Wind": 0.8572
     },
     "2021": {
       "Bioenergy": 0.0187,
-      "Hydro": 0.1121,
-      "Solar": 0.0121,
+      "Hydro": 0.112,
+      "Solar": 0.0122,
       "Wind": 0.8571
     },
     "2022": {
       "Bioenergy": 0.016,
-      "Hydro": 0.087,
-      "Solar": 0.0112,
-      "Wind": 0.8858
+      "Hydro": 0.0869,
+      "Solar": 0.0114,
+      "Wind": 0.8857
     },
     "2023": {
       "Bioenergy": 0.016,
       "Hydro": 0.1118,
-      "Solar": 0.044,
-      "Wind": 0.8282
+      "Solar": 0.0442,
+      "Wind": 0.828
     },
     "2024": {
-      "Bioenergy": 0.0192,
-      "Hydro": 0.1137,
-      "Solar": 0.0879,
-      "Wind": 0.7793
+      "Bioenergy": 0.0185,
+      "Hydro": 0.1154,
+      "Solar": 0.0771,
+      "Wind": 0.7889
     }
   },
   "IL": {
@@ -3375,10 +3375,10 @@
       "Wind": 0.2286
     },
     "2024": {
-      "Bioenergy": 0.0244,
-      "Hydro": 0.4403,
-      "Solar": 0.3111,
-      "Wind": 0.2242
+      "Bioenergy": 0.0273,
+      "Hydro": 0.4287,
+      "Solar": 0.344,
+      "Wind": 0.2
     }
   },
   "IQ": {
@@ -3452,7 +3452,7 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9999,
+      "Hydro": 1,
       "Solar": 0,
       "Wind": 0
     }
@@ -3498,7 +3498,7 @@
   "IT": {
     "2019": {
       "Bioenergy": 0.1643,
-      "Hydro": 0.4219,
+      "Hydro": 0.4218,
       "Solar": 0.2114,
       "Wind": 0.2025
     },
@@ -3511,26 +3511,26 @@
     "2021": {
       "Bioenergy": 0.1584,
       "Hydro": 0.4079,
-      "Solar": 0.2229,
-      "Wind": 0.2108
+      "Solar": 0.223,
+      "Wind": 0.2107
     },
     "2022": {
-      "Bioenergy": 0.165,
-      "Hydro": 0.3142,
-      "Solar": 0.2842,
+      "Bioenergy": 0.1649,
+      "Hydro": 0.3141,
+      "Solar": 0.2844,
       "Wind": 0.2366
     },
     "2023": {
-      "Bioenergy": 0.1325,
-      "Hydro": 0.3582,
-      "Solar": 0.2696,
-      "Wind": 0.2397
+      "Bioenergy": 0.1324,
+      "Hydro": 0.3581,
+      "Solar": 0.2698,
+      "Wind": 0.2396
     },
     "2024": {
-      "Bioenergy": 0.1173,
-      "Hydro": 0.4016,
-      "Solar": 0.2833,
-      "Wind": 0.1978
+      "Bioenergy": 0.1178,
+      "Hydro": 0.3956,
+      "Solar": 0.2807,
+      "Wind": 0.2059
     }
   },
   "JM": {
@@ -3641,10 +3641,10 @@
       "Wind": 0.0693
     },
     "2024": {
-      "Bioenergy": 0.1941,
-      "Hydro": 0.3184,
-      "Solar": 0.4278,
-      "Wind": 0.0598
+      "Bioenergy": 0.2036,
+      "Hydro": 0.2839,
+      "Solar": 0.4542,
+      "Wind": 0.0583
     }
   },
   "KE": {
@@ -3679,10 +3679,10 @@
       "Wind": 0.3659
     },
     "2024": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.6012,
-      "Solar": 0.0753,
-      "Wind": 0.3022
+      "Bioenergy": 0.0259,
+      "Hydro": 0.6033,
+      "Solar": 0.0749,
+      "Wind": 0.2958
     }
   },
   "KG": {
@@ -3755,10 +3755,10 @@
       "Wind": 0.0424
     },
     "2024": {
-      "Bioenergy": 0.0312,
-      "Hydro": 0.8556,
-      "Solar": 0.0701,
-      "Wind": 0.0431
+      "Bioenergy": 0.0314,
+      "Hydro": 0.8554,
+      "Solar": 0.0697,
+      "Wind": 0.0434
     }
   },
   "KI": {
@@ -3945,10 +3945,10 @@
       "Wind": 0.0694
     },
     "2024": {
-      "Bioenergy": 0.2297,
-      "Hydro": 0.0836,
-      "Solar": 0.636,
-      "Wind": 0.0506
+      "Bioenergy": 0.2368,
+      "Hydro": 0.0818,
+      "Solar": 0.6249,
+      "Wind": 0.0565
     }
   },
   "KW": {
@@ -4060,9 +4060,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.6392,
-      "Solar": 0.1236,
-      "Wind": 0.2372
+      "Hydro": 0.6402,
+      "Solar": 0.1091,
+      "Wind": 0.2507
     }
   },
   "LA": {
@@ -4296,115 +4296,115 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.3681,
-      "Solar": 0.0687,
-      "Wind": 0.4338
+      "Hydro": 0.368,
+      "Solar": 0.069,
+      "Wind": 0.4336
     },
     "2020": {
-      "Bioenergy": 0.1269,
-      "Hydro": 0.3372,
-      "Solar": 0.0713,
-      "Wind": 0.4647
+      "Bioenergy": 0.1268,
+      "Hydro": 0.337,
+      "Solar": 0.0717,
+      "Wind": 0.4645
     },
     "2021": {
-      "Bioenergy": 0.1301,
-      "Hydro": 0.3629,
-      "Solar": 0.0891,
-      "Wind": 0.4179
+      "Bioenergy": 0.13,
+      "Hydro": 0.3626,
+      "Solar": 0.0897,
+      "Wind": 0.4177
     },
     "2022": {
-      "Bioenergy": 0.1123,
-      "Hydro": 0.3114,
-      "Solar": 0.1387,
-      "Wind": 0.4376
+      "Bioenergy": 0.1122,
+      "Hydro": 0.311,
+      "Solar": 0.1396,
+      "Wind": 0.4373
     },
     "2023": {
       "Bioenergy": 0.0722,
-      "Hydro": 0.253,
-      "Solar": 0.1667,
-      "Wind": 0.508
+      "Hydro": 0.2527,
+      "Solar": 0.1675,
+      "Wind": 0.5076
     },
     "2024": {
-      "Bioenergy": 0.0506,
-      "Hydro": 0.1885,
-      "Solar": 0.2388,
-      "Wind": 0.522
+      "Bioenergy": 0.0514,
+      "Hydro": 0.1855,
+      "Solar": 0.2352,
+      "Wind": 0.5279
     }
   },
   "LU": {
     "2019": {
-      "Bioenergy": 0.1491,
-      "Hydro": 0.3874,
-      "Solar": 0.13,
-      "Wind": 0.3335
+      "Bioenergy": 0.149,
+      "Hydro": 0.3872,
+      "Solar": 0.1304,
+      "Wind": 0.3334
     },
     "2020": {
-      "Bioenergy": 0.1647,
-      "Hydro": 0.3503,
-      "Solar": 0.1316,
-      "Wind": 0.3535
+      "Bioenergy": 0.1646,
+      "Hydro": 0.3501,
+      "Solar": 0.132,
+      "Wind": 0.3534
     },
     "2021": {
-      "Bioenergy": 0.1847,
-      "Hydro": 0.3443,
-      "Solar": 0.1516,
-      "Wind": 0.3194
+      "Bioenergy": 0.1846,
+      "Hydro": 0.344,
+      "Solar": 0.1522,
+      "Wind": 0.3192
     },
     "2022": {
-      "Bioenergy": 0.1871,
-      "Hydro": 0.2896,
-      "Solar": 0.1943,
-      "Wind": 0.3291
+      "Bioenergy": 0.1869,
+      "Hydro": 0.2892,
+      "Solar": 0.1951,
+      "Wind": 0.3288
     },
     "2023": {
-      "Bioenergy": 0.1104,
-      "Hydro": 0.2897,
-      "Solar": 0.1985,
-      "Wind": 0.4014
+      "Bioenergy": 0.1103,
+      "Hydro": 0.2892,
+      "Solar": 0.1996,
+      "Wind": 0.4009
     },
     "2024": {
-      "Bioenergy": 0.1414,
-      "Hydro": 0.2959,
-      "Solar": 0.222,
-      "Wind": 0.3406
+      "Bioenergy": 0.1379,
+      "Hydro": 0.295,
+      "Solar": 0.2183,
+      "Wind": 0.3489
     }
   },
   "LV": {
     "2019": {
       "Bioenergy": 0.1957,
-      "Hydro": 0.7134,
-      "Solar": 0.0129,
+      "Hydro": 0.7133,
+      "Solar": 0.013,
       "Wind": 0.0781
     },
     "2020": {
       "Bioenergy": 0.1523,
-      "Hydro": 0.7501,
-      "Solar": 0.0185,
+      "Hydro": 0.75,
+      "Solar": 0.0186,
       "Wind": 0.0792
     },
     "2021": {
       "Bioenergy": 0.147,
-      "Hydro": 0.7509,
-      "Solar": 0.0236,
+      "Hydro": 0.7508,
+      "Solar": 0.0238,
       "Wind": 0.0784
     },
     "2022": {
-      "Bioenergy": 0.1012,
-      "Hydro": 0.755,
-      "Solar": 0.035,
-      "Wind": 0.1088
+      "Bioenergy": 0.1007,
+      "Hydro": 0.7509,
+      "Solar": 0.0403,
+      "Wind": 0.1082
     },
     "2023": {
-      "Bioenergy": 0.06,
-      "Hydro": 0.7981,
-      "Solar": 0.0378,
-      "Wind": 0.1041
+      "Bioenergy": 0.0583,
+      "Hydro": 0.7757,
+      "Solar": 0.0651,
+      "Wind": 0.101
     },
     "2024": {
-      "Bioenergy": 0.0775,
-      "Hydro": 0.7083,
-      "Solar": 0.1069,
-      "Wind": 0.1073
+      "Bioenergy": 0.0742,
+      "Hydro": 0.6892,
+      "Solar": 0.129,
+      "Wind": 0.1076
     }
   },
   "LY": {
@@ -4472,73 +4472,73 @@
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.087,
-      "Solar": 0.2291,
-      "Wind": 0.6831
+      "Hydro": 0.0867,
+      "Solar": 0.2284,
+      "Wind": 0.6841
     },
     "2024": {
-      "Bioenergy": 0.0009,
-      "Hydro": 0.0978,
-      "Solar": 0.1602,
-      "Wind": 0.7411
+      "Bioenergy": 0.0007,
+      "Hydro": 0.0747,
+      "Solar": 0.1593,
+      "Wind": 0.7653
     }
   },
   "MD": {
     "2019": {
       "Bioenergy": 0.0837,
-      "Hydro": 0.7093,
-      "Solar": 0.0347,
+      "Hydro": 0.7092,
+      "Solar": 0.0349,
       "Wind": 0.1723
     },
     "2020": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.9172,
-      "Solar": 0.0098,
+      "Hydro": 0.9171,
+      "Solar": 0.0099,
       "Wind": 0.0598
     },
     "2021": {
       "Bioenergy": 0.014,
-      "Hydro": 0.9155,
-      "Solar": 0.0267,
+      "Hydro": 0.9153,
+      "Solar": 0.0269,
       "Wind": 0.0438
     },
     "2022": {
       "Bioenergy": 0.0472,
-      "Hydro": 0.6992,
-      "Solar": 0.076,
-      "Wind": 0.1776
+      "Hydro": 0.6986,
+      "Solar": 0.0768,
+      "Wind": 0.1774
     },
     "2023": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.8465,
-      "Solar": 0.0156,
+      "Hydro": 0.8463,
+      "Solar": 0.0158,
       "Wind": 0.1267
     },
     "2024": {
       "Bioenergy": 0.0123,
-      "Hydro": 0.643,
+      "Hydro": 0.6423,
       "Solar": 0.1679,
-      "Wind": 0.1768
+      "Wind": 0.1774
     }
   },
   "ME": {
     "2019": {
       "Bioenergy": 0.0142,
-      "Hydro": 0.7939,
-      "Solar": 0.0195,
-      "Wind": 0.1724
+      "Hydro": 0.7938,
+      "Solar": 0.0196,
+      "Wind": 0.1723
     },
     "2020": {
       "Bioenergy": 0.0144,
-      "Hydro": 0.7523,
-      "Solar": 0.0174,
-      "Wind": 0.216
+      "Hydro": 0.7522,
+      "Solar": 0.0175,
+      "Wind": 0.2159
     },
     "2021": {
       "Bioenergy": 0.0075,
-      "Hydro": 0.8139,
-      "Solar": 0.0151,
-      "Wind": 0.1636
+      "Hydro": 0.8138,
+      "Solar": 0.0152,
+      "Wind": 0.1635
     },
     "2022": {
       "Bioenergy": 0.0016,
@@ -4548,15 +4548,15 @@
     },
     "2023": {
       "Bioenergy": 0.0013,
-      "Hydro": 0.8432,
-      "Solar": 0.0048,
-      "Wind": 0.1507
+      "Hydro": 0.8431,
+      "Solar": 0.0049,
+      "Wind": 0.1506
     },
     "2024": {
-      "Bioenergy": 0.0066,
-      "Hydro": 0.7608,
-      "Solar": 0.0711,
-      "Wind": 0.1615
+      "Bioenergy": 0.0068,
+      "Hydro": 0.7616,
+      "Solar": 0.0703,
+      "Wind": 0.1613
     }
   },
   "MG": {
@@ -4599,40 +4599,40 @@
   },
   "MK": {
     "2019": {
-      "Bioenergy": 0.0677,
-      "Hydro": 0.77,
-      "Solar": 0.019,
+      "Bioenergy": 0.0676,
+      "Hydro": 0.7699,
+      "Solar": 0.0192,
       "Wind": 0.1433
     },
     "2020": {
       "Bioenergy": 0.0716,
-      "Hydro": 0.7499,
-      "Solar": 0.0262,
-      "Wind": 0.1523
+      "Hydro": 0.7498,
+      "Solar": 0.0264,
+      "Wind": 0.1522
     },
     "2021": {
       "Bioenergy": 0.0647,
-      "Hydro": 0.7683,
-      "Solar": 0.0301,
+      "Hydro": 0.7681,
+      "Solar": 0.0304,
       "Wind": 0.1369
     },
     "2022": {
-      "Bioenergy": 0.0421,
-      "Hydro": 0.7831,
-      "Solar": 0.0416,
-      "Wind": 0.1333
+      "Bioenergy": 0.042,
+      "Hydro": 0.7828,
+      "Solar": 0.042,
+      "Wind": 0.1332
     },
     "2023": {
       "Bioenergy": 0.0466,
       "Hydro": 0.7213,
-      "Solar": 0.1465,
+      "Solar": 0.1466,
       "Wind": 0.0855
     },
     "2024": {
-      "Bioenergy": 0.0466,
-      "Hydro": 0.728,
-      "Solar": 0.1399,
-      "Wind": 0.0855
+      "Bioenergy": 0.0511,
+      "Hydro": 0.6836,
+      "Solar": 0.1538,
+      "Wind": 0.1115
     }
   },
   "ML": {
@@ -4781,10 +4781,10 @@
       "Wind": 0.2252
     },
     "2024": {
-      "Bioenergy": 0.188,
-      "Hydro": 0.3673,
-      "Solar": 0.2315,
-      "Wind": 0.2132
+      "Bioenergy": 0.1918,
+      "Hydro": 0.3588,
+      "Solar": 0.232,
+      "Wind": 0.2174
     }
   },
   "MQ": {
@@ -4903,40 +4903,40 @@
   },
   "MT": {
     "2019": {
-      "Bioenergy": 0.0878,
-      "Hydro": 0.5235,
-      "Solar": 0.1015,
-      "Wind": 0.2872
+      "Bioenergy": 0.0877,
+      "Hydro": 0.5232,
+      "Solar": 0.1021,
+      "Wind": 0.2871
     },
     "2020": {
-      "Bioenergy": 0.0852,
-      "Hydro": 0.5125,
-      "Solar": 0.1018,
-      "Wind": 0.3005
+      "Bioenergy": 0.0851,
+      "Hydro": 0.5121,
+      "Solar": 0.1024,
+      "Wind": 0.3004
     },
     "2021": {
-      "Bioenergy": 0.09,
-      "Hydro": 0.4984,
-      "Solar": 0.1097,
-      "Wind": 0.302
+      "Bioenergy": 0.0899,
+      "Hydro": 0.4979,
+      "Solar": 0.1106,
+      "Wind": 0.3017
     },
     "2022": {
-      "Bioenergy": 0.0562,
-      "Hydro": 0.2891,
-      "Solar": 0.4491,
-      "Wind": 0.2056
+      "Bioenergy": 0.0561,
+      "Hydro": 0.2886,
+      "Solar": 0.4499,
+      "Wind": 0.2053
     },
     "2023": {
       "Bioenergy": 0.0248,
-      "Hydro": 0.1548,
-      "Solar": 0.7044,
-      "Wind": 0.1161
+      "Hydro": 0.1546,
+      "Solar": 0.7048,
+      "Wind": 0.1159
     },
     "2024": {
-      "Bioenergy": 0.0302,
-      "Hydro": 0.1949,
-      "Solar": 0.6416,
-      "Wind": 0.1333
+      "Bioenergy": 0.0296,
+      "Hydro": 0.1909,
+      "Solar": 0.6471,
+      "Wind": 0.1324
     }
   },
   "MU": {
@@ -5351,10 +5351,10 @@
       "Wind": 0.3663
     },
     "2024": {
-      "Bioenergy": 0.4028,
-      "Hydro": 0.1994,
+      "Bioenergy": 0.4023,
+      "Hydro": 0.2004,
       "Solar": 0.0296,
-      "Wind": 0.3682
+      "Wind": 0.3678
     }
   },
   "NL": {
@@ -5379,7 +5379,7 @@
     "2022": {
       "Bioenergy": 0.1827,
       "Hydro": 0.0034,
-      "Solar": 0.3573,
+      "Solar": 0.3574,
       "Wind": 0.4565
     },
     "2023": {
@@ -5389,10 +5389,10 @@
       "Wind": 0.5266
     },
     "2024": {
-      "Bioenergy": 0.0886,
-      "Hydro": 0.0033,
-      "Solar": 0.3862,
-      "Wind": 0.5219
+      "Bioenergy": 0.098,
+      "Hydro": 0.0036,
+      "Solar": 0.3628,
+      "Wind": 0.5357
     }
   },
   "NO": {
@@ -5428,9 +5428,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9051,
+      "Hydro": 0.9031,
       "Solar": 0,
-      "Wind": 0.0949
+      "Wind": 0.0969
     }
   },
   "NP": {
@@ -5465,10 +5465,10 @@
       "Wind": 0.0188
     },
     "2024": {
-      "Bioenergy": 0.0049,
+      "Bioenergy": 0.005,
       "Hydro": 0.946,
-      "Solar": 0.0299,
-      "Wind": 0.0193
+      "Solar": 0.0297,
+      "Wind": 0.0194
     }
   },
   "NR": {
@@ -5580,9 +5580,9 @@
     },
     "2024": {
       "Bioenergy": 0.0086,
-      "Hydro": 0.8502,
+      "Hydro": 0.8517,
       "Solar": 0,
-      "Wind": 0.1412
+      "Wind": 0.1397
     }
   },
   "OM": {
@@ -5807,10 +5807,10 @@
       "Wind": 0.085
     },
     "2024": {
-      "Bioenergy": 0.066,
-      "Hydro": 0.5954,
-      "Solar": 0.2781,
-      "Wind": 0.0605
+      "Bioenergy": 0.0581,
+      "Hydro": 0.6675,
+      "Solar": 0.2156,
+      "Wind": 0.0587
     }
   },
   "PK": {
@@ -5845,23 +5845,23 @@
       "Wind": 0.0982
     },
     "2024": {
-      "Bioenergy": 0.0165,
-      "Hydro": 0.8812,
-      "Solar": 0.0262,
-      "Wind": 0.0761
+      "Bioenergy": 0.0169,
+      "Hydro": 0.8832,
+      "Solar": 0.0256,
+      "Wind": 0.0744
     }
   },
   "PL": {
     "2019": {
       "Bioenergy": 0.1058,
       "Hydro": 0.1469,
-      "Solar": 0.0477,
-      "Wind": 0.6996
+      "Solar": 0.0478,
+      "Wind": 0.6995
     },
     "2020": {
       "Bioenergy": 0.0963,
       "Hydro": 0.1561,
-      "Solar": 0.1029,
+      "Solar": 0.103,
       "Wind": 0.6447
     },
     "2021": {
@@ -5879,14 +5879,14 @@
     "2023": {
       "Bioenergy": 0.0544,
       "Hydro": 0.0657,
-      "Solar": 0.3309,
-      "Wind": 0.549
+      "Solar": 0.331,
+      "Wind": 0.5489
     },
     "2024": {
-      "Bioenergy": 0.0532,
-      "Hydro": 0.0535,
-      "Solar": 0.3837,
-      "Wind": 0.5096
+      "Bioenergy": 0.0524,
+      "Hydro": 0.0538,
+      "Solar": 0.38,
+      "Wind": 0.5138
     }
   },
   "PM": {
@@ -5961,8 +5961,8 @@
     "2024": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.5952,
-      "Wind": 0.4048
+      "Solar": 0.559,
+      "Wind": 0.441
     }
   },
   "PS": {
@@ -6007,38 +6007,38 @@
     "2019": {
       "Bioenergy": 0.1108,
       "Hydro": 0.3007,
-      "Solar": 0.0477,
-      "Wind": 0.5408
+      "Solar": 0.0478,
+      "Wind": 0.5407
     },
     "2020": {
       "Bioenergy": 0.1187,
       "Hydro": 0.3923,
       "Solar": 0.0514,
-      "Wind": 0.4377
+      "Wind": 0.4376
     },
     "2021": {
       "Bioenergy": 0.1225,
       "Hydro": 0.3554,
       "Solar": 0.068,
-      "Wind": 0.4541
+      "Wind": 0.454
     },
     "2022": {
       "Bioenergy": 0.1292,
-      "Hydro": 0.2463,
-      "Solar": 0.1203,
-      "Wind": 0.5042
+      "Hydro": 0.2462,
+      "Solar": 0.1205,
+      "Wind": 0.5041
     },
     "2023": {
       "Bioenergy": 0.094,
-      "Hydro": 0.3447,
-      "Solar": 0.1442,
-      "Wind": 0.4171
+      "Hydro": 0.3446,
+      "Solar": 0.1444,
+      "Wind": 0.417
     },
     "2024": {
-      "Bioenergy": 0.0845,
-      "Hydro": 0.3569,
-      "Solar": 0.1665,
-      "Wind": 0.3922
+      "Bioenergy": 0.0859,
+      "Hydro": 0.3541,
+      "Solar": 0.1686,
+      "Wind": 0.3913
     }
   },
   "PY": {
@@ -6187,10 +6187,10 @@
       "Wind": 0.2639
     },
     "2024": {
-      "Bioenergy": 0.0207,
-      "Hydro": 0.5622,
-      "Solar": 0.1701,
-      "Wind": 0.247
+      "Bioenergy": 0.0206,
+      "Hydro": 0.5605,
+      "Solar": 0.1648,
+      "Wind": 0.2542
     }
   },
   "RS": {
@@ -6208,14 +6208,14 @@
     },
     "2021": {
       "Bioenergy": 0.0246,
-      "Hydro": 0.8694,
+      "Hydro": 0.8693,
       "Solar": 0.0049,
       "Wind": 0.1012
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.8244,
-      "Solar": 0.0174,
+      "Hydro": 0.8243,
+      "Solar": 0.0176,
       "Wind": 0.1263
     },
     "2023": {
@@ -6226,9 +6226,9 @@
     },
     "2024": {
       "Bioenergy": 0.0253,
-      "Hydro": 0.8486,
-      "Solar": 0.0162,
-      "Wind": 0.11
+      "Hydro": 0.8482,
+      "Solar": 0.0164,
+      "Wind": 0.1102
     }
   },
   "RU": {
@@ -6492,9 +6492,9 @@
     },
     "2024": {
       "Bioenergy": 0.0535,
-      "Hydro": 0.5786,
-      "Solar": 0.0159,
-      "Wind": 0.352
+      "Hydro": 0.5728,
+      "Solar": 0.0156,
+      "Wind": 0.358
     }
   },
   "SG": {
@@ -6575,7 +6575,7 @@
   },
   "SI": {
     "2019": {
-      "Bioenergy": 0.0274,
+      "Bioenergy": 0.0273,
       "Hydro": 0.9038,
       "Solar": 0.0537,
       "Wind": 0.0152
@@ -6589,26 +6589,26 @@
     "2021": {
       "Bioenergy": 0.0159,
       "Hydro": 0.9108,
-      "Solar": 0.0602,
+      "Solar": 0.0603,
       "Wind": 0.0131
     },
     "2022": {
       "Bioenergy": 0.0304,
-      "Hydro": 0.8192,
-      "Solar": 0.1054,
-      "Wind": 0.0451
+      "Hydro": 0.819,
+      "Solar": 0.1056,
+      "Wind": 0.045
     },
     "2023": {
       "Bioenergy": 0.0138,
-      "Hydro": 0.8845,
-      "Solar": 0.0866,
+      "Hydro": 0.8844,
+      "Solar": 0.0867,
       "Wind": 0.0151
     },
     "2024": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8378,
-      "Solar": 0.1361,
-      "Wind": 0.0056
+      "Bioenergy": 0.021,
+      "Hydro": 0.839,
+      "Solar": 0.1344,
+      "Wind": 0.0057
     }
   },
   "SK": {
@@ -6621,19 +6621,19 @@
     "2020": {
       "Bioenergy": 0.1516,
       "Hydro": 0.7507,
-      "Solar": 0.0867,
+      "Solar": 0.0868,
       "Wind": 0.0109
     },
     "2021": {
       "Bioenergy": 0.1554,
       "Hydro": 0.7356,
-      "Solar": 0.0908,
+      "Solar": 0.0909,
       "Wind": 0.0182
     },
     "2022": {
       "Bioenergy": 0.1474,
-      "Hydro": 0.7121,
-      "Solar": 0.1127,
+      "Hydro": 0.712,
+      "Solar": 0.1129,
       "Wind": 0.0277
     },
     "2023": {
@@ -6643,9 +6643,9 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.1463,
-      "Hydro": 0.7596,
-      "Solar": 0.094,
+      "Bioenergy": 0.1456,
+      "Hydro": 0.7621,
+      "Solar": 0.0921,
       "Wind": 0.0002
     }
   },
@@ -7131,16 +7131,16 @@
       "Wind": 0.1356
     },
     "2023": {
-      "Bioenergy": 0.3923,
+      "Bioenergy": 0.3922,
       "Hydro": 0.2699,
       "Solar": 0.1849,
       "Wind": 0.153
     },
     "2024": {
-      "Bioenergy": 0.3618,
-      "Hydro": 0.2687,
-      "Solar": 0.2208,
-      "Wind": 0.1488
+      "Bioenergy": 0.3661,
+      "Hydro": 0.2614,
+      "Solar": 0.2219,
+      "Wind": 0.1505
     }
   },
   "TJ": {
@@ -7365,10 +7365,10 @@
       "Wind": 0.2737
     },
     "2024": {
-      "Bioenergy": 0.0595,
-      "Hydro": 0.5133,
-      "Solar": 0.1794,
-      "Wind": 0.2478
+      "Bioenergy": 0.0596,
+      "Hydro": 0.512,
+      "Solar": 0.1778,
+      "Wind": 0.2507
     }
   },
   "TT": {
@@ -7593,10 +7593,10 @@
       "Wind": 0.4495
     },
     "2024": {
-      "Bioenergy": 0.0446,
-      "Hydro": 0.2208,
-      "Solar": 0.2923,
-      "Wind": 0.4422
+      "Bioenergy": 0.0449,
+      "Hydro": 0.2254,
+      "Solar": 0.29,
+      "Wind": 0.4398
     }
   },
   "UY": {
@@ -7631,10 +7631,10 @@
       "Wind": 0.4608
     },
     "2024": {
-      "Bioenergy": 0.131,
-      "Hydro": 0.5066,
-      "Solar": 0.0295,
-      "Wind": 0.3329
+      "Bioenergy": 0.1296,
+      "Hydro": 0.5053,
+      "Solar": 0.0308,
+      "Wind": 0.3343
     }
   },
   "UZ": {
@@ -7669,9 +7669,9 @@
       "Wind": 0.0135
     },
     "2024": {
-      "Bioenergy": 0.0038,
-      "Hydro": 0.9654,
-      "Solar": 0.0169,
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9655,
+      "Solar": 0.0167,
       "Wind": 0.0139
     }
   },
@@ -7952,7 +7952,7 @@
       "Bioenergy": 0.0019,
       "Hydro": 0.6732,
       "Solar": 0.0344,
-      "Wind": 0.2906
+      "Wind": 0.2905
     },
     "2021": {
       "Bioenergy": 0.0019,
@@ -7962,21 +7962,21 @@
     },
     "2022": {
       "Bioenergy": 0.0263,
-      "Hydro": 0.3312,
-      "Solar": 0.0176,
-      "Wind": 0.6248
+      "Hydro": 0.3311,
+      "Solar": 0.0179,
+      "Wind": 0.6247
     },
     "2023": {
       "Bioenergy": 0.0235,
-      "Hydro": 0.4722,
-      "Solar": 0.0401,
-      "Wind": 0.4642
+      "Hydro": 0.4719,
+      "Solar": 0.0406,
+      "Wind": 0.464
     },
     "2024": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.4055,
-      "Solar": 0.0365,
-      "Wind": 0.5387
+      "Bioenergy": 0.0204,
+      "Hydro": 0.3848,
+      "Solar": 0.0387,
+      "Wind": 0.5561
     }
   },
   "YE": {
@@ -8050,9 +8050,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.0355,
-      "Solar": 0.6029,
-      "Wind": 0.3616
+      "Hydro": 0.0349,
+      "Solar": 0.6137,
+      "Wind": 0.3514
     }
   },
   "ZM": {