@digital4better/data 1.3.20 → 1.3.21

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

@@ -37,10 +37,10 @@
       "Wind": 0.5752
     },
     "2025": {
-      "Bioenergy": 0.1999,
-      "Hydro": 0.0951,
+      "Bioenergy": 0.2001,
+      "Hydro": 0.0952,
       "Solar": 0.167,
-      "Wind": 0.538
+      "Wind": 0.5378
     }
   },
   "CA-BC": {
@@ -81,7 +81,7 @@
       "Wind": 0.033
     },
     "2025": {
-      "Bioenergy": 0.0072,
+      "Bioenergy": 0.0073,
       "Hydro": 0.9634,
       "Solar": 0.0002,
       "Wind": 0.0291
@@ -126,7 +126,7 @@
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.97,
+      "Hydro": 0.9701,
       "Solar": 0.0001,
       "Wind": 0.0296
     }
@@ -169,8 +169,8 @@
       "Wind": 0.24
     },
     "2025": {
-      "Bioenergy": 0.0808,
-      "Hydro": 0.6987,
+      "Bioenergy": 0.0809,
+      "Hydro": 0.6986,
       "Solar": 0.0004,
       "Wind": 0.2201
     }
@@ -257,10 +257,10 @@
       "Wind": 0.5629
     },
     "2025": {
-      "Bioenergy": 0.1673,
-      "Hydro": 0.2693,
+      "Bioenergy": 0.1675,
+      "Hydro": 0.2692,
       "Solar": 0.0013,
-      "Wind": 0.5621
+      "Wind": 0.562
     }
   },
   "CA-NT": {
@@ -301,8 +301,8 @@
       "Wind": 0.0954
     },
     "2025": {
-      "Bioenergy": 0.1256,
-      "Hydro": 0.7668,
+      "Bioenergy": 0.1257,
+      "Hydro": 0.7667,
       "Solar": 0.0243,
       "Wind": 0.0832
     }
@@ -389,10 +389,10 @@
       "Wind": 0.2413
     },
     "2025": {
-      "Bioenergy": 0.0434,
+      "Bioenergy": 0.0435,
       "Hydro": 0.6969,
       "Solar": 0.0429,
-      "Wind": 0.2169
+      "Wind": 0.2167
     }
   },
   "CA-PE": {
@@ -436,7 +436,7 @@
       "Bioenergy": 0.001,
       "Hydro": 0,
       "Solar": 0.0912,
-      "Wind": 0.9079
+      "Wind": 0.9078
     }
   },
   "CA-QC": {
@@ -521,10 +521,10 @@
       "Wind": 0.3482
     },
     "2025": {
-      "Bioenergy": 0.2108,
-      "Hydro": 0.4048,
+      "Bioenergy": 0.2111,
+      "Hydro": 0.4047,
       "Solar": 0.0076,
-      "Wind": 0.3768
+      "Wind": 0.3766
     }
   },
   "CA-YT": {
@@ -743,7 +743,7 @@
     "2025": {
       "Bioenergy": 0.0066,
       "Hydro": 0.2054,
-      "Solar": 0.6514,
+      "Solar": 0.6515,
       "Wind": 0.1365
     }
   },
@@ -1007,7 +1007,7 @@
     "2025": {
       "Bioenergy": 0.2464,
       "Hydro": 0.1267,
-      "Solar": 0.6268,
+      "Solar": 0.6269,
       "Wind": 0
     }
   },
@@ -1227,7 +1227,7 @@
     "2025": {
       "Bioenergy": 0.0117,
       "Hydro": 0.0263,
-      "Solar": 0.4096,
+      "Solar": 0.4097,
       "Wind": 0.5523
     }
   },
@@ -1357,7 +1357,7 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.3714,
+      "Bioenergy": 0.3713,
       "Hydro": 0.1376,
       "Solar": 0.4911,
       "Wind": 0
@@ -2240,7 +2240,7 @@
       "Bioenergy": 0.1575,
       "Hydro": 0.2112,
       "Solar": 0.2283,
