npm - @digital4better/data - Versions diffs - 1.1.27 → 1.1.28 - Mend

@digital4better/data 1.1.27 → 1.1.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 (57) hide show

package/data/factor/continent-monthly-green.csv +84 -84
package/data/factor/continent-monthly-green.json +659 -659
package/data/factor/continent-monthly.csv +87 -87
package/data/factor/continent-monthly.json +641 -641
package/data/factor/continent-yearly-green.csv +17 -17
package/data/factor/continent-yearly-green.json +123 -123
package/data/factor/continent-yearly.csv +16 -16
package/data/factor/continent-yearly.json +116 -116
package/data/factor/country-monthly-green.csv +563 -563
package/data/factor/country-monthly-green.json +4772 -4772
package/data/factor/country-monthly.csv +606 -606
package/data/factor/country-monthly.json +4539 -4539
package/data/factor/country-yearly-green.csv +124 -124
package/data/factor/country-yearly-green.json +979 -979
package/data/factor/country-yearly.csv +116 -116
package/data/factor/country-yearly.json +850 -850
package/data/factor/subdivision-yearly-green.csv +50 -50
package/data/factor/subdivision-yearly-green.json +438 -438
package/data/factor/subdivision-yearly.csv +50 -50
package/data/factor/subdivision-yearly.json +426 -426
package/data/factor/world-monthly-green.csv +39 -39
package/data/factor/world-monthly-green.json +351 -351
package/data/factor/world-monthly.csv +39 -39
package/data/factor/world-monthly.json +332 -332
package/data/factor/world-yearly-green.csv +4 -4
package/data/factor/world-yearly-green.json +35 -35
package/data/factor/world-yearly.csv +4 -4
package/data/factor/world-yearly.json +34 -34
package/data/mix/continent-monthly-green.csv +61 -61
package/data/mix/continent-monthly-green.json +187 -187
package/data/mix/continent-monthly.csv +61 -61
package/data/mix/continent-monthly.json +248 -248
package/data/mix/continent-yearly-green.csv +11 -11
package/data/mix/continent-yearly-green.json +30 -30
package/data/mix/continent-yearly.csv +11 -11
package/data/mix/continent-yearly.json +52 -52
package/data/mix/country-monthly-green.csv +447 -447
package/data/mix/country-monthly-green.json +1428 -1428
package/data/mix/country-monthly.csv +447 -447
package/data/mix/country-monthly.json +1619 -1619
package/data/mix/country-yearly-green.csv +75 -75
package/data/mix/country-yearly-green.json +234 -234
package/data/mix/country-yearly.csv +75 -75
package/data/mix/country-yearly.json +338 -338
package/data/mix/subdivision-yearly-green.csv +25 -25
package/data/mix/subdivision-yearly-green.json +48 -48
package/data/mix/subdivision-yearly.csv +25 -25
package/data/mix/subdivision-yearly.json +35 -35
package/data/mix/world-monthly-green.csv +35 -35
package/data/mix/world-monthly-green.json +137 -137
package/data/mix/world-monthly.csv +35 -35
package/data/mix/world-monthly.json +129 -129
package/data/mix/world-yearly-green.csv +4 -4
package/data/mix/world-yearly-green.json +14 -14
package/data/mix/world-yearly.csv +4 -4
package/data/mix/world-yearly.json +17 -17
package/package.json +1 -1

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

