npm - @digital4better/data - Versions diffs - 1.2.8 → 1.2.10 - Mend

@digital4better/data 1.2.8 → 1.2.10

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

package/data/cloud/aws-vms.csv +885 -885
package/data/cloud/aws-vms.json +1768 -884
package/data/cloud/azure-vms.csv +977 -977
package/data/cloud/azure-vms.json +1952 -976
package/data/cloud/gcp-vms.csv +323 -323
package/data/cloud/gcp-vms.json +644 -322
package/data/factor/continent-monthly-green.csv +138 -138
package/data/factor/continent-monthly-green.json +1115 -1115
package/data/factor/continent-monthly.csv +144 -144
package/data/factor/continent-monthly.json +1108 -1108
package/data/factor/continent-yearly-green.csv +19 -19
package/data/factor/continent-yearly-green.json +158 -158
package/data/factor/continent-yearly.csv +18 -18
package/data/factor/continent-yearly.json +154 -154
package/data/factor/country-monthly-green.csv +1356 -1356
package/data/factor/country-monthly-green.json +11335 -11335
package/data/factor/country-monthly.csv +1462 -1462
package/data/factor/country-monthly.json +10838 -10838
package/data/factor/country-yearly-green.csv +241 -241
package/data/factor/country-yearly-green.json +2073 -2073
package/data/factor/country-yearly.csv +253 -253
package/data/factor/country-yearly.json +1989 -1989
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +348 -348
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +351 -351
package/data/factor/subdivision-yearly-green.csv +63 -63
package/data/factor/subdivision-yearly-green.json +330 -330
package/data/factor/subdivision-yearly.csv +65 -65
package/data/factor/subdivision-yearly.json +303 -303
package/data/factor/world-monthly-green.csv +52 -52
package/data/factor/world-monthly-green.json +455 -455
package/data/factor/world-monthly.csv +52 -52
package/data/factor/world-monthly.json +460 -460
package/data/factor/world-yearly-green.csv +6 -6
package/data/factor/world-yearly-green.json +52 -52
package/data/factor/world-yearly.csv +6 -6
package/data/factor/world-yearly.json +52 -52
package/data/mix/continent-monthly-green.csv +86 -86
package/data/mix/continent-monthly-green.json +285 -285
package/data/mix/continent-monthly.csv +86 -86
package/data/mix/continent-monthly.json +357 -357
package/data/mix/continent-yearly-green.csv +16 -16
package/data/mix/continent-yearly-green.json +52 -52
package/data/mix/continent-yearly.csv +16 -16
package/data/mix/continent-yearly.json +83 -83
package/data/mix/country-monthly-green.csv +1107 -1107
package/data/mix/country-monthly-green.json +3322 -3322
package/data/mix/country-monthly.csv +1107 -1107
package/data/mix/country-monthly.json +4822 -4822
package/data/mix/country-yearly-green.csv +189 -189
package/data/mix/country-yearly-green.json +629 -629
package/data/mix/country-yearly.csv +189 -189
package/data/mix/country-yearly.json +1141 -1141
package/data/mix/subdivision-monthly-green.csv +30 -30
package/data/mix/subdivision-monthly-green.json +66 -66
package/data/mix/subdivision-monthly.csv +30 -30
package/data/mix/subdivision-monthly.json +111 -111
package/data/mix/subdivision-yearly-green.csv +21 -21
package/data/mix/subdivision-yearly-green.json +41 -41
package/data/mix/subdivision-yearly.csv +21 -21
package/data/mix/subdivision-yearly.json +80 -80
package/data/mix/world-monthly-green.csv +38 -38
package/data/mix/world-monthly-green.json +104 -104
package/data/mix/world-monthly.csv +38 -38
package/data/mix/world-monthly.json +108 -108
package/data/mix/world-yearly-green.csv +4 -4
package/data/mix/world-yearly-green.json +12 -12
package/data/mix/world-yearly.csv +4 -4
package/data/mix/world-yearly.json +24 -24
package/package.json +1 -1

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

@@ -75,16 +75,16 @@
       "Wind": 0.1323
     },
     "2024": {
-      "Bioenergy": 0.0363,
-      "Hydro": 0.6692,
-      "Solar": 0.1631,
-      "Wind": 0.1314
+      "Bioenergy": 0.0368,
+      "Hydro": 0.6685,
+      "Solar": 0.1625,
+      "Wind": 0.1322
     },
     "2025": {
-      "Bioenergy": 0.0381,
-      "Hydro": 0.6494,
-      "Solar": 0.1662,
-      "Wind": 0.1462
+      "Bioenergy": 0.0427,
+      "Hydro": 0.6449,
+      "Solar": 0.1583,
+      "Wind": 0.1541
     }
   },
   "AG": {
@@ -153,26 +153,26 @@
     "2022": {
       "Bioenergy": 0.012,
       "Hydro": 0.9189,
-      "Solar": 0.0238,
-      "Wind": 0.0453
+      "Solar": 0.0237,
+      "Wind": 0.0454
     },
     "2023": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9118,
-      "Solar": 0.028,
-      "Wind": 0.0492
+      "Hydro": 0.912,
+      "Solar": 0.0278,
+      "Wind": 0.0494
     },
     "2024": {
       "Bioenergy": 0.011,
-      "Hydro": 0.9075,
-      "Solar": 0.0329,
-      "Wind": 0.0486
+      "Hydro": 0.907,
+      "Solar": 0.0323,
+      "Wind": 0.0497
     },
     "2025": {
-      "Bioenergy": 0.0112,
-      "Hydro": 0.9186,
-      "Solar": 0.0174,
-      "Wind": 0.0528
+      "Bioenergy": 0.0109,
+      "Hydro": 0.9171,
+      "Solar": 0.0144,
+      "Wind": 0.0577
     }
   },
   "AM": {
@@ -296,7 +296,7 @@
     },
     "2024": {
       "Bioenergy": 0.0219,
-      "Hydro": 0.6236,
+      "Hydro": 0.6237,
       "Solar": 0.0717,
       "Wind": 0.2827
     },
@@ -304,7 +304,7 @@
       "Bioenergy": 0.0185,
       "Hydro": 0.6281,
       "Solar": 0.0885,
