npm - @digital4better/data - Versions diffs - 1.2.24 → 1.2.26 - Mend

@digital4better/data 1.2.24 → 1.2.26

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 +66 -66
package/data/factor/continent-monthly-green.json +434 -434
package/data/factor/continent-monthly.csv +89 -89
package/data/factor/continent-monthly.json +475 -475
package/data/factor/continent-yearly-green.csv +15 -15
package/data/factor/continent-yearly-green.json +101 -101
package/data/factor/continent-yearly.csv +15 -15
package/data/factor/continent-yearly.json +87 -87
package/data/factor/country-monthly-green.csv +455 -455
package/data/factor/country-monthly-green.json +3707 -3707
package/data/factor/country-monthly.csv +827 -827
package/data/factor/country-monthly.json +5309 -5309
package/data/factor/country-yearly-green.csv +150 -150
package/data/factor/country-yearly-green.json +1126 -1126
package/data/factor/country-yearly.csv +184 -184
package/data/factor/country-yearly.json +1189 -1189
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +342 -342
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +351 -351
package/data/factor/subdivision-yearly-green.csv +56 -56
package/data/factor/subdivision-yearly-green.json +240 -240
package/data/factor/subdivision-yearly.csv +55 -55
package/data/factor/subdivision-yearly.json +217 -217
package/data/factor/world-monthly-green.csv +19 -19
package/data/factor/world-monthly-green.json +153 -153
package/data/factor/world-monthly.csv +23 -23
package/data/factor/world-monthly.json +144 -144
package/data/factor/world-yearly-green.csv +3 -3
package/data/factor/world-yearly-green.json +23 -23
package/data/factor/world-yearly.csv +3 -3
package/data/factor/world-yearly.json +19 -19
package/data/mix/continent-monthly-green.csv +32 -32
package/data/mix/continent-monthly-green.json +108 -108
package/data/mix/continent-monthly.csv +32 -32
package/data/mix/continent-monthly.json +146 -146
package/data/mix/continent-yearly-green.csv +7 -7
package/data/mix/continent-yearly-green.json +25 -25
package/data/mix/continent-yearly.csv +7 -7
package/data/mix/continent-yearly.json +43 -43
package/data/mix/country-monthly-green.csv +388 -388
package/data/mix/country-monthly-green.json +932 -932
package/data/mix/country-monthly.csv +388 -388
package/data/mix/country-monthly.json +1453 -1453
package/data/mix/country-yearly-green.csv +80 -80
package/data/mix/country-yearly-green.json +280 -280
package/data/mix/country-yearly.csv +80 -80
package/data/mix/country-yearly.json +528 -528
package/data/mix/subdivision-monthly-green.csv +33 -33
package/data/mix/subdivision-monthly-green.json +57 -57
package/data/mix/subdivision-monthly.csv +33 -33
package/data/mix/subdivision-monthly.json +129 -129
package/data/mix/subdivision-yearly-green.csv +12 -12
package/data/mix/subdivision-yearly-green.json +25 -25
package/data/mix/subdivision-yearly.csv +12 -12
package/data/mix/subdivision-yearly.json +54 -54
package/data/mix/world-monthly-green.csv +10 -10
package/data/mix/world-monthly-green.json +32 -32
package/data/mix/world-monthly.csv +10 -10
package/data/mix/world-monthly.json +35 -35
package/data/mix/world-yearly-green.csv +2 -2
package/data/mix/world-yearly-green.json +5 -5
package/data/mix/world-yearly.csv +2 -2
package/data/mix/world-yearly.json +8 -8
package/package.json +2 -2

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

@@ -76,15 +76,15 @@
     },
     "2024": {
       "Bioenergy": 0.0372,
-      "Hydro": 0.6678,
-      "Solar": 0.1621,
-      "Wind": 0.133
+      "Hydro": 0.6679,
+      "Solar": 0.162,
+      "Wind": 0.1329
     },
     "2025": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.6161,
-      "Solar": 0.1854,
-      "Wind": 0.1588
+      "Bioenergy": 0.0381,
+      "Hydro": 0.6073,
+      "Solar": 0.191,
+      "Wind": 0.1635
     }
   },
   "AG": {
@@ -169,10 +169,10 @@
       "Wind": 0.0497
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Hydro": 0.912,
-      "Solar": 0.0271,
-      "Wind": 0.0497
+      "Bioenergy": 0.0113,
+      "Hydro": 0.9103,
+      "Solar": 0.0304,
+      "Wind": 0.048
     }
   },
   "AM": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0234,