@@ -51,28 +51,28 @@
       "Wind": 0.108
     },
     "2021": {
-      "Bioenergy": 0.0411,
-      "Hydro": 0.7042,
-      "Solar": 0.1213,
-      "Wind": 0.1334
+      "Bioenergy": 0.0442,
+      "Hydro": 0.702,
+      "Solar": 0.1209,
+      "Wind": 0.1329
     },
     "2022": {
-      "Bioenergy": 0.0412,
-      "Hydro": 0.6778,
-      "Solar": 0.1378,
-      "Wind": 0.1431
+      "Bioenergy": 0.0442,
+      "Hydro": 0.6758,
+      "Solar": 0.1374,
+      "Wind": 0.1426
     },
     "2023": {
-      "Bioenergy": 0.0446,
-      "Hydro": 0.6388,
+      "Bioenergy": 0.0447,
+      "Hydro": 0.6389,
       "Solar": 0.1597,
       "Wind": 0.1568
     },
     "2024": {
-      "Bioenergy": 0.0544,
-      "Hydro": 0.5959,
-      "Solar": 0.1688,
-      "Wind": 0.1809
+      "Bioenergy": 0.0516,
+      "Hydro": 0.5975,
+      "Solar": 0.1686,
+      "Wind": 0.1823
     }
   },
   "AG": {
@@ -145,10 +145,10 @@
       "Wind": 0.0499
     },
     "2024": {
-      "Bioenergy": 0.0106,
-      "Hydro": 0.9117,
+      "Bioenergy": 0.0108,
+      "Hydro": 0.912,
       "Solar": 0.0183,
-      "Wind": 0.0593
+      "Wind": 0.0589
     }
   },
   "AM": {
@@ -335,10 +335,10 @@
       "Wind": 0.1668
     },
     "2024": {
-      "Bioenergy": 0.0281,
-      "Hydro": 0.7079,
-      "Solar": 0.0489,
-      "Wind": 0.2152
+      "Bioenergy": 0.0291,
+      "Hydro": 0.6966,
+      "Solar": 0.0507,
+      "Wind": 0.2235
     }
   },
   "AU": {
@@ -545,28 +545,28 @@
       "Wind": 0.1233
     },
     "2021": {
-      "Bioenergy": 0.0463,
-      "Hydro": 0.6024,
-      "Solar": 0.2005,
-      "Wind": 0.1508
+      "Bioenergy": 0.0497,
+      "Hydro": 0.6003,
+      "Solar": 0.1998,
+      "Wind": 0.1502
     },
     "2022": {
-      "Bioenergy": 0.0443,
-      "Hydro": 0.5507,
-      "Solar": 0.25,
-      "Wind": 0.155
+      "Bioenergy": 0.0474,
+      "Hydro": 0.5489,
+      "Solar": 0.2491,
+      "Wind": 0.1545
     },
     "2023": {
-      "Bioenergy": 0.056,
-      "Hydro": 0.4511,
-      "Solar": 0.2969,
+      "Bioenergy": 0.0561,
+      "Hydro": 0.4512,
+      "Solar": 0.2968,
       "Wind": 0.1959
     },
     "2024": {
-      "Bioenergy": 0.0698,
-      "Hydro": 0.3927,
-      "Solar": 0.3056,
-      "Wind": 0.2319
+      "Bioenergy": 0.0663,
+      "Hydro": 0.3929,
+      "Solar": 0.3066,
+      "Wind": 0.2342
     }
   },
   "BE": {
@@ -601,10 +601,10 @@
       "Wind": 0.6101
     },
     "2024": {
-      "Bioenergy": 0.0327,
-      "Hydro": 0.0801,
-      "Solar": 0.1817,
-      "Wind": 0.7055
+      "Bioenergy": 0.033,
+      "Hydro": 0.08,
+      "Solar": 0.1818,
+      "Wind": 0.7052
     }
   },
   "BF": {
@@ -938,15 +938,15 @@
     },
     "2023": {
       "Bioenergy": 0.0149,
-      "Hydro": 0.7413,
+      "Hydro": 0.7412,
       "Solar": 0.0867,
       "Wind": 0.1571
     },
     "2024": {
-      "Bioenergy": 0.0057,
-      "Hydro": 0.7761,
-      "Solar": 0.1056,
-      "Wind": 0.1126
+      "Bioenergy": 0.0065,
+      "Hydro": 0.7842,
+      "Solar": 0.1055,
+      "Wind": 0.1037
     }
   },
   "BS": {
@@ -1128,13 +1128,13 @@
     },
     "2023": {
       "Bioenergy": 0.223,
-      "Hydro": 0.6811,
+      "Hydro": 0.681,
       "Solar": 0.0465,
       "Wind": 0.0494
     },
     "2024": {
       "Bioenergy": 0.2191,
-      "Hydro": 0.687,
+      "Hydro": 0.6871,
       "Solar": 0.052,
       "Wind": 0.0418
     }
@@ -1324,8 +1324,8 @@
     },
     "2024": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.9369,
