npm - @digital4better/data - Versions diffs - 1.1.30 → 1.1.32 - Mend

@digital4better/data 1.1.30 → 1.1.32

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 +177 -171
package/data/factor/continent-monthly-green.json +1462 -1396
package/data/factor/continent-monthly.csv +183 -177
package/data/factor/continent-monthly.json +1476 -1410
package/data/factor/continent-yearly-green.csv +22 -22
package/data/factor/continent-yearly-green.json +174 -174
package/data/factor/continent-yearly.csv +23 -23
package/data/factor/continent-yearly.json +171 -171
package/data/factor/country-monthly-green.csv +1260 -1046
package/data/factor/country-monthly-green.json +10791 -8437
package/data/factor/country-monthly.csv +1481 -1267
package/data/factor/country-monthly.json +11030 -8676
package/data/factor/country-yearly-green.csv +254 -254
package/data/factor/country-yearly-green.json +1958 -1958
package/data/factor/country-yearly.csv +282 -282
package/data/factor/country-yearly.json +1903 -1903
package/data/factor/subdivision-monthly-green.csv +869 -806
package/data/factor/subdivision-monthly-green.json +7903 -7210
package/data/factor/subdivision-monthly.csv +882 -819
package/data/factor/subdivision-monthly.json +8045 -7352
package/data/factor/subdivision-yearly-green.csv +128 -128
package/data/factor/subdivision-yearly-green.json +1150 -1150
package/data/factor/subdivision-yearly.csv +128 -128
package/data/factor/subdivision-yearly.json +1152 -1152
package/data/factor/world-monthly-green.csv +64 -63
package/data/factor/world-monthly-green.json +578 -567
package/data/factor/world-monthly.csv +64 -63
package/data/factor/world-monthly.json +578 -567
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 +125 -119
package/data/mix/continent-monthly-green.json +425 -389
package/data/mix/continent-monthly.csv +125 -119
package/data/mix/continent-monthly.json +904 -838
package/data/mix/continent-yearly-green.csv +15 -15
package/data/mix/continent-yearly-green.json +52 -52
package/data/mix/continent-yearly.csv +15 -15
package/data/mix/continent-yearly.json +109 -109
package/data/mix/country-monthly-green.csv +970 -756
package/data/mix/country-monthly-green.json +3059 -1775
package/data/mix/country-monthly.csv +970 -756
package/data/mix/country-monthly.json +5115 -2761
package/data/mix/country-yearly-green.csv +138 -138
package/data/mix/country-yearly-green.json +407 -407
package/data/mix/country-yearly.csv +138 -138
package/data/mix/country-yearly.json +717 -717
package/data/mix/subdivision-monthly-green.csv +852 -789
package/data/mix/subdivision-monthly-green.json +2066 -1688
package/data/mix/subdivision-monthly.csv +852 -789
package/data/mix/subdivision-monthly.json +3549 -2856
package/data/mix/subdivision-yearly-green.csv +125 -125
package/data/mix/subdivision-yearly-green.json +341 -341
package/data/mix/subdivision-yearly.csv +125 -125
package/data/mix/subdivision-yearly.json +612 -612
package/data/mix/world-monthly-green.csv +64 -63
package/data/mix/world-monthly-green.json +217 -211
package/data/mix/world-monthly.csv +64 -63
package/data/mix/world-monthly.json +435 -424
package/data/mix/world-yearly-green.csv +6 -6
package/data/mix/world-yearly-green.json +19 -19
package/data/mix/world-yearly.csv +6 -6
package/data/mix/world-yearly.json +44 -44
package/package.json +1 -1

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

@@ -57,22 +57,22 @@
       "Wind": 0.1329
     },
     "2022": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.6758,
