npm - @digital4better/data - Versions diffs - 1.3.0 → 1.3.2 - Mend

@digital4better/data 1.3.0 → 1.3.2

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

package/data/cloud/accelerators.csv +1 -0
package/data/cloud/accelerators.json +14 -0
package/data/cloud/cpus.csv +23 -0
package/data/cloud/cpus.json +345 -0
package/data/cloud/scaleway-regions.csv +10 -0
package/data/cloud/scaleway-regions.json +110 -0
package/data/cloud/scaleway-vms.csv +134 -0
package/data/cloud/scaleway-vms.json +1864 -0
package/data/factor/continent-monthly-green.csv +170 -170
package/data/factor/continent-monthly-green.json +1489 -1489
package/data/factor/continent-monthly.csv +175 -175
package/data/factor/continent-monthly.json +1502 -1502
package/data/factor/continent-yearly-green.csv +22 -22
package/data/factor/continent-yearly-green.json +183 -183
package/data/factor/continent-yearly.csv +22 -22
package/data/factor/continent-yearly.json +180 -180
package/data/factor/country-monthly-green.csv +891 -891
package/data/factor/country-monthly-green.json +7500 -7500
package/data/factor/country-monthly.csv +944 -944
package/data/factor/country-monthly.json +7092 -7092
package/data/factor/country-yearly-green.csv +171 -171
package/data/factor/country-yearly-green.json +1380 -1380
package/data/factor/country-yearly.csv +172 -172
package/data/factor/country-yearly.json +1319 -1319
package/data/factor/subdivision-monthly-green.csv +100 -100
package/data/factor/subdivision-monthly-green.json +900 -900
package/data/factor/subdivision-monthly.csv +100 -100
package/data/factor/subdivision-monthly.json +900 -900
package/data/factor/subdivision-yearly-green.csv +50 -50
package/data/factor/subdivision-yearly-green.json +450 -450
package/data/factor/subdivision-yearly.csv +50 -50
package/data/factor/subdivision-yearly.json +450 -450
package/data/factor/world-monthly-green.csv +77 -77
package/data/factor/world-monthly-green.json +668 -668
package/data/factor/world-monthly.csv +77 -77
package/data/factor/world-monthly.json +651 -651
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +62 -62
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +61 -61
package/data/mix/continent-monthly-green.csv +142 -142
package/data/mix/continent-monthly-green.json +385 -385
package/data/mix/continent-monthly.csv +142 -142
package/data/mix/continent-monthly.json +541 -541
package/data/mix/continent-yearly-green.csv +17 -17
package/data/mix/continent-yearly-green.json +52 -52
package/data/mix/continent-yearly.csv +17 -17
package/data/mix/continent-yearly.json +70 -70
package/data/mix/country-monthly-green.csv +737 -737
package/data/mix/country-monthly-green.json +1897 -1897
package/data/mix/country-monthly.csv +737 -737
package/data/mix/country-monthly.json +2987 -2987
package/data/mix/country-yearly-green.csv +122 -122
package/data/mix/country-yearly-green.json +291 -291
package/data/mix/country-yearly.csv +122 -122
package/data/mix/country-yearly.json +516 -516
package/data/mix/subdivision-monthly-green.csv +100 -100
package/data/mix/subdivision-monthly-green.json +352 -352
package/data/mix/subdivision-monthly.csv +100 -100
package/data/mix/subdivision-monthly.json +660 -660
package/data/mix/subdivision-yearly-green.csv +50 -50
package/data/mix/subdivision-yearly-green.json +176 -176
package/data/mix/subdivision-yearly.csv +50 -50
package/data/mix/subdivision-yearly.json +324 -324
package/data/mix/world-monthly-green.csv +43 -43
package/data/mix/world-monthly-green.json +99 -99
package/data/mix/world-monthly.csv +43 -43
package/data/mix/world-monthly.json +96 -96
package/data/mix/world-yearly-green.csv +5 -5
package/data/mix/world-yearly-green.json +5 -5
package/data/mix/world-yearly.csv +5 -5
package/data/mix/world-yearly.json +11 -11
package/package.json +2 -2

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

