npm - @digital4better/data - Versions diffs - 1.2.21 → 1.2.23 - Mend

@digital4better/data 1.2.21 → 1.2.23

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 +145 -145
package/data/factor/continent-monthly-green.json +1150 -1150
package/data/factor/continent-monthly.csv +146 -146
package/data/factor/continent-monthly.json +1178 -1178
package/data/factor/continent-yearly-green.csv +17 -17
package/data/factor/continent-yearly-green.json +145 -145
package/data/factor/continent-yearly.csv +18 -18
package/data/factor/continent-yearly.json +153 -153
package/data/factor/country-monthly-green.csv +1407 -1407
package/data/factor/country-monthly-green.json +10988 -10988
package/data/factor/country-monthly.csv +1517 -1517
package/data/factor/country-monthly.json +10023 -10023
package/data/factor/country-yearly-green.csv +245 -245
package/data/factor/country-yearly-green.json +1782 -1782
package/data/factor/country-yearly.csv +245 -245
package/data/factor/country-yearly.json +1657 -1657
package/data/factor/subdivision-monthly-green.csv +126 -126
package/data/factor/subdivision-monthly-green.json +1134 -1134
package/data/factor/subdivision-monthly.csv +126 -126
package/data/factor/subdivision-monthly.json +1134 -1134
package/data/factor/subdivision-yearly-green.csv +63 -63
package/data/factor/subdivision-yearly-green.json +567 -567
package/data/factor/subdivision-yearly.csv +63 -63
package/data/factor/subdivision-yearly.json +567 -567
package/data/factor/world-monthly-green.csv +75 -75
package/data/factor/world-monthly-green.json +672 -672
package/data/factor/world-monthly.csv +75 -75
package/data/factor/world-monthly.json +672 -672
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +63 -63
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +63 -63
package/data/mix/continent-monthly-green.csv +121 -121
package/data/mix/continent-monthly-green.json +292 -292
package/data/mix/continent-monthly.csv +121 -121
package/data/mix/continent-monthly.json +470 -470
package/data/mix/continent-yearly-green.csv +17 -17
package/data/mix/continent-yearly-green.json +41 -41
package/data/mix/continent-yearly.csv +17 -17
package/data/mix/continent-yearly.json +74 -74
package/data/mix/country-monthly-green.csv +949 -949
package/data/mix/country-monthly-green.json +2411 -2411
package/data/mix/country-monthly.csv +949 -949
package/data/mix/country-monthly.json +2789 -2789
package/data/mix/country-yearly-green.csv +121 -121
package/data/mix/country-yearly-green.json +266 -266
package/data/mix/country-yearly.csv +121 -121
package/data/mix/country-yearly.json +421 -421
package/data/mix/subdivision-monthly-green.csv +126 -126
package/data/mix/subdivision-monthly-green.json +450 -450
package/data/mix/subdivision-monthly.csv +126 -126
package/data/mix/subdivision-monthly.json +860 -860
package/data/mix/subdivision-yearly-green.csv +63 -63
package/data/mix/subdivision-yearly-green.json +223 -223
package/data/mix/subdivision-yearly.csv +63 -63
package/data/mix/subdivision-yearly.json +418 -418
package/data/mix/world-monthly-green.csv +75 -75
package/data/mix/world-monthly-green.json +175 -175
package/data/mix/world-monthly.csv +75 -75
package/data/mix/world-monthly.json +254 -254
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +16 -16
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +25 -25
package/package.json +5 -5

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

@@ -54,7 +54,7 @@
       "Bioenergy": 0.0343,
       "Hydro": 0.778,
       "Solar": 0.0971,