-      "Solar": 0.0595,
+      "Hydro": 0.9377,
+      "Solar": 0.0588,
       "Wind": 0.0034
     }
   },
@@ -1495,28 +1495,28 @@
       "Wind": 0.2249
     },
     "2021": {
-      "Bioenergy": 0.0623,
-      "Hydro": 0.5139,
-      "Solar": 0.141,
-      "Wind": 0.2829
+      "Bioenergy": 0.0692,
+      "Hydro": 0.5101,
+      "Solar": 0.14,
+      "Wind": 0.2808
     },
     "2022": {
-      "Bioenergy": 0.0575,
-      "Hydro": 0.4753,
-      "Solar": 0.1679,
-      "Wind": 0.2994
+      "Bioenergy": 0.0639,
+      "Hydro": 0.472,
+      "Solar": 0.1667,
+      "Wind": 0.2973
     },
     "2023": {
-      "Bioenergy": 0.0623,
-      "Hydro": 0.412,
+      "Bioenergy": 0.0622,
+      "Hydro": 0.4122,
       "Solar": 0.2089,
-      "Wind": 0.3168
+      "Wind": 0.3167
     },
     "2024": {
-      "Bioenergy": 0.0766,
-      "Hydro": 0.3159,
-      "Solar": 0.2298,
-      "Wind": 0.3777
+      "Bioenergy": 0.0649,
+      "Hydro": 0.3059,
+      "Solar": 0.2409,
+      "Wind": 0.3884
     }
   },
   "CO": {
@@ -1699,14 +1699,14 @@
     "2023": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.7904,
-      "Wind": 0.2096
+      "Solar": 0.7905,
+      "Wind": 0.2095
     },
     "2024": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.7499,
-      "Wind": 0.2501
+      "Solar": 0.7143,
+      "Wind": 0.2857
     }
   },
   "CZ": {
@@ -1779,10 +1779,10 @@
       "Wind": 0.5154
     },
     "2024": {
-      "Bioenergy": 0.1549,
-      "Hydro": 0.0762,
+      "Bioenergy": 0.1559,
+      "Hydro": 0.0765,
       "Solar": 0.1376,
-      "Wind": 0.6312
+      "Wind": 0.63
     }
   },
   "DJ": {
@@ -2045,10 +2045,10 @@
       "Wind": 0.3742
     },
     "2024": {
-      "Bioenergy": 0.1989,
+      "Bioenergy": 0.1998,
       "Hydro": 0.204,
       "Solar": 0.0995,
-      "Wind": 0.4975
+      "Wind": 0.4968
     }
   },
   "EG": {
@@ -2235,10 +2235,10 @@
       "Wind": 0.3513
     },
     "2024": {
-      "Bioenergy": 0.2258,
+      "Bioenergy": 0.2259,
       "Hydro": 0.3671,
       "Solar": 0.0121,
-      "Wind": 0.395
+      "Wind": 0.3949
     }
   },
   "FJ": {
@@ -2463,10 +2463,10 @@
       "Wind": 0.7013
     },
     "2024": {
-      "Bioenergy": 0.13,
+      "Bioenergy": 0.1302,
       "Hydro": 0.0795,
       "Solar": 0.0627,
-      "Wind": 0.7278
+      "Wind": 0.7276
     }
   },
   "GD": {
@@ -2521,27 +2521,27 @@
       "Wind": 0.0214
     },
     "2021": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.966,
+      "Bioenergy": 0.0038,
+      "Hydro": 0.9658,
       "Solar": 0.0076,
       "Wind": 0.0228
     },
     "2022": {
-      "Bioenergy": 0.0029,
-      "Hydro": 0.9697,
+      "Bioenergy": 0.0031,
+      "Hydro": 0.9695,
       "Solar": 0.0068,
       "Wind": 0.0205
     },
     "2023": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9763,
+      "Hydro": 0.9764,
       "Solar": 0.0046,
       "Wind": 0.0173
     },
     "2024": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.9509,
-      "Solar": 0.0136,
+      "Bioenergy": 0.0048,
+      "Hydro": 0.9513,
+      "Solar": 0.0135,
       "Wind": 0.0304
     }
   },