-      "Hydro": 0.5625,
-      "Solar": 0.0987,
-      "Wind": 0.3154
+      "Bioenergy": 0.025,
+      "Hydro": 0.5483,
+      "Solar": 0.0958,
+      "Wind": 0.3309
     }
   },
   "AS": {
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.049,
-      "Hydro": 0.6226,
-      "Solar": 0.1266,
-      "Wind": 0.2018
+      "Bioenergy": 0.045,
+      "Hydro": 0.6351,
+      "Solar": 0.1276,
+      "Wind": 0.1924
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0026,
-      "Hydro": 0.1061,
-      "Solar": 0.5545,
-      "Wind": 0.3368
+      "Bioenergy": 0.0024,
+      "Hydro": 0.1116,
+      "Solar": 0.5571,
+      "Wind": 0.3289
     }
   },
   "AW": {
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9391,
-      "Solar": 0.0224,
-      "Wind": 0.0385
+      "Hydro": 0.9199,
+      "Solar": 0.04,
+      "Wind": 0.0402
     }
   },
   "BB": {
@@ -648,15 +648,15 @@
     },
     "2024": {
       "Bioenergy": 0.0494,
-      "Hydro": 0.4312,
-      "Solar": 0.3426,
+      "Hydro": 0.4314,
+      "Solar": 0.3425,
       "Wind": 0.1767
     },
     "2025": {
-      "Bioenergy": 0.0591,
-      "Hydro": 0.2362,
-      "Solar": 0.4685,
-      "Wind": 0.2361
+      "Bioenergy": 0.0554,
+      "Hydro": 0.2304,
+      "Solar": 0.4762,
+      "Wind": 0.238
     }
   },
   "BE": {
@@ -697,10 +697,10 @@
       "Wind": 0.5431
     },
     "2025": {
-      "Bioenergy": 0.0444,
-      "Hydro": 0.0858,
-      "Solar": 0.3768,
-      "Wind": 0.493
+      "Bioenergy": 0.0427,
+      "Hydro": 0.087,
+      "Solar": 0.392,
+      "Wind": 0.4783
     }
   },
   "BF": {
@@ -785,10 +785,10 @@
       "Wind": 0.1602
     },
     "2025": {
-      "Bioenergy": 0.0139,
-      "Hydro": 0.2505,
-      "Solar": 0.5556,
-      "Wind": 0.1799
+      "Bioenergy": 0.0135,
+      "Hydro": 0.2687,
+      "Solar": 0.5533,
+      "Wind": 0.1645
     }
   },
   "BH": {
@@ -1308,15 +1308,15 @@
     },
     "2024": {
       "Bioenergy": 0.2236,
-      "Hydro": 0.6679,
+      "Hydro": 0.668,
       "Solar": 0.0549,
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.2172,
-      "Hydro": 0.6775,
-      "Solar": 0.0596,
-      "Wind": 0.0457
+      "Bioenergy": 0.217,
+      "Hydro": 0.675,
+      "Solar": 0.061,
+      "Wind": 0.047
     }
   },
   "CA": {
@@ -1357,10 +1357,10 @@
       "Wind": 0.1147
     },
     "2025": {
-      "Bioenergy": 0.0218,
-      "Hydro": 0.8529,
-      "Solar": 0.0048,
-      "Wind": 0.1205
+      "Bioenergy": 0.0237,
+      "Hydro": 0.859,
+      "Solar": 0.006,
+      "Wind": 0.1113
     }
   },
   "CD": {
@@ -1533,10 +1533,10 @@
       "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.008,
-      "Hydro": 0.7823,
-      "Solar": 0.1693,
-      "Wind": 0.0404
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7921,
+      "Solar": 0.1742,
+      "Wind": 0.0284
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0351,
-      "Hydro": 0.3661,
-      "Solar": 0.392,
-      "Wind": 0.2068
+      "Bioenergy": 0.0375,
+      "Hydro": 0.371,
+      "Solar": 0.3848,
+      "Wind": 0.2067
     }
   },
   "CM": {
@@ -1798,9 +1798,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9347,
-      "Solar": 0.0634,
-      "Wind": 0.0019
+      "Hydro": 0.9368,
+      "Solar": 0.0614,
+      "Wind": 0.0018
     }
   },
   "CR": {
@@ -1841,10 +1841,10 @@
       "Wind": 0.1275
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Hydro": 0.79,
-      "Solar": 0.0038,
-      "Wind": 0.1952
+      "Bioenergy": 0.0108,
+      "Hydro": 0.793,
+      "Solar": 0.0023,
+      "Wind": 0.194
     }
   },
   "CU": {
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.3078,
-      "Hydro": 0.2233,
-      "Solar": 0.4065,
-      "Wind": 0.0623
+      "Bioenergy": 0.2997,
+      "Hydro": 0.2138,
+      "Solar": 0.426,
+      "Wind": 0.0605
     }
   },
   "DE": {
@@ -2061,10 +2061,10 @@
       "Wind": 0.4833
     },
     "2025": {
-      "Bioenergy": 0.165,
-      "Hydro": 0.07,
-      "Solar": 0.2572,
-      "Wind": 0.5078
+      "Bioenergy": 0.1636,
+      "Hydro": 0.0717,
+      "Solar": 0.2825,
+      "Wind": 0.4822
     }
   },
   "DJ": {
@@ -2149,10 +2149,10 @@
       "Wind": 0.7019
     },
     "2025": {
-      "Bioenergy": 0.1844,
-      "Hydro": 0.0268,
-      "Solar": 0.1069,
-      "Wind": 0.682
+      "Bioenergy": 0.1821,
+      "Hydro": 0.039,
+      "Solar": 0.1305,
+      "Wind": 0.6484
     }
   },
   "DM": {
@@ -2326,9 +2326,9 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.9876,
+      "Hydro": 0.9874,
       "Solar": 0.0039,
-      "Wind": 0.0083
+      "Wind": 0.0084
     }
   },
   "EE": {
@@ -2369,10 +2369,10 @@
       "Wind": 0.4191
     },
     "2025": {
-      "Bioenergy": 0.1821,
-      "Hydro": 0.1176,
-      "Solar": 0.1705,
-      "Wind": 0.5299
+      "Bioenergy": 0.1755,
+      "Hydro": 0.1137,
+      "Solar": 0.2135,
+      "Wind": 0.4974
     }
   },
   "EG": {
@@ -2501,10 +2501,10 @@
       "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.022,
-      "Hydro": 0.271,
-      "Solar": 0.2493,
-      "Wind": 0.4577
+      "Bioenergy": 0.0226,
+      "Hydro": 0.2747,
+      "Solar": 0.2805,
+      "Wind": 0.4222
     }
   },
   "ET": {
@@ -2580,7 +2580,7 @@
       "Bioenergy": 0.2569,
       "Hydro": 0.378,
       "Solar": 0.0176,
-      "Wind": 0.3475
+      "Wind": 0.3476
     },
     "2024": {
       "Bioenergy": 0.2091,
@@ -2590,9 +2590,9 @@
     },
     "2025": {
       "Bioenergy": 0.2261,
-      "Hydro": 0.2684,
-      "Solar": 0.0184,
-      "Wind": 0.487
+      "Hydro": 0.2733,
+      "Solar": 0.0274,
+      "Wind": 0.4733
     }
   },
   "FJ": {
@@ -2765,10 +2765,10 @@
       "Wind": 0.3424
     },
     "2025": {
-      "Bioenergy": 0.0216,
-      "Hydro": 0.4403,
-      "Solar": 0.165,
-      "Wind": 0.373
+      "Bioenergy": 0.0218,
+      "Hydro": 0.4377,
+      "Solar": 0.1729,
+      "Wind": 0.3676
     }
   },
   "GA": {
@@ -2853,10 +2853,10 @@
       "Wind": 0.6501
     },
     "2025": {
-      "Bioenergy": 0.1532,
-      "Hydro": 0.0743,
-      "Solar": 0.1227,
-      "Wind": 0.6498
+      "Bioenergy": 0.1651,
+      "Hydro": 0.0722,
+      "Solar": 0.1417,
+      "Wind": 0.6209
     }
   },
   "GD": {
@@ -2941,10 +2941,10 @@
       "Wind": 0.0181
     },
     "2025": {
-      "Bioenergy": 0.0139,
-      "Hydro": 0.8566,
-      "Solar": 0.0569,
-      "Wind": 0.0726
+      "Bioenergy": 0.0084,
+      "Hydro": 0.9065,
+      "Solar": 0.0365,
+      "Wind": 0.0486
     }
   },
   "GF": {
@@ -3337,10 +3337,10 @@
       "Wind": 0.4355
     },
     "2025": {
-      "Bioenergy": 0.0008,
-      "Hydro": 0.0819,
-      "Solar": 0.445,
-      "Wind": 0.4723
+      "Bioenergy": 0.0022,
+      "Hydro": 0.0913,
+      "Solar": 0.4688,
+      "Wind": 0.4377
     }
   },
   "GT": {
@@ -3552,15 +3552,15 @@
     },
     "2024": {
       "Bioenergy": 0.1046,
-      "Hydro": 0.3956,
-      "Solar": 0.2587,
-      "Wind": 0.2411
+      "Hydro": 0.3958,
+      "Solar": 0.2586,
+      "Wind": 0.241
     },
     "2025": {
-      "Bioenergy": 0.1114,
-      "Hydro": 0.2921,
-      "Solar": 0.3045,
-      "Wind": 0.292
+      "Bioenergy": 0.1061,
+      "Hydro": 0.2869,
+      "Solar": 0.3108,
+      "Wind": 0.2962
     }
   },
   "HN": {
@@ -3602,8 +3602,8 @@
     },
     "2025": {
       "Bioenergy": 0.2438,
-      "Hydro": 0.4257,
-      "Solar": 0.1903,
+      "Hydro": 0.4255,
+      "Solar": 0.1904,
       "Wind": 0.1403
     }
   },