-      "Wind": 0.0906
+      "Wind": 0.0907
     },
     "2021": {
       "Bioenergy": 0.0376,
@@ -64,27 +64,27 @@
     },
     "2022": {
       "Bioenergy": 0.0397,
-      "Hydro": 0.7196,
-      "Solar": 0.1205,
+      "Hydro": 0.7195,
+      "Solar": 0.1206,
       "Wind": 0.1202
     },
     "2023": {
       "Bioenergy": 0.0402,
-      "Hydro": 0.6883,
-      "Solar": 0.1395,
-      "Wind": 0.132
+      "Hydro": 0.6882,
+      "Solar": 0.1394,
+      "Wind": 0.1322
     },
     "2024": {
       "Bioenergy": 0.0372,
-      "Hydro": 0.6681,
-      "Solar": 0.1623,
-      "Wind": 0.1324
+      "Hydro": 0.6678,
+      "Solar": 0.1621,
+      "Wind": 0.133
     },
     "2025": {
-      "Bioenergy": 0.04,
-      "Hydro": 0.6165,
-      "Solar": 0.1866,
-      "Wind": 0.1569
+      "Bioenergy": 0.0399,
+      "Hydro": 0.6162,
+      "Solar": 0.185,
+      "Wind": 0.1588
     }
   },
   "AG": {
@@ -164,15 +164,15 @@
     },
     "2024": {
       "Bioenergy": 0.011,
-      "Hydro": 0.907,
+      "Hydro": 0.9069,
       "Solar": 0.0324,
-      "Wind": 0.0496
+      "Wind": 0.0497
     },
     "2025": {
       "Bioenergy": 0.0112,
       "Hydro": 0.9144,
       "Solar": 0.0243,
-      "Wind": 0.0501
+      "Wind": 0.0502
     }
   },
   "AM": {
@@ -302,9 +302,9 @@
     },
     "2025": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.5628,
+      "Hydro": 0.563,
       "Solar": 0.0988,