-      "Wind": 0.403
+      "Wind": 0.4029
     }
   },
   "US-RI": {
@@ -2589,7 +2589,7 @@
       "Wind": 0.1404
     },
     "2025": {
-      "Bioenergy": 0.1722,
+      "Bioenergy": 0.1721,
       "Hydro": 0.5802,
       "Solar": 0.102,
       "Wind": 0.1456
@@ -2724,7 +2724,7 @@
       "Bioenergy": 0,
       "Hydro": 0.4114,
       "Solar": 0.0823,
-      "Wind": 0.5063
+      "Wind": 0.5062
     }
   },
   "US-WY": {

package/data/mix/subdivision-yearly.csv

@@ -5,28 +5,28 @@ CA-AB,2021,0.0759,0.2325,0.5352,0.0284,0,0.0323,0.0012,0.0034,0.0911
 CA-AB,2022,0.0688,0.1762,0.5757,0.0298,0,0.0405,0.001,0.0112,0.0968
 CA-AB,2023,0.0632,0.1406,0.5747,0.0254,0,0.0309,0.001,0.0296,0.1348
 CA-AB,2024,0.0609,0.1358,0.5551,0.0225,0,0.0298,0.0017,0.0345,0.1597
-CA-AB,2025,0.0591,0.1323,0.5406,0.0281,0,0.0292,0.0024,0.0494,0.1591
+CA-AB,2025,0.0592,0.1324,0.5408,0.0281,0,0.029,0.0021,0.0494,0.159
 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.0074,0.0227,0.0523,0.8864,0,0.0032,0.0001,0.0001,0.0278
 CA-BC,2022,0.0056,0.0143,0.0467,0.9091,0,0.0033,0.0001,0.0001,0.0209
 CA-BC,2023,0.0073,0.0163,0.0668,0.8754,0,0.0036,0.0001,0.0001,0.0303
 CA-BC,2024,0.0073,0.0163,0.0665,0.876,0,0.0036,0.0002,0.0001,0.0302
-CA-BC,2025,0.0067,0.0149,0.061,0.8869,0,0.0033,0.0003,0.0002,0.0268
+CA-BC,2025,0.0067,0.0149,0.061,0.8869,0,0.0033,0.0002,0.0002,0.0268
 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
 CA-MB,2022,0.0002,0.0006,0.002,0.9706,0,0.0001,0,0,0.0264
 CA-MB,2023,0.0003,0.0007,0.0027,0.9713,0,0.0001,0,0,0.0249
 CA-MB,2024,0.0003,0.0006,0.0025,0.9663,0,0.0001,0,0.0001,0.03
-CA-MB,2025,0.0002,0.0005,0.0021,0.9674,0,0.0001,0,0.0001,0.0296
+CA-MB,2025,0.0002,0.0005,0.0021,0.9674,0,0.0001,0,0.0001,0.0295
 CA-NB,2019,0.0279,0.1238,0.1766,0.2225,0.3692,0.0144,0.0005,0,0.0651
 CA-NB,2020,0.0245,0.0946,0.1787,0.2261,0.3901,0.0126,0.0003,0,0.0731
 CA-NB,2021,0.0324,0.0993,0.2285,0.2124,0.3557,0.0137,0.0005,0,0.0574
 CA-NB,2022,0.032,0.082,0.268,0.2667,0.2871,0.0188,0.0005,0,0.0449
 CA-NB,2023,0.0329,0.0732,0.2994,0.2376,0.301,0.0161,0.0005,0,0.0392
 CA-NB,2024,0.041,0.0914,0.3737,0.2304,0.1563,0.0201,0.0012,0.0002,0.0858
-CA-NB,2025,0.028,0.0628,0.2564,0.2423,0.3191,0.0138,0.0011,0.0001,0.0763
+CA-NB,2025,0.0281,0.0628,0.2566,0.2424,0.319,0.0137,0.001,0.0001,0.0763
 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.0029,0.0088,0.0203,0.9629,0,0.0012,0.0001,0,0.0038
@@ -40,35 +40,35 @@ CA-NS,2021,0.0687,0.2103,0.484,0.0856,0,0.0291,0.0011,0,0.1212
 CA-NS,2022,0.0596,0.1527,0.4988,0.0993,0,0.035,0.0009,0,0.1537
 CA-NS,2023,0.0567,0.1261,0.5155,0.1159,0,0.0277,0.0009,0.0003,0.1569
 CA-NS,2024,0.0571,0.1275,0.521,0.0833,0,0.028,0.0016,0.0003,0.1813
-CA-NS,2025,0.0559,0.1251,0.5112,0.0899,0,0.0275,0.0022,0.0004,0.1877
+CA-NS,2025,0.0559,0.1252,0.5115,0.0899,0,0.0273,0.002,0.0004,0.1877
 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.0515,0.1578,0.3632,0.3793,0,0.0219,0.0009,0.0003,0.025
 CA-NT,2022,0.0507,0.1298,0.4241,0.3406,0,0.0298,0.0007,0.0003,0.024
 CA-NT,2023,0.0561,0.1248,0.5104,0.2556,0,0.0274,0.0009,0.0003,0.0243
 CA-NT,2024,0.0597,0.1331,0.5442,0.1994,0,0.0292,0.0016,0.0048,0.0278
-CA-NT,2025,0.0503,0.1126,0.4601,0.3071,0,0.0248,0.002,0.0097,0.0333
+CA-NT,2025,0.0504,0.1127,0.4603,0.3071,0,0.0247,0.0018,0.0097,0.0333
 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.0866,0.2651,0.6101,0,0,0.0368,0.0014,0,0
 CA-NU,2022,0.0798,0.2044,0.6677,0,0,0.047,0.0012,0,0
 CA-NU,2023,0.0779,0.1734,0.7089,0,0,0.0381,0.0012,0.0005,0
 CA-NU,2024,0.0777,0.1733,0.7084,0,0,0.0381,0.0022,0.0004,0
-CA-NU,2025,0.0774,0.1732,0.7077,0,0,0.0382,0.0031,0.0005,0
+CA-NU,2025,0.0775,0.1733,0.7079,0,0,0.0379,0.0028,0.0005,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.0091,0.0278,0.064,0.2381,0.5556,0.0038,0.0001,0.0165,0.085
 CA-ON,2022,0.0096,0.0247,0.0808,0.2577,0.5126,0.0057,0.0001,0.0148,0.094
 CA-ON,2023,0.0114,0.0253,0.1035,0.248,0.5108,0.0056,0.0002,0.0147,0.0805
 CA-ON,2024,0.0136,0.0303,0.124,0.2397,0.4861,0.0067,0.0004,0.0141,0.0851
-CA-ON,2025,0.0155,0.0347,0.1417,0.2487,0.4585,0.0076,0.0006,0.0153,0.0774
+CA-ON,2025,0.0155,0.0347,0.1418,0.2487,0.4585,0.0076,0.0005,0.0153,0.0774
 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.0009,0.0023,0.0074,0,0,0.0005,0,0.0011,0.9879
 CA-PE,2023,0.0009,0.0019,0.0079,0,0,0.0004,0,0.0011,0.9877
 CA-PE,2024,0.0007,0.0017,0.0068,0,0,0.0004,0,0.0555,0.9349
-CA-PE,2025,0.001,0.0021,0.0087,0,0,0.0005,0,0.0901,0.8975
+CA-PE,2025,0.001,0.0021,0.0087,0,0,0.0005,0,0.0902,0.8975
 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
 CA-QC,2021,0.0008,0.0026,0.0059,0.9416,0,0.0004,0,0,0.0487
@@ -82,14 +82,14 @@ CA-SK,2021,0.073,0.2237,0.5149,0.1208,0,0.031,0.0012,0.0002,0.0352
 CA-SK,2022,0.0636,0.1629,0.5322,0.1362,0,0.0374,0.0009,0.0012,0.0655
 CA-SK,2023,0.063,0.1402,0.5732,0.1093,0,0.0308,0.001,0.002,0.0806
 CA-SK,2024,0.0633,0.1411,0.5767,0.0971,0,0.031,0.0018,0.0023,0.0869
-CA-SK,2025,0.06,0.1343,0.549,0.1152,0,0.0296,0.0024,0.0022,0.1073
+CA-SK,2025,0.0601,0.1345,0.5492,0.1152,0,0.0294,0.0021,0.0022,0.1072
 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.0101,0.031,0.0713,0.883,0,0.0043,0.0002,0.0002,0
 CA-YT,2022,0.0094,0.0242,0.0789,0.8805,0,0.0055,0.0002,0.0013,0
 CA-YT,2023,0.01,0.0223,0.0911,0.8692,0,0.0049,0.0002,0.0012,0.0011
 CA-YT,2024,0.0164,0.0366,0.1496,0.7778,0,0.008,0.0005,0.0015,0.0097
-CA-YT,2025,0.0245,0.0548,0.2238,0.654,0,0.012,0.001,0.0196,0.0104
+CA-YT,2025,0.0245,0.0548,0.2238,0.6541,0,0.012,0.0009,0.0196,0.0104
 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
@@ -131,7 +131,7 @@ 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.0023,0.3265,0.2993,0.0282,0,0.0013,0,0.0628,0.2797
 US-CO,2024,0.0014,0.2812,0.3039,0.0288,0,0.0003,0,0.0842,0.3002
-US-CO,2025,0.0011,0.2712,0.3072,0.0315,0,0.0002,0,0.1014,0.2874
+US-CO,2025,0.0011,0.2711,0.3072,0.0315,0,0.0002,0,0.1014,0.2874
 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
 US-CT,2021,0.0172,0.0056,0.5555,0.0108,0.3906,0.014,0,0.006,0.0003
@@ -145,7 +145,7 @@ US-DE,2021,0.0171,0.066,0.8986,0,0,0.0039,0,0.0133,0.0011
 US-DE,2022,0.0148,0.0226,0.9293,0,0,0.0205,0,0.012,0.0008
 US-DE,2023,0.0138,0.0026,0.9487,0,0,0.0017,0,0.0323,0.0009
 US-DE,2024,0.0132,0.0324,0.9175,0,0,0.0009,0,0.0354,0.0006
-US-DE,2025,0.0092,0.0524,0.8948,0,0,0.0118,0,0.0311,0.0007
+US-DE,2025,0.0092,0.0524,0.8949,0,0,0.0118,0,0.0311,0.0007
 US-FL,2019,0.0181,0.0865,0.7411,0.0009,0.1185,0.0191,0,0.0159,0
 US-FL,2020,0.016,0.0662,0.7552,0.0009,0.1173,0.0184,0,0.026,0
 US-FL,2021,0.0171,0.0742,0.7366,0.001,0.1191,0.0156,0,0.0365,0
@@ -173,7 +173,7 @@ 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.235,0.1466,0.0136,0,0.0009,0,0.0075,0.5934
 US-IA,2024,0.003,0.2076,0.1316,0.0137,0,0.0003,0,0.0096,0.6342
-US-IA,2025,0.0024,0.2759,0.1343,0.0132,0,0.001,0,0.0204,0.5526
+US-IA,2025,0.0024,0.2759,0.1344,0.0132,0,0.001,0,0.0204,0.5526
 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
@@ -194,7 +194,7 @@ US-IN,2021,0.0046,0.5783,0.317,0.0041,0,0.0066,0,0.0061,0.0834
 US-IN,2022,0.0039,0.5241,0.3495,0.0038,0,0.0059,0,0.011,0.1018
 US-IN,2023,0.0028,0.4545,0.4122,0.0051,0,0.0064,0,0.0206,0.0983
 US-IN,2024,0.0024,0.4285,0.4228,0.0048,0,0.0056,0,0.0327,0.1032
-US-IN,2025,0.0018,0.4662,0.3779,0.004,0,0.0046,0,0.062,0.0836
+US-IN,2025,0.0018,0.4661,0.3779,0.004,0,0.0046,0,0.062,0.0836
 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
@@ -229,7 +229,7 @@ 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.0089,0.0474,0.426,0.0514,0.4162,0.0105,0,0.0262,0.0134
 US-MD,2024,0.0094,0.0689,0.396,0.0517,0.4123,0.0152,0,0.031,0.0156
-US-MD,2025,0.0077,0.0862,0.4357,0.0517,0.3506,0.0192,0,0.0343,0.0145
+US-MD,2025,0.0077,0.0862,0.4358,0.0517,0.3506,0.0192,0,0.0343,0.0145
 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
 US-ME,2021,0.1805,0.0046,0.3069,0.233,0,0.0272,0,0.0144,0.2333
@@ -285,7 +285,7 @@ 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.5354,0.0679,0.0504,0,0.0022,0,0,0.3442
 US-ND,2024,0,0.5362,0.067,0.048,0,0.0011,0,0,0.3477
-US-ND,2025,0,0.5329,0.0689,0.0511,0,0.0012,0,0,0.346
+US-ND,2025,0,0.5328,0.0689,0.0511,0,0.0012,0,0,0.3461
 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
 US-NE,2021,0.0024,0.4994,0.031,0.0296,0.1815,0.0015,0,0.0016,0.253
@@ -341,7 +341,7 @@ 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.003,0.0582,0.5066,0.016,0,0.0004,0,0.0009,0.4149
 US-OK,2024,0.0035,0.0646,0.5062,0.0156,0,0.0005,0,0.0031,0.4065
-US-OK,2025,0.0032,0.109,0.4593,0.0168,0,0.0006,0,0.007,0.4041
+US-OK,2025,0.0032,0.109,0.4593,0.0168,0,0.0006,0,0.007,0.4042
 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

package/data/mix/subdivision-yearly.json

@@ -67,15 +67,15 @@
       "Wind": 0.1597
     },
     "2025": {
-      "Bioenergy": 0.0591,
-      "Coal": 0.1323,
-      "Gas": 0.5406,
+      "Bioenergy": 0.0592,
+      "Coal": 0.1324,
+      "Gas": 0.5408,
       "Hydro": 0.0281,
       "Nuclear": 0,
-      "Other Fossil": 0.0292,
-      "Other Renewables": 0.0024,
+      "Other Fossil": 0.029,
+      "Other Renewables": 0.0021,
       "Solar": 0.0494,
-      "Wind": 0.1591
+      "Wind": 0.159
     }
   },
   "CA-BC": {
@@ -152,7 +152,7 @@
       "Hydro": 0.8869,
       "Nuclear": 0,
       "Other Fossil": 0.0033,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0002,
       "Solar": 0.0002,
       "Wind": 0.0268
     }
