@digital4better/data 1.2.8 → 1.2.9

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

@@ -31,16 +31,16 @@
       "Wind": 0.5413
     },
     "2024": {
-      "Bioenergy": 0.2101,
+      "Bioenergy": 0.2104,
       "Hydro": 0.0849,
-      "Solar": 0.1283,
+      "Solar": 0.128,
       "Wind": 0.5766
     },
     "2025": {
-      "Bioenergy": 0.2341,
-      "Hydro": 0.0952,
-      "Solar": 0.0432,
-      "Wind": 0.6275
+      "Bioenergy": 0.2354,
+      "Hydro": 0.095,
+      "Solar": 0.0431,
+      "Wind": 0.6264
     }
   },
   "CA-BC": {
@@ -82,7 +82,7 @@
     },
     "2025": {
       "Bioenergy": 0.0065,
-      "Hydro": 0.9647,
+      "Hydro": 0.9646,
       "Solar": 0,
       "Wind": 0.0289
     }
@@ -163,16 +163,16 @@
       "Wind": 0.1273
     },
     "2024": {
-      "Bioenergy": 0.1092,
-      "Hydro": 0.6347,
+      "Bioenergy": 0.1095,
+      "Hydro": 0.634,
       "Solar": 0.0006,
-      "Wind": 0.2555
+      "Wind": 0.2559
     },
     "2025": {
-      "Bioenergy": 0.1616,
-      "Hydro": 0.3902,
+      "Bioenergy": 0.1626,
+      "Hydro": 0.3897,
       "Solar": 0.0003,
-      "Wind": 0.4479
+      "Wind": 0.4474
     }
   },
   "CA-NL": {
@@ -251,16 +251,16 @@
       "Wind": 0.4808
     },
     "2024": {
-      "Bioenergy": 0.1643,
-      "Hydro": 0.2559,
+      "Bioenergy": 0.1644,
+      "Hydro": 0.2553,
       "Solar": 0.0009,
-      "Wind": 0.5788
+      "Wind": 0.5793
     },
     "2025": {
-      "Bioenergy": 0.1463,
-      "Hydro": 0.0869,
+      "Bioenergy": 0.1472,
+      "Hydro": 0.0868,
       "Solar": 0.0003,
-      "Wind": 0.7665
+      "Wind": 0.7656
     }
   },
   "CA-NT": {
@@ -295,16 +295,16 @@
       "Wind": 0.0731
     },
     "2024": {
-      "Bioenergy": 0.1964,
+      "Bioenergy": 0.1965,
       "Hydro": 0.6877,
       "Solar": 0.017,
       "Wind": 0.0989
     },
     "2025": {
-      "Bioenergy": 0.1633,
-      "Hydro": 0.7367,
+      "Bioenergy": 0.1643,
+      "Hydro": 0.7358,
       "Solar": 0.0017,
-      "Wind": 0.0984
+      "Wind": 0.0983
     }
   },
   "CA-NU": {
@@ -384,15 +384,15 @@
     },
     "2024": {
       "Bioenergy": 0.0354,
-      "Hydro": 0.6818,
-      "Solar": 0.0409,
-      "Wind": 0.242
+      "Hydro": 0.6817,
+      "Solar": 0.0408,
+      "Wind": 0.2422
     },
     "2025": {
-      "Bioenergy": 0.0263,
-      "Hydro": 0.6592,
+      "Bioenergy": 0.0265,
+      "Hydro": 0.659,
       "Solar": 0.0204,
-      "Wind": 0.2941
+      "Wind": 0.294
     }
   },
   "CA-PE": {
@@ -429,8 +429,8 @@
     "2024": {
       "Bioenergy": 0.0006,
       "Hydro": 0,
-      "Solar": 0.0548,
-      "Wind": 0.9446
+      "Solar": 0.0546,
+      "Wind": 0.9447
     },
     "2025": {
       "Bioenergy": 0.0005,
@@ -515,16 +515,16 @@
       "Wind": 0.3212
     },
     "2024": {
-      "Bioenergy": 0.2445,
-      "Hydro": 0.3912,
+      "Bioenergy": 0.2447,
+      "Hydro": 0.391,
       "Solar": 0.0094,
-      "Wind": 0.3548
+      "Wind": 0.355
     },
     "2025": {
-      "Bioenergy": 0.2183,
-      "Hydro": 0.3605,
+      "Bioenergy": 0.2195,
+      "Hydro": 0.36,
       "Solar": 0.0037,
-      "Wind": 0.4174
+      "Wind": 0.4168
     }
   },
   "CA-YT": {
@@ -559,14 +559,14 @@
       "Wind": 0.0013
     },
     "2024": {
-      "Bioenergy": 0.0189,
-      "Hydro": 0.9675,
+      "Bioenergy": 0.019,
+      "Hydro": 0.9674,
       "Solar": 0.0019,
       "Wind": 0.0117
     },
     "2025": {
-      "Bioenergy": 0.0323,
-      "Hydro": 0.9556,
+      "Bioenergy": 0.0326,
+      "Hydro": 0.9553,
       "Solar": 0.0017,
       "Wind": 0.0104
     }