@@ -2881,7 +2881,7 @@
       "Wind": 0.4449
     },
     "2024": {
-      "Bioenergy": 0.0028,
+      "Bioenergy": 0.0029,
       "Hydro": 0.1403,
       "Solar": 0.3316,
       "Wind": 0.5252
@@ -3053,28 +3053,28 @@
       "Wind": 0.18
     },
     "2021": {
-      "Bioenergy": 0.1115,
-      "Hydro": 0.5021,
-      "Solar": 0.1665,
-      "Wind": 0.2199
+      "Bioenergy": 0.1162,
+      "Hydro": 0.4995,
+      "Solar": 0.1656,
+      "Wind": 0.2188
     },
     "2022": {
-      "Bioenergy": 0.1077,
-      "Hydro": 0.4709,
-      "Solar": 0.1907,
-      "Wind": 0.2307
+      "Bioenergy": 0.1121,
+      "Hydro": 0.4686,
+      "Solar": 0.1897,
+      "Wind": 0.2296
     },
     "2023": {
-      "Bioenergy": 0.1121,
-      "Hydro": 0.4116,
-      "Solar": 0.2249,
-      "Wind": 0.2513
+      "Bioenergy": 0.1122,
+      "Hydro": 0.4118,
+      "Solar": 0.2248,
+      "Wind": 0.2512
     },
     "2024": {
-      "Bioenergy": 0.134,
-      "Hydro": 0.3216,
-      "Solar": 0.2453,
-      "Wind": 0.2991
+      "Bioenergy": 0.1302,
+      "Hydro": 0.3211,
+      "Solar": 0.2459,
+      "Wind": 0.3028
     }
   },
   "HN": {
@@ -3147,10 +3147,10 @@
       "Wind": 0.2554
     },
     "2024": {
-      "Bioenergy": 0.0588,
-      "Hydro": 0.6423,
+      "Bioenergy": 0.0589,
+      "Hydro": 0.6424,
       "Solar": 0.0171,
-      "Wind": 0.2818
+      "Wind": 0.2816
     }
   },
   "HT": {
@@ -3223,10 +3223,10 @@
       "Wind": 0.1703
     },
     "2024": {
-      "Bioenergy": 0.0931,
+      "Bioenergy": 0.0938,
       "Hydro": 0.1887,
-      "Solar": 0.5059,
-      "Wind": 0.2123
+      "Solar": 0.5062,
+      "Wind": 0.2114
     }
   },
   "ID": {
@@ -3243,7 +3243,7 @@
       "Wind": 0.016
     },
     "2021": {
-      "Bioenergy": 0.3554,
+      "Bioenergy": 0.3555,
       "Hydro": 0.6225,
       "Solar": 0.0055,
       "Wind": 0.0166
@@ -3263,7 +3263,7 @@
     "2024": {
       "Bioenergy": 0.3557,
       "Hydro": 0.6203,
-      "Solar": 0.0065,
+      "Solar": 0.0064,
       "Wind": 0.0175
     }
   },
@@ -3299,7 +3299,7 @@
       "Wind": 0.8336
     },
     "2024": {
-      "Bioenergy": 0.0129,
+      "Bioenergy": 0.013,
       "Hydro": 0.1235,
       "Solar": 0.0224,
       "Wind": 0.8412
@@ -3527,10 +3527,10 @@
       "Wind": 0.2402
     },
     "2024": {
-      "Bioenergy": 0.1337,
-      "Hydro": 0.361,
+      "Bioenergy": 0.1341,
+      "Hydro": 0.3611,
       "Solar": 0.1957,
-      "Wind": 0.3096
+      "Wind": 0.3091
     }
   },
   "JM": {
@@ -3641,10 +3641,10 @@
       "Wind": 0.0693
     },
     "2024": {
-      "Bioenergy": 0.2588,
-      "Hydro": 0.2561,
-      "Solar": 0.372,
-      "Wind": 0.1131
+      "Bioenergy": 0.2512,
+      "Hydro": 0.2707,
+      "Solar": 0.3733,
+      "Wind": 0.1048
     }
   },
   "KE": {
@@ -3737,14 +3737,14 @@
       "Wind": 0.0279
     },
     "2021": {
-      "Bioenergy": 0.0307,
-      "Hydro": 0.8849,
+      "Bioenergy": 0.0315,
+      "Hydro": 0.8842,
       "Solar": 0.0495,
       "Wind": 0.0349
     },
     "2022": {
-      "Bioenergy": 0.0308,
-      "Hydro": 0.8761,
+      "Bioenergy": 0.0316,
+      "Hydro": 0.8754,
       "Solar": 0.0546,
       "Wind": 0.0384
     },