@@ -75,15 +75,15 @@
       "Wind": 0.1321
     },
     "2024": {
-      "Bioenergy": 0.0378,
-      "Hydro": 0.6674,
+      "Bioenergy": 0.0379,
+      "Hydro": 0.6672,
       "Solar": 0.1617,
-      "Wind": 0.1331
+      "Wind": 0.1332
     },
     "2025": {
-      "Bioenergy": 0.0373,
-      "Hydro": 0.6067,
-      "Solar": 0.1929,
+      "Bioenergy": 0.0374,
+      "Hydro": 0.6068,
+      "Solar": 0.1927,
       "Wind": 0.1631
     }
   },
@@ -164,14 +164,14 @@
     },
     "2024": {
       "Bioenergy": 0.011,
-      "Hydro": 0.9069,
+      "Hydro": 0.907,
       "Solar": 0.0324,
       "Wind": 0.0497
     },
     "2025": {
-      "Bioenergy": 0.0113,
-      "Hydro": 0.9059,
-      "Solar": 0.0354,
+      "Bioenergy": 0.0114,
+      "Hydro": 0.906,
+      "Solar": 0.0353,
       "Wind": 0.0473
     }
   },
@@ -202,20 +202,20 @@
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.8084,
-      "Solar": 0.1878,
+      "Hydro": 0.8075,
+      "Solar": 0.1887,
       "Wind": 0.003
     },
     "2024": {
       "Bioenergy": 0.0012,
-      "Hydro": 0.7789,
-      "Solar": 0.2158,
-      "Wind": 0.0042
+      "Hydro": 0.7859,
+      "Solar": 0.2084,
+      "Wind": 0.0045
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.7223,
-      "Solar": 0.2777,
+      "Hydro": 0.7748,
+      "Solar": 0.2252,
       "Wind": 0
     }
   },
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0412,
-      "Hydro": 0.6253,
-      "Solar": 0.1662,
-      "Wind": 0.1673
+      "Bioenergy": 0.0414,
+      "Hydro": 0.6228,
+      "Solar": 0.1673,
+      "Wind": 0.1684
     }
   },
   "AU": {
@@ -516,14 +516,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8907,
-      "Solar": 0.1093,
+      "Hydro": 0.9133,
+      "Solar": 0.0867,
       "Wind": 0
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8125,
-      "Solar": 0.1875,
+      "Hydro": 0.8475,
+      "Solar": 0.1525,
       "Wind": 0
     }
   },
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9152,
-      "Solar": 0.0454,
-      "Wind": 0.0394
+      "Hydro": 0.9019,
+      "Solar": 0.0592,
+      "Wind": 0.0389
     }
   },
   "BB": {
@@ -647,16 +647,16 @@
       "Wind": 0.1934
     },
     "2024": {
-      "Bioenergy": 0.0502,
-      "Hydro": 0.4307,
-      "Solar": 0.3424,
-      "Wind": 0.1768
+      "Bioenergy": 0.0503,
+      "Hydro": 0.4304,
+      "Solar": 0.3425,
+      "Wind": 0.1769
     },
     "2025": {
-      "Bioenergy": 0.0536,
-      "Hydro": 0.2354,
-      "Solar": 0.4764,
-      "Wind": 0.2346
+      "Bioenergy": 0.0534,
+      "Hydro": 0.2353,
+      "Solar": 0.4774,
+      "Wind": 0.2339
     }
   },
   "BE": {
@@ -691,10 +691,10 @@
       "Wind": 0.6099
     },
     "2024": {
-      "Bioenergy": 0.0362,
+      "Bioenergy": 0.0361,
       "Hydro": 0.0794,
       "Solar": 0.3412,
-      "Wind": 0.5431
+      "Wind": 0.5432
     },
     "2025": {
       "Bioenergy": 0.0387,
@@ -1093,10 +1093,10 @@
       "Wind": 0.1713
     },
     "2025": {
-      "Bioenergy": 0.0071,
-      "Hydro": 0.7259,
-      "Solar": 0.1364,
-      "Wind": 0.1305
+      "Bioenergy": 0.0083,
+      "Hydro": 0.7142,
+      "Solar": 0.1359,
+      "Wind": 0.1416
     }
   },
   "BS": {
@@ -1263,16 +1263,16 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.3888,
-      "Hydro": 0.3019,
-      "Solar": 0.1789,
-      "Wind": 0.1304
+      "Bioenergy": 0.2936,
+      "Hydro": 0.3693,
+      "Solar": 0.1859,
+      "Wind": 0.1512
     },
     "2025": {
-      "Bioenergy": 0.4433,
-      "Hydro": 0.2234,
-      "Solar": 0.2234,
-      "Wind": 0.1099
+      "Bioenergy": 0.4549,
+      "Hydro": 0.3097,
+      "Solar": 0.078,
+      "Wind": 0.1574
     }
   },
   "BZ": {
@@ -1309,14 +1309,14 @@
     "2024": {
       "Bioenergy": 0.2236,
       "Hydro": 0.668,
-      "Solar": 0.0549,
+      "Solar": 0.0548,
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.218,
-      "Hydro": 0.674,
+      "Bioenergy": 0.2176,
+      "Hydro": 0.6743,
       "Solar": 0.06,
-      "Wind": 0.048
+      "Wind": 0.0481
     }
   },
   "CA": {
@@ -1535,8 +1535,8 @@
     "2025": {
       "Bioenergy": 0.004,
       "Hydro": 0.7901,
-      "Solar": 0.1841,
-      "Wind": 0.0218
+      "Solar": 0.1843,
+      "Wind": 0.0217
     }
   },
   "CI": {
@@ -1742,65 +1742,65 @@
     },
     "2023": {
       "Bioenergy": 0.0691,
-      "Hydro": 0.4093,
+      "Hydro": 0.4094,
       "Solar": 0.2072,
       "Wind": 0.3143
     },
     "2024": {
-      "Bioenergy": 0.0601,
-      "Hydro": 0.3878,
-      "Solar": 0.2522,
-      "Wind": 0.2999
+      "Bioenergy": 0.06,
+      "Hydro": 0.3876,
+      "Solar": 0.2523,
+      "Wind": 0.3
     },
     "2025": {
-      "Bioenergy": 0.0544,
-      "Hydro": 0.275,
+      "Bioenergy": 0.054,
+      "Hydro": 0.285,
       "Solar": 0.3036,
-      "Wind": 0.367
+      "Wind": 0.3573
     }
   },
   "CO": {
     "2019": {
-      "Bioenergy": 0.0016,
-      "Hydro": 0.9949,
-      "Solar": 0.002,
-      "Wind": 0.0015
+      "Bioenergy": 0.002,
+      "Hydro": 0.9911,
+      "Solar": 0.0028,
+      "Wind": 0.0041
     },
     "2020": {
-      "Bioenergy": 0.0028,
-      "Hydro": 0.9932,
-      "Solar": 0.004,
-      "Wind": 0
+      "Bioenergy": 0.0036,
+      "Hydro": 0.9849,
+      "Solar": 0.006,
+      "Wind": 0.0055
     },
     "2021": {
-      "Bioenergy": 0,
-      "Hydro": 0.9936,
-      "Solar": 0.0054,
-      "Wind": 0.001
+      "Bioenergy": 0.0003,
+      "Hydro": 0.9894,
+      "Solar": 0.0066,
+      "Wind": 0.0038
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 0.9912,
-      "Solar": 0.0077,
-      "Wind": 0.0011
+      "Bioenergy": 0.0002,
+      "Hydro": 0.9888,
+      "Solar": 0.0084,
+      "Wind": 0.0026
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 0.9767,
-      "Solar": 0.0198,
-      "Wind": 0.0036
+      "Bioenergy": 0.0007,
+      "Hydro": 0.967,
+      "Solar": 0.0229,
+      "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0.9406,
-      "Solar": 0.0568,
-      "Wind": 0.0026
+      "Bioenergy": 0.0015,
+      "Hydro": 0.9199,
+      "Solar": 0.0625,
+      "Wind": 0.0161
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.9381,
-      "Solar": 0.0602,
-      "Wind": 0.0018
+      "Bioenergy": 0.0001,
+      "Hydro": 0.9366,
+      "Solar": 0.0601,
+      "Wind": 0.0031
     }
   },
   "CR": {
@@ -2061,10 +2061,10 @@
       "Wind": 0.4833
     },
     "2025": {
-      "Bioenergy": 0.1548,
-      "Hydro": 0.0712,
-      "Solar": 0.3197,
-      "Wind": 0.4543
+      "Bioenergy": 0.156,
+      "Hydro": 0.0717,
+      "Solar": 0.3146,
+      "Wind": 0.4577
     }
   },
   "DJ": {
@@ -2150,9 +2150,9 @@
     },
     "2025": {
       "Bioenergy": 0.1569,
-      "Hydro": 0.0425,
-      "Solar": 0.1619,
-      "Wind": 0.6388
+      "Hydro": 0.0424,
+      "Solar": 0.1618,
+      "Wind": 0.6389
     }
   },
   "DM": {
@@ -2231,16 +2231,16 @@
       "Wind": 0.3123
     },
     "2024": {
-      "Bioenergy": 0.0547,
-      "Hydro": 0.3362,
-      "Solar": 0.3592,
-      "Wind": 0.25
+      "Bioenergy": 0.0523,
+      "Hydro": 0.3539,
+      "Solar": 0.3468,
+      "Wind": 0.247
     },
     "2025": {
-      "Bioenergy": 0.0542,
-      "Hydro": 0.324,
-      "Solar": 0.4056,
-      "Wind": 0.2162
+      "Bioenergy": 0.0544,
+      "Hydro": 0.3532,
+      "Solar": 0.3587,
+      "Wind": 0.2338
     }
   },
   "DZ": {
@@ -2326,7 +2326,7 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.9881,
+      "Hydro": 0.988,
       "Solar": 0.0036,
       "Wind": 0.0081
     }