package/data/mix/subdivision-yearly.csv

@@ -4,15 +4,15 @@ CA-AB,2020,0.0708,0.2732,0.516,0.0319,0,0.0365,0.0009,0.0003,0.0703
 CA-AB,2021,0.0693,0.2375,0.5362,0.0284,0,0.0328,0.0012,0.0034,0.0911
 CA-AB,2022,0.063,0.1826,0.5742,0.0298,0,0.0414,0.001,0.0112,0.0968
 CA-AB,2023,0.0593,0.1716,0.5395,0.0254,0,0.0389,0.001,0.0296,0.1348
-CA-AB,2024,0.0573,0.1661,0.5224,0.0231,0,0.0374,0.0016,0.035,0.1572
-CA-AB,2025,0.0588,0.171,0.5382,0.0239,0,0.0385,0.0014,0.0108,0.1575
+CA-AB,2024,0.0573,0.1661,0.5223,0.0231,0,0.0373,0.0017,0.0349,0.1572
+CA-AB,2025,0.0592,0.171,0.5375,0.0239,0,0.0379,0.0022,0.0108,0.1575
 CA-BC,2019,0.0083,0.0367,0.0524,0.8747,0,0.0043,0.0001,0,0.0235
 CA-BC,2020,0.0062,0.0241,0.0455,0.8794,0,0.0032,0.0001,0,0.0413
 CA-BC,2021,0.0068,0.0232,0.0524,0.8864,0,0.0032,0.0001,0.0001,0.0278
 CA-BC,2022,0.0051,0.0148,0.0466,0.9091,0,0.0034,0.0001,0.0001,0.0209
 CA-BC,2023,0.0069,0.0199,0.0627,0.8754,0,0.0045,0.0001,0.0001,0.0303
-CA-BC,2024,0.0069,0.0199,0.0627,0.8757,0,0.0045,0.0002,0.0001,0.03
-CA-BC,2025,0.006,0.0173,0.0546,0.8914,0,0.0039,0.0001,0,0.0267
+CA-BC,2024,0.0069,0.0199,0.0627,0.8758,0,0.0045,0.0002,0.0001,0.03
+CA-BC,2025,0.006,0.0173,0.0545,0.8914,0,0.0038,0.0002,0,0.0267
 CA-MB,2019,0.0003,0.0011,0.0016,0.9707,0,0.0001,0,0,0.0262
 CA-MB,2020,0.0002,0.0009,0.0017,0.9713,0,0.0001,0,0,0.0258
 CA-MB,2021,0.0003,0.001,0.0023,0.963,0,0.0001,0,0.0001,0.0332