+      "Bioenergy": 0.0441,
+      "Hydro": 0.6759,
       "Solar": 0.1374,
       "Wind": 0.1426
     },
     "2023": {
-      "Bioenergy": 0.0447,
-      "Hydro": 0.6389,
-      "Solar": 0.1597,
-      "Wind": 0.1568
+      "Bioenergy": 0.0446,
+      "Hydro": 0.6391,
+      "Solar": 0.1596,
+      "Wind": 0.1567
     },
     "2024": {
-      "Bioenergy": 0.0516,
-      "Hydro": 0.5975,
-      "Solar": 0.1686,
-      "Wind": 0.1823
+      "Bioenergy": 0.0494,
+      "Hydro": 0.5822,
+      "Solar": 0.1795,
+      "Wind": 0.1889
     }
   },
   "AG": {
@@ -145,10 +145,10 @@
       "Wind": 0.0499
     },
     "2024": {
-      "Bioenergy": 0.0108,
-      "Hydro": 0.912,
-      "Solar": 0.0183,
-      "Wind": 0.0589
+      "Bioenergy": 0.0111,
+      "Hydro": 0.908,
+      "Solar": 0.0229,
+      "Wind": 0.058
     }
   },
   "AM": {
@@ -231,7 +231,7 @@
     "2019": {
       "Bioenergy": 0.0131,
       "Hydro": 0.8528,
-      "Solar": 0.0188,
+      "Solar": 0.0189,
       "Wind": 0.1153
     },
     "2020": {
@@ -259,10 +259,10 @@
       "Wind": 0.2374
     },
     "2024": {
-      "Bioenergy": 0.0186,
-      "Hydro": 0.672,
-      "Solar": 0.0671,
-      "Wind": 0.2423
+      "Bioenergy": 0.0204,
+      "Hydro": 0.6368,
+      "Solar": 0.0706,
+      "Wind": 0.2722
     }
   },
   "AS": {
@@ -335,10 +335,10 @@
       "Wind": 0.1668
     },
     "2024": {
-      "Bioenergy": 0.0291,
-      "Hydro": 0.6966,
-      "Solar": 0.0507,
-      "Wind": 0.2235
+      "Bioenergy": 0.0306,
+      "Hydro": 0.6895,
+      "Solar": 0.0692,
+      "Wind": 0.2107
     }
   },
   "AU": {
@@ -373,10 +373,10 @@
       "Wind": 0.3506
     },
     "2024": {
-      "Bioenergy": 0.0034,
-      "Hydro": 0.1243,
-      "Solar": 0.554,
-      "Wind": 0.3182
+      "Bioenergy": 0.0037,
+      "Hydro": 0.1339,
+      "Solar": 0.5417,
+      "Wind": 0.3207
     }
   },
   "AW": {
@@ -488,9 +488,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9367,
-      "Solar": 0.0254,
-      "Wind": 0.0379
+      "Hydro": 0.9311,
+      "Solar": 0.0325,
+      "Wind": 0.0364
     }
   },
   "BB": {
@@ -552,21 +552,21 @@
     },
     "2022": {
       "Bioenergy": 0.0474,
-      "Hydro": 0.5489,
+      "Hydro": 0.5491,
       "Solar": 0.2491,
-      "Wind": 0.1545
+      "Wind": 0.1544
     },
     "2023": {
-      "Bioenergy": 0.0561,
-      "Hydro": 0.4512,
-      "Solar": 0.2968,
-      "Wind": 0.1959
+      "Bioenergy": 0.056,
+      "Hydro": 0.4515,
+      "Solar": 0.2967,
+      "Wind": 0.1958
     },
     "2024": {
-      "Bioenergy": 0.0663,
-      "Hydro": 0.3929,
-      "Solar": 0.3066,
-      "Wind": 0.2342
+      "Bioenergy": 0.0639,
+      "Hydro": 0.3356,
+      "Solar": 0.3563,
+      "Wind": 0.2443
     }
   },
   "BE": {
@@ -601,10 +601,10 @@
       "Wind": 0.6101
     },
     "2024": {
-      "Bioenergy": 0.033,
-      "Hydro": 0.08,
-      "Solar": 0.1818,
-      "Wind": 0.7052
+      "Bioenergy": 0.0286,
+      "Hydro": 0.0756,
+      "Solar": 0.2297,
+      "Wind": 0.6661
     }
   },
   "BF": {
@@ -677,10 +677,10 @@
       "Wind": 0.1938
     },
     "2024": {
-      "Bioenergy": 0.0192,
-      "Hydro": 0.3635,
-      "Solar": 0.377,
-      "Wind": 0.2404
+      "Bioenergy": 0.0167,
+      "Hydro": 0.3743,
+      "Solar": 0.4014,
+      "Wind": 0.2076
     }
   },
   "BH": {
@@ -906,9 +906,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8202,
-      "Solar": 0.0786,
-      "Wind": 0.1012
+      "Hydro": 0.8189,
+      "Solar": 0.0738,
+      "Wind": 0.1073
     }
   },
   "BR": {
@@ -943,10 +943,10 @@
       "Wind": 0.1571
     },
     "2024": {
-      "Bioenergy": 0.0065,
-      "Hydro": 0.7842,
-      "Solar": 0.1055,
-      "Wind": 0.1037
+      "Bioenergy": 0.0069,
+      "Hydro": 0.7873,
+      "Solar": 0.1052,
+      "Wind": 0.1006
     }
   },
   "BS": {
@@ -1103,22 +1103,22 @@
   },
   "BZ": {
     "2019": {
-      "Bioenergy": 0.2318,
-      "Hydro": 0.7093,
+      "Bioenergy": 0.2316,
+      "Hydro": 0.7094,
       "Solar": 0.0249,
       "Wind": 0.0341
     },
     "2020": {
-      "Bioenergy": 0.2283,
-      "Hydro": 0.7045,
+      "Bioenergy": 0.2285,
+      "Hydro": 0.7044,
       "Solar": 0.0292,
       "Wind": 0.038
     },
     "2021": {
-      "Bioenergy": 0.23,
-      "Hydro": 0.6912,
-      "Solar": 0.0339,
-      "Wind": 0.045
+      "Bioenergy": 0.2301,
+      "Hydro": 0.6911,
+      "Solar": 0.0338,
+      "Wind": 0.0449
     },
     "2022": {
       "Bioenergy": 0.2236,
@@ -1127,54 +1127,54 @@
       "Wind": 0.046
     },
     "2023": {
-      "Bioenergy": 0.223,
-      "Hydro": 0.681,
+      "Bioenergy": 0.2226,
+      "Hydro": 0.6814,
       "Solar": 0.0465,
-      "Wind": 0.0494
+      "Wind": 0.0495
     },
     "2024": {
-      "Bioenergy": 0.2191,
-      "Hydro": 0.6871,
-      "Solar": 0.052,
-      "Wind": 0.0418
+      "Bioenergy": 0.2187,
+      "Hydro": 0.6893,
+      "Solar": 0.0524,
+      "Wind": 0.0396
     }
   },
   "CA": {
     "2019": {
-      "Bioenergy": 0.0266,
-      "Hydro": 0.8901,
-      "Solar": 0.0057,
-      "Wind": 0.0775
+      "Bioenergy": 0.0253,
+      "Hydro": 0.8913,
+      "Solar": 0.0058,
+      "Wind": 0.0776
     },
     "2020": {
-      "Bioenergy": 0.024,
-      "Hydro": 0.886,
+      "Bioenergy": 0.0222,
+      "Hydro": 0.8877,
       "Solar": 0.0059,
-      "Wind": 0.0841
+      "Wind": 0.0843
     },
     "2021": {
-      "Bioenergy": 0.0233,
-      "Hydro": 0.8852,
+      "Bioenergy": 0.0231,
+      "Hydro": 0.8854,
       "Solar": 0.0064,
       "Wind": 0.0851
     },
     "2022": {
-      "Bioenergy": 0.0219,
-      "Hydro": 0.8827,
+      "Bioenergy": 0.0203,
+      "Hydro": 0.8842,
       "Solar": 0.0071,
-      "Wind": 0.0883
+      "Wind": 0.0885
     },
     "2023": {
-      "Bioenergy": 0.0246,
-      "Hydro": 0.8681,
-      "Solar": 0.0112,
-      "Wind": 0.0961
+      "Bioenergy": 0.0226,
+      "Hydro": 0.8699,
+      "Solar": 0.0113,
+      "Wind": 0.0963
     },
     "2024": {
-      "Bioenergy": 0.0262,
-      "Hydro": 0.8688,
-      "Solar": 0.0036,
-      "Wind": 0.1014
+      "Bioenergy": 0.0236,
+      "Hydro": 0.8582,
+      "Solar": 0.008,
+      "Wind": 0.1103
     }
   },
   "CD": {
@@ -1318,15 +1318,15 @@
     },
     "2023": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.9023,