@@ -2363,16 +2363,16 @@
       "Wind": 0.3731
     },
     "2024": {
-      "Bioenergy": 0.1402,
+      "Bioenergy": 0.1401,
       "Hydro": 0.1365,
       "Solar": 0.3042,
       "Wind": 0.4191
     },
     "2025": {
-      "Bioenergy": 0.154,
-      "Hydro": 0.105,
-      "Solar": 0.2981,
-      "Wind": 0.4429
+      "Bioenergy": 0.1522,
+      "Hydro": 0.1036,
+      "Solar": 0.3066,
+      "Wind": 0.4375
     }
   },
   "EG": {
@@ -2413,10 +2413,10 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.518,
-      "Solar": 0.2559,
-      "Wind": 0.2208
+      "Bioenergy": 0.0049,
+      "Hydro": 0.4718,
+      "Solar": 0.2433,
+      "Wind": 0.28
     }
   },
   "ER": {
@@ -2589,10 +2589,10 @@
       "Wind": 0.4324
     },
     "2025": {
-      "Bioenergy": 0.2157,
-      "Hydro": 0.2912,
-      "Solar": 0.0357,
-      "Wind": 0.4575
+      "Bioenergy": 0.217,
+      "Hydro": 0.294,
+      "Solar": 0.0362,
+      "Wind": 0.4528
     }
   },
   "FJ": {
@@ -2850,10 +2850,10 @@
       "Bioenergy": 0.1502,
       "Hydro": 0.0738,
       "Solar": 0.1259,
-      "Wind": 0.6501
+      "Wind": 0.6502
     },
     "2025": {
-      "Bioenergy": 0.1626,
+      "Bioenergy": 0.1627,
       "Hydro": 0.0686,
       "Solar": 0.168,
       "Wind": 0.6007
@@ -2938,7 +2938,7 @@
       "Bioenergy": 0.0021,
       "Hydro": 0.973,
       "Solar": 0.0068,
-      "Wind": 0.0181
+      "Wind": 0.0182
     },
     "2025": {
       "Bioenergy": 0.0047,
@@ -3339,8 +3339,8 @@
     "2025": {
       "Bioenergy": 0.0017,
       "Hydro": 0.0898,
-      "Solar": 0.4864,
-      "Wind": 0.422
+      "Solar": 0.4869,
+      "Wind": 0.4216
     }
   },
   "GT": {
@@ -3547,19 +3547,19 @@
     "2023": {
       "Bioenergy": 0.1169,
       "Hydro": 0.4119,
-      "Solar": 0.2232,
+      "Solar": 0.2233,
       "Wind": 0.2479
     },
     "2024": {
-      "Bioenergy": 0.1057,
-      "Hydro": 0.3951,
-      "Solar": 0.2579,
-      "Wind": 0.2412
+      "Bioenergy": 0.1058,
+      "Hydro": 0.3947,
+      "Solar": 0.258,
+      "Wind": 0.2414
     },
     "2025": {
-      "Bioenergy": 0.1031,
-      "Hydro": 0.2933,
-      "Solar": 0.3114,
+      "Bioenergy": 0.1032,
+      "Hydro": 0.2938,
+      "Solar": 0.3109,
       "Wind": 0.2922
     }
   },