@@ -233,7 +233,7 @@
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.0001,
-      "Wind": 0.0296
+      "Wind": 0.0295
     }
   },
   "CA-NB": {
@@ -304,13 +304,13 @@
       "Wind": 0.0858
     },
     "2025": {
-      "Bioenergy": 0.028,
+      "Bioenergy": 0.0281,
       "Coal": 0.0628,
-      "Gas": 0.2564,
-      "Hydro": 0.2423,
-      "Nuclear": 0.3191,
-      "Other Fossil": 0.0138,
-      "Other Renewables": 0.0011,
+      "Gas": 0.2566,
+      "Hydro": 0.2424,
+      "Nuclear": 0.319,
+      "Other Fossil": 0.0137,
+      "Other Renewables": 0.001,
       "Solar": 0.0001,
       "Wind": 0.0763
     }
@@ -463,12 +463,12 @@
     },
     "2025": {
       "Bioenergy": 0.0559,
-      "Coal": 0.1251,
-      "Gas": 0.5112,
+      "Coal": 0.1252,
+      "Gas": 0.5115,
       "Hydro": 0.0899,
       "Nuclear": 0,
-      "Other Fossil": 0.0275,
-      "Other Renewables": 0.0022,
+      "Other Fossil": 0.0273,
+      "Other Renewables": 0.002,
       "Solar": 0.0004,
       "Wind": 0.1877
     }