-      "Wind": 0.265
+      "Wind": 0.2649
     }
   },
   "AS": {
@@ -371,28 +371,28 @@
       "Wind": 0.1513
     },
     "2022": {
-      "Bioenergy": 0.0529,
-      "Hydro": 0.7039,
-      "Solar": 0.0866,
-      "Wind": 0.1566
+      "Bioenergy": 0.0538,
+      "Hydro": 0.7153,
+      "Solar": 0.0719,
+      "Wind": 0.1591
     },
     "2023": {
-      "Bioenergy": 0.026,
-      "Hydro": 0.6998,
-      "Solar": 0.1232,
-      "Wind": 0.151
+      "Bioenergy": 0.0269,
+      "Hydro": 0.7237,
+      "Solar": 0.0931,
+      "Wind": 0.1562
     },
     "2024": {
-      "Bioenergy": 0.0296,
-      "Hydro": 0.6791,
-      "Solar": 0.1495,
-      "Wind": 0.1417
+      "Bioenergy": 0.0305,
+      "Hydro": 0.7023,
+      "Solar": 0.1171,
+      "Wind": 0.1501
     },
     "2025": {
-      "Bioenergy": 0.0505,
-      "Hydro": 0.6424,
-      "Solar": 0.1257,
-      "Wind": 0.1814
+      "Bioenergy": 0.0516,
+      "Hydro": 0.6687,
+      "Solar": 0.0839,
+      "Wind": 0.1958
     }
   },
   "AU": {
@@ -516,8 +516,8 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8906,
-      "Solar": 0.1094,
+      "Hydro": 0.8907,
+      "Solar": 0.1093,
       "Wind": 0
     },
     "2025": {
@@ -560,15 +560,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8845,
-      "Solar": 0.088,
-      "Wind": 0.0275
+      "Hydro": 0.8847,
+      "Solar": 0.0823,
+      "Wind": 0.033
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8571,
-      "Solar": 0.1429,
-      "Wind": 0
+      "Hydro": 0.8665,
+      "Solar": 0.1001,
+      "Wind": 0.0334
     }
   },
   "BB": {
@@ -631,7 +631,7 @@
     "2021": {
       "Bioenergy": 0.0497,
       "Hydro": 0.6004,
-      "Solar": 0.1997,
+      "Solar": 0.1998,
       "Wind": 0.1502
     },
     "2022": {
@@ -647,16 +647,16 @@
       "Wind": 0.1943
     },
     "2024": {
-      "Bioenergy": 0.0482,
-      "Hydro": 0.4386,
+      "Bioenergy": 0.0489,
+      "Hydro": 0.4367,
       "Solar": 0.3388,
-      "Wind": 0.1744
+      "Wind": 0.1756
     },
     "2025": {
-      "Bioenergy": 0.0476,
-      "Hydro": 0.3859,
-      "Solar": 0.3835,
-      "Wind": 0.183
+      "Bioenergy": 0.0538,
+      "Hydro": 0.3714,
+      "Solar": 0.3807,
+      "Wind": 0.1941
     }
   },
   "BE": {
@@ -685,22 +685,22 @@
       "Wind": 0.5695
     },
     "2023": {
-      "Bioenergy": 0.0431,
-      "Hydro": 0.0392,
-      "Solar": 0.3078,
-      "Wind": 0.6098
+      "Bioenergy": 0.0432,
+      "Hydro": 0.0393,
+      "Solar": 0.3077,
+      "Wind": 0.6099
     },
     "2024": {
-      "Bioenergy": 0.0369,
-      "Hydro": 0.081,
-      "Solar": 0.3511,
-      "Wind": 0.531
+      "Bioenergy": 0.0359,
+      "Hydro": 0.0766,
+      "Solar": 0.3425,
+      "Wind": 0.5449
     },
     "2025": {
-      "Bioenergy": 0.0555,
-      "Hydro": 0.1201,
-      "Solar": 0.146,
-      "Wind": 0.6784
+      "Bioenergy": 0.0519,
+      "Hydro": 0.1229,
+      "Solar": 0.1315,
+      "Wind": 0.6937
     }
   },
   "BF": {
@@ -776,19 +776,19 @@
       "Bioenergy": 0.0234,
       "Hydro": 0.3932,
       "Solar": 0.3896,
-      "Wind": 0.1937
+      "Wind": 0.1938
     },
     "2024": {
-      "Bioenergy": 0.018,
-      "Hydro": 0.3203,
-      "Solar": 0.5057,
-      "Wind": 0.156
+      "Bioenergy": 0.0171,
+      "Hydro": 0.3201,
+      "Solar": 0.5035,
+      "Wind": 0.1593
     },
     "2025": {
-      "Bioenergy": 0.0353,
-      "Hydro": 0.2591,
-      "Solar": 0.4367,
-      "Wind": 0.2689
+      "Bioenergy": 0.0168,
+      "Hydro": 0.2713,
+      "Solar": 0.4916,
+      "Wind": 0.2204
     }
   },
   "BH": {
@@ -1093,10 +1093,10 @@
       "Wind": 0.1713
     },
     "2025": {
-      "Bioenergy": 0.0084,
-      "Hydro": 0.6701,
-      "Solar": 0.1451,
-      "Wind": 0.1764
+      "Bioenergy": 0.004,
+      "Hydro": 0.7599,
+      "Solar": 0.1348,
+      "Wind": 0.1013
     }
   },
   "BS": {
@@ -1252,21 +1252,21 @@
     },
     "2022": {
       "Bioenergy": 0.2433,
-      "Hydro": 0.3741,
-      "Solar": 0.2125,
+      "Hydro": 0.3739,
+      "Solar": 0.2126,
       "Wind": 0.1701
     },
     "2023": {
-      "Bioenergy": 0.4123,
-      "Hydro": 0.3097,
-      "Solar": 0.1262,
-      "Wind": 0.1518
+      "Bioenergy": 0.4119,
+      "Hydro": 0.3102,
+      "Solar": 0.1261,
+      "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.389,
-      "Hydro": 0.3017,
-      "Solar": 0.179,
-      "Wind": 0.1304
+      "Bioenergy": 0.3889,
+      "Hydro": 0.3021,
+      "Solar": 0.1788,
+      "Wind": 0.1303
     },
     "2025": {
       "Bioenergy": 0.4433,
@@ -1303,20 +1303,20 @@
     "2023": {
       "Bioenergy": 0.2237,
       "Hydro": 0.68,
-      "Solar": 0.0466,
+      "Solar": 0.0465,
       "Wind": 0.0498
     },
     "2024": {
-      "Bioenergy": 0.2241,
-      "Hydro": 0.6668,
-      "Solar": 0.0551,
-      "Wind": 0.0539
+      "Bioenergy": 0.2235,
+      "Hydro": 0.6679,
+      "Solar": 0.0549,
+      "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.2222,
-      "Hydro": 0.6559,
-      "Solar": 0.0611,
-      "Wind": 0.0609
+      "Bioenergy": 0.2176,
+      "Hydro": 0.6625,
+      "Solar": 0.0623,
+      "Wind": 0.0576
     }
   },
   "CA": {
@@ -1351,16 +1351,16 @@
       "Wind": 0.0963
     },
     "2024": {
-      "Bioenergy": 0.0248,
-      "Hydro": 0.8419,
-      "Solar": 0.0151,
-      "Wind": 0.1182
+      "Bioenergy": 0.0246,
+      "Hydro": 0.8457,
+      "Solar": 0.0136,
+      "Wind": 0.1161
     },
     "2025": {
-      "Bioenergy": 0.0254,
-      "Hydro": 0.8128,
-      "Solar": 0.0137,
-      "Wind": 0.1482
+      "Bioenergy": 0.0242,
+      "Hydro": 0.8374,
+      "Solar": 0.0054,
+      "Wind": 0.1329
     }
   },
   "CD": {
@@ -1523,20 +1523,20 @@
     "2023": {
       "Bioenergy": 0.0016,
       "Hydro": 0.9046,
-      "Solar": 0.0829,
+      "Solar": 0.0828,
       "Wind": 0.0109
     },
     "2024": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.9113,
-      "Solar": 0.0833,
-      "Wind": 0.0049
+      "Hydro": 0.9095,
+      "Solar": 0.0844,
+      "Wind": 0.0055
     },
     "2025": {
-      "Bioenergy": 0.0056,
-      "Hydro": 0.9218,
-      "Solar": 0.0437,
-      "Wind": 0.0289
+      "Bioenergy": 0.0046,
+      "Hydro": 0.9171,
+      "Solar": 0.0513,
+      "Wind": 0.027
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0227,
-      "Hydro": 0.4405,
-      "Solar": 0.3549,
-      "Wind": 0.1819
+      "Bioenergy": 0.0316,
+      "Hydro": 0.3856,
+      "Solar": 0.3873,
+      "Wind": 0.1955
     }
   },
   "CM": {
@@ -1798,9 +1798,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9324,
-      "Solar": 0.0655,
-      "Wind": 0.0021
+      "Hydro": 0.9302,
+      "Solar": 0.0679,
+      "Wind": 0.0019
     }
   },
   "CR": {
@@ -1837,14 +1837,14 @@
     "2024": {
       "Bioenergy": 0.0054,
       "Hydro": 0.8647,
-      "Solar": 0.0025,
+      "Solar": 0.0024,
       "Wind": 0.1275
     },
     "2025": {
-      "Bioenergy": 0.01,
-      "Hydro": 0.83,
+      "Bioenergy": 0.0091,
+      "Hydro": 0.8272,
       "Solar": 0,
-      "Wind": 0.16
+      "Wind": 0.1637
     }
   },
   "CU": {
@@ -1969,14 +1969,14 @@
     "2024": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.848,
-      "Wind": 0.152
+      "Solar": 0.8375,
+      "Wind": 0.1625
     },
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8751,
-      "Wind": 0.1249
+      "Solar": 0.8181,
+      "Wind": 0.1819
     }
   },
   "CZ": {
@@ -2011,16 +2011,16 @@
       "Wind": 0.0905
     },
     "2024": {
-      "Bioenergy": 0.236,
-      "Hydro": 0.2643,
-      "Solar": 0.4241,
-      "Wind": 0.0756
+      "Bioenergy": 0.2367,
+      "Hydro": 0.271,
+      "Solar": 0.418,
+      "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.3333,
-      "Hydro": 0.3166,
-      "Solar": 0.2338,
-      "Wind": 0.1164
+      "Bioenergy": 0.3936,
+      "Hydro": 0.3284,
+      "Solar": 0.1636,
+      "Wind": 0.1144
     }
   },
   "DE": {
@@ -2050,21 +2050,21 @@
     },
     "2023": {
       "Bioenergy": 0.1601,
-      "Hydro": 0.0876,
-      "Solar": 0.2371,
-      "Wind": 0.5152
+      "Hydro": 0.0877,
+      "Solar": 0.237,
+      "Wind": 0.5153
     },
     "2024": {
-      "Bioenergy": 0.1548,
-      "Hydro": 0.1023,
-      "Solar": 0.2676,
-      "Wind": 0.4752
+      "Bioenergy": 0.1537,
+      "Hydro": 0.1008,
+      "Solar": 0.2622,
+      "Wind": 0.4833
     },
     "2025": {
-      "Bioenergy": 0.1741,
-      "Hydro": 0.0839,
-      "Solar": 0.1104,
-      "Wind": 0.6316
+      "Bioenergy": 0.1594,
+      "Hydro": 0.0708,
+      "Solar": 0.0863,
+      "Wind": 0.6836
     }
   },
   "DJ": {
@@ -2133,26 +2133,26 @@
     "2022": {
       "Bioenergy": 0.1599,
       "Hydro": 0.0183,
-      "Solar": 0.0906,
+      "Solar": 0.0905,
       "Wind": 0.7313
     },
     "2023": {
       "Bioenergy": 0.1389,
       "Hydro": 0.0232,
-      "Solar": 0.1201,
-      "Wind": 0.7178
+      "Solar": 0.12,
+      "Wind": 0.7179
     },
     "2024": {
-      "Bioenergy": 0.1399,
-      "Hydro": 0.0269,
-      "Solar": 0.1399,
-      "Wind": 0.6933
+      "Bioenergy": 0.1378,
+      "Hydro": 0.0248,
+      "Solar": 0.1358,
+      "Wind": 0.7016
     },
     "2025": {
-      "Bioenergy": 0.2214,
-      "Hydro": 0.0313,
-      "Solar": 0.0361,
-      "Wind": 0.7112
+      "Bioenergy": 0.1831,
+      "Hydro": 0.0226,
+      "Solar": 0.0252,
+      "Wind": 0.7691
     }
   },
   "DM": {
@@ -2319,16 +2319,16 @@
       "Wind": 0.0119
     },
     "2024": {
-      "Bioenergy": 0.0222,
-      "Hydro": 0.9591,
+      "Bioenergy": 0.0221,
+      "Hydro": 0.9592,
       "Solar": 0.0039,
-      "Wind": 0.0148
+      "Wind": 0.0147
     },
     "2025": {
-      "Bioenergy": 0.0603,
-      "Hydro": 0.9032,
-      "Solar": 0.0122,
-      "Wind": 0.0243
+      "Bioenergy": 0.0597,
+      "Hydro": 0.9041,
+      "Solar": 0.0127,
+      "Wind": 0.0236
     }
   },
   "EE": {
@@ -2354,25 +2354,25 @@
       "Bioenergy": 0.328,
       "Hydro": 0.0688,
       "Solar": 0.253,
-      "Wind": 0.3502
+      "Wind": 0.3503
     },
     "2023": {
-      "Bioenergy": 0.1796,
-      "Hydro": 0.1688,
-      "Solar": 0.2789,
-      "Wind": 0.3727
+      "Bioenergy": 0.1797,
+      "Hydro": 0.169,
+      "Solar": 0.2782,
+      "Wind": 0.373
     },
     "2024": {
-      "Bioenergy": 0.1365,
-      "Hydro": 0.1403,
-      "Solar": 0.3092,
-      "Wind": 0.4139
+      "Bioenergy": 0.1409,
+      "Hydro": 0.1377,
+      "Solar": 0.3002,
+      "Wind": 0.4213
     },
     "2025": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.1435,