@@ -25,49 +25,49 @@ CA-NB,2020,0.0245,0.0946,0.1787,0.2261,0.3901,0.0126,0.0003,0,0.0731
 CA-NB,2021,0.0296,0.1014,0.2289,0.2124,0.3557,0.014,0.0005,0,0.0574
 CA-NB,2022,0.0293,0.085,0.2673,0.2667,0.2871,0.0192,0.0005,0,0.0449
 CA-NB,2023,0.0309,0.0894,0.281,0.2376,0.301,0.0202,0.0005,0,0.0392
-CA-NB,2024,0.0392,0.1139,0.3582,0.2281,0.1418,0.0257,0.0011,0.0002,0.0918
-CA-NB,2025,0.0528,0.1536,0.4837,0.1275,0,0.0346,0.0013,0.0001,0.1464
+CA-NB,2024,0.0393,0.114,0.3584,0.2278,0.1415,0.0256,0.0012,0.0002,0.092
+CA-NB,2025,0.0532,0.1537,0.4831,0.1275,0,0.034,0.002,0.0001,0.1464
 CA-NL,2019,0.0033,0.0146,0.0208,0.9554,0,0.0017,0.0001,0,0.0043
 CA-NL,2020,0.003,0.0115,0.0218,0.9577,0,0.0015,0,0,0.0044
 CA-NL,2021,0.0026,0.009,0.0204,0.9629,0,0.0012,0.0001,0,0.0038
 CA-NL,2022,0.0022,0.0063,0.0199,0.9658,0,0.0014,0,0,0.0043
 CA-NL,2023,0.0016,0.0046,0.0144,0.9746,0,0.001,0,0,0.0037
-CA-NL,2024,0.002,0.0058,0.0181,0.9685,0,0.0013,0.0001,0,0.0043
-CA-NL,2025,0.003,0.0087,0.0275,0.954,0,0.002,0.0001,0,0.0047
+CA-NL,2024,0.002,0.0058,0.0182,0.9685,0,0.0013,0.0001,0,0.0043
+CA-NL,2025,0.003,0.0087,0.0275,0.954,0,0.0019,0.0001,0,0.0047
 CA-NS,2019,0.0635,0.2818,0.4019,0.1067,0,0.0328,0.0011,0,0.1122
 CA-NS,2020,0.0644,0.2486,0.4696,0.0832,0,0.0332,0.0009,0,0.1001
 CA-NS,2021,0.0627,0.2148,0.4849,0.0856,0,0.0296,0.0011,0,0.1212
 CA-NS,2022,0.0546,0.1582,0.4975,0.0993,0,0.0358,0.0009,0,0.1537
 CA-NS,2023,0.0532,0.154,0.484,0.1159,0,0.0349,0.0009,0.0003,0.1569
-CA-NS,2024,0.0532,0.1543,0.4855,0.0829,0,0.0348,0.0015,0.0003,0.1875
-CA-NS,2025,0.0511,0.1486,0.4677,0.0303,0,0.0334,0.0012,0.0001,0.2675
+CA-NS,2024,0.0533,0.1543,0.4854,0.0827,0,0.0347,0.0016,0.0003,0.1877
+CA-NS,2025,0.0514,0.1486,0.4672,0.0303,0,0.0329,0.0019,0.0001,0.2675
 CA-NT,2019,0.0526,0.2335,0.333,0.3297,0,0.0272,0.0009,0.0004,0.0227
 CA-NT,2020,0.0474,0.1829,0.3453,0.3698,0,0.0245,0.0006,0.0016,0.028
 CA-NT,2021,0.0471,0.1612,0.3639,0.3793,0,0.0223,0.0009,0.0003,0.025
 CA-NT,2022,0.0464,0.1345,0.423,0.3406,0,0.0305,0.0007,0.0003,0.024
 CA-NT,2023,0.0527,0.1524,0.4792,0.2556,0,0.0345,0.0009,0.0003,0.0243