-      "Wind": 0.3149
+      "Wind": 0.3148
     }
   },
   "AS": {
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0502,
-      "Hydro": 0.6302,
-      "Solar": 0.1196,
-      "Wind": 0.1999
+      "Bioenergy": 0.0493,
+      "Hydro": 0.6371,
+      "Solar": 0.1174,
+      "Wind": 0.1962
     }
   },
   "AU": {
@@ -560,15 +560,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9042,
-      "Solar": 0.0663,
-      "Wind": 0.0294
+      "Hydro": 0.8973,
+      "Solar": 0.0678,
+      "Wind": 0.0349
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9434,
-      "Solar": 0.0188,
-      "Wind": 0.0378
+      "Hydro": 0.9388,
+      "Solar": 0.0232,
+      "Wind": 0.038
     }
   },
   "BB": {
@@ -617,7 +617,7 @@
   },
   "BD": {
     "2019": {
-      "Bioenergy": 0.0427,
+      "Bioenergy": 0.0426,
       "Hydro": 0.7255,
       "Solar": 0.1168,
       "Wind": 0.1151
@@ -630,7 +630,7 @@
     },
     "2021": {
       "Bioenergy": 0.0501,
-      "Hydro": 0.5998,
+      "Hydro": 0.5997,
       "Solar": 0.2002,
       "Wind": 0.1499
     },
@@ -642,21 +642,21 @@
     },
     "2023": {
       "Bioenergy": 0.0592,
-      "Hydro": 0.4513,
-      "Solar": 0.2958,
-      "Wind": 0.1937
+      "Hydro": 0.4512,
+      "Solar": 0.2956,
+      "Wind": 0.1939
     },
     "2024": {
-      "Bioenergy": 0.0495,
-      "Hydro": 0.4315,
-      "Solar": 0.3431,
-      "Wind": 0.176
+      "Bioenergy": 0.0494,
+      "Hydro": 0.4312,
+      "Solar": 0.3426,
+      "Wind": 0.1767
     },
     "2025": {
       "Bioenergy": 0.0597,
-      "Hydro": 0.2377,
-      "Solar": 0.4679,
-      "Wind": 0.2347
+      "Hydro": 0.2374,
+      "Solar": 0.4654,
+      "Wind": 0.2374
     }
   },
   "BE": {
@@ -694,7 +694,7 @@
       "Bioenergy": 0.0362,
       "Hydro": 0.0794,
       "Solar": 0.3412,
-      "Wind": 0.5432
+      "Wind": 0.5431
     },
     "2025": {
       "Bioenergy": 0.0451,
@@ -1050,9 +1050,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8888,
-      "Solar": 0.0809,
-      "Wind": 0.0303
+      "Hydro": 0.8909,
+      "Solar": 0.0728,
+      "Wind": 0.0363
     }
   },
   "BR": {
@@ -1093,10 +1093,10 @@
       "Wind": 0.1713
     },
     "2025": {
-      "Bioenergy": 0.0048,
-      "Hydro": 0.7429,
-      "Solar": 0.132,
-      "Wind": 0.1203
+      "Bioenergy": 0.0051,
+      "Hydro": 0.7351,
+      "Solar": 0.1362,
+      "Wind": 0.1237
     }
   },
   "BS": {
@@ -1263,7 +1263,7 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.3889,
+      "Bioenergy": 0.3888,
       "Hydro": 0.3019,
       "Solar": 0.1789,
       "Wind": 0.1304
@@ -1313,10 +1313,10 @@
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.2175,
-      "Hydro": 0.6774,
-      "Solar": 0.0597,
-      "Wind": 0.0454
+      "Bioenergy": 0.2172,
+      "Hydro": 0.6779,
+      "Solar": 0.0596,
+      "Wind": 0.0453
     }
   },
   "CA": {
@@ -1534,9 +1534,9 @@
     },
     "2025": {
       "Bioenergy": 0.0071,
-      "Hydro": 0.8099,
-      "Solar": 0.146,
-      "Wind": 0.0369
+      "Hydro": 0.8198,
+      "Solar": 0.1365,
+      "Wind": 0.0367
     }
   },
   "CI": {
@@ -1719,8 +1719,8 @@
     "2019": {
       "Bioenergy": 0.0583,
       "Hydro": 0.61,
-      "Solar": 0.118,
-      "Wind": 0.2137
+      "Solar": 0.1181,
+      "Wind": 0.2136
     },
     "2020": {
       "Bioenergy": 0.0639,
@@ -1729,10 +1729,10 @@
       "Wind": 0.2249
     },
     "2021": {
-      "Bioenergy": 0.0691,
+      "Bioenergy": 0.0692,
       "Hydro": 0.5101,
       "Solar": 0.14,
-      "Wind": 0.2808
+      "Wind": 0.2807
     },
     "2022": {
       "Bioenergy": 0.069,
@@ -1747,16 +1747,16 @@
       "Wind": 0.3149
     },
     "2024": {
-      "Bioenergy": 0.0584,
-      "Hydro": 0.3888,
-      "Solar": 0.2526,
-      "Wind": 0.3002
+      "Bioenergy": 0.0585,
+      "Hydro": 0.3885,
+      "Solar": 0.2527,
+      "Wind": 0.3003
     },
     "2025": {
-      "Bioenergy": 0.0584,
-      "Hydro": 0.277,
-      "Solar": 0.3032,
-      "Wind": 0.3615
+      "Bioenergy": 0.0562,
+      "Hydro": 0.2718,
+      "Solar": 0.3031,
+      "Wind": 0.3689
     }
   },
   "CO": {
@@ -1841,10 +1841,10 @@
       "Wind": 0.1275
     },
     "2025": {
-      "Bioenergy": 0.0103,
-      "Hydro": 0.811,
-      "Solar": 0,
-      "Wind": 0.1787
+      "Bioenergy": 0.0107,
+      "Hydro": 0.7985,
+      "Solar": 0.0025,
+      "Wind": 0.1883
     }
   },
   "CU": {
@@ -2061,10 +2061,10 @@
       "Wind": 0.4833
     },
     "2025": {
-      "Bioenergy": 0.1692,
-      "Hydro": 0.0729,
-      "Solar": 0.2157,
-      "Wind": 0.5422
+      "Bioenergy": 0.1668,
+      "Hydro": 0.072,
+      "Solar": 0.2179,
+      "Wind": 0.5433
     }
   },
   "DJ": {
@@ -2325,10 +2325,10 @@
       "Wind": 0.0147
     },
     "2025": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.9768,
