@digital4better/data 1.1.27 → 1.1.28

package/data/mix/subdivision-yearly-green.csv

@@ -81,7 +81,7 @@ US-AK,2019,0.0062,0.1125,0.4426,0.2674,0,0.1478,0,0,0.0235
 US-AK,2020,0.0062,0.115,0.4207,0.2811,0,0.1565,0,0,0.0205
 US-AK,2021,0.0058,0.1141,0.4678,0.2561,0,0.1362,0,0,0.02
 US-AK,2022,0.0061,0.1086,0.4824,0.256,0,0.1261,0,0,0.0208
-US-AK,2023,0.0059,0.1086,0.5255,0.2072,0,0.1351,0,0,0.0176
+US-AK,2023,0.0059,0.1086,0.5255,0.2073,0,0.1351,0,0,0.0176
 US-AK,2024,0.0066,0.1128,0.5476,0.1849,0,0.1298,0,0,0.0182
 US-AL,2019,0.0235,0.1868,0.4009,0.0799,0.306,0.0001,0,0.0027,0
 US-AL,2020,0.024,0.158,0.4015,0.097,0.3166,0.0001,0,0.0027,0
@@ -93,25 +93,25 @@ US-AR,2019,0.0207,0.3618,0.3378,0.0649,0.2106,0.0008,0,0.0033,0
 US-AR,2020,0.0171,0.2823,0.335,0.0841,0.2756,0.0009,0,0.005,0
 US-AR,2021,0.0141,0.3506,0.3375,0.0673,0.2219,0.001,0,0.0076,0
 US-AR,2022,0.0128,0.3089,0.3952,0.0536,0.2173,0.0011,0,0.0112,0
-US-AR,2023,0.0124,0.2741,0.3958,0.0602,0.2437,0.0008,0,0.013,0
+US-AR,2023,0.0124,0.2741,0.3959,0.0602,0.2437,0.0008,0,0.013,0
 US-AR,2024,0.0109,0.3658,0.3079,0.0742,0.2296,0.0011,0,0.0104,0
 US-AZ,2019,0.002,0.2045,0.4059,0.0547,0.2811,0.0005,0,0.0465,0.0049
 US-AZ,2020,0.002,0.1258,0.4646,0.0593,0.2886,0.0003,0,0.0534,0.0059
 US-AZ,2021,0.0019,0.1316,0.4425,0.0558,0.2912,0.0003,0,0.0618,0.0147
 US-AZ,2022,0.002,0.1285,0.4304,0.0515,0.305,0.0002,0,0.0675,0.0149
-US-AZ,2023,0.0009,0.1077,0.4738,0.0533,0.2827,0.0001,0,0.0659,0.0156
+US-AZ,2023,0.0009,0.1077,0.4738,0.0533,0.2828,0.0001,0,0.0659,0.0156
 US-AZ,2024,0.002,0.1501,0.4026,0.0504,0.3286,0,0,0.0525,0.0139
 US-CA,2019,0.0294,0.0012,0.4328,0.1899,0.0801,0.004,0.0541,0.1404,0.0681
 US-CA,2020,0.0292,0.0015,0.4847,0.1105,0.0842,0.0038,0.0589,0.1568,0.0704
 US-CA,2021,0.0275,0.0015,0.501,0.0728,0.0836,0.0033,0.0564,0.1769,0.077
 US-CA,2022,0.0261,0.0012,0.4808,0.086,0.0865,0.0017,0.055,0.1907,0.072
-US-CA,2023,0.0225,0.001,0.4417,0.1455,0.0818,0.0001,0.0506,0.188,0.0688
+US-CA,2023,0.0225,0.001,0.4417,0.1455,0.0819,0.0001,0.0506,0.188,0.0688
 US-CA,2024,0.0238,0.0012,0.5581,0.0875,0.0948,0,0.0506,0.1221,0.062
 US-CO,2019,0.0029,0.4494,0.3035,0.0287,0,0.0012,0,0.0216,0.1926
 US-CO,2020,0.0031,0.359,0.3353,0.028,0,0.0003,0,0.0277,0.2467
 US-CO,2021,0.003,0.4152,0.2563,0.0275,0,0.0015,0,0.0304,0.2661
 US-CO,2022,0.0028,0.3743,0.2662,0.0228,0,0.0013,0,0.0414,0.2912
