npm - @digital4better/data - Versions diffs - 1.3.44 → 1.3.45 - Mend

@digital4better/data 1.3.44 → 1.3.45

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 (49) hide show

package/data/factor/continent-monthly-green.csv +176 -176
package/data/factor/continent-monthly-green.json +1418 -1418
package/data/factor/continent-monthly.csv +178 -178
package/data/factor/continent-monthly.json +1443 -1443
package/data/factor/continent-yearly-green.csv +19 -19
package/data/factor/continent-yearly-green.json +160 -160
package/data/factor/continent-yearly.csv +19 -19
package/data/factor/continent-yearly.json +155 -155
package/data/factor/country-monthly-green.csv +2602 -2602
package/data/factor/country-monthly-green.json +20333 -20333
package/data/factor/country-monthly.csv +2997 -2997
package/data/factor/country-monthly.json +18885 -18885
package/data/factor/country-yearly-green.csv +394 -394
package/data/factor/country-yearly-green.json +2998 -2998
package/data/factor/country-yearly.csv +390 -390
package/data/factor/country-yearly.json +2596 -2596
package/data/factor/world-monthly-green.csv +88 -88
package/data/factor/world-monthly-green.json +777 -777
package/data/factor/world-monthly.csv +88 -88
package/data/factor/world-monthly.json +779 -779
package/data/factor/world-yearly-green.csv +8 -8
package/data/factor/world-yearly-green.json +72 -72
package/data/factor/world-yearly.csv +8 -8
package/data/factor/world-yearly.json +72 -72
package/data/mix/continent-monthly-green.csv +115 -115
package/data/mix/continent-monthly-green.json +364 -364
package/data/mix/continent-monthly.csv +115 -115
package/data/mix/continent-monthly.json +471 -471
package/data/mix/continent-yearly-green.csv +15 -15
package/data/mix/continent-yearly-green.json +43 -43
package/data/mix/continent-yearly.csv +15 -15
package/data/mix/continent-yearly.json +72 -72
package/data/mix/country-monthly-green.csv +1688 -1688
package/data/mix/country-monthly-green.json +3197 -3197
package/data/mix/country-monthly.csv +1688 -1688
package/data/mix/country-monthly.json +4069 -4069
package/data/mix/country-yearly-green.csv +185 -185
package/data/mix/country-yearly-green.json +314 -314
package/data/mix/country-yearly.csv +185 -185
package/data/mix/country-yearly.json +496 -496
package/data/mix/world-monthly-green.csv +54 -54
package/data/mix/world-monthly-green.json +94 -94
package/data/mix/world-monthly.csv +54 -54
package/data/mix/world-monthly.json +103 -103
package/data/mix/world-yearly-green.csv +4 -4
package/data/mix/world-yearly-green.json +7 -7
package/data/mix/world-yearly.csv +4 -4
package/data/mix/world-yearly.json +13 -13
package/package.json +1 -1

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

@@ -51,14 +51,14 @@
   },
   "AF": {
     "2019": {
-      "Bioenergy": 0.0319,
+      "Bioenergy": 0.0318,
       "Hydro": 0.7969,
       "Solar": 0.0873,
       "Wind": 0.084
     },
     "2020": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.7796,
+      "Hydro": 0.7797,
       "Solar": 0.0959,
       "Wind": 0.0899
     },
@@ -75,28 +75,28 @@
       "Wind": 0.1196
     },
     "2023": {
-      "Bioenergy": 0.041,
+      "Bioenergy": 0.0409,
       "Hydro": 0.6887,
       "Solar": 0.1388,
-      "Wind": 0.1316
+      "Wind": 0.1315
     },
     "2024": {
       "Bioenergy": 0.0385,
-      "Hydro": 0.6673,
+      "Hydro": 0.6675,
       "Solar": 0.1617,
-      "Wind": 0.1325
+      "Wind": 0.1324
     },
     "2025": {
       "Bioenergy": 0.0354,
-      "Hydro": 0.6324,
-      "Solar": 0.1931,
+      "Hydro": 0.6323,
+      "Solar": 0.1932,
       "Wind": 0.1391
     },
     "2026": {
       "Bioenergy": 0.039,
-      "Hydro": 0.6031,
-      "Solar": 0.2066,
-      "Wind": 0.1513
+      "Hydro": 0.6026,
+      "Solar": 0.2069,
+      "Wind": 0.1515
     }
   },
   "AG": {
@@ -159,7 +159,7 @@
     "2020": {
       "Bioenergy": 0.0116,
       "Hydro": 0.9278,
-      "Solar": 0.0185,
+      "Solar": 0.0186,
       "Wind": 0.042
     },
     "2021": {
@@ -182,7 +182,7 @@
     },
     "2024": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9063,
+      "Hydro": 0.9062,
       "Solar": 0.0331,
       "Wind": 0.0498
     },
@@ -202,50 +202,50 @@
   "AM": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.997,
+      "Solar": 0.003,
       "Wind": 0
     },
     "2020": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.9699,