-      "Solar": 0.0089,
-      "Wind": 0.0136
+      "Bioenergy": 0.0003,
+      "Hydro": 0.9865,
+      "Solar": 0.0044,
+      "Wind": 0.0088
     }
   },
   "EE": {
@@ -2369,10 +2369,10 @@
       "Wind": 0.4191
     },
     "2025": {
-      "Bioenergy": 0.1862,
+      "Bioenergy": 0.1861,
       "Hydro": 0.1266,
-      "Solar": 0.1484,
-      "Wind": 0.5389
+      "Solar": 0.1483,
+      "Wind": 0.539
     }
   },
   "EG": {
@@ -2589,10 +2589,10 @@
       "Wind": 0.4324
     },
     "2025": {
-      "Bioenergy": 0.2226,
-      "Hydro": 0.2766,
+      "Bioenergy": 0.2325,
+      "Hydro": 0.2684,
       "Solar": 0.0148,
-      "Wind": 0.486
+      "Wind": 0.4843
     }
   },
   "FJ": {
@@ -2842,13 +2842,13 @@
     },
     "2023": {
       "Bioenergy": 0.1195,
-      "Hydro": 0.0621,
+      "Hydro": 0.0622,
       "Solar": 0.1165,
       "Wind": 0.7018
     },
     "2024": {
       "Bioenergy": 0.1502,
-      "Hydro": 0.0737,
+      "Hydro": 0.0738,
       "Solar": 0.1259,
       "Wind": 0.6501
     },
@@ -2931,7 +2931,7 @@
     "2023": {
       "Bioenergy": 0.0019,
       "Hydro": 0.9763,
-      "Solar": 0.0045,
+      "Solar": 0.0046,
       "Wind": 0.0173
     },
     "2024": {
@@ -2942,9 +2942,9 @@
     },
     "2025": {
       "Bioenergy": 0.0136,
-      "Hydro": 0.8603,
-      "Solar": 0.0558,
-      "Wind": 0.0703
+      "Hydro": 0.8602,
+      "Solar": 0.0553,
+      "Wind": 0.0709
     }
   },
   "GF": {
@@ -3523,20 +3523,20 @@
     "2019": {
       "Bioenergy": 0.1121,
       "Hydro": 0.5807,
-      "Solar": 0.1351,
+      "Solar": 0.135,
       "Wind": 0.1722
     },
     "2020": {
       "Bioenergy": 0.1126,
       "Hydro": 0.5584,
       "Solar": 0.1497,
-      "Wind": 0.1793
+      "Wind": 0.1794
     },
     "2021": {
       "Bioenergy": 0.1166,
       "Hydro": 0.4992,
       "Solar": 0.1662,
-      "Wind": 0.218
+      "Wind": 0.2181
     },
     "2022": {
       "Bioenergy": 0.1157,
@@ -3546,21 +3546,21 @@
     },
     "2023": {
       "Bioenergy": 0.1156,
-      "Hydro": 0.4126,
-      "Solar": 0.224,
-      "Wind": 0.2479
+      "Hydro": 0.4125,
+      "Solar": 0.2238,
+      "Wind": 0.2482
     },
     "2024": {
-      "Bioenergy": 0.1047,
-      "Hydro": 0.396,
-      "Solar": 0.2592,
-      "Wind": 0.24
+      "Bioenergy": 0.1046,
+      "Hydro": 0.3956,
+      "Solar": 0.2587,
+      "Wind": 0.2411
     },
     "2025": {
       "Bioenergy": 0.1119,
-      "Hydro": 0.2924,
-      "Solar": 0.307,
-      "Wind": 0.2887
+      "Hydro": 0.2921,
+      "Solar": 0.304,
+      "Wind": 0.2921
     }
   },
   "HN": {
@@ -3645,7 +3645,7 @@
       "Wind": 0.2749
     },
     "2025": {
-      "Bioenergy": 0.0581,
+      "Bioenergy": 0.0582,
       "Hydro": 0.5372,
       "Solar": 0.0779,
       "Wind": 0.3268
@@ -3722,9 +3722,9 @@
     },
     "2023": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.1678,