-US-CO,2023,0.0024,0.329,0.3005,0.0236,0,0.001,0,0.0631,0.2804
+US-CO,2023,0.0024,0.3289,0.3005,0.0236,0,0.001,0,0.0631,0.2804
 US-CO,2024,0.002,0.3595,0.3258,0.0177,0,0.0037,0,0.0587,0.2326
 US-CT,2019,0.0187,0.0016,0.5328,0.0107,0.4177,0.0147,0,0.0035,0.0003
 US-CT,2020,0.019,0,0.5712,0.0079,0.3813,0.0151,0,0.0052,0.0003
@@ -147,13 +147,13 @@ US-IA,2019,0.0034,0.3537,0.1242,0.0127,0.0836,0.0022,0,0.0002,0.4198
 US-IA,2020,0.0035,0.2373,0.118,0.0172,0.0487,0.0019,0,0.0004,0.5731
 US-IA,2021,0.003,0.329,0.0962,0.0146,0,0.002,0,0.0033,0.5519
 US-IA,2022,0.003,0.2492,0.1006,0.0138,0,0.0013,0,0.0053,0.6267
-US-IA,2023,0.003,0.2337,0.1487,0.0107,0,0.001,0,0.0074,0.5955
+US-IA,2023,0.003,0.2338,0.1487,0.0107,0,0.001,0,0.0074,0.5955
 US-IA,2024,0.0024,0.2934,0.1426,0.0094,0,0.0021,0,0.003,0.5471
 US-ID,2019,0.0281,0.0011,0.2319,0.5613,0,0.0036,0.0052,0.0302,0.1386
 US-ID,2020,0.0295,0.0011,0.235,0.5376,0,0.003,0.0051,0.032,0.1566
 US-ID,2021,0.0291,0.001,0.2931,0.4749,0,0.0037,0.0055,0.0336,0.1592
 US-ID,2022,0.0283,0.0004,0.2664,0.5135,0,0.0031,0.0056,0.0328,0.1499
-US-ID,2023,0.0283,0,0.3215,0.4361,0,0.0047,0.0042,0.055,0.1502
+US-ID,2023,0.0282,0,0.3215,0.4361,0,0.0047,0.0042,0.055,0.1502
 US-ID,2024,0.0173,0,0.3988,0.4045,0,0.0044,0,0.0233,0.1517
 US-IL,2019,0.0022,0.2645,0.1171,0.0007,0.5352,0.0015,0,0.0003,0.0784
 US-IL,2020,0.0023,0.1802,0.143,0.0008,0.5781,0.0016,0,0.0005,0.0936
@@ -171,7 +171,7 @@ US-KS,2019,0.0012,0.3402,0.0594,0.0004,0.1819,0.0016,0,0.0002,0.415
 US-KS,2020,0.0012,0.311,0.0514,0.0006,0.194,0.0015,0,0.0011,0.4393
 US-KS,2021,0.001,0.3426,0.047,0.0005,0.1514,0.0027,0,0.0011,0.4537
 US-KS,2022,0.001,0.3243,0.0539,0.0004,0.1439,0,0,0.0012,0.4754
-US-KS,2023,0.001,0.2749,0.0842,0.0002,0.1739,0.0009,0,0.0014,0.4636
+US-KS,2023,0.001,0.2749,0.0843,0.0002,0.1739,0.0009,0,0.0014,0.4635
 US-KS,2024,0.001,0.3337,0.0748,0.0001,0.1728,0.0046,0,0.0008,0.4121
 US-KY,2019,0.0052,0.7202,0.2136,0.0589,0,0.0014,0,0.0006,0
 US-KY,2020,0.0055,0.6868,0.2264,0.0788,0,0.0019,0,0.0007,0
@@ -183,7 +183,7 @@ US-LA,2019,0.0224,0.0741,0.7127,0.0136,0.1396,0.0375,0,0,0
 US-LA,2020,0.021,0.0389,0.7196,0.0119,0.1682,0.04,0,0.0004,0
 US-LA,2021,0.0217,0.0797,0.6661,0.0112,0.1747,0.045,0,0.0015,0
 US-LA,2022,0.0197,0.0775,0.7029,0.0087,0.1532,0.0362,0,0.0019,0