-      "Solar": 0.085,
-      "Wind": 0.011
+      "Hydro": 0.9054,
+      "Solar": 0.0821,
+      "Wind": 0.0109
     },
     "2024": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.9377,
-      "Solar": 0.0588,
-      "Wind": 0.0034
+      "Hydro": 0.9218,
+      "Solar": 0.0748,
+      "Wind": 0.0032
     }
   },
   "CI": {
@@ -1437,10 +1437,10 @@
       "Wind": 0.1891
     },
     "2024": {
-      "Bioenergy": 0.0395,
-      "Hydro": 0.423,
-      "Solar": 0.3655,
-      "Wind": 0.172
+      "Bioenergy": 0.0408,
+      "Hydro": 0.41,
+      "Solar": 0.3692,
+      "Wind": 0.1799
     }
   },
   "CM": {
@@ -1513,10 +1513,10 @@
       "Wind": 0.3167
     },
     "2024": {
-      "Bioenergy": 0.0649,
-      "Hydro": 0.3059,
-      "Solar": 0.2409,
-      "Wind": 0.3884
+      "Bioenergy": 0.0629,
+      "Hydro": 0.3001,
+      "Solar": 0.245,
+      "Wind": 0.3919
     }
   },
   "CO": {
@@ -1552,15 +1552,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9441,
-      "Solar": 0.0522,
-      "Wind": 0.0038
+      "Hydro": 0.9416,
+      "Solar": 0.0544,
+      "Wind": 0.004
     }
   },
   "CR": {
     "2019": {
       "Bioenergy": 0.0074,
-      "Hydro": 0.8094,
+      "Hydro": 0.8095,
       "Solar": 0.0005,
       "Wind": 0.1826
     },
@@ -1589,10 +1589,10 @@
       "Wind": 0.1492
     },
     "2024": {
-      "Bioenergy": 0.0139,
-      "Hydro": 0.7484,
-      "Solar": 0.0043,
-      "Wind": 0.2334
+      "Bioenergy": 0.0138,
+      "Hydro": 0.7558,
+      "Solar": 0.0042,
+      "Wind": 0.2261
     }
   },
   "CU": {
@@ -1741,10 +1741,10 @@
       "Wind": 0.0905
     },
     "2024": {
-      "Bioenergy": 0.2589,
-      "Hydro": 0.3822,
-      "Solar": 0.2534,
-      "Wind": 0.1054
+      "Bioenergy": 0.2539,
+      "Hydro": 0.3289,
+      "Solar": 0.3211,
+      "Wind": 0.096
     }
   },
   "DE": {
@@ -1779,10 +1779,10 @@
       "Wind": 0.5154
     },
     "2024": {
-      "Bioenergy": 0.1559,
-      "Hydro": 0.0765,
-      "Solar": 0.1376,
-      "Wind": 0.63
+      "Bioenergy": 0.1539,
+      "Hydro": 0.0811,
+      "Solar": 0.1777,
+      "Wind": 0.5873
     }
   },
   "DJ": {
@@ -1855,10 +1855,10 @@
       "Wind": 0.718
     },
     "2024": {
-      "Bioenergy": 0.1636,
-      "Hydro": 0,
-      "Solar": 0.0427,
-      "Wind": 0.7937
+      "Bioenergy": 0.1558,
+      "Hydro": 0.0051,
+      "Solar": 0.0715,
+      "Wind": 0.7677
     }
   },
   "DM": {
@@ -2001,16 +2001,16 @@
       "Wind": 0.004
     },
     "2023": {
-      "Bioenergy": 0.0047,
-      "Hydro": 0.9876,
-      "Solar": 0.0013,
-      "Wind": 0.0065
+      "Bioenergy": 0.0134,
+      "Hydro": 0.9718,
+      "Solar": 0.0029,
+      "Wind": 0.0119
     },
     "2024": {
-      "Bioenergy": 0.0046,
-      "Hydro": 0.9877,
-      "Solar": 0.0015,
-      "Wind": 0.0062
+      "Bioenergy": 0.0012,
+      "Hydro": 0.993,
+      "Solar": 0.0006,
+      "Wind": 0.0052
     }
   },
   "EE": {
@@ -2040,15 +2040,15 @@
     },
     "2023": {
       "Bioenergy": 0.1797,
-      "Hydro": 0.1697,
+      "Hydro": 0.1698,
       "Solar": 0.2764,
       "Wind": 0.3742
     },
     "2024": {
-      "Bioenergy": 0.1998,
-      "Hydro": 0.204,
-      "Solar": 0.0995,
-      "Wind": 0.4968
+      "Bioenergy": 0.1768,
+      "Hydro": 0.1969,
+      "Solar": 0.158,
+      "Wind": 0.4683
     }
   },
   "EG": {
@@ -2159,10 +2159,10 @@
       "Wind": 0.474
     },
     "2024": {
-      "Bioenergy": 0.0207,
-      "Hydro": 0.2927,
-      "Solar": 0.2021,
-      "Wind": 0.4845
+      "Bioenergy": 0.0212,
+      "Hydro": 0.2917,
+      "Solar": 0.2354,
+      "Wind": 0.4517
     }
   },
   "ET": {
@@ -2223,7 +2223,7 @@
       "Wind": 0.2333
     },
     "2022": {
-      "Bioenergy": 0.3012,
+      "Bioenergy": 0.3011,
       "Hydro": 0.3709,
       "Solar": 0.0236,
       "Wind": 0.3043
@@ -2235,10 +2235,10 @@
       "Wind": 0.3513
     },
     "2024": {
-      "Bioenergy": 0.2259,
-      "Hydro": 0.3671,
-      "Solar": 0.0121,
-      "Wind": 0.3949
+      "Bioenergy": 0.239,
+      "Hydro": 0.3289,
+      "Solar": 0.0218,
+      "Wind": 0.4103
     }
   },
   "FJ": {
@@ -2387,10 +2387,10 @@
       "Wind": 0.3923
     },
     "2024": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.4823,