@@ -3645,10 +3645,10 @@
       "Wind": 0.2749
     },
     "2025": {
-      "Bioenergy": 0.0553,
-      "Hydro": 0.538,
-      "Solar": 0.0863,
-      "Wind": 0.3205
+      "Bioenergy": 0.0572,
+      "Hydro": 0.5314,
+      "Solar": 0.0915,
+      "Wind": 0.3199
     }
   },
   "HT": {
@@ -3733,10 +3733,10 @@
       "Wind": 0.1366
     },
     "2025": {
-      "Bioenergy": 0.1489,
-      "Hydro": 0.164,
-      "Solar": 0.5201,
-      "Wind": 0.167
+      "Bioenergy": 0.13,
+      "Hydro": 0.1336,
+      "Solar": 0.6005,
+      "Wind": 0.1359
     }
   },
   "ID": {
@@ -3777,10 +3777,10 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.355,
-      "Hydro": 0.6193,
-      "Solar": 0.0078,
-      "Wind": 0.018
+      "Bioenergy": 0.3548,
+      "Hydro": 0.6191,
+      "Solar": 0.008,
+      "Wind": 0.0182
     }
   },
   "IE": {
@@ -3821,10 +3821,10 @@
       "Wind": 0.7933
     },
     "2025": {
-      "Bioenergy": 0.0138,
-      "Hydro": 0.0985,
-      "Solar": 0.0287,
-      "Wind": 0.859
+      "Bioenergy": 0.0165,
+      "Hydro": 0.1171,
+      "Solar": 0.0439,
+      "Wind": 0.8225
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0743,
-      "Hydro": 0.2803,
-      "Solar": 0.4676,
-      "Wind": 0.1779
+      "Bioenergy": 0.0571,
+      "Hydro": 0.2928,
+      "Solar": 0.4822,
+      "Wind": 0.168
     }
   },
   "IQ": {
@@ -4081,14 +4081,14 @@
     "2024": {
       "Bioenergy": 0.118,
       "Hydro": 0.396,
-      "Solar": 0.2808,
+      "Solar": 0.2809,
       "Wind": 0.2052
     },
     "2025": {
-      "Bioenergy": 0.1458,
-      "Hydro": 0.3013,
-      "Solar": 0.2089,
-      "Wind": 0.344
+      "Bioenergy": 0.1454,
+      "Hydro": 0.3022,
+      "Solar": 0.212,
+      "Wind": 0.3405
     }
   },
   "JM": {
@@ -4255,16 +4255,16 @@
       "Wind": 0.3659
     },
     "2024": {
-      "Bioenergy": 0.0245,
-      "Hydro": 0.6091,
-      "Solar": 0.0755,
-      "Wind": 0.2908
+      "Bioenergy": 0.0427,
+      "Hydro": 0.5978,
+      "Solar": 0.0741,
+      "Wind": 0.2854
     },
     "2025": {
-      "Bioenergy": 0.0389,
-      "Hydro": 0.5732,
-      "Solar": 0.0791,
-      "Wind": 0.3088
+      "Bioenergy": 0.0578,
+      "Hydro": 0.5123,
+      "Solar": 0.0788,
+      "Wind": 0.3512
     }
   },
   "KG": {
@@ -4306,9 +4306,9 @@
     },
     "2025": {
       "Bioenergy": 0.0019,
-      "Hydro": 0.9828,
-      "Solar": 0.0078,
-      "Wind": 0.0076
+      "Hydro": 0.982,
+      "Solar": 0.0082,
+      "Wind": 0.0079
     }
   },
   "KH": {
@@ -4349,10 +4349,10 @@
       "Wind": 0.042
     },
     "2025": {
-      "Bioenergy": 0.0313,
-      "Hydro": 0.8457,
-      "Solar": 0.0734,
-      "Wind": 0.0496
+      "Bioenergy": 0.0308,
+      "Hydro": 0.8416,
+      "Solar": 0.0759,
+      "Wind": 0.0517
     }
   },
   "KI": {
@@ -5009,10 +5009,10 @@
       "Wind": 0.5288
     },
     "2025": {
-      "Bioenergy": 0.0461,
-      "Hydro": 0.1387,
-      "Solar": 0.1503,
-      "Wind": 0.6649
+      "Bioenergy": 0.0404,
+      "Hydro": 0.1244,
+      "Solar": 0.1902,
+      "Wind": 0.6449
     }
   },
   "LU": {
@@ -5050,13 +5050,13 @@
       "Bioenergy": 0.1385,
       "Hydro": 0.2936,
       "Solar": 0.218,
-      "Wind": 0.35
+      "Wind": 0.3499
     },
     "2025": {
-      "Bioenergy": 0.159,
-      "Hydro": 0.283,
-      "Solar": 0.2051,
-      "Wind": 0.353
+      "Bioenergy": 0.1494,
+      "Hydro": 0.2749,
+      "Solar": 0.2273,
+      "Wind": 0.3484
     }
   },
   "LV": {
@@ -5097,10 +5097,10 @@
       "Wind": 0.1081
     },
     "2025": {
-      "Bioenergy": 0.082,
-      "Hydro": 0.7611,
-      "Solar": 0.0885,
-      "Wind": 0.0684
+      "Bioenergy": 0.0903,
+      "Hydro": 0.7336,
+      "Solar": 0.1028,
+      "Wind": 0.0733
     }
   },
   "LY": {
@@ -5229,10 +5229,10 @@
       "Wind": 0.1776
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.6398,
-      "Solar": 0.3145,
-      "Wind": 0.0373
+      "Bioenergy": 0.0085,
+      "Hydro": 0.6394,
+      "Solar": 0.3161,
+      "Wind": 0.036
     }
   },
   "ME": {
@@ -5273,10 +5273,10 @@
       "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0061,
-      "Hydro": 0.7989,
-      "Solar": 0.0125,
-      "Wind": 0.1825
+      "Bioenergy": 0.0149,
+      "Hydro": 0.7384,
+      "Solar": 0.0474,
+      "Wind": 0.1994
     }
   },
   "MG": {
@@ -5362,9 +5362,9 @@
     },
     "2025": {
       "Bioenergy": 0.0561,
-      "Hydro": 0.661,
-      "Solar": 0.1152,
-      "Wind": 0.1677
+      "Hydro": 0.6596,
+      "Solar": 0.1212,
+      "Wind": 0.1632
     }
   },
   "ML": {
@@ -5525,22 +5525,22 @@
       "Wind": 0.204
     },
     "2023": {
-      "Bioenergy": 0.2086,
+      "Bioenergy": 0.2087,
       "Hydro": 0.3713,
       "Solar": 0.1967,
       "Wind": 0.2234
     },
     "2024": {
       "Bioenergy": 0.1925,
-      "Hydro": 0.3587,
-      "Solar": 0.2301,
-      "Wind": 0.2186
+      "Hydro": 0.3589,
+      "Solar": 0.23,
+      "Wind": 0.2185
     },
     "2025": {
-      "Bioenergy": 0.2012,
-      "Hydro": 0.2641,
-      "Solar": 0.2708,
-      "Wind": 0.264
+      "Bioenergy": 0.1937,
+      "Hydro": 0.2602,
+      "Solar": 0.2774,
+      "Wind": 0.2686
     }
   },
   "MQ": {
@@ -5713,10 +5713,10 @@
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0365,
-      "Hydro": 0.2038,
-      "Solar": 0.5949,
-      "Wind": 0.1647
+      "Bioenergy": 0.0368,
+      "Hydro": 0.2074,
+      "Solar": 0.5979,
+      "Wind": 0.1579
     }
   },
   "MU": {
@@ -5889,10 +5889,10 @@
       "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0.0023,
-      "Hydro": 0.283,
-      "Solar": 0.2674,
-      "Wind": 0.4473
+      "Bioenergy": 0.0022,
+      "Hydro": 0.2944,
+      "Solar": 0.2839,
+      "Wind": 0.4195
     }
   },
   "MY": {
@@ -5927,15 +5927,15 @@
       "Wind": 0.0001
     },
     "2024": {
-      "Bioenergy": 0.11,
-      "Hydro": 0.8136,
-      "Solar": 0.0763,
+      "Bioenergy": 0.1109,
+      "Hydro": 0.8164,
+      "Solar": 0.0726,
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1085,
-      "Hydro": 0.803,
-      "Solar": 0.0885,
+      "Bioenergy": 0.1108,
+      "Hydro": 0.8077,
+      "Solar": 0.0816,
       "Wind": 0
     }
   },