+      "Solar": 0.0301,
       "Wind": 0
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.9603,
-      "Solar": 0.0397,
+      "Hydro": 0.9406,
+      "Solar": 0.0594,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0006,
-      "Hydro": 0.8855,
-      "Solar": 0.1117,
-      "Wind": 0.0022
+      "Bioenergy": 0.0004,
+      "Hydro": 0.8716,
+      "Solar": 0.1266,
+      "Wind": 0.0015
     },
     "2023": {
-      "Bioenergy": 0.0008,
-      "Hydro": 0.8075,
-      "Solar": 0.1887,
-      "Wind": 0.003
+      "Bioenergy": 0.0005,
+      "Hydro": 0.7636,
+      "Solar": 0.2339,
+      "Wind": 0.0019
     },
     "2024": {
-      "Bioenergy": 0.0013,
-      "Hydro": 0.7837,
-      "Solar": 0.2106,
-      "Wind": 0.0044
+      "Bioenergy": 0.0008,
+      "Hydro": 0.7529,
+      "Solar": 0.2436,
+      "Wind": 0.0028
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.7888,
-      "Solar": 0.2097,
-      "Wind": 0.0012
+      "Hydro": 0.7784,
+      "Solar": 0.2203,
+      "Wind": 0.0011
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.6665,
-      "Solar": 0.3335,
+      "Hydro": 0.6633,
+      "Solar": 0.3367,
       "Wind": 0
     }
   },
@@ -416,7 +416,7 @@
       "Bioenergy": 0.0331,
       "Hydro": 0.765,
       "Solar": 0.0507,
-      "Wind": 0.1512
+      "Wind": 0.1513
     },
     "2022": {
       "Bioenergy": 0.0538,
@@ -552,51 +552,51 @@
   "AZ": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.9798,
+      "Solar": 0.0202,
       "Wind": 0
     },
     "2020": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.9574,
+      "Solar": 0.0426,
       "Wind": 0
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.9692,
-      "Solar": 0.0308,
+      "Hydro": 0.9672,
+      "Solar": 0.0328,
       "Wind": 0
     },
     "2022": {
       "Bioenergy": 0,
-      "Hydro": 0.9634,
-      "Solar": 0.0366,
+      "Hydro": 0.9654,
+      "Solar": 0.0346,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.9576,
-      "Solar": 0.038,
-      "Wind": 0.0032
+      "Bioenergy": 0.001,
+      "Hydro": 0.9579,
+      "Solar": 0.0382,
+      "Wind": 0.0029
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9133,
-      "Solar": 0.0867,
+      "Hydro": 0.9254,
+      "Solar": 0.0746,
       "Wind": 0
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9554,
-      "Solar": 0.0446,
+      "Hydro": 0.9664,
+      "Solar": 0.0336,
       "Wind": 0
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.9562,
-      "Solar": 0.0438,
-      "Wind": 0
+      "Hydro": 0.7515,
+      "Solar": 0.0621,
+      "Wind": 0.1863
     }
   },
   "BA": {
@@ -702,51 +702,51 @@
   "BD": {
     "2019": {
       "Bioenergy": 0.0438,
-      "Hydro": 0.7412,
+      "Hydro": 0.7413,
       "Solar": 0.0981,
       "Wind": 0.1169
     },
     "2020": {
       "Bioenergy": 0.0467,
-      "Hydro": 0.7065,
+      "Hydro": 0.7066,
       "Solar": 0.1247,
       "Wind": 0.122
     },
     "2021": {
       "Bioenergy": 0.0505,
-      "Hydro": 0.6016,
+      "Hydro": 0.6017,
       "Solar": 0.1994,
-      "Wind": 0.1485
+      "Wind": 0.1484
     },
     "2022": {
       "Bioenergy": 0.0506,
-      "Hydro": 0.5488,
+      "Hydro": 0.5489,
       "Solar": 0.2478,
-      "Wind": 0.1527
+      "Wind": 0.1526
     },
     "2023": {
-      "Bioenergy": 0.0484,
-      "Hydro": 0.4587,
+      "Bioenergy": 0.0483,
+      "Hydro": 0.4588,
       "Solar": 0.3358,
       "Wind": 0.1571
     },
     "2024": {
       "Bioenergy": 0.0443,
-      "Hydro": 0.4344,
-      "Solar": 0.352,
+      "Hydro": 0.4346,
+      "Solar": 0.3519,
       "Wind": 0.1692
     },
     "2025": {
-      "Bioenergy": 0.0441,
-      "Hydro": 0.3781,
+      "Bioenergy": 0.0442,
+      "Hydro": 0.378,
       "Solar": 0.3992,
-      "Wind": 0.1785
+      "Wind": 0.1786
     },
     "2026": {
       "Bioenergy": 0.0516,
-      "Hydro": 0.2985,
-      "Solar": 0.4418,
-      "Wind": 0.2081
+      "Hydro": 0.298,
+      "Solar": 0.4422,
+      "Wind": 0.2083
     }
   },
   "BE": {
@@ -790,7 +790,7 @@
       "Bioenergy": 0.0419,
       "Hydro": 0.081,
       "Solar": 0.3874,
-      "Wind": 0.4896
+      "Wind": 0.4897
     },
     "2026": {
       "Bioenergy": 0.0446,
@@ -1401,52 +1401,52 @@
   },
   "BY": {
     "2019": {
-      "Bioenergy": 0.1403,
-      "Hydro": 0.4247,
-      "Solar": 0.2242,
-      "Wind": 0.2108
+      "Bioenergy": 0.0742,
+      "Hydro": 0.4601,
+      "Solar": 0.2303,
+      "Wind": 0.2355
     },
     "2020": {
-      "Bioenergy": 0.2286,
-      "Hydro": 0.4047,
-      "Solar": 0.152,
-      "Wind": 0.2147
+      "Bioenergy": 0.1133,
+      "Hydro": 0.4711,
+      "Solar": 0.1994,
+      "Wind": 0.2162
     },
     "2021": {
-      "Bioenergy": 0.2408,
-      "Hydro": 0.4051,
-      "Solar": 0.1865,
-      "Wind": 0.1675
+      "Bioenergy": 0.1307,
+      "Hydro": 0.4482,
+      "Solar": 0.213,
+      "Wind": 0.2081
     },
     "2022": {
-      "Bioenergy": 0.2433,
-      "Hydro": 0.3739,
-      "Solar": 0.2126,
-      "Wind": 0.1701
+      "Bioenergy": 0.1131,
+      "Hydro": 0.4361,
+      "Solar": 0.2447,
+      "Wind": 0.2061
     },
     "2023": {
-      "Bioenergy": 0.4119,
-      "Hydro": 0.3102,
-      "Solar": 0.1262,
-      "Wind": 0.1517
+      "Bioenergy": 0.2204,
+      "Hydro": 0.3895,
+      "Solar": 0.1996,
+      "Wind": 0.1905
     },
     "2024": {
-      "Bioenergy": 0.2914,
-      "Hydro": 0.3668,
-      "Solar": 0.1915,
-      "Wind": 0.1502
+      "Bioenergy": 0.1842,
+      "Hydro": 0.3986,
+      "Solar": 0.2321,
+      "Wind": 0.1851
     },
     "2025": {
-      "Bioenergy": 0.1539,
-      "Hydro": 0.4671,
-      "Solar": 0.1629,
-      "Wind": 0.216
+      "Bioenergy": 0.1377,
+      "Hydro": 0.4809,
+      "Solar": 0.1545,
+      "Wind": 0.227
     },
     "2026": {
-      "Bioenergy": 0.1383,
-      "Hydro": 0.4725,
-      "Solar": 0.1665,
-      "Wind": 0.2227
+      "Bioenergy": 0.2596,
+      "Hydro": 0.3125,
+      "Solar": 0.1555,
+      "Wind": 0.2725
     }
   },
   "BZ": {
@@ -1493,10 +1493,10 @@
       "Wind": 0.055
     },
     "2026": {
-      "Bioenergy": 0.2303,
+      "Bioenergy": 0.2304,
       "Hydro": 0.6603,
       "Solar": 0.0649,
-      "Wind": 0.0445
+      "Wind": 0.0444
     }
   },
   "CA": {
@@ -1745,7 +1745,7 @@
     "2026": {
       "Bioenergy": 0.0101,
       "Hydro": 0.7404,
-      "Solar": 0.1926,
+      "Solar": 0.1927,
       "Wind": 0.0569
     }
   },