-      "Solar": 0.0913,
-      "Wind": 0.6217
+      "Bioenergy": 0.1716,
+      "Hydro": 0.1428,
+      "Solar": 0.0254,
+      "Wind": 0.6602
     }
   },
   "EG": {
@@ -2484,27 +2484,27 @@
     },
     "2022": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.1873,
-      "Solar": 0.2745,
-      "Wind": 0.5037
+      "Hydro": 0.1877,
+      "Solar": 0.2729,
+      "Wind": 0.5049
     },
     "2023": {
-      "Bioenergy": 0.0231,
-      "Hydro": 0.1814,
-      "Solar": 0.3402,
-      "Wind": 0.4554
+      "Bioenergy": 0.0234,
+      "Hydro": 0.1837,
+      "Solar": 0.3319,
+      "Wind": 0.4611
     },
     "2024": {
-      "Bioenergy": 0.0227,
-      "Hydro": 0.2123,
-      "Solar": 0.3751,
-      "Wind": 0.3899
+      "Bioenergy": 0.0232,
+      "Hydro": 0.2149,
+      "Solar": 0.364,
+      "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.0284,
-      "Hydro": 0.2302,
-      "Solar": 0.2713,
-      "Wind": 0.4701
+      "Bioenergy": 0.0247,
+      "Hydro": 0.2217,
+      "Solar": 0.1775,
+      "Wind": 0.5761
     }
   },
   "ET": {
@@ -2573,8 +2573,8 @@
     "2022": {
       "Bioenergy": 0.303,
       "Hydro": 0.372,
-      "Solar": 0.024,
-      "Wind": 0.3011
+      "Solar": 0.0239,
+      "Wind": 0.3012
     },
     "2023": {
       "Bioenergy": 0.2569,
@@ -2583,16 +2583,16 @@
       "Wind": 0.3475
     },
     "2024": {
-      "Bioenergy": 0.203,
-      "Hydro": 0.3371,
-      "Solar": 0.0322,
-      "Wind": 0.4277
+      "Bioenergy": 0.2089,
+      "Hydro": 0.3265,
+      "Solar": 0.0313,
+      "Wind": 0.4333
     },
     "2025": {
-      "Bioenergy": 0.1918,
-      "Hydro": 0.2786,
-      "Solar": 0.0045,
-      "Wind": 0.5251
+      "Bioenergy": 0.2161,
+      "Hydro": 0.2667,
+      "Solar": 0.0046,
+      "Wind": 0.5126
     }
   },
   "FJ": {
@@ -2748,9 +2748,9 @@
     },
     "2022": {
       "Bioenergy": 0.038,
-      "Hydro": 0.4254,
-      "Solar": 0.1769,
-      "Wind": 0.3596
+      "Hydro": 0.4255,
+      "Solar": 0.1768,
+      "Wind": 0.3597
     },
     "2023": {
       "Bioenergy": 0.0263,
@@ -2759,16 +2759,16 @@
       "Wind": 0.3923
     },
     "2024": {
-      "Bioenergy": 0.0232,
-      "Hydro": 0.4646,
-      "Solar": 0.1744,
-      "Wind": 0.3379
+      "Bioenergy": 0.0227,
+      "Hydro": 0.4665,
+      "Solar": 0.1692,
+      "Wind": 0.3416
     },
     "2025": {
-      "Bioenergy": 0.0264,
-      "Hydro": 0.4372,
-      "Solar": 0.1205,
-      "Wind": 0.4159
+      "Bioenergy": 0.0226,
+      "Hydro": 0.4659,
+      "Solar": 0.0792,
+      "Wind": 0.4323
     }
   },
   "GA": {
@@ -2843,20 +2843,20 @@
     "2023": {
       "Bioenergy": 0.1203,
       "Hydro": 0.0625,
-      "Solar": 0.1173,
-      "Wind": 0.6998
+      "Solar": 0.1172,
+      "Wind": 0.6999
     },
     "2024": {
-      "Bioenergy": 0.1493,
-      "Hydro": 0.0738,
-      "Solar": 0.1207,
-      "Wind": 0.6562
+      "Bioenergy": 0.1486,
+      "Hydro": 0.0731,
+      "Solar": 0.1245,
+      "Wind": 0.6538
     },
     "2025": {
-      "Bioenergy": 0.1066,
-      "Hydro": 0.059,
-      "Solar": 0.0219,
-      "Wind": 0.8125
+      "Bioenergy": 0.1521,
+      "Hydro": 0.068,
+      "Solar": 0.0422,
+      "Wind": 0.7378
     }
   },
   "GD": {
@@ -2936,15 +2936,15 @@
     },
     "2024": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.9724,