@@ -3602,7 +3602,7 @@
     },
     "2025": {
       "Bioenergy": 0.2438,
-      "Hydro": 0.4254,
+      "Hydro": 0.4255,
       "Solar": 0.1903,
       "Wind": 0.1404
     }
@@ -3639,15 +3639,15 @@
       "Wind": 0.2488
     },
     "2024": {
-      "Bioenergy": 0.0634,
+      "Bioenergy": 0.0633,
       "Hydro": 0.5505,
       "Solar": 0.1113,
       "Wind": 0.2749
     },
     "2025": {
       "Bioenergy": 0.0582,
-      "Hydro": 0.5155,
-      "Solar": 0.1176,
+      "Hydro": 0.5156,
+      "Solar": 0.1174,
       "Wind": 0.3088
     }
   },
@@ -3727,14 +3727,14 @@
       "Wind": 0.1663
     },
     "2024": {
-      "Bioenergy": 0.0807,
-      "Hydro": 0.1386,
+      "Bioenergy": 0.0806,
+      "Hydro": 0.1387,
       "Solar": 0.6441,
       "Wind": 0.1366
     },
     "2025": {
       "Bioenergy": 0.1148,
-      "Hydro": 0.1156,
+      "Hydro": 0.1155,
       "Solar": 0.6548,
       "Wind": 0.1148
     }