-      "Solar": 0.5813,
-      "Wind": 0.1662
+      "Hydro": 0.1679,
+      "Solar": 0.5812,
+      "Wind": 0.1663
     },
     "2024": {
       "Bioenergy": 0.0807,
@@ -3733,17 +3733,17 @@
       "Wind": 0.1366
     },
     "2025": {
-      "Bioenergy": 0.1426,
-      "Hydro": 0.1651,
-      "Solar": 0.5262,
-      "Wind": 0.1661
+      "Bioenergy": 0.1522,
+      "Hydro": 0.1763,
+      "Solar": 0.4938,
+      "Wind": 0.1777
     }
   },
   "ID": {
     "2019": {
       "Bioenergy": 0.3557,
       "Hydro": 0.6236,
-      "Solar": 0.005,
+      "Solar": 0.0049,
       "Wind": 0.0158
     },
     "2020": {
@@ -3779,8 +3779,8 @@
     "2025": {
       "Bioenergy": 0.355,
       "Hydro": 0.6193,
-      "Solar": 0.0078,
-      "Wind": 0.0179
+      "Solar": 0.0077,
+      "Wind": 0.018
     }
   },
   "IE": {
@@ -3824,7 +3824,7 @@
       "Bioenergy": 0.0138,
       "Hydro": 0.0987,
       "Solar": 0.0268,
-      "Wind": 0.8606
+      "Wind": 0.8607
     }
   },
   "IL": {
@@ -4076,19 +4076,19 @@
       "Bioenergy": 0.1325,
       "Hydro": 0.3581,
       "Solar": 0.2697,
-      "Wind": 0.2397
+      "Wind": 0.2398
     },
     "2024": {
       "Bioenergy": 0.118,
       "Hydro": 0.396,
-      "Solar": 0.2809,
+      "Solar": 0.2808,
       "Wind": 0.2052
     },
     "2025": {
       "Bioenergy": 0.1463,
-      "Hydro": 0.3023,
+      "Hydro": 0.3022,
       "Solar": 0.2061,
-      "Wind": 0.3453
+      "Wind": 0.3454
     }
   },
   "JM": {
@@ -4295,8 +4295,8 @@
     "2023": {
       "Bioenergy": 0.002,
       "Hydro": 0.9866,
-      "Solar": 0.0048,
-      "Wind": 0.0066
+      "Solar": 0.0049,
+      "Wind": 0.0065
     },
     "2024": {
       "Bioenergy": 0.0023,
@@ -4307,8 +4307,8 @@
     "2025": {
       "Bioenergy": 0.0019,
       "Hydro": 0.9828,
-      "Solar": 0.0078,
-      "Wind": 0.0075
+      "Solar": 0.0077,
+      "Wind": 0.0076
     }
   },
   "KH": {
@@ -4333,26 +4333,26 @@
     "2022": {
       "Bioenergy": 0.0312,
       "Hydro": 0.8796,
-      "Solar": 0.0525,
+      "Solar": 0.0526,
       "Wind": 0.0367
     },
     "2023": {
       "Bioenergy": 0.0313,
       "Hydro": 0.8696,
       "Solar": 0.0585,
-      "Wind": 0.0405
+      "Wind": 0.0406
     },
     "2024": {
       "Bioenergy": 0.0305,
-      "Hydro": 0.861,
+      "Hydro": 0.8609,
       "Solar": 0.0667,
-      "Wind": 0.0418
+      "Wind": 0.042
     },
     "2025": {
       "Bioenergy": 0.0313,
-      "Hydro": 0.8459,
-      "Solar": 0.0738,
-      "Wind": 0.049
+      "Hydro": 0.8458,
+      "Solar": 0.0733,
+      "Wind": 0.0496
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.2813,
-      "Hydro": 0.0579,
-      "Solar": 0.5545,
-      "Wind": 0.1063
+      "Bioenergy": 0.2368,
+      "Hydro": 0.0465,
+      "Solar": 0.6063,
+      "Wind": 0.1104
     }
   },
   "KW": {
@@ -5048,15 +5048,15 @@
     },
     "2024": {
       "Bioenergy": 0.1385,
-      "Hydro": 0.2935,
+      "Hydro": 0.2936,
       "Solar": 0.218,
       "Wind": 0.35
     },
     "2025": {
-      "Bioenergy": 0.1555,
+      "Bioenergy": 0.1554,
       "Hydro": 0.2945,
-      "Solar": 0.1765,
-      "Wind": 0.3735
+      "Solar": 0.1764,
+      "Wind": 0.3737
     }
   },
   "LV": {
@@ -5094,13 +5094,13 @@
       "Bioenergy": 0.087,
       "Hydro": 0.681,
       "Solar": 0.124,
-      "Wind": 0.108
+      "Wind": 0.1081
     },
     "2025": {
-      "Bioenergy": 0.0921,
-      "Hydro": 0.78,
-      "Solar": 0.06,
-      "Wind": 0.0679
+      "Bioenergy": 0.0912,
+      "Hydro": 0.7727,
+      "Solar": 0.0688,
+      "Wind": 0.0673
     }
   },
   "LY": {
@@ -5179,16 +5179,16 @@
       "Wind": 0.6835
     },
     "2024": {
-      "Bioenergy": 0.0009,
-      "Hydro": 0.0881,
-      "Solar": 0.1404,
-      "Wind": 0.7707
+      "Bioenergy": 0.0008,
+      "Hydro": 0.0912,
+      "Solar": 0.1381,
+      "Wind": 0.7699
     },
     "2025": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.0999,