-      "Solar": 0.1011,
-      "Wind": 0.397
+      "Bioenergy": 0.0201,
+      "Hydro": 0.4684,
+      "Solar": 0.1228,
+      "Wind": 0.3887
     }
   },
   "GA": {
@@ -2463,10 +2463,10 @@
       "Wind": 0.7013
     },
     "2024": {
-      "Bioenergy": 0.1302,
-      "Hydro": 0.0795,
-      "Solar": 0.0627,
-      "Wind": 0.7276
+      "Bioenergy": 0.131,
+      "Hydro": 0.0756,
+      "Solar": 0.08,
+      "Wind": 0.7134
     }
   },
   "GD": {
@@ -2539,10 +2539,10 @@
       "Wind": 0.0173
     },
     "2024": {
-      "Bioenergy": 0.0048,
-      "Hydro": 0.9513,
-      "Solar": 0.0135,
-      "Wind": 0.0304
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9579,
+      "Solar": 0.0114,
+      "Wind": 0.027
     }
   },
   "GF": {
@@ -2881,10 +2881,10 @@
       "Wind": 0.4449
     },
     "2024": {
-      "Bioenergy": 0.0029,
-      "Hydro": 0.1403,
-      "Solar": 0.3316,
-      "Wind": 0.5252
+      "Bioenergy": 0.0022,
+      "Hydro": 0.1271,
+      "Solar": 0.3635,
+      "Wind": 0.5072
     }
   },
   "GT": {
@@ -3060,21 +3060,21 @@
     },
     "2022": {
       "Bioenergy": 0.1121,
-      "Hydro": 0.4686,
+      "Hydro": 0.4688,
       "Solar": 0.1897,
-      "Wind": 0.2296
+      "Wind": 0.2294
     },
     "2023": {
-      "Bioenergy": 0.1122,
-      "Hydro": 0.4118,
-      "Solar": 0.2248,
-      "Wind": 0.2512
+      "Bioenergy": 0.112,
+      "Hydro": 0.4122,
+      "Solar": 0.2247,
+      "Wind": 0.2511
     },
     "2024": {
-      "Bioenergy": 0.1302,
-      "Hydro": 0.3211,
-      "Solar": 0.2459,
-      "Wind": 0.3028
+      "Bioenergy": 0.1227,
+      "Hydro": 0.3097,
+      "Solar": 0.2599,
+      "Wind": 0.3076
     }
   },
   "HN": {
@@ -3104,15 +3104,15 @@
     },
     "2023": {
       "Bioenergy": 0.2442,
-      "Hydro": 0.4255,
+      "Hydro": 0.4256,
       "Solar": 0.1895,
       "Wind": 0.1408
     },
     "2024": {
-      "Bioenergy": 0.2439,
-      "Hydro": 0.4262,
+      "Bioenergy": 0.2438,
+      "Hydro": 0.4265,
       "Solar": 0.1898,
-      "Wind": 0.1401
+      "Wind": 0.1399
     }
   },
   "HR": {
@@ -3147,10 +3147,10 @@
       "Wind": 0.2554
     },
     "2024": {
-      "Bioenergy": 0.0589,
-      "Hydro": 0.6424,
-      "Solar": 0.0171,
-      "Wind": 0.2816
+      "Bioenergy": 0.0608,
+      "Hydro": 0.6332,
+      "Solar": 0.0254,
+      "Wind": 0.2806
     }
   },
   "HT": {
@@ -3218,15 +3218,15 @@
     },
     "2023": {
       "Bioenergy": 0.0862,
-      "Hydro": 0.1716,
+      "Hydro": 0.1717,
       "Solar": 0.5718,
       "Wind": 0.1703
     },
     "2024": {
-      "Bioenergy": 0.0938,
-      "Hydro": 0.1887,
-      "Solar": 0.5062,
-      "Wind": 0.2114
+      "Bioenergy": 0.0875,
+      "Hydro": 0.1628,
+      "Solar": 0.5665,
+      "Wind": 0.1833
     }
   },
   "ID": {
@@ -3261,10 +3261,10 @@
       "Wind": 0.0172
     },
     "2024": {
-      "Bioenergy": 0.3557,
-      "Hydro": 0.6203,
-      "Solar": 0.0064,
-      "Wind": 0.0175
+      "Bioenergy": 0.3555,
+      "Hydro": 0.62,
+      "Solar": 0.0068,
+      "Wind": 0.0178
     }
   },
   "IE": {
@@ -3299,10 +3299,10 @@
       "Wind": 0.8336
     },
     "2024": {
-      "Bioenergy": 0.013,
-      "Hydro": 0.1235,
-      "Solar": 0.0224,
-      "Wind": 0.8412
+      "Bioenergy": 0.0131,
+      "Hydro": 0.1244,
+      "Solar": 0.0249,
+      "Wind": 0.8376
     }
   },
   "IL": {
@@ -3375,10 +3375,10 @@
       "Wind": 0.2286
     },
     "2024": {
-      "Bioenergy": 0.0901,
-      "Hydro": 0.2815,
-      "Solar": 0.4288,
-      "Wind": 0.1996
+      "Bioenergy": 0.0795,
+      "Hydro": 0.2876,
+      "Solar": 0.4477,
+      "Wind": 0.1851
     }
   },
   "IQ": {
@@ -3527,10 +3527,10 @@
       "Wind": 0.2402
     },
     "2024": {
-      "Bioenergy": 0.1341,
-      "Hydro": 0.3611,
-      "Solar": 0.1957,
-      "Wind": 0.3091
+      "Bioenergy": 0.1263,
+      "Hydro": 0.3664,
+      "Solar": 0.2283,
+      "Wind": 0.279
     }
   },
   "JM": {
@@ -3641,10 +3641,10 @@
       "Wind": 0.0693
     },
     "2024": {
-      "Bioenergy": 0.2512,
-      "Hydro": 0.2707,
-      "Solar": 0.3733,
-      "Wind": 0.1048
+      "Bioenergy": 0.2767,
+      "Hydro": 0.288,
+      "Solar": 0.3845,
+      "Wind": 0.0509
     }
   },
   "KE": {
@@ -3750,15 +3750,15 @@
     },
     "2023": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.865,