@@ -3810,21 +3810,21 @@
     },
     "2023": {
       "Bioenergy": 0.016,
-      "Hydro": 0.1117,
-      "Solar": 0.044,
-      "Wind": 0.8283
+      "Hydro": 0.1116,
+      "Solar": 0.0446,
+      "Wind": 0.8278
     },
     "2024": {
       "Bioenergy": 0.018,
-      "Hydro": 0.1141,
-      "Solar": 0.0746,
+      "Hydro": 0.1142,
+      "Solar": 0.0745,
       "Wind": 0.7933
     },
     "2025": {
-      "Bioenergy": 0.0165,
-      "Hydro": 0.1184,
-      "Solar": 0.0479,
-      "Wind": 0.8172
+      "Bioenergy": 0.0183,
+      "Hydro": 0.1047,
+      "Solar": 0.0894,
+      "Wind": 0.7875
     }
   },
   "IL": {
@@ -3998,9 +3998,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Hydro": 0.9995,
+      "Solar": 0.0004,
+      "Wind": 0.0001
     }
   },
   "IS": {
@@ -4079,15 +4079,15 @@
       "Wind": 0.2398
     },
     "2024": {
-      "Bioenergy": 0.118,
+      "Bioenergy": 0.1179,
       "Hydro": 0.396,
-      "Solar": 0.2809,
+      "Solar": 0.2808,
       "Wind": 0.2052
     },
     "2025": {
-      "Bioenergy": 0.1442,
+      "Bioenergy": 0.1443,
       "Hydro": 0.3024,
-      "Solar": 0.2163,
+      "Solar": 0.2162,
       "Wind": 0.3371
     }
   },