-US-LA,2023,0.0202,0.0495,0.7802,0.0088,0.1252,0.013,0,0.003,0
+US-LA,2023,0.0202,0.0495,0.7801,0.0088,0.1253,0.013,0,0.003,0
 US-LA,2024,0.0192,0.0811,0.7949,0.0109,0.0843,0.0058,0,0.0039,0
 US-MA,2019,0.0466,0,0.7153,0.0262,0.101,0.0471,0,0.054,0.0098
 US-MA,2020,0.0551,0,0.7767,0.0263,0,0.0519,0,0.0769,0.0131
@@ -195,7 +195,7 @@ US-MD,2019,0.0099,0.1455,0.3714,0.0556,0.3818,0.01,0,0.0126,0.0132
 US-MD,2020,0.0094,0.0933,0.3911,0.0471,0.4185,0.0108,0,0.0146,0.0151
 US-MD,2021,0.0098,0.1354,0.3655,0.0554,0.3921,0.0117,0,0.0165,0.0135
 US-MD,2022,0.0084,0.1249,0.3757,0.0479,0.3988,0.0118,0,0.0192,0.0134
-US-MD,2023,0.0091,0.0473,0.4251,0.0515,0.4163,0.0106,0,0.0268,0.0133
+US-MD,2023,0.0091,0.0473,0.4251,0.0515,0.4162,0.0106,0,0.0268,0.0133
 US-MD,2024,0.0084,0.0939,0.3305,0.092,0.4232,0.0154,0,0.015,0.0217
 US-ME,2019,0.2143,0.0068,0.1713,0.3336,0,0.0356,0,0.0007,0.2377
 US-ME,2020,0.2093,0.0055,0.1905,0.3157,0,0.0367,0,0.0028,0.2395
@@ -213,13 +213,13 @@ US-MN,2019,0.02,0.2999,0.2123,0.0178,0.2375,0.0068,0,0.021,0.1846
 US-MN,2020,0.0205,0.2485,0.2091,0.0177,0.2597,0.0063,0,0.0289,0.2093
 US-MN,2021,0.0212,0.2663,0.2161,0.0115,0.2386,0.0071,0,0.032,0.2073
 US-MN,2022,0.0201,0.2741,0.1482,0.0161,0.2492,0.0042,0,0.0323,0.2558
-US-MN,2023,0.0204,0.2214,0.2444,0.0124,0.2067,0.0059,0,0.0346,0.2543
+US-MN,2023,0.0204,0.2213,0.2444,0.0124,0.2068,0.0059,0,0.0346,0.2542
 US-MN,2024,0.0208,0.3404,0.2819,0.0123,0.0806,0.0048,0,0.0196,0.2396
 US-MO,2019,0.0015,0.7113,0.098,0.0326,0.1175,0.0012,0,0.0013,0.0365
 US-MO,2020,0.0017,0.7132,0.1042,0.0256,0.1067,0.0011,0,0.0014,0.0461
 US-MO,2021,0.0016,0.7518,0.0787,0.0221,0.056,0.0034,0,0.0015,0.0849
 US-MO,2022,0.0014,0.6657,0.1028,0.0195,0.1118,0.0021,0,0.0019,0.0947
-US-MO,2023,0.0016,0.6022,0.1357,0.0177,0.137,0.0014,0,0.0026,0.1017
+US-MO,2023,0.0016,0.6022,0.1357,0.0178,0.1371,0.0014,0,0.0026,0.1017
 US-MO,2024,0.0013,0.6478,0.1214,0.0224,0.1278,0.0049,0,0.0011,0.0732
 US-MS,2019,0.0212,0.0669,0.7396,0,0.1672,0.0002,0,0.0049,0
 US-MS,2020,0.0213,0.069,0.8058,0,0.0973,0.0001,0,0.0065,0