-      "Solar": 0.1335,
-      "Wind": 0.7655
+      "Bioenergy": 0,
+      "Hydro": 0.0874,
+      "Solar": 0.1002,
+      "Wind": 0.8124
     }
   },
   "MD": {
@@ -5220,7 +5220,7 @@
       "Bioenergy": 0.0112,
       "Hydro": 0.8464,
       "Solar": 0.0156,
-      "Wind": 0.1267
+      "Wind": 0.1268
     },
     "2024": {
       "Bioenergy": 0.0124,
@@ -5232,7 +5232,7 @@
       "Bioenergy": 0.0084,
       "Hydro": 0.6411,
       "Solar": 0.313,
-      "Wind": 0.0375
+      "Wind": 0.0376
     }
   },
   "ME": {
@@ -5274,9 +5274,9 @@
     },
     "2025": {
       "Bioenergy": 0.0067,
-      "Hydro": 0.7989,
+      "Hydro": 0.7988,
       "Solar": 0.0121,
-      "Wind": 0.1823
+      "Wind": 0.1824
     }
   },
   "MG": {
@@ -5357,14 +5357,14 @@
     "2024": {
       "Bioenergy": 0.0541,
       "Hydro": 0.6827,
-      "Solar": 0.1418,
+      "Solar": 0.1419,
       "Wind": 0.1213
     },
     "2025": {
       "Bioenergy": 0.0564,
-      "Hydro": 0.6646,
+      "Hydro": 0.6645,
       "Solar": 0.1099,
-      "Wind": 0.169
+      "Wind": 0.1692
     }
   },
   "ML": {
@@ -5525,22 +5525,22 @@
       "Wind": 0.204
     },
     "2023": {
-      "Bioenergy": 0.2087,
-      "Hydro": 0.3714,
-      "Solar": 0.1968,
-      "Wind": 0.2231
+      "Bioenergy": 0.2086,
+      "Hydro": 0.3713,
+      "Solar": 0.1967,
+      "Wind": 0.2234
     },
     "2024": {
-      "Bioenergy": 0.1927,
-      "Hydro": 0.3591,
-      "Solar": 0.2306,
-      "Wind": 0.2176
+      "Bioenergy": 0.1925,
+      "Hydro": 0.3587,
+      "Solar": 0.2301,
+      "Wind": 0.2186
     },
     "2025": {
-      "Bioenergy": 0.2017,
-      "Hydro": 0.2644,
-      "Solar": 0.2729,
-      "Wind": 0.261
+      "Bioenergy": 0.2016,
+      "Hydro": 0.264,
+      "Solar": 0.2703,
+      "Wind": 0.264
     }
   },
   "MQ": {
@@ -5702,21 +5702,21 @@
     },
     "2023": {
       "Bioenergy": 0.0248,
-      "Hydro": 0.1544,
-      "Solar": 0.7047,
-      "Wind": 0.1161
+      "Hydro": 0.1545,
+      "Solar": 0.7046,
+      "Wind": 0.1162
     },
     "2024": {
       "Bioenergy": 0.0301,
       "Hydro": 0.1921,
-      "Solar": 0.6448,
+      "Solar": 0.6447,
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0459,
-      "Hydro": 0.2557,
-      "Solar": 0.493,
-      "Wind": 0.2055
+      "Bioenergy": 0.0373,
+      "Hydro": 0.2079,
+      "Solar": 0.5855,
+      "Wind": 0.1692
     }
   },
   "MU": {
@@ -6197,10 +6197,10 @@
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.3987,
-      "Hydro": 0.2076,
+      "Bioenergy": 0.3985,
+      "Hydro": 0.208,
       "Solar": 0.0313,
-      "Wind": 0.3624
+      "Wind": 0.3622
     }
   },
   "NL": {
@@ -6324,15 +6324,15 @@
     },
     "2024": {
       "Bioenergy": 0.005,
-      "Hydro": 0.9446,
+      "Hydro": 0.9445,
       "Solar": 0.031,
-      "Wind": 0.0194
+      "Wind": 0.0195
     },
     "2025": {
       "Bioenergy": 0.0053,
       "Hydro": 0.9383,
-      "Solar": 0.034,
-      "Wind": 0.0224
+      "Solar": 0.0337,
+      "Wind": 0.0226
     }
   },
   "NR": {
@@ -6462,9 +6462,9 @@
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.8848,
+      "Hydro": 0.8702,
       "Solar": 0,
-      "Wind": 0.1134
+      "Wind": 0.128
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0095,
-      "Hydro": 0.8959,
-      "Solar": 0.0284,
-      "Wind": 0.0662
+      "Bioenergy": 0.0083,
+      "Hydro": 0.8845,
+      "Solar": 0.0296,
+      "Wind": 0.0776
     }
   },
   "PF": {
@@ -6990,7 +6990,7 @@
     },
     "2025": {
       "Bioenergy": 0.0644,
-      "Hydro": 0.4433,
+      "Hydro": 0.4434,
       "Solar": 0.1034,
       "Wind": 0.3888
     }