@@ -4269,10 +4269,10 @@
   },
   "KG": {
     "2019": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0003,
+      "Hydro": 0.9986,
+      "Solar": 0.0005,
+      "Wind": 0.0007
     },
     "2020": {
       "Bioenergy": 0.0004,
@@ -4302,7 +4302,7 @@
       "Bioenergy": 0.0023,
       "Hydro": 0.9817,
       "Solar": 0.0079,
-      "Wind": 0.008
+      "Wind": 0.0081
     },
     "2025": {
       "Bioenergy": 0.0018,
@@ -4350,9 +4350,9 @@
     },
     "2025": {
       "Bioenergy": 0.0306,
-      "Hydro": 0.8405,
+      "Hydro": 0.8404,
       "Solar": 0.0769,
-      "Wind": 0.052
+      "Wind": 0.0521
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.2122,
-      "Hydro": 0.0445,
-      "Solar": 0.6585,
-      "Wind": 0.0849
+      "Bioenergy": 0.1989,
+      "Hydro": 0.046,
+      "Solar": 0.6777,
+      "Wind": 0.0774
     }
   },
   "KW": {
@@ -4702,9 +4702,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.5389,
-      "Solar": 0.1096,
-      "Wind": 0.3515
+      "Hydro": 0.5936,
+      "Solar": 0.1057,
+      "Wind": 0.3007
     }
   },
   "LA": {
@@ -5003,16 +5003,16 @@
       "Wind": 0.5082
     },
     "2024": {
-      "Bioenergy": 0.0516,
-      "Hydro": 0.1845,
-      "Solar": 0.2351,
-      "Wind": 0.5288
+      "Bioenergy": 0.0515,
+      "Hydro": 0.1846,
+      "Solar": 0.235,
+      "Wind": 0.5289
     },
     "2025": {
       "Bioenergy": 0.0371,
-      "Hydro": 0.1156,
+      "Hydro": 0.1155,
       "Solar": 0.2443,
-      "Wind": 0.603
+      "Wind": 0.6031
     }
   },
   "LU": {
@@ -5047,16 +5047,16 @@
       "Wind": 0.4016
     },
     "2024": {
-      "Bioenergy": 0.1385,
-      "Hydro": 0.2936,
-      "Solar": 0.218,
-      "Wind": 0.3499
+      "Bioenergy": 0.1383,
+      "Hydro": 0.2937,
+      "Solar": 0.2179,
+      "Wind": 0.3501
     },
     "2025": {
-      "Bioenergy": 0.1401,
-      "Hydro": 0.2571,
-      "Solar": 0.2616,
-      "Wind": 0.3412
+      "Bioenergy": 0.1402,
+      "Hydro": 0.257,
+      "Solar": 0.2615,
+      "Wind": 0.3413
     }
   },
   "LV": {
@@ -5091,16 +5091,16 @@
       "Wind": 0.1011
     },
     "2024": {
-      "Bioenergy": 0.087,
+      "Bioenergy": 0.0869,
       "Hydro": 0.681,
-      "Solar": 0.124,
+      "Solar": 0.1239,
       "Wind": 0.1081
     },
     "2025": {
-      "Bioenergy": 0.0944,
-      "Hydro": 0.6891,
-      "Solar": 0.1477,
-      "Wind": 0.0688
+      "Bioenergy": 0.0945,
+      "Hydro": 0.6942,
+      "Solar": 0.1375,
+      "Wind": 0.0738
     }
   },
   "LY": {
@@ -5223,16 +5223,16 @@
       "Wind": 0.1268
     },
     "2024": {
-      "Bioenergy": 0.0124,
+      "Bioenergy": 0.0123,
       "Hydro": 0.6423,
       "Solar": 0.1677,
       "Wind": 0.1776
     },
     "2025": {
       "Bioenergy": 0.0085,
-      "Hydro": 0.6376,
+      "Hydro": 0.6377,
       "Solar": 0.3183,
-      "Wind": 0.0356
+      "Wind": 0.0355
     }
   },
   "ME": {
@@ -5268,15 +5268,15 @@
     },
     "2024": {
       "Bioenergy": 0.0069,
-      "Hydro": 0.7727,
-      "Solar": 0.0566,
+      "Hydro": 0.7728,
+      "Solar": 0.0565,
       "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0182,
-      "Hydro": 0.6982,
-      "Solar": 0.0658,
-      "Wind": 0.2178
+      "Bioenergy": 0.0183,
+      "Hydro": 0.6985,
+      "Solar": 0.0656,
+      "Wind": 0.2177
     }
   },
   "MG": {
@@ -5361,10 +5361,10 @@
       "Wind": 0.1213
     },
     "2025": {
-      "Bioenergy": 0.0328,
-      "Hydro": 0.6257,
-      "Solar": 0.1527,
-      "Wind": 0.1888
+      "Bioenergy": 0.0329,
+      "Hydro": 0.6258,
+      "Solar": 0.1526,
+      "Wind": 0.1887
     }
   },
   "ML": {
@@ -5531,15 +5531,15 @@
       "Wind": 0.2232
     },
     "2024": {
-      "Bioenergy": 0.1935,
-      "Hydro": 0.3583,
-      "Solar": 0.2294,
-      "Wind": 0.2188
+      "Bioenergy": 0.1936,
+      "Hydro": 0.3579,
+      "Solar": 0.2295,
+      "Wind": 0.2189
     },
     "2025": {
       "Bioenergy": 0.1891,
-      "Hydro": 0.2666,
-      "Solar": 0.2787,
+      "Hydro": 0.2671,
+      "Solar": 0.2783,
       "Wind": 0.2656
     }
   },