@@ -243,7 +243,7 @@ US-ND,2019,0,0.6113,0.0369,0.0773,0,0.002,0,0,0.2725
 US-ND,2020,0,0.5808,0.0362,0.0581,0,0.0016,0,0,0.3232
 US-ND,2021,0,0.5671,0.0376,0.0462,0,0.002,0,0,0.347
 US-ND,2022,0,0.5594,0.0334,0.0403,0,0.001,0,0,0.3659
-US-ND,2023,0,0.5526,0.0499,0.0355,0,0.0013,0,0,0.3607
+US-ND,2023,0,0.5526,0.0499,0.0355,0,0.0013,0,0,0.3606
 US-ND,2024,0,0.6092,0.052,0.0312,0,0.0015,0,0,0.3061
 US-NE,2019,0.0023,0.5466,0.0342,0.0359,0.1864,0.0004,0,0.0008,0.1933
 US-NE,2020,0.0024,0.5099,0.0328,0.0377,0.1679,0.0004,0,0.0015,0.2474
@@ -255,7 +255,7 @@ US-NH,2019,0.0674,0.019,0.1987,0.0811,0.6051,0.0047,0,0,0.024
 US-NH,2020,0.0529,0.0079,0.2225,0.0751,0.6033,0.0059,0,0.0002,0.0321
 US-NH,2021,0.054,0.0165,0.2597,0.0596,0.5733,0.0073,0,0.0002,0.0293
 US-NH,2022,0.0454,0.0163,0.2401,0.064,0.582,0.0264,0,0.0002,0.0257
-US-NH,2023,0.0382,0.0099,0.2614,0.0684,0.5899,0.0067,0,0,0.0255
+US-NH,2023,0.0383,0.0099,0.2614,0.0684,0.5899,0.0067,0,0,0.0255
 US-NH,2024,0.0457,0.0179,0.2283,0.0962,0.5828,0.002,0,0,0.0269
 US-NJ,2019,0.0112,0.0147,0.572,0,0.3747,0.0107,0,0.0164,0.0003
 US-NJ,2020,0.012,0.015,0.5038,0,0.4368,0.0107,0,0.0213,0.0003
@@ -267,7 +267,7 @@ US-NM,2019,0.0006,0.4177,0.3356,0.0045,0,0.0052,0.0017,0.0388,0.1959
 US-NM,2020,0.0007,0.3753,0.3522,0.0059,0,0.0009,0.0016,0.0513,0.212
 US-NM,2021,0.0007,0.3563,0.287,0.0035,0,0.0007,0.0014,0.0498,0.3007
 US-NM,2022,0.0004,0.3251,0.2686,0.003,0,0.0005,0.0012,0.0484,0.3529
-US-NM,2023,0.0005,0.1919,0.3533,0,0,0,0.0009,0.0656,0.3879
+US-NM,2023,0.0005,0.1919,0.3533,0,0,0,0.0009,0.0656,0.3878
 US-NM,2024,0.0007,0.2667,0.3164,0,0,0,0.0011,0.0528,0.3624
 US-NV,2019,0.0014,0.0686,0.6462,0.0562,0,0.0008,0.098,0.1206,0.0083
 US-NV,2020,0.0013,0.0483,0.663,0.0476,0,0.0008,0.094,0.1369,0.008
@@ -291,13 +291,13 @@ US-OK,2019,0.0036,0.0918,0.5186,0.0446,0,0.0003,0,0.0007,0.3404
 US-OK,2020,0.0043,0.0722,0.5317,0.0332,0,0.0004,0,0.0008,0.3574
 US-OK,2021,0.0039,0.1392,0.4193,0.0332,0,0.0005,0,0.0009,0.4029
 US-OK,2022,0.0037,0.1058,0.4258,0.0198,0,0.0004,0,0.001,0.4435
-US-OK,2023,0.0029,0.0578,0.4981,0.0201,0,0.0004,0,0.0008,0.4199
+US-OK,2023,0.0029,0.0578,0.4981,0.0201,0,0.0004,0,0.0008,0.4198
 US-OK,2024,0.0035,0.1092,0.5384,0.0259,0,0.0008,0,0.0004,0.3218
 US-OR,2019,0.0154,0.0413,0.3362,0.487,0,0.0007,0.003,0.0109,0.1055
 US-OR,2020,0.0151,0.0256,0.299,0.5017,0,0.0007,0.003,0.0169,0.138
 US-OR,2021,0.0165,0,0.349,0.4533,0,0.0006,0.003,0.024,0.1537
 US-OR,2022,0.0161,0,0.3108,0.5105,0,0.0006,0.0029,0.0262,0.1329