-CA-NT,2024,0.0562,0.163,0.5126,0.1967,0,0.0368,0.0016,0.0049,0.0283
-CA-NT,2025,0.053,0.1542,0.4853,0.2391,0,0.0347,0.0013,0.0006,0.0319
+CA-NT,2024,0.0562,0.1629,0.5124,0.1969,0,0.0367,0.0017,0.0049,0.0283
+CA-NT,2025,0.0534,0.1542,0.4847,0.2391,0,0.0341,0.002,0.0006,0.0319
 CA-NU,2019,0.0813,0.3608,0.5145,0,0,0.042,0.0014,0,0
 CA-NU,2020,0.0788,0.3044,0.5749,0,0,0.0407,0.0011,0,0
 CA-NU,2021,0.0791,0.2708,0.6113,0,0,0.0374,0.0014,0,0
 CA-NU,2022,0.0731,0.2118,0.666,0,0,0.048,0.0012,0,0
 CA-NU,2023,0.0731,0.2117,0.6655,0,0,0.0479,0.0012,0.0005,0
-CA-NU,2024,0.0729,0.2116,0.6655,0,0,0.0477,0.002,0.0004,0
-CA-NU,2025,0.0727,0.2116,0.6662,0,0,0.0476,0.0018,0,0
+CA-NU,2024,0.073,0.2116,0.6653,0,0,0.0475,0.0022,0.0004,0
+CA-NU,2025,0.0733,0.2116,0.6654,0,0,0.0469,0.0027,0,0
 CA-ON,2019,0.0071,0.0314,0.0447,0.2456,0.5781,0.0036,0.0001,0.0154,0.0739
 CA-ON,2020,0.0067,0.0257,0.0486,0.2514,0.5656,0.0034,0.0001,0.0162,0.0823
 CA-ON,2021,0.0083,0.0284,0.0641,0.2381,0.5556,0.0039,0.0001,0.0165,0.085
 CA-ON,2022,0.0088,0.0256,0.0806,0.2577,0.5126,0.0058,0.0001,0.0148,0.094
 CA-ON,2023,0.0107,0.0309,0.0972,0.248,0.5108,0.007,0.0002,0.0147,0.0805
-CA-ON,2024,0.0126,0.0364,0.1146,0.2423,0.485,0.0082,0.0003,0.0145,0.086
-CA-ON,2025,0.01,0.0291,0.0916,0.2505,0.4926,0.0065,0.0002,0.0078,0.1117
+CA-ON,2024,0.0126,0.0364,0.1145,0.2423,0.485,0.0082,0.0004,0.0145,0.0861
+CA-ON,2025,0.0101,0.0291,0.0915,0.2505,0.4926,0.0064,0.0004,0.0078,0.1117
 CA-PE,2019,0.0007,0.0032,0.0046,0,0,0.0004,0,0.0009,0.9902
 CA-PE,2020,0.0007,0.0026,0.0048,0,0,0.0003,0,0.0009,0.9907
 CA-PE,2021,0.0009,0.0029,0.0066,0,0,0.0004,0,0.0009,0.9882
 CA-PE,2022,0.0008,0.0023,0.0074,0,0,0.0005,0,0.0011,0.9879
 CA-PE,2023,0.0008,0.0024,0.0075,0,0,0.0005,0,0.0011,0.9877
-CA-PE,2024,0.0006,0.0019,0.0059,0,0,0.0004,0,0.0543,0.9369
+CA-PE,2024,0.0006,0.0019,0.0059,0,0,0.0004,0,0.0542,0.937
 CA-PE,2025,0.0005,0.0015,0.0048,0,0,0.0003,0,0.019,0.9739
 CA-QC,2019,0.0008,0.0034,0.0048,0.9372,0,0.0004,0,0,0.0534
 CA-QC,2020,0.0008,0.003,0.0056,0.9379,0,0.0004,0,0,0.0523
@@ -81,15 +81,15 @@ CA-SK,2020,0.062,0.2393,0.4519,0.1803,0,0.032,0.0008,0,0.0337
 CA-SK,2021,0.0667,0.2285,0.5158,0.1208,0,0.0316,0.0012,0.0002,0.0352
 CA-SK,2022,0.0582,0.1688,0.5308,0.1362,0,0.0382,0.0009,0.0012,0.0655
 CA-SK,2023,0.0591,0.1712,0.5381,0.1093,0,0.0388,0.001,0.002,0.0806