-      "Solar": 0.0074,
-      "Wind": 0.0182
+      "Hydro": 0.9729,
+      "Solar": 0.007,
+      "Wind": 0.018
     },
     "2025": {
       "Bioenergy": 0.0066,
-      "Hydro": 0.9281,
-      "Solar": 0.0251,
-      "Wind": 0.0402
+      "Hydro": 0.9329,
+      "Solar": 0.0207,
+      "Wind": 0.0398
     }
   },
   "GF": {
@@ -3327,20 +3327,20 @@
     "2023": {
       "Bioenergy": 0.0064,
       "Hydro": 0.188,
-      "Solar": 0.361,
-      "Wind": 0.4446
+      "Solar": 0.3609,
+      "Wind": 0.4447
     },
     "2024": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.1115,
-      "Solar": 0.4548,
-      "Wind": 0.4322
+      "Hydro": 0.1139,
+      "Solar": 0.4503,
+      "Wind": 0.4344
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0524,
-      "Solar": 0.3873,
-      "Wind": 0.5603
+      "Hydro": 0.1235,
+      "Solar": 0.4045,
+      "Wind": 0.472
     }
   },
   "GT": {
@@ -3536,12 +3536,12 @@
       "Bioenergy": 0.1161,
       "Hydro": 0.4998,
       "Solar": 0.1655,
-      "Wind": 0.2186
+      "Wind": 0.2187
     },
     "2022": {
       "Bioenergy": 0.115,
       "Hydro": 0.469,
-      "Solar": 0.1882,
+      "Solar": 0.1883,
       "Wind": 0.2277
     },
     "2023": {
@@ -3551,16 +3551,16 @@
       "Wind": 0.2488
     },
     "2024": {
-      "Bioenergy": 0.1028,
-      "Hydro": 0.399,
-      "Solar": 0.2602,
-      "Wind": 0.2379
+      "Bioenergy": 0.1042,
+      "Hydro": 0.3961,
+      "Solar": 0.2597,
+      "Wind": 0.2401
     },
     "2025": {
-      "Bioenergy": 0.109,
-      "Hydro": 0.3508,
-      "Solar": 0.2703,
-      "Wind": 0.2699
+      "Bioenergy": 0.1212,
+      "Hydro": 0.3274,
+      "Solar": 0.2604,
+      "Wind": 0.2909
     }
   },
   "HN": {
@@ -3596,15 +3596,15 @@
     },
     "2024": {
       "Bioenergy": 0.2443,
-      "Hydro": 0.4245,
+      "Hydro": 0.4246,
       "Solar": 0.1901,
       "Wind": 0.141
     },
     "2025": {
-      "Bioenergy": 0.2442,
-      "Hydro": 0.4238,
+      "Bioenergy": 0.2438,
+      "Hydro": 0.4246,
       "Solar": 0.1905,
-      "Wind": 0.1415
+      "Wind": 0.1412
     }
   },
   "HR": {
@@ -3627,28 +3627,28 @@
       "Wind": 0.2352
     },
     "2022": {
-      "Bioenergy": 0.0849,
-      "Hydro": 0.564,
-      "Solar": 0.0472,
-      "Wind": 0.3039
+      "Bioenergy": 0.0846,
+      "Hydro": 0.5616,
+      "Solar": 0.0511,
+      "Wind": 0.3027
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6398,
-      "Solar": 0.0521,
-      "Wind": 0.2485
+      "Hydro": 0.6405,
+      "Solar": 0.0511,
+      "Wind": 0.2488
     },
     "2024": {
-      "Bioenergy": 0.0635,
-      "Hydro": 0.5471,
-      "Solar": 0.1163,
-      "Wind": 0.2731
+      "Bioenergy": 0.0633,
+      "Hydro": 0.5507,
+      "Solar": 0.1112,
+      "Wind": 0.2748
     },
     "2025": {
-      "Bioenergy": 0.065,
-      "Hydro": 0.4922,
-      "Solar": 0.0786,
-      "Wind": 0.3643
+      "Bioenergy": 0.0578,
+      "Hydro": 0.5543,
+      "Solar": 0.0197,
+      "Wind": 0.3682
     }
   },
   "HT": {
@@ -3717,26 +3717,26 @@
     "2022": {
       "Bioenergy": 0.1385,
       "Hydro": 0.1869,
-      "Solar": 0.4903,
-      "Wind": 0.1843
+      "Solar": 0.49,
+      "Wind": 0.1845
     },
     "2023": {
-      "Bioenergy": 0.0846,
-      "Hydro": 0.1678,
-      "Solar": 0.5817,
-      "Wind": 0.1659
+      "Bioenergy": 0.0847,
+      "Hydro": 0.1679,
+      "Solar": 0.5813,
+      "Wind": 0.1662
     },
     "2024": {
-      "Bioenergy": 0.0784,
-      "Hydro": 0.1381,
-      "Solar": 0.6515,
-      "Wind": 0.1319
+      "Bioenergy": 0.0801,
+      "Hydro": 0.1382,
+      "Solar": 0.6457,
+      "Wind": 0.1359
     },
     "2025": {
-      "Bioenergy": 0.1379,
-      "Hydro": 0.1839,
-      "Solar": 0.4904,
-      "Wind": 0.1879
+      "Bioenergy": 0.1381,
+      "Hydro": 0.1937,
+      "Solar": 0.4521,
+      "Wind": 0.2162
     }
   },
   "ID": {
@@ -3771,16 +3771,16 @@
       "Wind": 0.0172
     },
     "2024": {
-      "Bioenergy": 0.3547,
+      "Bioenergy": 0.3548,
       "Hydro": 0.6207,
       "Solar": 0.0072,
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.355,
-      "Hydro": 0.6202,
-      "Solar": 0.0072,
-      "Wind": 0.0176
+      "Bioenergy": 0.3553,
+      "Hydro": 0.62,
+      "Solar": 0.0069,
+      "Wind": 0.0177
     }
   },
   "IE": {
@@ -3805,26 +3805,26 @@
     "2022": {
       "Bioenergy": 0.0159,
       "Hydro": 0.0869,
-      "Solar": 0.0114,
+      "Solar": 0.0113,
       "Wind": 0.8858
     },
     "2023": {
       "Bioenergy": 0.016,
       "Hydro": 0.1117,
-      "Solar": 0.0442,
-      "Wind": 0.8281
+      "Solar": 0.044,
+      "Wind": 0.8283
     },
     "2024": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.1155,
-      "Solar": 0.0774,
-      "Wind": 0.7885
+      "Bioenergy": 0.018,
+      "Hydro": 0.1143,
+      "Solar": 0.0745,
+      "Wind": 0.7932
     },
     "2025": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.1027,