-US-OR,2023,0.0158,0,0.3807,0.4209,0,0.0004,0.0033,0.032,0.1469
+US-OR,2023,0.0158,0,0.3806,0.4209,0,0.0004,0.0033,0.032,0.147
 US-OR,2024,0.0166,0,0.4247,0.4302,0,0.0003,0,0.0136,0.1146
 US-PA,2019,0.0087,0.1656,0.4303,0.0128,0.3635,0.0046,0,0.0004,0.0142
 US-PA,2020,0.0083,0.1019,0.5273,0.009,0.3325,0.0041,0,0.0006,0.0163
@@ -321,7 +321,7 @@ US-SD,2019,0,0.1804,0.0806,0.5456,0,0.0009,0,0.0001,0.1923
 US-SD,2020,0.0008,0.1165,0.078,0.4121,0,0.0005,0,0.0001,0.392
 US-SD,2021,0.0013,0.0946,0.0757,0.2877,0,0.0022,0,0.0001,0.5383
 US-SD,2022,0.0016,0.1048,0.0797,0.2379,0,0.0009,0,0.0001,0.575
-US-SD,2023,0.0001,0.0922,0.1388,0.2105,0,0.0009,0,0.0027,0.5548
+US-SD,2023,0.0001,0.0923,0.1388,0.2105,0,0.0009,0,0.0027,0.5547
 US-SD,2024,0,0.1317,0.1506,0.1824,0,0,0,0.0062,0.5291
 US-TN,2019,0.0112,0.227,0.2061,0.1156,0.4339,0.0018,0,0.004,0.0005
 US-TN,2020,0.0092,0.1769,0.1946,0.158,0.4554,0.0015,0,0.004,0.0005
@@ -333,31 +333,31 @@ US-TX,2019,0.003,0.19,0.535,0.0031,0.0855,0.0014,0,0.009,0.173
 US-TX,2020,0.0029,0.1665,0.5264,0.0023,0.0875,0.0012,0,0.018,0.1952
 US-TX,2021,0.0027,0.1843,0.4884,0.0022,0.0835,0.0015,0,0.031,0.2064
 US-TX,2022,0.0028,0.1624,0.4921,0.0012,0.0791,0.0014,0,0.0427,0.2183
-US-TX,2023,0.0021,0.1325,0.5151,0.0016,0.0753,0.0011,0,0.0507,0.2218
+US-TX,2023,0.0021,0.1324,0.5151,0.0016,0.0753,0.0011,0,0.0507,0.2218
 US-TX,2024,0.0023,0.1498,0.5299,0.0029,0.073,0.0014,0,0.0414,0.1992
 US-UT,2019,0.0018,0.6453,0.2399,0.0224,0,0.0058,0.0079,0.0559,0.0209
 US-UT,2020,0.0021,0.6149,0.2553,0.022,0,0.0046,0.0102,0.0693,0.0216
 US-UT,2021,0.0019,0.6196,0.2512,0.0116,0,0.0047,0.0099,0.0818,0.0194
 US-UT,2022,0.0019,0.5686,0.282,0.0151,0,0.0045,0.0118,0.0978,0.0184
-US-UT,2023,0.0021,0.4733,0.3554,0.0134,0,0.0034,0.0155,0.1165,0.0203
+US-UT,2023,0.0021,0.4733,0.3555,0.0134,0,0.0034,0.0155,0.1165,0.0204
 US-UT,2024,0.0025,0.4104,0.4479,0.0168,0,0.0053,0.0152,0.0773,0.0244
 US-VA,2019,0.0386,0.0352,0.5979,0.0059,0.3041,0.0084,0,0.0098,0
 US-VA,2020,0.0332,0.0365,0.6071,0.0101,0.2922,0.0076,0,0.0133,0
 US-VA,2021,0.0384,0.0347,0.5729,0.004,0.3053,0.0093,0,0.0349,0.0005
 US-VA,2022,0.0405,0.0372,0.5425,0.0015,0.3133,0.0131,0,0.0514,0.0006