@@ -7168,7 +7168,7 @@
       "Bioenergy": 0.0292,
       "Hydro": 0.5082,
       "Solar": 0.1526,
-      "Wind": 0.3099
+      "Wind": 0.31
     }
   },
   "RS": {
@@ -7204,7 +7204,7 @@
     },
     "2024": {
       "Bioenergy": 0.0253,
-      "Hydro": 0.8486,
+      "Hydro": 0.8485,
       "Solar": 0.0162,
       "Wind": 0.11
     },
@@ -7555,16 +7555,16 @@
       "Wind": 0.0062
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0004,
+      "Hydro": 0.0015,
+      "Solar": 0.9969,
+      "Wind": 0.0013
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": 0.0038,
+      "Hydro": 0.0149,
+      "Solar": 0.9664,
+      "Wind": 0.0149
     }
   },
   "SH": {
@@ -8249,26 +8249,26 @@
     "2022": {
       "Bioenergy": 0.3872,
       "Hydro": 0.2972,
-      "Solar": 0.1803,
+      "Solar": 0.1804,
       "Wind": 0.1353
     },
     "2023": {
       "Bioenergy": 0.3918,
       "Hydro": 0.2705,
       "Solar": 0.185,
-      "Wind": 0.1526
+      "Wind": 0.1527
     },
     "2024": {
-      "Bioenergy": 0.3583,
+      "Bioenergy": 0.3582,
       "Hydro": 0.2692,
-      "Solar": 0.2154,
-      "Wind": 0.1571
+      "Solar": 0.2152,
+      "Wind": 0.1574
     },
     "2025": {
       "Bioenergy": 0.392,
-      "Hydro": 0.278,
-      "Solar": 0.1857,
-      "Wind": 0.1443
+      "Hydro": 0.2779,
+      "Solar": 0.1851,
+      "Wind": 0.145
     }
   },
   "TJ": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0672,