@@ -541,13 +541,13 @@
       "Wind": 0.0278
     },
     "2025": {
-      "Bioenergy": 0.0503,
-      "Coal": 0.1126,
-      "Gas": 0.4601,
+      "Bioenergy": 0.0504,
+      "Coal": 0.1127,
+      "Gas": 0.4603,
       "Hydro": 0.3071,
       "Nuclear": 0,
-      "Other Fossil": 0.0248,
-      "Other Renewables": 0.002,
+      "Other Fossil": 0.0247,
+      "Other Renewables": 0.0018,
       "Solar": 0.0097,
       "Wind": 0.0333
     }
@@ -620,13 +620,13 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0774,
-      "Coal": 0.1732,
-      "Gas": 0.7077,
+      "Bioenergy": 0.0775,
+      "Coal": 0.1733,
+      "Gas": 0.7079,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0382,
-      "Other Renewables": 0.0031,
+      "Other Fossil": 0.0379,
+      "Other Renewables": 0.0028,
       "Solar": 0.0005,
       "Wind": 0
     }
@@ -701,11 +701,11 @@
     "2025": {
       "Bioenergy": 0.0155,
       "Coal": 0.0347,
-      "Gas": 0.1417,
+      "Gas": 0.1418,
       "Hydro": 0.2487,
       "Nuclear": 0.4585,
       "Other Fossil": 0.0076,
-      "Other Renewables": 0.0006,
+      "Other Renewables": 0.0005,
       "Solar": 0.0153,
       "Wind": 0.0774
     }