@@ -3755,10 +3755,10 @@
       "Wind": 0.0424
     },
     "2024": {
-      "Bioenergy": 0.0342,
-      "Hydro": 0.8569,
-      "Solar": 0.0618,
-      "Wind": 0.0472
+      "Bioenergy": 0.0334,
+      "Hydro": 0.8577,
+      "Solar": 0.0616,
+      "Wind": 0.0473
     }
   },
   "KI": {
@@ -3945,10 +3945,10 @@
       "Wind": 0.0694
     },
     "2024": {
-      "Bioenergy": 0.3019,
-      "Hydro": 0.0604,
-      "Solar": 0.5272,
-      "Wind": 0.1105
+      "Bioenergy": 0.3108,
+      "Hydro": 0.0711,
+      "Solar": 0.5217,
+      "Wind": 0.0964
     }
   },
   "KW": {
@@ -4325,10 +4325,10 @@
       "Wind": 0.5094
     },
     "2024": {
-      "Bioenergy": 0.0535,
+      "Bioenergy": 0.0541,
       "Hydro": 0.236,
-      "Solar": 0.0874,
-      "Wind": 0.6231
+      "Solar": 0.0873,
+      "Wind": 0.6227
     }
   },
   "LU": {
@@ -4358,15 +4358,15 @@
     },
     "2023": {
       "Bioenergy": 0.1104,
-      "Hydro": 0.2901,
+      "Hydro": 0.2902,
       "Solar": 0.1961,
       "Wind": 0.4033
     },
     "2024": {
-      "Bioenergy": 0.1032,
-      "Hydro": 0.3158,
-      "Solar": 0.1195,
-      "Wind": 0.4615
+      "Bioenergy": 0.1042,
+      "Hydro": 0.3159,
+      "Solar": 0.1194,
+      "Wind": 0.4605
     }
   },
   "LV": {
@@ -4515,10 +4515,10 @@
       "Wind": 0.1271
     },
     "2024": {
-      "Bioenergy": 0.021,
-      "Hydro": 0.6027,
-      "Solar": 0.0222,
-      "Wind": 0.354
+      "Bioenergy": 0.0212,
+      "Hydro": 0.6029,
+      "Solar": 0.0221,
+      "Wind": 0.3537
     }
   },
   "ME": {
@@ -4629,10 +4629,10 @@
       "Wind": 0.085
     },
     "2024": {
-      "Bioenergy": 0.0492,
-      "Hydro": 0.7199,
+      "Bioenergy": 0.0495,
+      "Hydro": 0.7201,
       "Solar": 0.0919,
-      "Wind": 0.139
+      "Wind": 0.1386
     }
   },
   "ML": {
@@ -4763,28 +4763,28 @@
       "Wind": 0.1601
     },
     "2021": {
-      "Bioenergy": 0.2124,
-      "Hydro": 0.448,
-      "Solar": 0.1434,
-      "Wind": 0.1962
+      "Bioenergy": 0.2161,
+      "Hydro": 0.4459,
+      "Solar": 0.1427,
+      "Wind": 0.1953
     },
     "2022": {
-      "Bioenergy": 0.2039,
-      "Hydro": 0.4227,
-      "Solar": 0.1663,
-      "Wind": 0.2071
+      "Bioenergy": 0.2074,
+      "Hydro": 0.4208,
+      "Solar": 0.1655,
+      "Wind": 0.2062
     },
     "2023": {
       "Bioenergy": 0.2065,
-      "Hydro": 0.3701,
-      "Solar": 0.1974,
-      "Wind": 0.226
+      "Hydro": 0.3703,
+      "Solar": 0.1973,
+      "Wind": 0.2259
     },
     "2024": {
-      "Bioenergy": 0.2331,
-      "Hydro": 0.2867,
-      "Solar": 0.2136,
-      "Wind": 0.2666
+      "Bioenergy": 0.2307,
+      "Hydro": 0.2859,
+      "Solar": 0.2138,
+      "Wind": 0.2696
     }
   },
   "MQ": {
@@ -4928,15 +4928,15 @@
     },
     "2023": {
       "Bioenergy": 0.0315,
-      "Hydro": 0.1966,
-      "Solar": 0.6231,
+      "Hydro": 0.1967,
+      "Solar": 0.623,
       "Wind": 0.1488
     },
     "2024": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.2639,