-      "Solar": 0.0309,
-      "Wind": 0.8471
+      "Bioenergy": 0.0136,
+      "Hydro": 0.0989,
+      "Solar": 0.02,
+      "Wind": 0.8675
     }
   },
   "IL": {
@@ -3903,16 +3903,16 @@
       "Wind": 0.2286
     },
     "2024": {
-      "Bioenergy": 0.0325,
-      "Hydro": 0.4103,
-      "Solar": 0.3509,
-      "Wind": 0.2063
+      "Bioenergy": 0.0349,
+      "Hydro": 0.4056,
+      "Solar": 0.3475,
+      "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0518,
-      "Hydro": 0.3773,
-      "Solar": 0.4474,
-      "Wind": 0.1235
+      "Bioenergy": 0.0841,
+      "Hydro": 0.3132,
+      "Solar": 0.3922,
+      "Wind": 0.2105
     }
   },
   "IQ": {
@@ -4069,26 +4069,26 @@
     "2022": {
       "Bioenergy": 0.1649,
       "Hydro": 0.314,
-      "Solar": 0.2845,
+      "Solar": 0.2844,
       "Wind": 0.2366
     },
     "2023": {
       "Bioenergy": 0.1325,
-      "Hydro": 0.358,
-      "Solar": 0.2699,
-      "Wind": 0.2396
+      "Hydro": 0.3581,
+      "Solar": 0.2697,
+      "Wind": 0.2397
     },
     "2024": {
-      "Bioenergy": 0.1173,
-      "Hydro": 0.4014,
-      "Solar": 0.2835,
-      "Wind": 0.1978
+      "Bioenergy": 0.1179,
+      "Hydro": 0.3955,
+      "Solar": 0.2806,
+      "Wind": 0.206
     },
     "2025": {
-      "Bioenergy": 0.1372,
-      "Hydro": 0.3848,
-      "Solar": 0.2321,
-      "Wind": 0.2459
+      "Bioenergy": 0.1448,
+      "Hydro": 0.3017,
+      "Solar": 0.1925,
+      "Wind": 0.361
     }
   },
   "JM": {
@@ -4211,16 +4211,16 @@
       "Wind": 0.0693
     },
     "2024": {
-      "Bioenergy": 0.2036,
-      "Hydro": 0.2839,
-      "Solar": 0.4542,
-      "Wind": 0.0583
+      "Bioenergy": 0.2141,
+      "Hydro": 0.2811,
+      "Solar": 0.4402,
+      "Wind": 0.0645
     },
     "2025": {
-      "Bioenergy": 0.2124,
-      "Hydro": 0.2583,
-      "Solar": 0.4795,
-      "Wind": 0.0497
+      "Bioenergy": 0.26,
+      "Hydro": 0.2433,
+      "Solar": 0.4204,
+      "Wind": 0.0763
     }
   },
   "KE": {
@@ -4275,40 +4275,40 @@
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0004,
+      "Hydro": 0.998,
+      "Solar": 0.0006,
+      "Wind": 0.001
     },
     "2021": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0008,
+      "Hydro": 0.9948,
+      "Solar": 0.0018,
+      "Wind": 0.0026
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0021,
+      "Hydro": 0.9855,
+      "Solar": 0.0052,
+      "Wind": 0.0071
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.002,
+      "Hydro": 0.9867,
+      "Solar": 0.0048,
+      "Wind": 0.0066
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0023,
+      "Hydro": 0.9818,
+      "Solar": 0.008,
+      "Wind": 0.008
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.002,
+      "Hydro": 0.9846,
+      "Solar": 0.0063,
+      "Wind": 0.0071
     }
   },
   "KH": {
@@ -4343,16 +4343,16 @@
       "Wind": 0.0406
     },
     "2024": {
-      "Bioenergy": 0.0302,
+      "Bioenergy": 0.0304,
       "Hydro": 0.8612,
-      "Solar": 0.067,
-      "Wind": 0.0416
+      "Solar": 0.0667,
+      "Wind": 0.0417
     },
     "2025": {
-      "Bioenergy": 0.0307,
-      "Hydro": 0.8564,
-      "Solar": 0.0673,
-      "Wind": 0.0455
+      "Bioenergy": 0.0321,
+      "Hydro": 0.8567,
+      "Solar": 0.0641,
+      "Wind": 0.0471
     }
   },
   "KI": {
@@ -4992,27 +4992,27 @@
     },
     "2022": {
       "Bioenergy": 0.1122,
-      "Hydro": 0.3109,
-      "Solar": 0.1396,
-      "Wind": 0.4373
+      "Hydro": 0.311,
+      "Solar": 0.1393,
+      "Wind": 0.4376
     },
     "2023": {
-      "Bioenergy": 0.0722,
-      "Hydro": 0.2524,
-      "Solar": 0.1676,
-      "Wind": 0.5077
+      "Bioenergy": 0.0723,
+      "Hydro": 0.2526,
+      "Solar": 0.1669,
+      "Wind": 0.5082
     },
     "2024": {
-      "Bioenergy": 0.0508,
-      "Hydro": 0.188,
-      "Solar": 0.2392,
-      "Wind": 0.522
+      "Bioenergy": 0.0516,
+      "Hydro": 0.1849,
+      "Solar": 0.2349,
+      "Wind": 0.5287
     },
     "2025": {
-      "Bioenergy": 0.0404,
-      "Hydro": 0.1652,
-      "Solar": 0.0632,
-      "Wind": 0.7312
+      "Bioenergy": 0.0483,
+      "Hydro": 0.1459,
+      "Solar": 0.0486,
+      "Wind": 0.7572
     }
   },
   "LU": {
@@ -5036,27 +5036,27 @@
     },
     "2022": {
       "Bioenergy": 0.1869,
-      "Hydro": 0.289,
-      "Solar": 0.1952,
-      "Wind": 0.3288
+      "Hydro": 0.2891,
+      "Solar": 0.1949,
+      "Wind": 0.3291
     },
     "2023": {
-      "Bioenergy": 0.1104,
-      "Hydro": 0.2889,
-      "Solar": 0.1997,
-      "Wind": 0.401
+      "Bioenergy": 0.1105,
+      "Hydro": 0.2892,
+      "Solar": 0.1988,
+      "Wind": 0.4016
     },
     "2024": {
-      "Bioenergy": 0.1416,
-      "Hydro": 0.295,
-      "Solar": 0.2228,
-      "Wind": 0.3406
+      "Bioenergy": 0.1383,
+      "Hydro": 0.2942,
+      "Solar": 0.2176,
+      "Wind": 0.3499
     },
     "2025": {
-      "Bioenergy": 0.1883,
-      "Hydro": 0.3019,
-      "Solar": 0.105,
-      "Wind": 0.4048
+      "Bioenergy": 0.1758,
+      "Hydro": 0.2886,
+      "Solar": 0.0878,
+      "Wind": 0.4478
     }
   },
   "LV": {
@@ -5080,27 +5080,27 @@
     },
     "2022": {
       "Bioenergy": 0.1007,
-      "Hydro": 0.7509,
-      "Solar": 0.0403,
-      "Wind": 0.1081
+      "Hydro": 0.751,
+      "Solar": 0.0401,
+      "Wind": 0.1082
     },
     "2023": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.7758,