@@ -785,7 +785,7 @@
       "Nuclear": 0,
       "Other Fossil": 0.0005,
       "Other Renewables": 0,
-      "Solar": 0.0901,
+      "Solar": 0.0902,
       "Wind": 0.8975
     }
   },
@@ -936,15 +936,15 @@
       "Wind": 0.0869
     },
     "2025": {
-      "Bioenergy": 0.06,
-      "Coal": 0.1343,
-      "Gas": 0.549,
+      "Bioenergy": 0.0601,
+      "Coal": 0.1345,
+      "Gas": 0.5492,
       "Hydro": 0.1152,
       "Nuclear": 0,
-      "Other Fossil": 0.0296,
-      "Other Renewables": 0.0024,
+      "Other Fossil": 0.0294,
+      "Other Renewables": 0.0021,
       "Solar": 0.0022,
-      "Wind": 0.1073
+      "Wind": 0.1072
     }
   },
   "CA-YT": {
@@ -1018,10 +1018,10 @@
       "Bioenergy": 0.0245,
       "Coal": 0.0548,
       "Gas": 0.2238,
-      "Hydro": 0.654,
+      "Hydro": 0.6541,
       "Nuclear": 0,
       "Other Fossil": 0.012,
-      "Other Renewables": 0.001,
+      "Other Renewables": 0.0009,
       "Solar": 0.0196,
       "Wind": 0.0104
     }