@@ -1988,15 +1988,15 @@
     },
     "2025": {
       "Bioenergy": 0.0525,
-      "Hydro": 0.3459,
-      "Solar": 0.306,
-      "Wind": 0.2956
+      "Hydro": 0.3456,
+      "Solar": 0.3062,
+      "Wind": 0.2957
     },
     "2026": {
-      "Bioenergy": 0.0577,
-      "Hydro": 0.2807,
-      "Solar": 0.3207,
-      "Wind": 0.3408
+      "Bioenergy": 0.0541,
+      "Hydro": 0.2737,
+      "Solar": 0.3336,
+      "Wind": 0.3386
     }
   },
   "CO": {
@@ -2408,9 +2408,9 @@
     },
     "2020": {
       "Bioenergy": 0.1395,
-      "Hydro": 0.0601,
+      "Hydro": 0.0602,
       "Solar": 0.069,
-      "Wind": 0.7314
+      "Wind": 0.7313
     },
     "2021": {
       "Bioenergy": 0.2081,
@@ -2444,7 +2444,7 @@
     },
     "2026": {
       "Bioenergy": 0.1792,
-      "Hydro": 0.0303,
+      "Hydro": 0.0302,
       "Solar": 0.114,
       "Wind": 0.6765
     }
@@ -2643,10 +2643,10 @@
       "Wind": 0.0082
     },
     "2026": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.9881,
-      "Solar": 0.0013,
-      "Wind": 0.0057
+      "Bioenergy": 0.0026,
+      "Hydro": 0.9906,
+      "Solar": 0.0012,
+      "Wind": 0.0056
     }
   },
   "EE": {
@@ -2657,28 +2657,28 @@
       "Wind": 0.4508
     },
     "2020": {
-      "Bioenergy": 0.2352,
-      "Hydro": 0.23,
-      "Solar": 0.0867,
-      "Wind": 0.4481
+      "Bioenergy": 0.2351,
+      "Hydro": 0.2301,
+      "Solar": 0.0868,
+      "Wind": 0.448
     },
     "2021": {
       "Bioenergy": 0.2228,
-      "Hydro": 0.1848,
+      "Hydro": 0.1849,
       "Solar": 0.1681,
       "Wind": 0.4243
     },
     "2022": {
       "Bioenergy": 0.328,
-      "Hydro": 0.0687,
+      "Hydro": 0.0688,
       "Solar": 0.2532,
       "Wind": 0.35
     },
     "2023": {
       "Bioenergy": 0.1794,
-      "Hydro": 0.169,
+      "Hydro": 0.1691,
       "Solar": 0.2792,
-      "Wind": 0.3724
+      "Wind": 0.3723
     },
     "2024": {
       "Bioenergy": 0.1394,
@@ -2694,7 +2694,7 @@
     },
     "2026": {
       "Bioenergy": 0.1498,
-      "Hydro": 0.1492,
+      "Hydro": 0.1491,
       "Solar": 0.2458,
       "Wind": 0.4553
     }