-      "Solar": 0.065,
-      "Wind": 0.1009
+      "Hydro": 0.776,
+      "Solar": 0.0647,
+      "Wind": 0.1011
     },
     "2024": {
-      "Bioenergy": 0.0752,
-      "Hydro": 0.6893,
-      "Solar": 0.1313,
-      "Wind": 0.1042
+      "Bioenergy": 0.0745,
+      "Hydro": 0.6909,
+      "Solar": 0.1265,
+      "Wind": 0.1081
     },
     "2025": {
-      "Bioenergy": 0.1044,
-      "Hydro": 0.576,
-      "Solar": 0.0734,
-      "Wind": 0.2462
+      "Bioenergy": 0.0535,
+      "Hydro": 0.8529,
+      "Solar": 0.0028,
+      "Wind": 0.0907
     }
   },
   "LY": {
@@ -5174,21 +5174,21 @@
     },
     "2023": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.0869,
-      "Solar": 0.2283,
-      "Wind": 0.6841
+      "Hydro": 0.087,
+      "Solar": 0.2288,
+      "Wind": 0.6835
     },
     "2024": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.0748,
-      "Solar": 0.1592,
-      "Wind": 0.7654
+      "Bioenergy": 0.0009,
+      "Hydro": 0.0881,
+      "Solar": 0.1404,
+      "Wind": 0.7707
     },
     "2025": {
-      "Bioenergy": 0.0006,
-      "Hydro": 0.0686,
-      "Solar": 0.1604,
-      "Wind": 0.7705
+      "Bioenergy": 0.0011,
+      "Hydro": 0.0999,
+      "Solar": 0.1335,
+      "Wind": 0.7655
     }
   },
   "MD": {
@@ -5212,27 +5212,27 @@
     },
     "2022": {
       "Bioenergy": 0.0471,
-      "Hydro": 0.6986,
-      "Solar": 0.0769,
-      "Wind": 0.1774
+      "Hydro": 0.6987,
+      "Solar": 0.0765,
+      "Wind": 0.1777
     },
     "2023": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.8463,
-      "Solar": 0.0158,
-      "Wind": 0.1266
+      "Hydro": 0.8464,
+      "Solar": 0.0156,
+      "Wind": 0.1267
     },
     "2024": {
-      "Bioenergy": 0.0123,
-      "Hydro": 0.6427,
-      "Solar": 0.1682,
-      "Wind": 0.1768
+      "Bioenergy": 0.0124,
+      "Hydro": 0.6424,
+      "Solar": 0.1677,
+      "Wind": 0.1776
     },
     "2025": {
-      "Bioenergy": 0.0084,
-      "Hydro": 0.6433,
-      "Solar": 0.3088,
-      "Wind": 0.0395
+      "Bioenergy": 0.0081,
+      "Hydro": 0.6425,
+      "Solar": 0.3062,
+      "Wind": 0.0432
     }
   },
   "ME": {
@@ -5263,20 +5263,20 @@
     "2023": {
       "Bioenergy": 0.0013,
       "Hydro": 0.8432,
-      "Solar": 0.0049,
-      "Wind": 0.1506
+      "Solar": 0.0048,
+      "Wind": 0.1507
     },
     "2024": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.762,
-      "Solar": 0.0706,
-      "Wind": 0.1606
+      "Bioenergy": 0.0069,
+      "Hydro": 0.7728,
+      "Solar": 0.0565,
+      "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0055,
-      "Hydro": 0.8067,
-      "Solar": 0.0456,
-      "Wind": 0.1421
+      "Bioenergy": 0.0073,
+      "Hydro": 0.787,
+      "Solar": 0.0074,
+      "Wind": 0.1983
     }
   },
   "MG": {
@@ -5345,26 +5345,26 @@
     "2022": {
       "Bioenergy": 0.042,
       "Hydro": 0.7828,
-      "Solar": 0.042,
-      "Wind": 0.1331
+      "Solar": 0.0419,
+      "Wind": 0.1333
     },
     "2023": {
-      "Bioenergy": 0.0466,
+      "Bioenergy": 0.0467,
       "Hydro": 0.7213,
       "Solar": 0.1466,
       "Wind": 0.0855
     },
     "2024": {
-      "Bioenergy": 0.0511,
-      "Hydro": 0.6836,
-      "Solar": 0.1538,
-      "Wind": 0.1115
+      "Bioenergy": 0.0515,
+      "Hydro": 0.6854,
+      "Solar": 0.139,
+      "Wind": 0.1241
     },
     "2025": {
-      "Bioenergy": 0.0713,
-      "Hydro": 0.5715,
-      "Solar": 0.2143,
-      "Wind": 0.143
+      "Bioenergy": 0.069,
+      "Hydro": 0.6097,
+      "Solar": 0.1196,
+      "Wind": 0.2016
     }
   },
   "ML": {
@@ -5515,14 +5515,14 @@
     "2021": {
       "Bioenergy": 0.2159,
       "Hydro": 0.4462,
-      "Solar": 0.1426,
+      "Solar": 0.1427,
       "Wind": 0.1952
     },
     "2022": {
       "Bioenergy": 0.2094,
-      "Hydro": 0.4216,
+      "Hydro": 0.4215,
       "Solar": 0.1644,
-      "Wind": 0.2046
+      "Wind": 0.2047
     },
     "2023": {
       "Bioenergy": 0.2085,
@@ -5531,16 +5531,16 @@
       "Wind": 0.2239
     },
     "2024": {
-      "Bioenergy": 0.1907,
-      "Hydro": 0.3619,
-      "Solar": 0.2316,
-      "Wind": 0.2158
+      "Bioenergy": 0.1924,
+      "Hydro": 0.359,
+      "Solar": 0.231,
+      "Wind": 0.2176
     },
     "2025": {
-      "Bioenergy": 0.1997,
-      "Hydro": 0.3169,
-      "Solar": 0.2395,
-      "Wind": 0.2439
+      "Bioenergy": 0.2148,
+      "Hydro": 0.2944,
+      "Solar": 0.2293,
+      "Wind": 0.2615
     }
   },
   "MQ": {
@@ -5696,27 +5696,27 @@
     },
     "2022": {
       "Bioenergy": 0.0561,
-      "Hydro": 0.2885,
-      "Solar": 0.4502,
-      "Wind": 0.2053
+      "Hydro": 0.2886,
+      "Solar": 0.4497,
+      "Wind": 0.2056
     },
     "2023": {
-      "Bioenergy": 0.0247,
-      "Hydro": 0.1543,
-      "Solar": 0.7051,
-      "Wind": 0.1158
+      "Bioenergy": 0.0248,
+      "Hydro": 0.1545,
+      "Solar": 0.7047,
+      "Wind": 0.1161
     },
     "2024": {
-      "Bioenergy": 0.0298,
-      "Hydro": 0.1915,
-      "Solar": 0.6489,
-      "Wind": 0.1298
+      "Bioenergy": 0.0293,
+      "Hydro": 0.1889,
+      "Solar": 0.6526,
+      "Wind": 0.1292
     },
     "2025": {
-      "Bioenergy": 0.0353,
-      "Hydro": 0.197,
-      "Solar": 0.6014,
-      "Wind": 0.1662
+      "Bioenergy": 0.0318,
+      "Hydro": 0.1831,
+      "Solar": 0.6157,
+      "Wind": 0.1693
     }
   },
   "MU": {
@@ -5883,16 +5883,16 @@
       "Wind": 0.3472
     },
     "2024": {
-      "Bioenergy": 0.001,
-      "Hydro": 0.3954,
-      "Solar": 0.2957,
-      "Wind": 0.3078
+      "Bioenergy": 0.0014,
+      "Hydro": 0.3808,
+      "Solar": 0.2979,
+      "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.4453,
-      "Solar": 0.2608,
-      "Wind": 0.2939
+      "Bioenergy": 0.0045,
+      "Hydro": 0.3023,
+      "Solar": 0.28,
+      "Wind": 0.4133
     }
   },
   "MY": {
@@ -6191,16 +6191,16 @@
       "Wind": 0.3664
     },
     "2024": {
-      "Bioenergy": 0.4024,
-      "Hydro": 0.2002,
+      "Bioenergy": 0.4021,
+      "Hydro": 0.201,
       "Solar": 0.0294,
-      "Wind": 0.3679
+      "Wind": 0.3675
     },
     "2025": {
-      "Bioenergy": 0.4011,
-      "Hydro": 0.1976,
-      "Solar": 0.0317,
-      "Wind": 0.3695
+      "Bioenergy": 0.3985,
+      "Hydro": 0.2026,
+      "Solar": 0.0324,
+      "Wind": 0.3666
     }
   },
   "NL": {
@@ -6235,16 +6235,16 @@
       "Wind": 0.5266
     },
     "2024": {
-      "Bioenergy": 0.0991,
-      "Hydro": 0.0037,
-      "Solar": 0.3766,
-      "Wind": 0.5207
+      "Bioenergy": 0.1026,
+      "Hydro": 0.0033,
+      "Solar": 0.3613,
+      "Wind": 0.5328
     },
     "2025": {
-      "Bioenergy": 0.175,
-      "Hydro": 0.0026,
-      "Solar": 0.114,
-      "Wind": 0.7084
+      "Bioenergy": 0.2009,
+      "Hydro": 0,
+      "Solar": 0.1151,
+      "Wind": 0.684
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8856,
+      "Hydro": 0.9154,
       "Solar": 0,
-      "Wind": 0.1144
+      "Wind": 0.0846
     }
   },
   "NP": {
@@ -6323,16 +6323,16 @@
       "Wind": 0.0187
     },
     "2024": {
-      "Bioenergy": 0.0049,
+      "Bioenergy": 0.005,
       "Hydro": 0.9447,
-      "Solar": 0.0312,
+      "Solar": 0.031,
       "Wind": 0.0193
     },
     "2025": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.9429,