-US-VA,2023,0.0345,0.0154,0.558,0.0051,0.3217,0.0068,0,0.0581,0.0005
+US-VA,2023,0.0345,0.0154,0.5581,0.0051,0.3216,0.0068,0,0.0581,0.0005
 US-VA,2024,0.0299,0.0383,0.5969,0.0052,0.288,0.0111,0,0.03,0.0006
 US-VT,2019,0.1861,0,0.0008,0.5838,0,0.0002,0,0.0643,0.1648
 US-VT,2020,0.2127,0,0.0009,0.5232,0,0.0007,0,0.0847,0.1777
 US-VT,2021,0.2355,0,0.001,0.5184,0,0.0024,0,0.0823,0.1604
 US-VT,2022,0.1934,0,0.0007,0.5221,0,0.0037,0,0.0927,0.1874
-US-VT,2023,0.1667,0,0.0007,0.5511,0,0.0017,0,0.1037,0.1761
+US-VT,2023,0.1667,0,0.0007,0.5512,0,0.0017,0,0.1037,0.176
 US-VT,2024,0.2287,0,0.0009,0.625,0,0.001,0,0.0381,0.1064
 US-WA,2019,0.0145,0.0674,0.1508,0.6202,0.0833,0.0008,0,0.0004,0.0627
 US-WA,2020,0.012,0.0445,0.1232,0.6582,0.0812,0.0008,0,0.0004,0.0798
 US-WA,2021,0.0136,0.0283,0.1518,0.6443,0.0768,0.0009,0,0.0005,0.0839
 US-WA,2022,0.0112,0.0306,0.1268,0.6764,0.0844,0.0009,0,0.0007,0.069
-US-WA,2023,0.0124,0.0413,0.1785,0.604,0.0837,0.001,0,0.0036,0.0755
+US-WA,2023,0.0124,0.0413,0.1785,0.6041,0.0837,0.001,0,0.0036,0.0755
 US-WA,2024,0.0108,0.0347,0.2085,0.5736,0.0976,0.0021,0,0.0013,0.0713
 US-WI,2019,0.0212,0.4195,0.3239,0.0421,0.1598,0.0029,0,0.0006,0.0299
 US-WI,2020,0.0185,0.3867,0.3581,0.0454,0.159,0.0022,0,0.0015,0.0287
@@ -369,11 +369,11 @@ US-WV,2019,0,0.9102,0.0357,0.0267,0,0.0019,0,0,0.0255
 US-WV,2020,0.0001,0.8863,0.0498,0.0281,0,0.0022,0,0,0.0335
 US-WV,2021,0.0002,0.9063,0.0407,0.0259,0,0.0023,0,0,0.0247
 US-WV,2022,0.0002,0.8951,0.0379,0.029,0,0.0024,0,0,0.0354
-US-WV,2023,0,0.8583,0.07,0.0288,0,0.0029,0,0,0.04
+US-WV,2023,0,0.8584,0.07,0.0288,0,0.0029,0,0,0.04
 US-WV,2024,0,0.884,0.0444,0.03,0,0.0012,0,0,0.0404
 US-WY,2019,0,0.8394,0.0312,0.0235,0,0.0028,0,0.0043,0.0988
 US-WY,2020,0,0.7941,0.042,0.0259,0,0.0029,0,0.0039,0.1312
 US-WY,2021,0,0.7373,0.0428,0.0182,0,0.0033,0,0.0041,0.1943
 US-WY,2022,0,0.7233,0.0429,0.0161,0,0.0028,0,0.004,0.2109
-US-WY,2023,0,0.7135,0.0593,0.0135,0,0.003,0,0.004,0.2067
+US-WY,2023,0,0.7135,0.0593,0.0136,0,0.003,0,0.004,0.2067
 US-WY,2024,0,0.6859,0.0727,0.013,0,0.003,0,0.0016,0.2238

package/data/mix/subdivision-yearly-green.json

@@ -522,7 +522,7 @@
       "Bioenergy": 0.0258,
       "Hydro": 0.8979,
       "Solar": 0,