@@ -6197,10 +6197,10 @@
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.3984,
-      "Hydro": 0.2079,
-      "Solar": 0.0313,
-      "Wind": 0.3623
+      "Bioenergy": 0.3983,
+      "Hydro": 0.2072,
+      "Solar": 0.0319,
+      "Wind": 0.3626
     }
   },
   "NL": {
@@ -6241,10 +6241,10 @@
       "Wind": 0.5327
     },
     "2025": {
-      "Bioenergy": 0.1669,
-      "Hydro": 0.0021,
-      "Solar": 0.3498,
-      "Wind": 0.4812
+      "Bioenergy": 0.1548,
+      "Hydro": 0.002,
+      "Solar": 0.3806,
+      "Wind": 0.4626
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9098,
+      "Hydro": 0.915,
       "Solar": 0,
-      "Wind": 0.0902
+      "Wind": 0.085
     }
   },
   "NP": {
@@ -6329,10 +6329,10 @@
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.9383,
-      "Solar": 0.0338,
-      "Wind": 0.0226
+      "Bioenergy": 0.0052,
+      "Hydro": 0.9363,
+      "Solar": 0.0349,
+      "Wind": 0.0236
     }
   },
   "NR": {
@@ -6813,10 +6813,10 @@
       "Wind": 0.5179
     },
     "2025": {
-      "Bioenergy": 0.0733,
-      "Hydro": 0.0376,
-      "Solar": 0.3342,
-      "Wind": 0.555
+      "Bioenergy": 0.0716,
+      "Hydro": 0.0364,
+      "Solar": 0.3596,
+      "Wind": 0.5325
     }
   },
   "PM": {
@@ -6903,8 +6903,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.332,
-      "Wind": 0.668
+      "Solar": 0.4665,
+      "Wind": 0.5335
     }
   },
   "PS": {
@@ -6980,7 +6980,7 @@
       "Bioenergy": 0.0942,
       "Hydro": 0.3452,
       "Solar": 0.1427,
-      "Wind": 0.4179
+      "Wind": 0.4178
     },
     "2024": {
       "Bioenergy": 0.0862,
@@ -6989,10 +6989,10 @@
       "Wind": 0.3921
     },
     "2025": {
-      "Bioenergy": 0.0629,
-      "Hydro": 0.444,
-      "Solar": 0.106,
-      "Wind": 0.3871
+      "Bioenergy": 0.0648,
+      "Hydro": 0.4456,
+      "Solar": 0.1152,
+      "Wind": 0.3744
     }
   },
   "PY": {
@@ -7165,10 +7165,10 @@
       "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0283,
-      "Hydro": 0.5024,
-      "Solar": 0.1641,
-      "Wind": 0.3051
+      "Bioenergy": 0.0259,
+      "Hydro": 0.5101,
+      "Solar": 0.1773,
+      "Wind": 0.2867
     }
   },
   "RS": {
@@ -7209,10 +7209,10 @@
       "Wind": 0.11
     },
     "2025": {
-      "Bioenergy": 0.0256,
-      "Hydro": 0.8358,
-      "Solar": 0.0013,
-      "Wind": 0.1373
+      "Bioenergy": 0.0227,
+      "Hydro": 0.8432,
+      "Solar": 0.0023,
+      "Wind": 0.1318
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.9662,
-      "Solar": 0.0041,
-      "Wind": 0.0239
+      "Bioenergy": 0.0056,
+      "Hydro": 0.961,
+      "Solar": 0.0068,
+      "Wind": 0.0267
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.358
     },
     "2025": {
-      "Bioenergy": 0.0587,
-      "Hydro": 0.5623,
-      "Solar": 0.0085,
-      "Wind": 0.3705
+      "Bioenergy": 0.0588,
+      "Hydro": 0.5765,
+      "Solar": 0.0112,
+      "Wind": 0.3534
     }
   },
   "SG": {
@@ -7561,10 +7561,10 @@
       "Wind": 0.0013
     },
     "2025": {
-      "Bioenergy": 0.0037,
-      "Hydro": 0.0149,
-      "Solar": 0.9664,
-      "Wind": 0.0149
+      "Bioenergy": 0.0036,
+      "Hydro": 0.0151,
+      "Solar": 0.9656,
+      "Wind": 0.0156
     }
   },
   "SH": {
@@ -7649,10 +7649,10 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0217,
-      "Hydro": 0.7036,
-      "Solar": 0.2727,
-      "Wind": 0.002
+      "Bioenergy": 0.0214,
+      "Hydro": 0.6931,
+      "Solar": 0.2836,
+      "Wind": 0.0019
     }
   },
   "SK": {
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.1972,
-      "Hydro": 0.6928,
-      "Solar": 0.11,
+      "Bioenergy": 0.2091,
+      "Hydro": 0.6749,
+      "Solar": 0.1161,
       "Wind": 0
     }
   },