@@ -5707,16 +5707,16 @@
       "Wind": 0.1162
     },
     "2024": {
-      "Bioenergy": 0.0301,
-      "Hydro": 0.1921,
+      "Bioenergy": 0.0299,
+      "Hydro": 0.1922,
       "Solar": 0.6447,
-      "Wind": 0.1331
+      "Wind": 0.1332
     },
     "2025": {
       "Bioenergy": 0.0326,
-      "Hydro": 0.1894,
-      "Solar": 0.6419,
-      "Wind": 0.1361
+      "Hydro": 0.1893,
+      "Solar": 0.642,
+      "Wind": 0.136
     }
   },
   "MU": {
@@ -6192,15 +6192,15 @@
     },
     "2024": {
       "Bioenergy": 0.4021,
-      "Hydro": 0.2009,
+      "Hydro": 0.201,
       "Solar": 0.0294,
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.3988,
-      "Hydro": 0.2064,
+      "Bioenergy": 0.3986,
+      "Hydro": 0.2068,
       "Solar": 0.0315,
-      "Wind": 0.3633
+      "Wind": 0.3632
     }
   },
   "NL": {
@@ -6235,16 +6235,16 @@
       "Wind": 0.5288
     },
     "2024": {
-      "Bioenergy": 0.104,
-      "Hydro": 0.0034,
-      "Solar": 0.3599,
-      "Wind": 0.5327
+      "Bioenergy": 0.0975,
+      "Hydro": 0.0035,
+      "Solar": 0.3575,
+      "Wind": 0.5415
     },
     "2025": {
-      "Bioenergy": 0.1383,
+      "Bioenergy": 0.1384,
       "Hydro": 0.0019,
-      "Solar": 0.4061,
-      "Wind": 0.4537
+      "Solar": 0.4058,
+      "Wind": 0.4539
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9152,
+      "Hydro": 0.915,
       "Solar": 0,
-      "Wind": 0.0848
+      "Wind": 0.085
     }
   },
   "NP": {
@@ -6324,8 +6324,8 @@
     },
     "2024": {
       "Bioenergy": 0.0051,
-      "Hydro": 0.9445,
-      "Solar": 0.0309,
+      "Hydro": 0.9444,
+      "Solar": 0.031,
       "Wind": 0.0195
     },
     "2025": {
@@ -6462,9 +6462,9 @@
     },
     "2025": {
       "Bioenergy": 0.0011,
-      "Hydro": 0.8593,
+      "Hydro": 0.8585,
       "Solar": 0,
-      "Wind": 0.1396
+      "Wind": 0.1404
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.007,
-      "Hydro": 0.8735,
-      "Solar": 0.0326,
-      "Wind": 0.0869
+      "Bioenergy": 0.0071,
+      "Hydro": 0.8741,
+      "Solar": 0.0335,
+      "Wind": 0.0852
     }
   },
   "PF": {
@@ -6807,16 +6807,16 @@
       "Wind": 0.549
     },
     "2024": {
-      "Bioenergy": 0.0521,
+      "Bioenergy": 0.052,
       "Hydro": 0.0528,
       "Solar": 0.3773,
       "Wind": 0.5179
     },
     "2025": {
-      "Bioenergy": 0.069,
-      "Hydro": 0.0381,
-      "Solar": 0.4057,
-      "Wind": 0.4872
+      "Bioenergy": 0.0691,
+      "Hydro": 0.0382,
+      "Solar": 0.407,
+      "Wind": 0.4857
     }
   },
   "PM": {
@@ -6980,10 +6980,10 @@
       "Bioenergy": 0.0942,
       "Hydro": 0.3452,
       "Solar": 0.1427,
-      "Wind": 0.4178
+      "Wind": 0.4179
     },
     "2024": {
-      "Bioenergy": 0.0862,
+      "Bioenergy": 0.0861,
       "Hydro": 0.3543,
       "Solar": 0.1675,
       "Wind": 0.3921
@@ -6992,7 +6992,7 @@
       "Bioenergy": 0.0662,
       "Hydro": 0.4428,
       "Solar": 0.1403,
-      "Wind": 0.3507
+      "Wind": 0.3508
     }
   },
   "PY": {
@@ -7203,16 +7203,16 @@
       "Wind": 0.0716
     },
     "2024": {
-      "Bioenergy": 0.0253,
-      "Hydro": 0.8485,
+      "Bioenergy": 0.0252,
+      "Hydro": 0.8486,
       "Solar": 0.0162,
       "Wind": 0.11
     },
     "2025": {
       "Bioenergy": 0.0238,
-      "Hydro": 0.8387,
-      "Solar": 0.009,
-      "Wind": 0.1285
+      "Hydro": 0.8388,
+      "Solar": 0.0089,
+      "Wind": 0.1284
     }
   },
   "RU": {
@@ -7557,12 +7557,12 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Hydro": 0.0015,
-      "Solar": 0.9969,
+      "Solar": 0.9968,
       "Wind": 0.0013
     },
     "2025": {
       "Bioenergy": 0.0035,
-      "Hydro": 0.0153,
+      "Hydro": 0.0154,
       "Solar": 0.9659,
       "Wind": 0.0153
     }