-      "Wind": 0.0764
+      "Wind": 0.0763
     },
     "2024": {
       "Bioenergy": 0.0317,
@@ -557,8 +557,8 @@
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.2145,
-      "Hydro": 0.7026,
+      "Bioenergy": 0.2146,
+      "Hydro": 0.7025,
       "Solar": 0.0829,
       "Wind": 0
     },
@@ -634,8 +634,8 @@
     },
     "2023": {
       "Bioenergy": 0.007,
-      "Hydro": 0.3927,
-      "Solar": 0.4857,
+      "Hydro": 0.3928,
+      "Solar": 0.4856,
       "Wind": 0.1146
     },
     "2024": {
@@ -672,8 +672,8 @@
     },
     "2023": {
       "Bioenergy": 0.053,
-      "Hydro": 0.3424,
-      "Solar": 0.4426,
+      "Hydro": 0.3425,
+      "Solar": 0.4425,
       "Wind": 0.162
     },
     "2024": {
@@ -748,7 +748,7 @@
     },
     "2023": {
       "Bioenergy": 0.3686,
-      "Hydro": 0.2584,
+      "Hydro": 0.2585,
       "Solar": 0.3652,
       "Wind": 0.0078
     },
@@ -862,7 +862,7 @@
     },
     "2023": {
       "Bioenergy": 0.3328,
-      "Hydro": 0.1759,
+      "Hydro": 0.1758,
       "Solar": 0.4913,
       "Wind": 0
     },
@@ -899,10 +899,10 @@
       "Wind": 0.399
     },
     "2023": {
-      "Bioenergy": 0.1802,
+      "Bioenergy": 0.1801,
       "Hydro": 0,
       "Solar": 0.4102,
-      "Wind": 0.4096
+      "Wind": 0.4097
     },
     "2024": {
       "Bioenergy": 0.2384,
@@ -976,7 +976,7 @@
     },
     "2023": {
       "Bioenergy": 0.0422,
-      "Hydro": 0.6513,
+      "Hydro": 0.6514,
       "Solar": 0.0822,
       "Wind": 0.2243
     },
@@ -1052,7 +1052,7 @@
     },
     "2023": {
       "Bioenergy": 0.031,
-      "Hydro": 0.0284,
+      "Hydro": 0.0285,
       "Solar": 0.1554,
       "Wind": 0.7851
     },
@@ -1165,9 +1165,9 @@
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.6317,
-      "Hydro": 0.2752,
-      "Solar": 0.0931,
+      "Bioenergy": 0.6316,
+      "Hydro": 0.2753,
+      "Solar": 0.093,
       "Wind": 0
     },
     "2024": {
@@ -1204,7 +1204,7 @@
     },
     "2023": {
       "Bioenergy": 0.2617,
-      "Hydro": 0.1273,
+      "Hydro": 0.1274,
       "Solar": 0.5556,
       "Wind": 0.0553
     },
@@ -1282,7 +1282,7 @@
       "Bioenergy": 0.2031,
       "Hydro": 0.4003,
       "Solar": 0.0761,
-      "Wind": 0.3206
+      "Wind": 0.3205
     },
     "2024": {
       "Bioenergy": 0.2013,
@@ -1318,9 +1318,9 @@
     },
     "2023": {
       "Bioenergy": 0.1665,
-      "Hydro": 0.0273,
+      "Hydro": 0.0272,
       "Solar": 0.1084,
-      "Wind": 0.6979
+      "Wind": 0.6978
     },
     "2024": {
       "Bioenergy": 0.1599,
@@ -1394,9 +1394,9 @@
     },
     "2023": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.1435,
+      "Hydro": 0.1436,
       "Solar": 0.021,
-      "Wind": 0.8224
+      "Wind": 0.8223
     },
     "2024": {
       "Bioenergy": 0.0129,
@@ -1508,7 +1508,7 @@
     },
     "2023": {
       "Bioenergy": 0.0918,
-      "Hydro": 0.2647,
+      "Hydro": 0.2646,
       "Solar": 0.6153,
       "Wind": 0.0282
     },