-      "Solar": 0.0608,
+      "Hydro": 0.8651,
+      "Solar": 0.0607,
       "Wind": 0.0424
     },
     "2024": {
-      "Bioenergy": 0.0334,
-      "Hydro": 0.8577,
-      "Solar": 0.0616,
-      "Wind": 0.0473
+      "Bioenergy": 0.0329,
+      "Hydro": 0.8516,
+      "Solar": 0.0653,
+      "Wind": 0.0502
     }
   },
   "KI": {
@@ -3945,10 +3945,10 @@
       "Wind": 0.0694
     },
     "2024": {
-      "Bioenergy": 0.3108,
-      "Hydro": 0.0711,
-      "Solar": 0.5217,
-      "Wind": 0.0964
+      "Bioenergy": 0.312,
+      "Hydro": 0.0726,
+      "Solar": 0.5209,
+      "Wind": 0.0945
     }
   },
   "KW": {
@@ -4060,9 +4060,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.5644,
-      "Solar": 0.0832,
-      "Wind": 0.3524
+      "Hydro": 0.5634,
+      "Solar": 0.0861,
+      "Wind": 0.3504
     }
   },
   "LA": {
@@ -4308,8 +4308,8 @@
     },
     "2021": {
       "Bioenergy": 0.13,
-      "Hydro": 0.3627,
-      "Solar": 0.0891,
+      "Hydro": 0.3628,
+      "Solar": 0.089,
       "Wind": 0.4182
     },
     "2022": {
@@ -4321,14 +4321,14 @@
     "2023": {
       "Bioenergy": 0.0723,
       "Hydro": 0.2534,
-      "Solar": 0.165,
+      "Solar": 0.1649,
       "Wind": 0.5094
     },
     "2024": {
-      "Bioenergy": 0.0541,
-      "Hydro": 0.236,
-      "Solar": 0.0873,
-      "Wind": 0.6227
+      "Bioenergy": 0.0532,
+      "Hydro": 0.2256,
+      "Solar": 0.1248,
+      "Wind": 0.5964
     }
   },
   "LU": {
@@ -4358,15 +4358,15 @@
     },
     "2023": {
       "Bioenergy": 0.1104,
-      "Hydro": 0.2902,
-      "Solar": 0.1961,
+      "Hydro": 0.2903,
+      "Solar": 0.196,
       "Wind": 0.4033
     },
     "2024": {
-      "Bioenergy": 0.1042,
-      "Hydro": 0.3159,
-      "Solar": 0.1194,
-      "Wind": 0.4605
+      "Bioenergy": 0.0979,
+      "Hydro": 0.3098,
+      "Solar": 0.1502,
+      "Wind": 0.4421
     }
   },
   "LV": {
@@ -4396,15 +4396,15 @@
     },
     "2023": {
       "Bioenergy": 0.06,
-      "Hydro": 0.798,
-      "Solar": 0.0372,
+      "Hydro": 0.7981,
+      "Solar": 0.0371,
       "Wind": 0.1048
     },
     "2024": {
-      "Bioenergy": 0.0407,
-      "Hydro": 0.9111,
+      "Bioenergy": 0.037,
+      "Hydro": 0.9208,
       "Solar": 0,
-      "Wind": 0.0482
+      "Wind": 0.0422
     }
   },
   "LY": {
@@ -4511,14 +4511,14 @@
     "2023": {
       "Bioenergy": 0.0113,
       "Hydro": 0.8467,
-      "Solar": 0.015,
+      "Solar": 0.0149,
       "Wind": 0.1271
     },
     "2024": {
-      "Bioenergy": 0.0212,
-      "Hydro": 0.6029,
-      "Solar": 0.0221,
-      "Wind": 0.3537
+      "Bioenergy": 0.0173,
+      "Hydro": 0.6149,
+      "Solar": 0.018,
+      "Wind": 0.3498
     }
   },
   "ME": {
@@ -4554,9 +4554,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8424,
-      "Solar": 0.0129,
-      "Wind": 0.1447
+      "Hydro": 0.8305,
+      "Solar": 0.0233,
+      "Wind": 0.1462
     }
   },
   "MG": {
@@ -4629,10 +4629,10 @@
       "Wind": 0.085
     },
     "2024": {
-      "Bioenergy": 0.0495,
-      "Hydro": 0.7201,
-      "Solar": 0.0919,
-      "Wind": 0.1386
+      "Bioenergy": 0.0143,
+      "Hydro": 0.7605,
+      "Solar": 0.0671,
+      "Wind": 0.1582
     }
   },
   "ML": {
@@ -4770,21 +4770,21 @@
     },
     "2022": {
       "Bioenergy": 0.2074,
-      "Hydro": 0.4208,
+      "Hydro": 0.4211,
       "Solar": 0.1655,
-      "Wind": 0.2062
+      "Wind": 0.2061
     },
     "2023": {
-      "Bioenergy": 0.2065,
-      "Hydro": 0.3703,
-      "Solar": 0.1973,
-      "Wind": 0.2259
+      "Bioenergy": 0.2063,
+      "Hydro": 0.3706,
+      "Solar": 0.1972,
+      "Wind": 0.2258
     },
     "2024": {
-      "Bioenergy": 0.2307,
-      "Hydro": 0.2859,
-      "Solar": 0.2138,
-      "Wind": 0.2696
+      "Bioenergy": 0.2196,
+      "Hydro": 0.2773,
+      "Solar": 0.2277,
+      "Wind": 0.2754
     }
   },
   "MQ": {
@@ -4928,15 +4928,15 @@
     },
     "2023": {
       "Bioenergy": 0.0315,
-      "Hydro": 0.1967,
-      "Solar": 0.623,
+      "Hydro": 0.1968,
+      "Solar": 0.6229,
       "Wind": 0.1488
     },
     "2024": {
-      "Bioenergy": 0.0406,
-      "Hydro": 0.264,
-      "Solar": 0.4749,
-      "Wind": 0.2205
+      "Bioenergy": 0.0388,
+      "Hydro": 0.2539,
+      "Solar": 0.5035,
+      "Wind": 0.2039
     }
   },
   "MU": {
@@ -5085,10 +5085,10 @@
       "Wind": 0.3473
     },
     "2024": {
-      "Bioenergy": 0.0038,
-      "Hydro": 0.2591,
-      "Solar": 0.3135,
-      "Wind": 0.4237
+      "Bioenergy": 0.0039,
+      "Hydro": 0.262,
+      "Solar": 0.3221,
+      "Wind": 0.412
     }
   },
   "MY": {
@@ -5322,21 +5322,21 @@
   "NI": {
     "2019": {
       "Bioenergy": 0.4074,
-      "Hydro": 0.2098,
+      "Hydro": 0.2099,
       "Solar": 0.0182,
       "Wind": 0.3646
     },
     "2020": {
-      "Bioenergy": 0.405,
-      "Hydro": 0.2112,
+      "Bioenergy": 0.4051,
+      "Hydro": 0.2111,
       "Solar": 0.0198,
-      "Wind": 0.3639
+      "Wind": 0.364
     },
     "2021": {
       "Bioenergy": 0.4064,
-      "Hydro": 0.2044,
+      "Hydro": 0.2043,
       "Solar": 0.0214,
-      "Wind": 0.3678
+      "Wind": 0.3679
     },
     "2022": {
       "Bioenergy": 0.4023,
@@ -5345,16 +5345,16 @@
       "Wind": 0.365
     },
     "2023": {
-      "Bioenergy": 0.4019,
-      "Hydro": 0.2058,
+      "Bioenergy": 0.4017,
+      "Hydro": 0.206,
       "Solar": 0.0263,
       "Wind": 0.366
     },
     "2024": {
-      "Bioenergy": 0.3996,
-      "Hydro": 0.2102,
-      "Solar": 0.0284,
-      "Wind": 0.3617
+      "Bioenergy": 0.3992,
+      "Hydro": 0.2117,
+      "Solar": 0.0286,
+      "Wind": 0.3605
     }
   },
   "NL": {
@@ -5389,10 +5389,10 @@
       "Wind": 0.5101
     },
     "2024": {
-      "Bioenergy": 0.0937,
+      "Bioenergy": 0.0895,
       "Hydro": 0,
-      "Solar": 0.1818,
-      "Wind": 0.7245
+      "Solar": 0.2462,
+      "Wind": 0.6643
     }
   },
   "NO": {
@@ -5428,9 +5428,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8926,
+      "Hydro": 0.8953,
       "Solar": 0,
-      "Wind": 0.1074
+      "Wind": 0.1047
     }
   },
   "NP": {
@@ -5465,10 +5465,10 @@
       "Wind": 0.0188
     },
     "2024": {
-      "Bioenergy": 0.0054,
-      "Hydro": 0.9481,
-      "Solar": 0.0259,
-      "Wind": 0.0206
+      "Bioenergy": 0.0053,
+      "Hydro": 0.9453,
+      "Solar": 0.0275,
+      "Wind": 0.0219
     }
   },
   "NR": {
@@ -5579,10 +5579,10 @@
       "Wind": 0.1009
     },
     "2024": {
-      "Bioenergy": 0.0091,
-      "Hydro": 0.8557,
+      "Bioenergy": 0.0092,
+      "Hydro": 0.8499,
       "Solar": 0,
-      "Wind": 0.1352
+      "Wind": 0.1409
     }
   },
   "OM": {
@@ -5693,10 +5693,10 @@
       "Wind": 0.0749
     },
     "2024": {
-      "Bioenergy": 0.0067,
-      "Hydro": 0.8935,
-      "Solar": 0.0276,
-      "Wind": 0.0723
+      "Bioenergy": 0.0064,
+      "Hydro": 0.8909,
+      "Solar": 0.0278,
+      "Wind": 0.0749
     }
   },
   "PF": {
@@ -5845,10 +5845,10 @@
       "Wind": 0.0982
     },
     "2024": {
-      "Bioenergy": 0.058,
-      "Hydro": 0.8335,
-      "Solar": 0.043,
-      "Wind": 0.0655
+      "Bioenergy": 0.0436,
+      "Hydro": 0.8388,
+      "Solar": 0.0424,
+      "Wind": 0.0753
     }
   },
   "PL": {
@@ -5883,10 +5883,10 @@
       "Wind": 0.5491
     },
     "2024": {
-      "Bioenergy": 0.0427,
-      "Hydro": 0.0818,
-      "Solar": 0.1905,
-      "Wind": 0.6851
+      "Bioenergy": 0.037,
+      "Hydro": 0.0762,
+      "Solar": 0.2504,
+      "Wind": 0.6364
     }
   },
   "PM": {
@@ -5929,40 +5929,40 @@
   },
   "PR": {
     "2019": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.1044,
-      "Solar": 0.51,
-      "Wind": 0.3414
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 0.6191,
+      "Wind": 0.3809
     },
     "2020": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.1044,