@@ -8254,21 +8254,21 @@
     },
     "2023": {
       "Bioenergy": 0.392,
-      "Hydro": 0.2704,
+      "Hydro": 0.2703,
       "Solar": 0.185,
       "Wind": 0.1527
     },
     "2024": {
-      "Bioenergy": 0.3584,
-      "Hydro": 0.269,
+      "Bioenergy": 0.3585,
+      "Hydro": 0.2688,
       "Solar": 0.2152,
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.3389,
-      "Hydro": 0.2698,
-      "Solar": 0.2559,
-      "Wind": 0.1354
+      "Bioenergy": 0.3388,
+      "Hydro": 0.2699,
+      "Solar": 0.2558,
+      "Wind": 0.1355
     }
   },
   "TJ": {
@@ -8304,15 +8304,15 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Hydro": 0.9998,
+      "Solar": 0.0001,
+      "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0004,
+      "Hydro": 0.9961,
+      "Solar": 0.0018,
+      "Wind": 0.0017
     }
   },
   "TL": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0585,
-      "Hydro": 0.4795,
-      "Solar": 0.215,
-      "Wind": 0.247
+      "Bioenergy": 0.0582,
+      "Hydro": 0.4772,
+      "Solar": 0.2188,
+      "Wind": 0.2458
     }
   },
   "TT": {
@@ -8794,9 +8794,9 @@
     },
     "2025": {
       "Bioenergy": 0.0381,
-      "Hydro": 0.22,
-      "Solar": 0.3003,
-      "Wind": 0.4415
+      "Hydro": 0.2197,
+      "Solar": 0.3012,
+      "Wind": 0.441
     }
   },
   "UY": {
@@ -8838,9 +8838,9 @@
     },
     "2025": {
       "Bioenergy": 0.1545,
-      "Hydro": 0.4373,
+      "Hydro": 0.4374,
       "Solar": 0.049,
-      "Wind": 0.3592
+      "Wind": 0.3591
     }
   },
   "UZ": {
@@ -9102,9 +9102,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.5598,
-      "Solar": 0.2883,
-      "Wind": 0.1518
+      "Hydro": 0.5932,
+      "Solar": 0.2717,
+      "Wind": 0.135
     }
   },
   "VU": {
@@ -9227,16 +9227,16 @@
       "Wind": 0.4644
     },
     "2024": {
-      "Bioenergy": 0.0282,
-      "Hydro": 0.3921,
+      "Bioenergy": 0.0281,
+      "Hydro": 0.3922,
       "Solar": 0.0418,
-      "Wind": 0.5379
+      "Wind": 0.538
     },
     "2025": {
-      "Bioenergy": 0.0372,
-      "Hydro": 0.4149,
-      "Solar": 0.0827,
-      "Wind": 0.4652
+      "Bioenergy": 0.039,
+      "Hydro": 0.4612,
+      "Solar": 0.0983,
+      "Wind": 0.4015
     }
   },
   "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.0298,
-      "Solar": 0.6667,
-      "Wind": 0.3035
+      "Hydro": 0.0741,
+      "Solar": 0.6266,
+      "Wind": 0.2993
     }
   },
   "ZM": {