-      "Solar": 0.4745,
-      "Wind": 0.2219
+      "Bioenergy": 0.0406,
+      "Hydro": 0.264,
+      "Solar": 0.4749,
+      "Wind": 0.2205
     }
   },
   "MU": {
@@ -5085,10 +5085,10 @@
       "Wind": 0.3473
     },
     "2024": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.2453,
-      "Solar": 0.301,
-      "Wind": 0.4498
+      "Bioenergy": 0.0038,
+      "Hydro": 0.2591,
+      "Solar": 0.3135,
+      "Wind": 0.4237
     }
   },
   "MY": {
@@ -5389,10 +5389,10 @@
       "Wind": 0.5101
     },
     "2024": {
-      "Bioenergy": 0.0466,
+      "Bioenergy": 0.0937,
       "Hydro": 0,
-      "Solar": 0.1954,
-      "Wind": 0.758
+      "Solar": 0.1818,
+      "Wind": 0.7245
     }
   },
   "NO": {
@@ -5447,16 +5447,16 @@
       "Wind": 0.0128
     },
     "2021": {
-      "Bioenergy": 0.0044,
-      "Hydro": 0.959,
+      "Bioenergy": 0.0047,
+      "Hydro": 0.9586,
       "Solar": 0.021,
       "Wind": 0.0156
     },
     "2022": {
-      "Bioenergy": 0.0045,
-      "Hydro": 0.9551,
+      "Bioenergy": 0.0048,
+      "Hydro": 0.9548,
       "Solar": 0.0232,
-      "Wind": 0.0172
+      "Wind": 0.0171
     },
     "2023": {
       "Bioenergy": 0.0049,
@@ -5465,9 +5465,9 @@
       "Wind": 0.0188
     },
     "2024": {
-      "Bioenergy": 0.0057,
-      "Hydro": 0.9476,
-      "Solar": 0.026,
+      "Bioenergy": 0.0054,
+      "Hydro": 0.9481,
+      "Solar": 0.0259,
       "Wind": 0.0206
     }
   },
@@ -5579,10 +5579,10 @@
       "Wind": 0.1009
     },
     "2024": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.8632,
+      "Bioenergy": 0.0091,
+      "Hydro": 0.8557,
       "Solar": 0,
-      "Wind": 0.1279
+      "Wind": 0.1352
     }
   },
   "OM": {
@@ -5693,10 +5693,10 @@
       "Wind": 0.0749
     },
     "2024": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.8994,