@@ -2909,17 +2909,17 @@
     "2020": {
       "Bioenergy": 0.268,
       "Hydro": 0.4816,
-      "Solar": 0.0226,
+      "Solar": 0.0227,
       "Wind": 0.2277
     },
     "2021": {
-      "Bioenergy": 0.2968,
+      "Bioenergy": 0.2967,
       "Hydro": 0.4471,
       "Solar": 0.0256,
       "Wind": 0.2305
     },
     "2022": {
-      "Bioenergy": 0.303,
+      "Bioenergy": 0.3029,
       "Hydro": 0.3719,
       "Solar": 0.0241,
       "Wind": 0.301
@@ -3204,7 +3204,7 @@
       "Bioenergy": 0.1779,
       "Hydro": 0.0713,
       "Solar": 0.1231,
-      "Wind": 0.6278
+      "Wind": 0.6277
     },
     "2020": {
       "Bioenergy": 0.1635,
@@ -3214,7 +3214,7 @@
     },
     "2021": {
       "Bioenergy": 0.1908,
-      "Hydro": 0.0728,
+      "Hydro": 0.0729,
       "Solar": 0.1187,
       "Wind": 0.6177
     },
@@ -3338,14 +3338,14 @@
     },
     "2025": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9632,
+      "Hydro": 0.9633,
       "Solar": 0.0122,
       "Wind": 0.0215
     },
     "2026": {
       "Bioenergy": 0.0091,
-      "Hydro": 0.901,
-      "Solar": 0.0416,
+      "Hydro": 0.9009,
+      "Solar": 0.0417,
       "Wind": 0.0483
     }
   },
@@ -3751,7 +3751,7 @@
   },
   "GR": {
     "2019": {
-      "Bioenergy": 0.0179,
+      "Bioenergy": 0.0178,
       "Hydro": 0.2968,
       "Solar": 0.253,
       "Wind": 0.4323
@@ -4002,51 +4002,51 @@
   "HK": {
     "2019": {
       "Bioenergy": 0.1127,
-      "Hydro": 0.5827,
-      "Solar": 0.1331,
-      "Wind": 0.1715
+      "Hydro": 0.5829,
+      "Solar": 0.133,
+      "Wind": 0.1714
     },
     "2020": {
       "Bioenergy": 0.1133,
-      "Hydro": 0.5609,
-      "Solar": 0.1476,
-      "Wind": 0.1782
+      "Hydro": 0.5611,
+      "Solar": 0.1475,
+      "Wind": 0.1781
     },
     "2021": {
-      "Bioenergy": 0.1174,
-      "Hydro": 0.5015,
+      "Bioenergy": 0.1173,
+      "Hydro": 0.5016,
       "Solar": 0.1649,
       "Wind": 0.2162
     },
     "2022": {
-      "Bioenergy": 0.1165,
-      "Hydro": 0.4695,
+      "Bioenergy": 0.1164,
+      "Hydro": 0.4696,
       "Solar": 0.1879,
-      "Wind": 0.2261
+      "Wind": 0.226
     },
     "2023": {
       "Bioenergy": 0.1171,
-      "Hydro": 0.4131,
+      "Hydro": 0.4132,
       "Solar": 0.2227,
       "Wind": 0.2471
     },
     "2024": {
-      "Bioenergy": 0.1069,
-      "Hydro": 0.3954,
-      "Solar": 0.2578,
-      "Wind": 0.24
+      "Bioenergy": 0.1068,
+      "Hydro": 0.3957,
+      "Solar": 0.2577,
+      "Wind": 0.2398
     },
     "2025": {
       "Bioenergy": 0.0952,
-      "Hydro": 0.3598,
-      "Solar": 0.3035,
+      "Hydro": 0.3597,
+      "Solar": 0.3036,
       "Wind": 0.2415
     },
     "2026": {
-      "Bioenergy": 0.106,
-      "Hydro": 0.2877,
-      "Solar": 0.3355,
-      "Wind": 0.2708
+      "Bioenergy": 0.1059,
+      "Hydro": 0.2871,
+      "Solar": 0.336,
+      "Wind": 0.2711
     }
   },
   "HN": {
@@ -4110,18 +4110,18 @@
       "Bioenergy": 0.0708,
       "Hydro": 0.6457,
       "Solar": 0.034,
-      "Wind": 0.2496
+      "Wind": 0.2495
     },
     "2021": {
       "Bioenergy": 0.0687,
-      "Hydro": 0.6666,
+      "Hydro": 0.6665,
       "Solar": 0.0298,
       "Wind": 0.235
     },
     "2022": {
       "Bioenergy": 0.0846,
       "Hydro": 0.5614,
-      "Solar": 0.0515,
+      "Solar": 0.0516,
       "Wind": 0.3024
     },
     "2023": {
@@ -4201,13 +4201,13 @@
   },
   "HU": {
     "2019": {
-      "Bioenergy": 0.1794,
+      "Bioenergy": 0.1793,
       "Hydro": 0.3178,
       "Solar": 0.2484,
       "Wind": 0.2544
     },
     "2020": {
-      "Bioenergy": 0.161,
+      "Bioenergy": 0.1609,
       "Hydro": 0.2781,
       "Solar": 0.3364,
       "Wind": 0.2245
@@ -4215,18 +4215,18 @@
     "2021": {
       "Bioenergy": 0.1476,
       "Hydro": 0.2316,
-      "Solar": 0.4304,
+      "Solar": 0.4303,
       "Wind": 0.1905
     },
     "2022": {
-      "Bioenergy": 0.1387,
+      "Bioenergy": 0.1386,
       "Hydro": 0.1869,
       "Solar": 0.4905,
       "Wind": 0.184
     },
     "2023": {
-      "Bioenergy": 0.0846,
-      "Hydro": 0.1679,
+      "Bioenergy": 0.0845,
+      "Hydro": 0.168,
       "Solar": 0.5816,
       "Wind": 0.1659
     },
@@ -4244,8 +4244,8 @@
     },
     "2026": {
       "Bioenergy": 0.1237,
-      "Hydro": 0.1522,
-      "Solar": 0.5588,
+      "Hydro": 0.1521,
+      "Solar": 0.5589,
       "Wind": 0.1653
     }
   },
@@ -4301,7 +4301,7 @@
   },
   "IE": {
     "2019": {
-      "Bioenergy": 0.009,
+      "Bioenergy": 0.0089,
       "Hydro": 0.1265,
       "Solar": 0.0097,
       "Wind": 0.8549
@@ -4310,7 +4310,7 @@
       "Bioenergy": 0.0081,
       "Hydro": 0.1174,
       "Solar": 0.0102,
-      "Wind": 0.8644
+      "Wind": 0.8643
     },
     "2021": {
       "Bioenergy": 0.0088,
@@ -4322,7 +4322,7 @@
       "Bioenergy": 0.007,
       "Hydro": 0.0874,
       "Solar": 0.0119,
-      "Wind": 0.8938
+      "Wind": 0.8937
     },
     "2023": {
       "Bioenergy": 0.008,
@@ -4344,9 +4344,9 @@
     },
     "2026": {
       "Bioenergy": 0.0362,
-      "Hydro": 0.1175,
+      "Hydro": 0.1174,
       "Solar": 0.0716,
-      "Wind": 0.7747
+      "Wind": 0.7748
     }
   },
   "IL": {
@@ -4870,47 +4870,47 @@
     },
     "2022": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.986,
+      "Hydro": 0.9859,
       "Solar": 0.005,
       "Wind": 0.007
     },
     "2023": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9874,