-CA-SK,2024,0.0595,0.1727,0.5432,0.0953,0,0.0389,0.0016,0.0023,0.0864
-CA-SK,2025,0.0577,0.1679,0.5285,0.0953,0,0.0378,0.0014,0.001,0.1104
+CA-SK,2024,0.0596,0.1727,0.543,0.0953,0,0.0388,0.0018,0.0023,0.0865
+CA-SK,2025,0.0581,0.1679,0.5279,0.0953,0,0.0372,0.0022,0.001,0.1104
 CA-YT,2019,0.016,0.0709,0.1011,0.8035,0,0.0082,0.0003,0,0
 CA-YT,2020,0.0138,0.0535,0.101,0.8244,0,0.0072,0.0002,0,0
 CA-YT,2021,0.0092,0.0316,0.0714,0.883,0,0.0043,0.0002,0.0002,0
 CA-YT,2022,0.0086,0.025,0.0787,0.8805,0,0.0056,0.0002,0.0013,0
 CA-YT,2023,0.0094,0.0272,0.0855,0.8692,0,0.0062,0.0002,0.0012,0.0011
-CA-YT,2024,0.0153,0.0443,0.1393,0.7799,0,0.01,0.0004,0.0016,0.0094
-CA-YT,2025,0.0229,0.0666,0.2097,0.6767,0,0.015,0.0006,0.0012,0.0074
+CA-YT,2024,0.0153,0.0443,0.1395,0.7795,0,0.01,0.0005,0.0015,0.0094
+CA-YT,2025,0.0231,0.0666,0.2094,0.6767,0,0.0148,0.0009,0.0012,0.0074
 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

package/data/mix/subdivision-yearly.json

@@ -58,22 +58,22 @@
     "2024": {
       "Bioenergy": 0.0573,
       "Coal": 0.1661,
-      "Gas": 0.5224,
+      "Gas": 0.5223,
       "Hydro": 0.0231,
       "Nuclear": 0,
-      "Other Fossil": 0.0374,
-      "Other Renewables": 0.0016,
-      "Solar": 0.035,
+      "Other Fossil": 0.0373,
+      "Other Renewables": 0.0017,
+      "Solar": 0.0349,
       "Wind": 0.1572
     },
     "2025": {
-      "Bioenergy": 0.0588,
+      "Bioenergy": 0.0592,
       "Coal": 0.171,
-      "Gas": 0.5382,
+      "Gas": 0.5375,
       "Hydro": 0.0239,
       "Nuclear": 0,
-      "Other Fossil": 0.0385,
-      "Other Renewables": 0.0014,
+      "Other Fossil": 0.0379,
+      "Other Renewables": 0.0022,
       "Solar": 0.0108,
       "Wind": 0.1575
     }
@@ -138,7 +138,7 @@
       "Bioenergy": 0.0069,
       "Coal": 0.0199,
       "Gas": 0.0627,
-      "Hydro": 0.8757,
+      "Hydro": 0.8758,
       "Nuclear": 0,
       "Other Fossil": 0.0045,
       "Other Renewables": 0.0002,
@@ -148,11 +148,11 @@
     "2025": {
       "Bioenergy": 0.006,
       "Coal": 0.0173,
-      "Gas": 0.0546,
+      "Gas": 0.0545,
       "Hydro": 0.8914,
       "Nuclear": 0,
-      "Other Fossil": 0.0039,
-      "Other Renewables": 0.0001,
+      "Other Fossil": 0.0038,
+      "Other Renewables": 0.0002,
       "Solar": 0,
       "Wind": 0.0267
     }