-      "Solar": 0.0261,
-      "Wind": 0.0677
+      "Bioenergy": 0.0067,
+      "Hydro": 0.8935,
+      "Solar": 0.0276,
+      "Wind": 0.0723
     }
   },
   "PF": {
@@ -5883,10 +5883,10 @@
       "Wind": 0.5491
     },
     "2024": {
-      "Bioenergy": 0.0426,
+      "Bioenergy": 0.0427,
       "Hydro": 0.0818,
       "Solar": 0.1905,
-      "Wind": 0.6852
+      "Wind": 0.6851
     }
   },
   "PM": {
@@ -6517,10 +6517,10 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0044,
+      "Bioenergy": 0.0047,
       "Hydro": 0.0376,
-      "Solar": 0.9444,
-      "Wind": 0.0136
+      "Solar": 0.9441,
+      "Wind": 0.0135
     },
     "2023": {
       "Bioenergy": 0.0018,
@@ -7119,16 +7119,16 @@
       "Wind": 0.1407
     },
     "2021": {
-      "Bioenergy": 0.4032,
-      "Hydro": 0.2576,
-      "Solar": 0.1634,
-      "Wind": 0.1758
+      "Bioenergy": 0.404,
+      "Hydro": 0.2573,
+      "Solar": 0.1632,
+      "Wind": 0.1756
     },
     "2022": {
-      "Bioenergy": 0.3861,
-      "Hydro": 0.2974,
-      "Solar": 0.1806,
-      "Wind": 0.1359
+      "Bioenergy": 0.3869,
+      "Hydro": 0.297,
+      "Solar": 0.1804,
+      "Wind": 0.1357
     },
     "2023": {
       "Bioenergy": 0.3918,
@@ -7137,10 +7137,10 @@
       "Wind": 0.1531
     },
     "2024": {
-      "Bioenergy": 0.4107,
-      "Hydro": 0.2316,
-      "Solar": 0.166,
-      "Wind": 0.1918
+      "Bioenergy": 0.4106,
+      "Hydro": 0.2313,
+      "Solar": 0.1659,
+      "Wind": 0.1921
     }
   },
   "TJ": {
@@ -7365,10 +7365,10 @@
       "Wind": 0.2738
     },
     "2024": {
-      "Bioenergy": 0.0584,
-      "Hydro": 0.6035,
-      "Solar": 0.1006,
-      "Wind": 0.2375
+      "Bioenergy": 0.0579,
+      "Hydro": 0.5979,
+      "Solar": 0.1094,
+      "Wind": 0.2349
     }
   },
   "TT": {
@@ -7588,15 +7588,15 @@
     },
     "2023": {
       "Bioenergy": 0.0502,
-      "Hydro": 0.2511,
-      "Solar": 0.2516,
+      "Hydro": 0.2509,
+      "Solar": 0.2517,
       "Wind": 0.4471
     },
     "2024": {
-      "Bioenergy": 0.0454,
-      "Hydro": 0.2648,
-      "Solar": 0.1992,
-      "Wind": 0.4906
+      "Bioenergy": 0.045,
+      "Hydro": 0.2556,
+      "Solar": 0.2083,
+      "Wind": 0.4911
     }
   },
   "UY": {
@@ -7631,10 +7631,10 @@
       "Wind": 0.4607
     },
     "2024": {
-      "Bioenergy": 0.1397,
-      "Hydro": 0.4857,
-      "Solar": 0.0397,
-      "Wind": 0.3349
+      "Bioenergy": 0.1379,
+      "Hydro": 0.4853,
+      "Solar": 0.0409,
+      "Wind": 0.336
     }
   },
   "UZ": {
@@ -7651,15 +7651,15 @@
       "Wind": 0.0088
     },
     "2021": {
-      "Bioenergy": 0.0034,
-      "Hydro": 0.9757,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9754,
       "Solar": 0.0099,
       "Wind": 0.011
     },
     "2022": {
-      "Bioenergy": 0.0035,
-      "Hydro": 0.9726,
-      "Solar": 0.0117,
+      "Bioenergy": 0.0038,
+      "Hydro": 0.9724,
+      "Solar": 0.0116,
       "Wind": 0.0122
     },
     "2023": {
@@ -7669,9 +7669,9 @@
       "Wind": 0.0135
     },
     "2024": {
-      "Bioenergy": 0.0045,
-      "Hydro": 0.9669,
-      "Solar": 0.0138,
+      "Bioenergy": 0.0042,
+      "Hydro": 0.9672,
+      "Solar": 0.0137,
       "Wind": 0.0149
     }
   },
@@ -7860,9 +7860,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.5474,
-      "Solar": 0.2423,
-      "Wind": 0.2103
+      "Hydro": 0.4906,
+      "Solar": 0.3048,
+      "Wind": 0.2046
     }
   },
   "VU": {
@@ -7973,10 +7973,10 @@
       "Wind": 0.4653
     },
     "2024": {
-      "Bioenergy": 0.0302,
-      "Hydro": 0.4794,
-      "Solar": 0.043,
-      "Wind": 0.4474
+      "Bioenergy": 0.0309,
+      "Hydro": 0.4796,
+      "Solar": 0.0429,
+      "Wind": 0.4465
     }
   },
   "YE": {