+      "Hydro": 0.9873,
       "Solar": 0.0045,
       "Wind": 0.0062
     },
     "2024": {
-      "Bioenergy": 0.0024,
-      "Hydro": 0.9817,
-      "Solar": 0.0079,
-      "Wind": 0.008
+      "Bioenergy": 0.004,
+      "Hydro": 0.9691,
+      "Solar": 0.0131,
+      "Wind": 0.0138
     },
     "2025": {
-      "Bioenergy": 0.0018,
-      "Hydro": 0.9823,
-      "Solar": 0.0088,
-      "Wind": 0.0071
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9617,
+      "Solar": 0.0191,
+      "Wind": 0.0153
     },
     "2026": {
-      "Bioenergy": 0.0019,
-      "Hydro": 0.9815,
-      "Solar": 0.0091,
-      "Wind": 0.0075
+      "Bioenergy": 0,
+      "Hydro": 1,
+      "Solar": 0,
+      "Wind": 0
     }
   },
   "KH": {
     "2019": {
       "Bioenergy": 0.0281,
       "Hydro": 0.9092,
-      "Solar": 0.0372,
+      "Solar": 0.0373,
       "Wind": 0.0255
     },
     "2020": {
       "Bioenergy": 0.0289,
       "Hydro": 0.9028,
       "Solar": 0.0404,
-      "Wind": 0.0279
+      "Wind": 0.0278
     },
     "2021": {
       "Bioenergy": 0.03,
@@ -4944,9 +4944,9 @@
     },
     "2026": {
       "Bioenergy": 0.0306,
-      "Hydro": 0.8392,
-      "Solar": 0.0795,
-      "Wind": 0.0507
+      "Hydro": 0.839,
+      "Solar": 0.0796,
+      "Wind": 0.0508
     }
   },
   "KI": {
@@ -5193,10 +5193,10 @@
       "Wind": 0.064
     },
     "2026": {
-      "Bioenergy": 0.2155,
-      "Hydro": 0.0433,
-      "Solar": 0.6456,
-      "Wind": 0.0957
+      "Bioenergy": 0.1937,
+      "Hydro": 0.0417,
+      "Solar": 0.6934,
+      "Wind": 0.0712
     }
   },
   "KW": {
@@ -5654,13 +5654,13 @@
       "Bioenergy": 0.1292,
       "Hydro": 0.3687,
       "Solar": 0.0689,
-      "Wind": 0.4333
+      "Wind": 0.4332
     },
     "2020": {
       "Bioenergy": 0.1267,
-      "Hydro": 0.3374,
-      "Solar": 0.0716,
-      "Wind": 0.4643
+      "Hydro": 0.3375,
+      "Solar": 0.0717,
+      "Wind": 0.4642
     },
     "2021": {
       "Bioenergy": 0.13,
@@ -5669,21 +5669,21 @@
       "Wind": 0.4169
     },
     "2022": {
-      "Bioenergy": 0.1124,
+      "Bioenergy": 0.1123,
       "Hydro": 0.3107,
       "Solar": 0.1404,
-      "Wind": 0.4366
+      "Wind": 0.4365
     },
     "2023": {
       "Bioenergy": 0.0721,
-      "Hydro": 0.2524,
+      "Hydro": 0.2525,
       "Solar": 0.1683,
       "Wind": 0.5071
     },
     "2024": {
       "Bioenergy": 0.0513,
       "Hydro": 0.1846,
-      "Solar": 0.2359,
+      "Solar": 0.236,
       "Wind": 0.5281
     },
     "2025": {
@@ -5694,26 +5694,26 @@
     },
     "2026": {
       "Bioenergy": 0.0298,
-      "Hydro": 0.1099,
+      "Hydro": 0.1098,
       "Solar": 0.1654,
-      "Wind": 0.6949
+      "Wind": 0.695
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.1488,
       "Hydro": 0.388,
-      "Solar": 0.1302,
-      "Wind": 0.333
+      "Solar": 0.1303,
+      "Wind": 0.3329
     },
     "2020": {
-      "Bioenergy": 0.1645,
-      "Hydro": 0.3506,
-      "Solar": 0.1319,
-      "Wind": 0.353
+      "Bioenergy": 0.1644,
+      "Hydro": 0.3507,
+      "Solar": 0.132,
+      "Wind": 0.3529
     },
     "2021": {
-      "Bioenergy": 0.1846,
+      "Bioenergy": 0.1845,
       "Hydro": 0.3445,
       "Solar": 0.1525,
       "Wind": 0.3185
@@ -5722,19 +5722,19 @@
       "Bioenergy": 0.187,
       "Hydro": 0.2889,
       "Solar": 0.196,
-      "Wind": 0.3282
+      "Wind": 0.3281
     },
     "2023": {
-      "Bioenergy": 0.1102,
-      "Hydro": 0.2888,
+      "Bioenergy": 0.1101,
+      "Hydro": 0.2889,
       "Solar": 0.2006,
       "Wind": 0.4004
     },
     "2024": {
       "Bioenergy": 0.1377,
       "Hydro": 0.2933,
-      "Solar": 0.2196,
-      "Wind": 0.3494
+      "Solar": 0.2197,
+      "Wind": 0.3493
     },
     "2025": {
       "Bioenergy": 0.1295,
@@ -5744,9 +5744,9 @@
     },
     "2026": {
       "Bioenergy": 0.0971,
-      "Hydro": 0.2747,
-      "Solar": 0.2223,
-      "Wind": 0.4059
+      "Hydro": 0.2746,
+      "Solar": 0.2224,
+      "Wind": 0.406
     }
   },
   "LV": {
@@ -5782,7 +5782,7 @@
     },
     "2024": {
       "Bioenergy": 0.0896,
-      "Hydro": 0.679,
+      "Hydro": 0.6789,
       "Solar": 0.1239,
       "Wind": 0.1075
     },