@@ -8265,10 +8265,10 @@
       "Wind": 0.1574
     },
     "2025": {
-      "Bioenergy": 0.3918,
-      "Hydro": 0.2779,
-      "Solar": 0.1852,
-      "Wind": 0.145
+      "Bioenergy": 0.3136,
+      "Hydro": 0.2693,
+      "Solar": 0.2542,
+      "Wind": 0.1629
     }
   },
   "TJ": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0647,
-      "Hydro": 0.4415,
-      "Solar": 0.2068,
-      "Wind": 0.287
+      "Bioenergy": 0.0607,
+      "Hydro": 0.4654,
+      "Solar": 0.2121,
+      "Wind": 0.2618
     }
   },
   "TT": {
@@ -8617,10 +8617,10 @@
       "Wind": 0.3486
     },
     "2025": {
-      "Bioenergy": 0.0071,
-      "Hydro": 0.1031,
-      "Solar": 0.3247,
-      "Wind": 0.5651
+      "Bioenergy": 0.007,
+      "Hydro": 0.116,
+      "Solar": 0.3631,
+      "Wind": 0.514
     }
   },
   "TZ": {
@@ -8794,9 +8794,9 @@
     },
     "2025": {
       "Bioenergy": 0.0381,
-      "Hydro": 0.2183,
-      "Solar": 0.2682,
-      "Wind": 0.4754
+      "Hydro": 0.2199,
+      "Solar": 0.2799,
+      "Wind": 0.4622
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.154,
-      "Hydro": 0.4443,
-      "Solar": 0.0526,
-      "Wind": 0.3491
+      "Bioenergy": 0.1611,
+      "Hydro": 0.4257,
+      "Solar": 0.0541,
+      "Wind": 0.3592
     }
   },
   "UZ": {
@@ -8881,10 +8881,10 @@
       "Wind": 0.014
     },
     "2025": {
-      "Bioenergy": 0.0041,
-      "Hydro": 0.9605,
-      "Solar": 0.0188,
-      "Wind": 0.0165
+      "Bioenergy": 0.004,
+      "Hydro": 0.9589,
+      "Solar": 0.0197,
+      "Wind": 0.0173
     }
   },
   "VC": {
@@ -9233,10 +9233,10 @@
       "Wind": 0.5379
     },
     "2025": {
-      "Bioenergy": 0.0474,
-      "Hydro": 0.3895,
-      "Solar": 0.1017,
-      "Wind": 0.4614
+      "Bioenergy": 0.0535,
+      "Hydro": 0.3987,
+      "Solar": 0.1255,
+      "Wind": 0.4223
     }
   },
   "YE": {