@@ -1546,9 +1546,9 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Hydro": 0.0896,
+      "Hydro": 0.0897,
       "Solar": 0,
-      "Wind": 0.9104
+      "Wind": 0.9103
     },
     "2024": {
       "Bioenergy": 0,
@@ -1622,9 +1622,9 @@
     },
     "2023": {
       "Bioenergy": 0.2895,
-      "Hydro": 0.5177,
+      "Hydro": 0.5178,
       "Solar": 0,
-      "Wind": 0.1928
+      "Wind": 0.1927
     },
     "2024": {
       "Bioenergy": 0.2706,
@@ -1659,7 +1659,7 @@
       "Wind": 0.0098
     },
     "2023": {
-      "Bioenergy": 0.2908,
+      "Bioenergy": 0.2907,
       "Hydro": 0,
       "Solar": 0.7013,
       "Wind": 0.008
@@ -1699,8 +1699,8 @@
     "2023": {
       "Bioenergy": 0.0011,
       "Hydro": 0,
-      "Solar": 0.1445,
-      "Wind": 0.8544
+      "Solar": 0.1444,
+      "Wind": 0.8545
     },
     "2024": {
       "Bioenergy": 0.0017,
@@ -1775,7 +1775,7 @@
     "2023": {
       "Bioenergy": 0.0451,
       "Hydro": 0.7519,
-      "Solar": 0.068,
+      "Solar": 0.0681,
       "Wind": 0.1349
     },
     "2024": {
@@ -1812,9 +1812,9 @@
     },
     "2023": {
       "Bioenergy": 0.0623,
-      "Hydro": 0.0936,
+      "Hydro": 0.0937,
       "Solar": 0.2679,
-      "Wind": 0.5762
+      "Wind": 0.5761
     },
     "2024": {
       "Bioenergy": 0.0509,
@@ -1852,7 +1852,7 @@
       "Bioenergy": 0.0066,
       "Hydro": 0.0453,
       "Solar": 0.0018,
-      "Wind": 0.9462
+      "Wind": 0.9463
     },
     "2024": {
       "Bioenergy": 0.0098,
@@ -1926,7 +1926,7 @@
     },
     "2023": {
       "Bioenergy": 0.2233,
-      "Hydro": 0.2665,
+      "Hydro": 0.2664,
       "Solar": 0.0567,
       "Wind": 0.4535
     },
@@ -2001,9 +2001,9 @@
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.2864,
-      "Hydro": 0.2982,
-      "Solar": 0.4154,
+      "Bioenergy": 0.2865,
+      "Hydro": 0.2981,
+      "Solar": 0.4155,
       "Wind": 0
     },
     "2024": {
@@ -2078,7 +2078,7 @@
     },
     "2023": {
       "Bioenergy": 0.0443,
-      "Hydro": 0.8601,
+      "Hydro": 0.86,
       "Solar": 0.0956,
       "Wind": 0
     },
@@ -2191,9 +2191,9 @@
       "Wind": 0.006
     },
     "2023": {
-      "Bioenergy": 0.3514,
-      "Hydro": 0.0518,
-      "Solar": 0.5916,
+      "Bioenergy": 0.3515,
+      "Hydro": 0.0516,
+      "Solar": 0.5917,
       "Wind": 0.0052
     },
     "2024": {
@@ -2230,9 +2230,9 @@
     },
     "2023": {
       "Bioenergy": 0.1671,
-      "Hydro": 0.5524,
-      "Solar": 0.104,
-      "Wind": 0.1765
+      "Hydro": 0.5525,
+      "Solar": 0.1039,
+      "Wind": 0.1764
     },
     "2024": {
       "Bioenergy": 0.2291,
@@ -2308,7 +2308,7 @@
       "Bioenergy": 0.187,
       "Hydro": 0.2801,
       "Solar": 0.2206,
-      "Wind": 0.3124
+      "Wind": 0.3123
     },
     "2024": {
       "Bioenergy": 0.2074,
@@ -2344,9 +2344,9 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Hydro": 0.4184,
+      "Hydro": 0.4185,
       "Solar": 0,
-      "Wind": 0.5816
+      "Wind": 0.5815
     },
     "2024": {
       "Bioenergy": 0,