-      "Solar": 0.51,
-      "Wind": 0.3414
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 0.659,
+      "Wind": 0.341
     },
     "2021": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.1044,
-      "Solar": 0.51,
-      "Wind": 0.3414
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 0.5713,
+      "Wind": 0.4287
     },
     "2022": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.1044,
-      "Solar": 0.51,
-      "Wind": 0.3414
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 0.5897,
+      "Wind": 0.4103
     },
     "2023": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.1044,
-      "Solar": 0.51,
-      "Wind": 0.3414
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 0.7097,
+      "Wind": 0.2903
     },
     "2024": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.1044,
-      "Solar": 0.51,
-      "Wind": 0.3414
+      "Bioenergy": 0,
+      "Hydro": 0,
+      "Solar": 0.5,
+      "Wind": 0.5
     }
   },
   "PS": {
@@ -6035,18 +6035,18 @@
       "Wind": 0.4235
     },
     "2024": {
-      "Bioenergy": 0.067,
-      "Hydro": 0.48,
-      "Solar": 0.0682,
-      "Wind": 0.3847
+      "Bioenergy": 0.0683,
+      "Hydro": 0.4789,
+      "Solar": 0.0811,
+      "Wind": 0.3716
     }
   },
   "PY": {
     "2019": {
-      "Bioenergy": 0.041,
-      "Hydro": 0.8266,
-      "Solar": 0.0298,
-      "Wind": 0.1026
+      "Bioenergy": 0.0028,
+      "Hydro": 0.9972,
+      "Solar": 0,
+      "Wind": 0
     },
     "2020": {
       "Bioenergy": 0.0051,
@@ -6187,10 +6187,10 @@
       "Wind": 0.2704
     },
     "2024": {
-      "Bioenergy": 0.0171,
-      "Hydro": 0.6309,
-      "Solar": 0.047,
-      "Wind": 0.305
+      "Bioenergy": 0.0177,
+      "Hydro": 0.6373,
+      "Solar": 0.0603,
+      "Wind": 0.2847
     }
   },
   "RS": {
@@ -6225,10 +6225,10 @@
       "Wind": 0.0716
     },
     "2024": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8914,