@@ -5908,8 +5908,8 @@
     },
     "2020": {
       "Bioenergy": 0.0131,
-      "Hydro": 0.9175,
-      "Solar": 0.0098,
+      "Hydro": 0.9174,
+      "Solar": 0.0099,
       "Wind": 0.0596
     },
     "2021": {
@@ -5920,8 +5920,8 @@
     },
     "2022": {
       "Bioenergy": 0.0474,
-      "Hydro": 0.698,
-      "Solar": 0.0777,
+      "Hydro": 0.6979,
+      "Solar": 0.0778,
       "Wind": 0.1769
     },
     "2023": {
@@ -5952,14 +5952,14 @@
   "ME": {
     "2019": {
       "Bioenergy": 0.0142,
-      "Hydro": 0.7941,
+      "Hydro": 0.794,
       "Solar": 0.0196,
       "Wind": 0.1722
     },
     "2020": {
       "Bioenergy": 0.0143,
       "Hydro": 0.7525,
-      "Solar": 0.0174,
+      "Solar": 0.0175,
       "Wind": 0.2158
     },
     "2021": {
@@ -5970,7 +5970,7 @@
     },
     "2022": {
       "Bioenergy": 0.0017,
-      "Hydro": 0.7949,
+      "Hydro": 0.7948,
       "Solar": 0.0025,
       "Wind": 0.201
     },
@@ -5982,8 +5982,8 @@
     },
     "2024": {
       "Bioenergy": 0.0068,
-      "Hydro": 0.7692,
-      "Solar": 0.0608,
+      "Hydro": 0.7691,
+      "Solar": 0.0609,
       "Wind": 0.1632
     },
     "2025": {
@@ -6052,26 +6052,26 @@
   "MK": {
     "2019": {
       "Bioenergy": 0.0676,
-      "Hydro": 0.7703,
+      "Hydro": 0.7702,
       "Solar": 0.0191,
       "Wind": 0.1431
     },
     "2020": {
       "Bioenergy": 0.0715,
-      "Hydro": 0.7503,
-      "Solar": 0.0263,
+      "Hydro": 0.7502,
+      "Solar": 0.0264,
       "Wind": 0.1519
     },
     "2021": {
       "Bioenergy": 0.0647,
-      "Hydro": 0.7683,
+      "Hydro": 0.7682,
       "Solar": 0.0305,
       "Wind": 0.1365
     },
     "2022": {
       "Bioenergy": 0.0421,
       "Hydro": 0.7824,
-      "Solar": 0.0424,
+      "Solar": 0.0425,
       "Wind": 0.133
     },
     "2023": {
@@ -6082,7 +6082,7 @@
     },
     "2024": {
       "Bioenergy": 0.0541,
-      "Hydro": 0.6824,
+      "Hydro": 0.6823,
       "Solar": 0.1422,
       "Wind": 0.1214
     },
@@ -6251,52 +6251,52 @@
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.2216,
-      "Hydro": 0.5148,
+      "Bioenergy": 0.2214,
+      "Hydro": 0.515,
       "Solar": 0.112,
-      "Wind": 0.1516
+      "Wind": 0.1515
     },
     "2020": {
-      "Bioenergy": 0.2165,
-      "Hydro": 0.499,
+      "Bioenergy": 0.2164,
+      "Hydro": 0.4991,
       "Solar": 0.126,
       "Wind": 0.1585
     },
     "2021": {
       "Bioenergy": 0.2171,
-      "Hydro": 0.4477,
+      "Hydro": 0.4478,
       "Solar": 0.1421,
       "Wind": 0.193
     },
     "2022": {
       "Bioenergy": 0.2107,
-      "Hydro": 0.422,
+      "Hydro": 0.4221,
       "Solar": 0.1641,
       "Wind": 0.2032
     },
     "2023": {
-      "Bioenergy": 0.2102,
-      "Hydro": 0.3718,
+      "Bioenergy": 0.2101,
+      "Hydro": 0.3719,
       "Solar": 0.1957,
       "Wind": 0.2224
     },
     "2024": {
-      "Bioenergy": 0.1944,
-      "Hydro": 0.3586,
+      "Bioenergy": 0.1943,
+      "Hydro": 0.3589,
       "Solar": 0.2293,
-      "Wind": 0.2176
+      "Wind": 0.2175
     },
     "2025": {
       "Bioenergy": 0.1764,
-      "Hydro": 0.3291,
+      "Hydro": 0.329,
       "Solar": 0.2736,
       "Wind": 0.2209
     },
     "2026": {
       "Bioenergy": 0.1914,
-      "Hydro": 0.2616,
-      "Solar": 0.3007,
-      "Wind": 0.2463
+      "Hydro": 0.261,
+      "Solar": 0.3012,
+      "Wind": 0.2465
     }
   },
   "MQ": {
@@ -6451,19 +6451,19 @@
   },
   "MT": {
     "2019": {
-      "Bioenergy": 0.0874,
-      "Hydro": 0.5244,
+      "Bioenergy": 0.0873,
+      "Hydro": 0.5245,
       "Solar": 0.1019,
       "Wind": 0.2863
     },
     "2020": {
       "Bioenergy": 0.0848,
       "Hydro": 0.5133,
-      "Solar": 0.1022,
-      "Wind": 0.2997
+      "Solar": 0.1023,
+      "Wind": 0.2996
     },
     "2021": {
-      "Bioenergy": 0.09,
+      "Bioenergy": 0.0899,
       "Hydro": 0.4985,
       "Solar": 0.1113,
       "Wind": 0.3002
@@ -6494,8 +6494,8 @@
     },
     "2026": {
       "Bioenergy": 0.0332,
-      "Hydro": 0.1875,
-      "Solar": 0.6165,
+      "Hydro": 0.1874,
+      "Solar": 0.6166,
       "Wind": 0.1628
     }
   },
@@ -6693,10 +6693,10 @@
       "Wind": 0.3092
     },
     "2026": {
-      "Bioenergy": 0.003,
-      "Hydro": 0.3704,
-      "Solar": 0.2559,
-      "Wind": 0.3707
+      "Bioenergy": 0.0025,
+      "Hydro": 0.374,
+      "Solar": 0.2645,
+      "Wind": 0.359
     }
   },
   "MY": {
@@ -7043,7 +7043,7 @@
       "Wind": 0.3668
     },
     "2026": {
-      "Bioenergy": 0.4033,
+      "Bioenergy": 0.4034,
       "Hydro": 0.2015,
       "Solar": 0.0333,
       "Wind": 0.3618
@@ -7151,7 +7151,7 @@
   },
   "NP": {
     "2019": {
-      "Bioenergy": 0.0039,
+      "Bioenergy": 0.0038,
       "Hydro": 0.9647,
       "Solar": 0.0198,
       "Wind": 0.0117
@@ -7196,7 +7196,7 @@
       "Bioenergy": 0.0054,
       "Hydro": 0.935,
       "Solar": 0.0374,
-      "Wind": 0.0222
+      "Wind": 0.0223
     }
   },
   "NR": {
@@ -7343,10 +7343,10 @@
       "Wind": 0.1373
     },
     "2026": {
-      "Bioenergy": 0.0045,
-      "Hydro": 0.8687,
+      "Bioenergy": 0.0046,
+      "Hydro": 0.8617,
       "Solar": 0,
-      "Wind": 0.1268
+      "Wind": 0.1337
     }
   },
   "OM": {
@@ -7493,10 +7493,10 @@
       "Wind": 0.1003
     },
     "2026": {
-      "Bioenergy": 0.0152,
-      "Hydro": 0.8455,
-      "Solar": 0.0641,
-      "Wind": 0.0753
+      "Bioenergy": 0.0133,
+      "Hydro": 0.8476,
+      "Solar": 0.0626,
+      "Wind": 0.0765
     }
   },
   "PF": {
@@ -7703,13 +7703,13 @@
     "2019": {
       "Bioenergy": 0.1057,
       "Hydro": 0.1471,
-      "Solar": 0.0477,
-      "Wind": 0.6995
+      "Solar": 0.0478,
+      "Wind": 0.6994
     },
     "2020": {
       "Bioenergy": 0.0962,
       "Hydro": 0.1562,
-      "Solar": 0.1029,
+      "Solar": 0.103,
       "Wind": 0.6446
     },
     "2021": {
@@ -7921,11 +7921,11 @@
     "2022": {
       "Bioenergy": 0.127,
       "Hydro": 0.2421,
-      "Solar": 0.1356,
-      "Wind": 0.4953
+      "Solar": 0.1357,
+      "Wind": 0.4952
     },
     "2023": {
-      "Bioenergy": 0.0908,
+      "Bioenergy": 0.0907,
       "Hydro": 0.3327,
       "Solar": 0.1741,
       "Wind": 0.4024
@@ -8133,7 +8133,7 @@
     "2024": {
       "Bioenergy": 0.0205,
       "Hydro": 0.559,
-      "Solar": 0.1667,
+      "Solar": 0.1668,
       "Wind": 0.2537
     },
     "2025": {
@@ -8146,7 +8146,7 @@
       "Bioenergy": 0.019,
       "Hydro": 0.5936,
       "Solar": 0.1121,
-      "Wind": 0.2753
+      "Wind": 0.2754
     }
   },
   "RS": {
@@ -8588,15 +8588,15 @@
     },
     "2025": {
       "Bioenergy": 0.0032,
-      "Hydro": 0.0191,
+      "Hydro": 0.019,
       "Solar": 0.9649,
       "Wind": 0.0128
     },
     "2026": {
-      "Bioenergy": 0.0028,
-      "Hydro": 0.0116,
-      "Solar": 0.9747,
-      "Wind": 0.0109
+      "Bioenergy": 0.0025,
+      "Hydro": 0.0103,
+      "Solar": 0.9776,
+      "Wind": 0.0097
     }
   },
   "SH": {
@@ -9096,7 +9096,7 @@
       "Bioenergy": 0.0009,
       "Hydro": 0.6569,
       "Solar": 0.309,
-      "Wind": 0.0332
+      "Wind": 0.0331
     }
   },
   "SY": {
@@ -9351,8 +9351,8 @@
   },
   "TH": {
     "2019": {
-      "Bioenergy": 0.3922,
-      "Hydro": 0.2901,
+      "Bioenergy": 0.3921,
+      "Hydro": 0.2902,
       "Solar": 0.1794,
       "Wind": 0.1383
     },
@@ -9363,26 +9363,26 @@
       "Wind": 0.1403
     },
     "2021": {
-      "Bioenergy": 0.4044,
+      "Bioenergy": 0.4043,
       "Hydro": 0.2576,
       "Solar": 0.1631,
-      "Wind": 0.175
+      "Wind": 0.1749
     },
     "2022": {
       "Bioenergy": 0.3874,
-      "Hydro": 0.2973,
+      "Hydro": 0.2974,
       "Solar": 0.1802,
       "Wind": 0.135
     },
     "2023": {
-      "Bioenergy": 0.3922,
-      "Hydro": 0.2705,
+      "Bioenergy": 0.3921,
+      "Hydro": 0.2706,
       "Solar": 0.1848,
       "Wind": 0.1525
     },
     "2024": {
       "Bioenergy": 0.38,
-      "Hydro": 0.2682,
+      "Hydro": 0.2683,
       "Solar": 0.203,
       "Wind": 0.1487
     },