-      "Solar": 0.0312,
-      "Wind": 0.0209
+      "Bioenergy": 0.0055,
+      "Hydro": 0.9433,
+      "Solar": 0.0297,
+      "Wind": 0.0215
     }
   },
   "NR": {
@@ -6763,16 +6763,16 @@
       "Wind": 0.0982
     },
     "2024": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.8832,
-      "Solar": 0.0256,
-      "Wind": 0.0744
+      "Bioenergy": 0.0183,
+      "Hydro": 0.8764,
+      "Solar": 0.0262,
+      "Wind": 0.0791
     },
     "2025": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.9237,
-      "Solar": 0.0242,
-      "Wind": 0.0348
+      "Bioenergy": 0.0451,
+      "Hydro": 0.8016,
+      "Solar": 0.036,
+      "Wind": 0.1172
     }
   },
   "PL": {
@@ -6807,16 +6807,16 @@
       "Wind": 0.549
     },
     "2024": {
-      "Bioenergy": 0.0532,
-      "Hydro": 0.0535,
-      "Solar": 0.3838,
-      "Wind": 0.5096
+      "Bioenergy": 0.0524,
+      "Hydro": 0.0538,
+      "Solar": 0.38,
+      "Wind": 0.5138
     },
     "2025": {
-      "Bioenergy": 0.0946,
-      "Hydro": 0.0361,
-      "Solar": 0.144,
-      "Wind": 0.7253
+      "Bioenergy": 0.0655,
+      "Hydro": 0.0379,
+      "Solar": 0.1084,
+      "Wind": 0.7882
     }
   },
   "PM": {
@@ -6973,26 +6973,26 @@
     "2022": {
       "Bioenergy": 0.1292,
       "Hydro": 0.2462,
-      "Solar": 0.1205,
-      "Wind": 0.5041
+      "Solar": 0.1204,
+      "Wind": 0.5042
     },
     "2023": {
-      "Bioenergy": 0.094,
-      "Hydro": 0.3446,
-      "Solar": 0.1445,
-      "Wind": 0.417
+      "Bioenergy": 0.0942,
+      "Hydro": 0.3452,
+      "Solar": 0.1427,
+      "Wind": 0.4179
     },
     "2024": {
-      "Bioenergy": 0.0845,
-      "Hydro": 0.3567,
-      "Solar": 0.1666,
+      "Bioenergy": 0.0862,
+      "Hydro": 0.3545,
+      "Solar": 0.1672,
       "Wind": 0.3922
     },
     "2025": {
-      "Bioenergy": 0.0827,
-      "Hydro": 0.2968,
-      "Solar": 0.1076,
-      "Wind": 0.513
+      "Bioenergy": 0.0702,
+      "Hydro": 0.3538,
+      "Solar": 0.0782,
+      "Wind": 0.4979
     }
   },
   "PY": {
@@ -7148,27 +7148,27 @@
     },
     "2022": {
       "Bioenergy": 0.0257,
-      "Hydro": 0.6066,
-      "Solar": 0.0673,
-      "Wind": 0.3004
+      "Hydro": 0.6063,
+      "Solar": 0.0677,
+      "Wind": 0.3003
     },
     "2023": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.6461,