+      "Bioenergy": 0.0188,
+      "Hydro": 0.8892,
       "Solar": 0,
-      "Wind": 0.0901
+      "Wind": 0.092
     }
   },
   "RU": {
@@ -6263,10 +6263,10 @@
       "Wind": 0.0218
     },
     "2024": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.9578,
-      "Solar": 0.0035,
-      "Wind": 0.0335
+      "Bioenergy": 0.0051,
+      "Hydro": 0.9593,
+      "Solar": 0.0061,
+      "Wind": 0.0296
     }
   },
   "RW": {
@@ -6491,10 +6491,10 @@
       "Wind": 0.3141
     },
     "2024": {
-      "Bioenergy": 0.0695,
-      "Hydro": 0.5801,
-      "Solar": 0.0035,
-      "Wind": 0.3469
+      "Bioenergy": 0.0706,
+      "Hydro": 0.5848,
+      "Solar": 0.0063,
+      "Wind": 0.3383
     }
   },
   "SG": {
@@ -6605,10 +6605,10 @@
       "Wind": 0.0158
     },
     "2024": {
-      "Bioenergy": 0.0225,
-      "Hydro": 0.9192,
-      "Solar": 0.0583,
-      "Wind": 0
+      "Bioenergy": 0.0232,
+      "Hydro": 0.8813,
+      "Solar": 0.0797,
+      "Wind": 0.0158
     }
   },
   "SK": {
@@ -6643,9 +6643,9 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.1237,
-      "Hydro": 0.8301,
-      "Solar": 0.0462,
+      "Bioenergy": 0.1278,
+      "Hydro": 0.8115,
+      "Solar": 0.0608,
       "Wind": 0
     }
   },