@@ -9394,8 +9394,8 @@
     },
     "2026": {
       "Bioenergy": 0.2157,
-      "Hydro": 0.3014,
-      "Solar": 0.3546,
+      "Hydro": 0.3013,
+      "Solar": 0.3547,
       "Wind": 0.1283
     }
   },
@@ -9443,10 +9443,10 @@
       "Wind": 0.0007
     },
     "2026": {
-      "Bioenergy": 0.0003,
-      "Hydro": 0.9973,
-      "Solar": 0.0014,
-      "Wind": 0.0011
+      "Bioenergy": 0,
+      "Hydro": 1,
+      "Solar": 0,
+      "Wind": 0
     }
   },
   "TL": {
@@ -9994,9 +9994,9 @@
     },
     "2026": {
       "Bioenergy": 0.0347,
-      "Hydro": 0.2315,
-      "Solar": 0.3004,
-      "Wind": 0.4334
+      "Hydro": 0.2316,
+      "Solar": 0.3005,
+      "Wind": 0.4333
     }
   },
   "UY": {
@@ -10471,8 +10471,8 @@
     "2022": {
       "Bioenergy": 0.0226,
       "Hydro": 0.405,
-      "Solar": 0.0155,
-      "Wind": 0.5569
+      "Solar": 0.0156,
+      "Wind": 0.5568
     },
     "2023": {
       "Bioenergy": 0.0235,
@@ -10484,7 +10484,7 @@
       "Bioenergy": 0.0281,
       "Hydro": 0.3913,
       "Solar": 0.0433,
-      "Wind": 0.5374
+      "Wind": 0.5373
     },
     "2025": {
       "Bioenergy": 0.035,
@@ -10494,7 +10494,7 @@
     },
     "2026": {
       "Bioenergy": 0.0342,
-      "Hydro": 0.4509,
+      "Hydro": 0.4508,
       "Solar": 0.0888,
       "Wind": 0.4262
     }