-      "Hydro": 0.4478,
-      "Solar": 0.1933,
-      "Wind": 0.2917
+      "Bioenergy": 0.0668,
+      "Hydro": 0.4455,
+      "Solar": 0.1972,
+      "Wind": 0.2905
     }
   },
   "TT": {
@@ -8581,46 +8581,46 @@
   },
   "TW": {
     "2019": {
-      "Bioenergy": 0.0162,
-      "Hydro": 0.4768,
-      "Solar": 0.3434,
+      "Bioenergy": 0.0161,
+      "Hydro": 0.4763,
+      "Solar": 0.3438,
       "Wind": 0.1637
     },
     "2020": {
       "Bioenergy": 0.019,
-      "Hydro": 0.2585,
-      "Solar": 0.5232,
+      "Hydro": 0.2584,
+      "Solar": 0.5233,
       "Wind": 0.1993
     },
     "2021": {
       "Bioenergy": 0.016,
-      "Hydro": 0.2502,
-      "Solar": 0.5719,
-      "Wind": 0.1618
+      "Hydro": 0.2501,
+      "Solar": 0.5715,
+      "Wind": 0.1624
     },
     "2022": {
       "Bioenergy": 0.0094,
-      "Hydro": 0.2886,
-      "Solar": 0.5272,
-      "Wind": 0.1749
+      "Hydro": 0.2882,
+      "Solar": 0.5263,
+      "Wind": 0.1762
     },
     "2023": {
-      "Bioenergy": 0.0085,
-      "Hydro": 0.2173,
-      "Solar": 0.6014,
-      "Wind": 0.1728
+      "Bioenergy": 0.0101,
+      "Hydro": 0.1698,
+      "Solar": 0.5529,
+      "Wind": 0.2672
     },
     "2024": {
-      "Bioenergy": 0.005,
-      "Hydro": 0.288,
-      "Solar": 0.5798,
-      "Wind": 0.1272
+      "Bioenergy": 0.0073,
+      "Hydro": 0.1416,
+      "Solar": 0.5025,
+      "Wind": 0.3486
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Hydro": 0.288,
-      "Solar": 0.5798,
-      "Wind": 0.1272
+      "Bioenergy": 0.0071,
+      "Hydro": 0.1,
+      "Solar": 0.3205,
+      "Wind": 0.5724
     }
   },
   "TZ": {
@@ -8688,9 +8688,9 @@
     },
     "2022": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.5641,
+      "Hydro": 0.5636,
       "Solar": 0.0006,
-      "Wind": 0.4345
+      "Wind": 0.4351
     },
     "2023": {
       "Bioenergy": 0,
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0396,
+      "Bioenergy": 0.0397,
       "Hydro": 0.2219,
-      "Solar": 0.2613,
-      "Wind": 0.4772
+      "Solar": 0.2614,
+      "Wind": 0.477
     }
   },
   "UY": {
@@ -8838,15 +8838,15 @@
     },
     "2025": {
       "Bioenergy": 0.154,
-      "Hydro": 0.4431,
-      "Solar": 0.0532,
-      "Wind": 0.3497
+      "Hydro": 0.4433,
+      "Solar": 0.0531,
+      "Wind": 0.3496
     }
   },
   "UZ": {
     "2019": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9812,
+      "Hydro": 0.9813,
       "Solar": 0.0078,
       "Wind": 0.0079
     },
@@ -8872,19 +8872,19 @@
       "Bioenergy": 0.0041,
       "Hydro": 0.9687,
       "Solar": 0.0137,
-      "Wind": 0.0134
+      "Wind": 0.0135
     },
     "2024": {
       "Bioenergy": 0.0039,
       "Hydro": 0.9654,
-      "Solar": 0.0167,
+      "Solar": 0.0166,
       "Wind": 0.014
     },
     "2025": {
       "Bioenergy": 0.0042,
       "Hydro": 0.9606,
-      "Solar": 0.0189,
-      "Wind": 0.0163
+      "Solar": 0.0188,
+      "Wind": 0.0165
     }
   },
   "VC": {
@@ -9102,9 +9102,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.5659,
-      "Solar": 0.2488,
-      "Wind": 0.1853
+      "Hydro": 0.5529,
+      "Solar": 0.2687,
+      "Wind": 0.1784
     }
   },
   "VU": {
@@ -9228,15 +9228,15 @@
     },
     "2024": {
       "Bioenergy": 0.0282,
-      "Hydro": 0.3922,
-      "Solar": 0.0417,
-      "Wind": 0.5378
+      "Hydro": 0.3921,
+      "Solar": 0.0418,
+      "Wind": 0.5379
     },
     "2025": {
       "Bioenergy": 0.0481,
-      "Hydro": 0.3941,
+      "Hydro": 0.3939,
       "Solar": 0.0904,
-      "Wind": 0.4674
+      "Wind": 0.4676
     }
   },
   "YE": {
@@ -9316,15 +9316,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.0345,
-      "Solar": 0.6205,
-      "Wind": 0.345
+      "Hydro": 0.0344,
+      "Solar": 0.6221,
+      "Wind": 0.3435
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0188,
-      "Solar": 0.6824,
-      "Wind": 0.2989
+      "Hydro": 0.0213,
+      "Solar": 0.6672,
+      "Wind": 0.3115
     }
   },
   "ZM": {