@@ -293,24 +293,24 @@
       "Wind": 0.0392
     },
     "2024": {
-      "Bioenergy": 0.0392,
-      "Coal": 0.1139,
-      "Gas": 0.3582,
-      "Hydro": 0.2281,
-      "Nuclear": 0.1418,
-      "Other Fossil": 0.0257,
-      "Other Renewables": 0.0011,
+      "Bioenergy": 0.0393,
+      "Coal": 0.114,
+      "Gas": 0.3584,
+      "Hydro": 0.2278,
+      "Nuclear": 0.1415,
+      "Other Fossil": 0.0256,
+      "Other Renewables": 0.0012,
       "Solar": 0.0002,
-      "Wind": 0.0918
+      "Wind": 0.092
     },
     "2025": {
-      "Bioenergy": 0.0528,
-      "Coal": 0.1536,
-      "Gas": 0.4837,
+      "Bioenergy": 0.0532,
+      "Coal": 0.1537,
+      "Gas": 0.4831,
       "Hydro": 0.1275,
       "Nuclear": 0,
-      "Other Fossil": 0.0346,
-      "Other Renewables": 0.0013,
+      "Other Fossil": 0.034,
+      "Other Renewables": 0.002,
       "Solar": 0.0001,
       "Wind": 0.1464
     }
@@ -374,7 +374,7 @@
     "2024": {
       "Bioenergy": 0.002,
       "Coal": 0.0058,
-      "Gas": 0.0181,
+      "Gas": 0.0182,
       "Hydro": 0.9685,
       "Nuclear": 0,
       "Other Fossil": 0.0013,
@@ -388,7 +388,7 @@
       "Gas": 0.0275,
       "Hydro": 0.954,
       "Nuclear": 0,
-      "Other Fossil": 0.002,
+      "Other Fossil": 0.0019,
       "Other Renewables": 0.0001,
       "Solar": 0,
       "Wind": 0.0047
@@ -451,24 +451,24 @@
       "Wind": 0.1569
     },
     "2024": {
-      "Bioenergy": 0.0532,
+      "Bioenergy": 0.0533,
       "Coal": 0.1543,
-      "Gas": 0.4855,
-      "Hydro": 0.0829,
+      "Gas": 0.4854,
+      "Hydro": 0.0827,
       "Nuclear": 0,
-      "Other Fossil": 0.0348,
-      "Other Renewables": 0.0015,
+      "Other Fossil": 0.0347,
+      "Other Renewables": 0.0016,
       "Solar": 0.0003,
-      "Wind": 0.1875
+      "Wind": 0.1877
     },
     "2025": {
-      "Bioenergy": 0.0511,
+      "Bioenergy": 0.0514,
       "Coal": 0.1486,
-      "Gas": 0.4677,
+      "Gas": 0.4672,
       "Hydro": 0.0303,
       "Nuclear": 0,
-      "Other Fossil": 0.0334,
-      "Other Renewables": 0.0012,
+      "Other Fossil": 0.0329,
+      "Other Renewables": 0.0019,
       "Solar": 0.0001,
       "Wind": 0.2675
     }
@@ -531,23 +531,23 @@
     },
     "2024": {
       "Bioenergy": 0.0562,
-      "Coal": 0.163,
-      "Gas": 0.5126,
-      "Hydro": 0.1967,
+      "Coal": 0.1629,
+      "Gas": 0.5124,
+      "Hydro": 0.1969,
       "Nuclear": 0,
-      "Other Fossil": 0.0368,
-      "Other Renewables": 0.0016,
+      "Other Fossil": 0.0367,
+      "Other Renewables": 0.0017,
       "Solar": 0.0049,
       "Wind": 0.0283
     },
     "2025": {
-      "Bioenergy": 0.053,
+      "Bioenergy": 0.0534,
       "Coal": 0.1542,
-      "Gas": 0.4853,
+      "Gas": 0.4847,
       "Hydro": 0.2391,
       "Nuclear": 0,
-      "Other Fossil": 0.0347,
-      "Other Renewables": 0.0013,
+      "Other Fossil": 0.0341,
+      "Other Renewables": 0.002,
       "Solar": 0.0006,
       "Wind": 0.0319
     }