@@ -6903,16 +6903,16 @@
       "Wind": 0.0406
     },
     "2023": {
-      "Bioenergy": 0.1604,
-      "Hydro": 0.3675,
-      "Solar": 0.4464,
-      "Wind": 0.0257
+      "Bioenergy": 0.1532,
+      "Hydro": 0.4499,
+      "Solar": 0.3468,
+      "Wind": 0.0501
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0.4117,
-      "Solar": 0.5883,
-      "Wind": 0
+      "Bioenergy": 0.2919,
+      "Hydro": 0.3209,
+      "Solar": 0.2955,
+      "Wind": 0.0917
     }
   },
   "SY": {
@@ -7125,22 +7125,22 @@
       "Wind": 0.1756
     },
     "2022": {
-      "Bioenergy": 0.3869,
-      "Hydro": 0.297,
+      "Bioenergy": 0.3868,
+      "Hydro": 0.2971,
       "Solar": 0.1804,
       "Wind": 0.1357
     },
     "2023": {
-      "Bioenergy": 0.3918,
-      "Hydro": 0.2701,
+      "Bioenergy": 0.3916,
+      "Hydro": 0.2703,
       "Solar": 0.1849,
       "Wind": 0.1531
     },
     "2024": {
-      "Bioenergy": 0.4106,
-      "Hydro": 0.2313,
-      "Solar": 0.1659,
-      "Wind": 0.1921
+      "Bioenergy": 0.4179,
+      "Hydro": 0.2514,
+      "Solar": 0.1808,
+      "Wind": 0.1499
     }
   },
   "TJ": {
@@ -7365,10 +7365,10 @@
       "Wind": 0.2738
     },
     "2024": {
-      "Bioenergy": 0.0579,
-      "Hydro": 0.5979,
-      "Solar": 0.1094,
-      "Wind": 0.2349
+      "Bioenergy": 0.0559,
+      "Hydro": 0.592,
+      "Solar": 0.1181,
+      "Wind": 0.234
     }
   },
   "TT": {
@@ -7581,7 +7581,7 @@
       "Wind": 0.4432
     },
     "2022": {
-      "Bioenergy": 0.0561,
+      "Bioenergy": 0.056,
       "Hydro": 0.2746,
       "Solar": 0.2139,
       "Wind": 0.4555
@@ -7593,10 +7593,10 @@
       "Wind": 0.4471
     },
     "2024": {
-      "Bioenergy": 0.045,
-      "Hydro": 0.2556,
-      "Solar": 0.2083,
-      "Wind": 0.4911
+      "Bioenergy": 0.0425,
+      "Hydro": 0.2337,
+      "Solar": 0.2242,
+      "Wind": 0.4995
     }
   },
   "UY": {
@@ -7608,7 +7608,7 @@
     },
     "2020": {
       "Bioenergy": 0.093,
-      "Hydro": 0.3686,
+      "Hydro": 0.3685,
       "Solar": 0.0382,
       "Wind": 0.5002
     },
@@ -7626,15 +7626,15 @@
     },
     "2023": {
       "Bioenergy": 0.1086,
-      "Hydro": 0.3868,
+      "Hydro": 0.3869,
       "Solar": 0.0438,
-      "Wind": 0.4607
+      "Wind": 0.4606
     },
     "2024": {
-      "Bioenergy": 0.1379,
-      "Hydro": 0.4853,
-      "Solar": 0.0409,
-      "Wind": 0.336
+      "Bioenergy": 0.1419,
+      "Hydro": 0.4734,
+      "Solar": 0.0366,
+      "Wind": 0.3481
     }
   },
   "UZ": {
@@ -7669,10 +7669,10 @@
       "Wind": 0.0135
     },
     "2024": {
-      "Bioenergy": 0.0042,
-      "Hydro": 0.9672,
-      "Solar": 0.0137,
-      "Wind": 0.0149
+      "Bioenergy": 0.0041,
+      "Hydro": 0.965,
+      "Solar": 0.015,
+      "Wind": 0.0159
     }
   },
   "VC": {
@@ -7860,9 +7860,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.4906,
-      "Solar": 0.3048,
-      "Wind": 0.2046
+      "Hydro": 0.4816,
+      "Solar": 0.3145,
+      "Wind": 0.2039
     }
   },
   "VU": {
@@ -7968,15 +7968,15 @@
     },
     "2023": {
       "Bioenergy": 0.0236,
-      "Hydro": 0.4724,
+      "Hydro": 0.4725,
       "Solar": 0.0387,
-      "Wind": 0.4653
+      "Wind": 0.4652
     },
     "2024": {
-      "Bioenergy": 0.0309,
-      "Hydro": 0.4796,
-      "Solar": 0.0429,
-      "Wind": 0.4465
+      "Bioenergy": 0.0312,
+      "Hydro": 0.4772,
+      "Solar": 0.0553,
+      "Wind": 0.4363
     }
   },
   "YE": {
@@ -8049,10 +8049,10 @@
       "Wind": 0.3951
     },
     "2024": {
-      "Bioenergy": 0.0002,
-      "Hydro": 0.1214,
-      "Solar": 0.5746,
-      "Wind": 0.3039
+      "Bioenergy": 0.0001,
+      "Hydro": 0.0635,
+      "Solar": 0.6257,
+      "Wind": 0.3108
     }
   },
   "ZM": {