@@ -1490,7 +1490,7 @@
     },
     "2025": {
       "Bioenergy": 0.0011,
-      "Coal": 0.2712,
+      "Coal": 0.2711,
       "Gas": 0.3072,
       "Hydro": 0.0315,
       "Nuclear": 0,
@@ -1649,7 +1649,7 @@
     "2025": {
       "Bioenergy": 0.0092,
       "Coal": 0.0524,
-      "Gas": 0.8948,
+      "Gas": 0.8949,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0.0118,
@@ -1965,7 +1965,7 @@
     "2025": {
       "Bioenergy": 0.0024,
       "Coal": 0.2759,
-      "Gas": 0.1343,
+      "Gas": 0.1344,
       "Hydro": 0.0132,
       "Nuclear": 0,
       "Other Fossil": 0.001,
@@ -2201,7 +2201,7 @@
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Coal": 0.4662,
+      "Coal": 0.4661,
       "Gas": 0.3779,
       "Hydro": 0.004,
       "Nuclear": 0,
@@ -2597,7 +2597,7 @@
     "2025": {
       "Bioenergy": 0.0077,
       "Coal": 0.0862,
-      "Gas": 0.4357,
+      "Gas": 0.4358,
       "Hydro": 0.0517,
       "Nuclear": 0.3506,
       "Other Fossil": 0.0192,
@@ -3228,14 +3228,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5329,
+      "Coal": 0.5328,
       "Gas": 0.0689,
       "Hydro": 0.0511,
       "Nuclear": 0,
       "Other Fossil": 0.0012,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.346
+      "Wind": 0.3461
     }
   },
   "US-NE": {
@@ -3867,7 +3867,7 @@
       "Other Fossil": 0.0006,
       "Other Renewables": 0,
       "Solar": 0.007,
-      "Wind": 0.4041
+      "Wind": 0.4042
     }
   },
   "US-OR": {