-      "Solar": 0.0769,
-      "Wind": 0.2639
+      "Hydro": 0.6463,
+      "Solar": 0.0765,
+      "Wind": 0.264
     },
     "2024": {
-      "Bioenergy": 0.0207,
-      "Hydro": 0.562,
-      "Solar": 0.1702,
-      "Wind": 0.247
+      "Bioenergy": 0.0206,
+      "Hydro": 0.5592,
+      "Solar": 0.1665,
+      "Wind": 0.2538
     },
     "2025": {
-      "Bioenergy": 0.0255,
-      "Hydro": 0.5204,
-      "Solar": 0.1195,
-      "Wind": 0.3346
+      "Bioenergy": 0.0327,
+      "Hydro": 0.5646,
+      "Solar": 0.0629,
+      "Wind": 0.3398
     }
   },
   "RS": {
@@ -7193,7 +7193,7 @@
     "2022": {
       "Bioenergy": 0.0318,
       "Hydro": 0.8243,
-      "Solar": 0.0177,
+      "Solar": 0.0176,
       "Wind": 0.1263
     },
     "2023": {
@@ -7204,15 +7204,15 @@
     },
     "2024": {
       "Bioenergy": 0.0253,
-      "Hydro": 0.8486,
-      "Solar": 0.0166,
-      "Wind": 0.1095
+      "Hydro": 0.8483,
+      "Solar": 0.0162,
+      "Wind": 0.1102
     },
     "2025": {
-      "Bioenergy": 0.0297,
-      "Hydro": 0.8241,
-      "Solar": 0.0106,
-      "Wind": 0.1355
+      "Bioenergy": 0.0213,
+      "Hydro": 0.8606,
+      "Solar": 0.0019,
+      "Wind": 0.1162
     }
   },
   "RU": {
@@ -7512,15 +7512,15 @@
     },
     "2024": {
       "Bioenergy": 0.0535,
-      "Hydro": 0.5786,
-      "Solar": 0.0159,
-      "Wind": 0.352
+      "Hydro": 0.5728,
+      "Solar": 0.0156,
+      "Wind": 0.358
     },
     "2025": {
-      "Bioenergy": 0.0485,
-      "Hydro": 0.5256,
-      "Solar": 0.0019,
-      "Wind": 0.4239
+      "Bioenergy": 0.0532,
+      "Hydro": 0.5645,
+      "Solar": 0.0008,
+      "Wind": 0.3815
     }
   },
   "SG": {
@@ -7631,27 +7631,27 @@
       "Wind": 0.0131
     },
     "2022": {
-      "Bioenergy": 0.0303,
-      "Hydro": 0.8191,
-      "Solar": 0.1056,
-      "Wind": 0.045
+      "Bioenergy": 0.0298,
+      "Hydro": 0.8047,
+      "Solar": 0.1212,
+      "Wind": 0.0443
     },
     "2023": {
-      "Bioenergy": 0.0138,
-      "Hydro": 0.8845,
-      "Solar": 0.0867,
-      "Wind": 0.0151
+      "Bioenergy": 0.0133,
+      "Hydro": 0.8551,
+      "Solar": 0.1171,
+      "Wind": 0.0146
     },
     "2024": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8378,
-      "Solar": 0.1361,
-      "Wind": 0.0056
+      "Bioenergy": 0.0198,
+      "Hydro": 0.7927,
+      "Solar": 0.1822,
+      "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0285,
-      "Hydro": 0.8858,
-      "Solar": 0.0857,
+      "Bioenergy": 0.0294,
+      "Hydro": 0.9412,
+      "Solar": 0.0294,
       "Wind": 0
     }
   },
@@ -7687,15 +7687,15 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.1463,
-      "Hydro": 0.7596,
-      "Solar": 0.094,
+      "Bioenergy": 0.1456,
+      "Hydro": 0.7621,
+      "Solar": 0.0921,
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.2255,
-      "Hydro": 0.71,
-      "Solar": 0.0645,
+      "Bioenergy": 0.1943,
+      "Hydro": 0.7781,
+      "Solar": 0.0276,
       "Wind": 0
     }
   },
@@ -8259,16 +8259,16 @@
       "Wind": 0.1527
     },
     "2024": {
-      "Bioenergy": 0.3656,
-      "Hydro": 0.2625,
-      "Solar": 0.2219,
-      "Wind": 0.1501
+      "Bioenergy": 0.3607,
+      "Hydro": 0.2668,
+      "Solar": 0.2199,
+      "Wind": 0.1527
     },
     "2025": {
-      "Bioenergy": 0.3747,
-      "Hydro": 0.2155,
-      "Solar": 0.2408,
-      "Wind": 0.1691
+      "Bioenergy": 0.3568,
+      "Hydro": 0.2304,
+      "Solar": 0.2233,
+      "Wind": 0.1894
     }
   },
   "TJ": {
@@ -8524,15 +8524,15 @@
     },
     "2024": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.512,
-      "Solar": 0.1778,
-      "Wind": 0.2507
+      "Hydro": 0.5127,
+      "Solar": 0.1766,
+      "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0741,
-      "Hydro": 0.4415,
-      "Solar": 0.1261,
-      "Wind": 0.3584
+      "Bioenergy": 0.0768,
+      "Hydro": 0.4996,
+      "Solar": 0.1297,
+      "Wind": 0.2939
     }
   },
   "TT": {
@@ -8787,16 +8787,16 @@
       "Wind": 0.4495
     },
     "2024": {
-      "Bioenergy": 0.0449,
-      "Hydro": 0.2253,
-      "Solar": 0.2899,
-      "Wind": 0.44
+      "Bioenergy": 0.0446,
+      "Hydro": 0.227,
+      "Solar": 0.2904,
+      "Wind": 0.438
     },
     "2025": {
-      "Bioenergy": 0.0495,
-      "Hydro": 0.2361,
-      "Solar": 0.2072,
-      "Wind": 0.5072
+      "Bioenergy": 0.0452,
+      "Hydro": 0.2445,
+      "Solar": 0.2296,
+      "Wind": 0.4808
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1078,
-      "Hydro": 0.4608,
-      "Solar": 0.049,
-      "Wind": 0.3824
+      "Bioenergy": 0.1652,
+      "Hydro": 0.423,
+      "Solar": 0.0553,
+      "Wind": 0.3566
     }
   },
   "UZ": {
@@ -8875,16 +8875,16 @@
       "Wind": 0.0135
     },
     "2024": {
-      "Bioenergy": 0.0038,
+      "Bioenergy": 0.0039,
       "Hydro": 0.9655,
-      "Solar": 0.0168,
+      "Solar": 0.0167,
       "Wind": 0.0139
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9642,
-      "Solar": 0.0167,
-      "Wind": 0.0152
+      "Bioenergy": 0.0043,
+      "Hydro": 0.9645,
+      "Solar": 0.0155,
+      "Wind": 0.0156
     }
   },
   "VC": {
@@ -9217,26 +9217,26 @@
     "2022": {
       "Bioenergy": 0.0263,
       "Hydro": 0.3311,
-      "Solar": 0.0179,
-      "Wind": 0.6248
+      "Solar": 0.0178,
+      "Wind": 0.6249
     },
     "2023": {
       "Bioenergy": 0.0235,
-      "Hydro": 0.4718,
-      "Solar": 0.0406,
-      "Wind": 0.464
+      "Hydro": 0.472,
+      "Solar": 0.0401,
+      "Wind": 0.4644
     },
     "2024": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.3856,
-      "Solar": 0.0394,
-      "Wind": 0.5545
+      "Bioenergy": 0.0251,
+      "Hydro": 0.4008,
+      "Solar": 0.0407,
+      "Wind": 0.5334
     },
     "2025": {
-      "Bioenergy": 0.0276,
-      "Hydro": 0.3175,
-      "Solar": 0.0348,
-      "Wind": 0.6201
+      "Bioenergy": 0.0501,
+      "Hydro": 0.4027,
+      "Solar": 0.0512,
+      "Wind": 0.496
     }
   },
   "YE": {