@@ -609,24 +609,24 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0729,
+      "Bioenergy": 0.073,
       "Coal": 0.2116,
-      "Gas": 0.6655,
+      "Gas": 0.6653,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0477,
-      "Other Renewables": 0.002,
+      "Other Fossil": 0.0475,
+      "Other Renewables": 0.0022,
       "Solar": 0.0004,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0727,
+      "Bioenergy": 0.0733,
       "Coal": 0.2116,
-      "Gas": 0.6662,
+      "Gas": 0.6654,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0476,
-      "Other Renewables": 0.0018,
+      "Other Fossil": 0.0469,
+      "Other Renewables": 0.0027,
       "Solar": 0,
       "Wind": 0
     }
@@ -690,22 +690,22 @@
     "2024": {
       "Bioenergy": 0.0126,
       "Coal": 0.0364,
-      "Gas": 0.1146,
+      "Gas": 0.1145,
       "Hydro": 0.2423,
       "Nuclear": 0.485,
       "Other Fossil": 0.0082,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.0145,
-      "Wind": 0.086
+      "Wind": 0.0861
     },
     "2025": {
-      "Bioenergy": 0.01,
+      "Bioenergy": 0.0101,
       "Coal": 0.0291,
-      "Gas": 0.0916,
+      "Gas": 0.0915,
       "Hydro": 0.2505,
       "Nuclear": 0.4926,
-      "Other Fossil": 0.0065,
-      "Other Renewables": 0.0002,
+      "Other Fossil": 0.0064,
+      "Other Renewables": 0.0004,
       "Solar": 0.0078,
       "Wind": 0.1117
     }
@@ -774,8 +774,8 @@
       "Nuclear": 0,
       "Other Fossil": 0.0004,
       "Other Renewables": 0,
-      "Solar": 0.0543,
-      "Wind": 0.9369
+      "Solar": 0.0542,
+      "Wind": 0.937
     },
     "2025": {
       "Bioenergy": 0.0005,
@@ -925,24 +925,24 @@
       "Wind": 0.0806
     },
     "2024": {
-      "Bioenergy": 0.0595,
+      "Bioenergy": 0.0596,
       "Coal": 0.1727,
-      "Gas": 0.5432,
+      "Gas": 0.543,
       "Hydro": 0.0953,
       "Nuclear": 0,
-      "Other Fossil": 0.0389,
-      "Other Renewables": 0.0016,
+      "Other Fossil": 0.0388,
+      "Other Renewables": 0.0018,
       "Solar": 0.0023,
-      "Wind": 0.0864
+      "Wind": 0.0865
     },
     "2025": {
-      "Bioenergy": 0.0577,
+      "Bioenergy": 0.0581,
       "Coal": 0.1679,
-      "Gas": 0.5285,
+      "Gas": 0.5279,
       "Hydro": 0.0953,
       "Nuclear": 0,
-      "Other Fossil": 0.0378,
-      "Other Renewables": 0.0014,
+      "Other Fossil": 0.0372,
+      "Other Renewables": 0.0022,
       "Solar": 0.001,
       "Wind": 0.1104
     }
@@ -1006,22 +1006,22 @@
     "2024": {
       "Bioenergy": 0.0153,
       "Coal": 0.0443,
-      "Gas": 0.1393,
-      "Hydro": 0.7799,
+      "Gas": 0.1395,
+      "Hydro": 0.7795,
       "Nuclear": 0,
       "Other Fossil": 0.01,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0016,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0015,
       "Wind": 0.0094
     },
     "2025": {
-      "Bioenergy": 0.0229,
+      "Bioenergy": 0.0231,
       "Coal": 0.0666,
-      "Gas": 0.2097,
+      "Gas": 0.2094,
       "Hydro": 0.6767,
       "Nuclear": 0,
-      "Other Fossil": 0.015,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.0148,
+      "Other Renewables": 0.0009,
       "Solar": 0.0012,
       "Wind": 0.0074
     }