@digital4better/data 1.1.58 → 1.1.59

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

@@ -31,10 +31,10 @@
       "Wind": 0.5413
     },
     "2024": {
-      "Bioenergy": 0.2106,
-      "Hydro": 0.0913,
-      "Solar": 0.1619,
-      "Wind": 0.5362
+      "Bioenergy": 0.2109,
+      "Hydro": 0.0904,
+      "Solar": 0.1605,
+      "Wind": 0.5382
     }
   },
   "CA-BC": {
@@ -70,9 +70,9 @@
     },
     "2024": {
       "Bioenergy": 0.008,
-      "Hydro": 0.9583,
+      "Hydro": 0.9582,
       "Solar": 0.0001,
-      "Wind": 0.0336
+      "Wind": 0.0337
     }
   },
   "CA-MB": {
@@ -108,9 +108,9 @@
     },
     "2024": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.9727,
+      "Hydro": 0.9724,
       "Solar": 0.0001,
-      "Wind": 0.027
+      "Wind": 0.0273
     }
   },
   "CA-NB": {
@@ -145,7 +145,7 @@
       "Wind": 0.1273
     },
     "2024": {
-      "Bioenergy": 0.092,
+      "Bioenergy": 0.0921,
       "Hydro": 0.7089,
       "Solar": 0.0006,
       "Wind": 0.1984
@@ -221,10 +221,10 @@
       "Wind": 0.4808
     },
     "2024": {
-      "Bioenergy": 0.1615,
-      "Hydro": 0.3207,
+      "Bioenergy": 0.1611,
+      "Hydro": 0.3224,
       "Solar": 0.0011,
-      "Wind": 0.5167
+      "Wind": 0.5154
     }
   },
   "CA-NT": {
@@ -259,10 +259,10 @@
       "Wind": 0.0731
     },
     "2024": {
-      "Bioenergy": 0.2161,
-      "Hydro": 0.6744,
-      "Solar": 0.0287,
-      "Wind": 0.0807
+      "Bioenergy": 0.2179,
+      "Hydro": 0.6726,
+      "Solar": 0.0284,
+      "Wind": 0.0811
     }
   },
   "CA-NU": {
@@ -297,9 +297,9 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.991,
+      "Bioenergy": 0.9912,
       "Hydro": 0,
-      "Solar": 0.009,
+      "Solar": 0.0088,
       "Wind": 0
     }
   },
@@ -335,10 +335,10 @@
       "Wind": 0.2276
     },
     "2024": {
-      "Bioenergy": 0.0384,
-      "Hydro": 0.7037,
-      "Solar": 0.0466,
-      "Wind": 0.2114
+      "Bioenergy": 0.0382,
+      "Hydro": 0.7025,
+      "Solar": 0.0462,
+      "Wind": 0.2131
     }
   },
   "CA-PE": {
@@ -375,8 +375,8 @@
     "2024": {
       "Bioenergy": 0.0007,
       "Hydro": 0,
-      "Solar": 0.0683,
-      "Wind": 0.931
+      "Solar": 0.0667,
+      "Wind": 0.9326
     }
   },
   "CA-QC": {
@@ -412,9 +412,9 @@
     },
     "2024": {
       "Bioenergy": 0.0009,
-      "Hydro": 0.9433,
+      "Hydro": 0.9429,
       "Solar": 0.0001,
-      "Wind": 0.0557
+      "Wind": 0.056
     }
   },
   "CA-SK": {
@@ -449,10 +449,10 @@
       "Wind": 0.3212
     },
     "2024": {
-      "Bioenergy": 0.2515,
-      "Hydro": 0.4296,
-      "Solar": 0.0114,
-      "Wind": 0.3075
+      "Bioenergy": 0.2523,
+      "Hydro": 0.4273,
+      "Solar": 0.0113,
+      "Wind": 0.3091
     }
   },
   "CA-YT": {
@@ -487,10 +487,10 @@
       "Wind": 0.0013
     },
     "2024": {
-      "Bioenergy": 0.0127,
-      "Hydro": 0.9741,
+      "Bioenergy": 0.0129,
+      "Hydro": 0.974,
       "Solar": 0.0024,
-      "Wind": 0.0108
+      "Wind": 0.0107
     }
   },
   "US-AK": {
@@ -641,7 +641,7 @@
     "2024": {
       "Bioenergy": 0.0023,
       "Hydro": 0.2988,
-      "Solar": 0.5684,
+      "Solar": 0.5685,
       "Wind": 0.1304
     }
   },
@@ -754,7 +754,7 @@
     },
     "2024": {
       "Bioenergy": 0.352,
-      "Hydro": 0.2103,
+      "Hydro": 0.2102,
       "Solar": 0.4304,
       "Wind": 0.0073
     }
@@ -1248,8 +1248,8 @@
     },
     "2024": {
       "Bioenergy": 0.0839,
-      "Hydro": 0.4929,
-      "Solar": 0.2974,
+      "Hydro": 0.4928,
+      "Solar": 0.2975,
       "Wind": 0.1258
     }
   },
@@ -1439,7 +1439,7 @@
     "2024": {
       "Bioenergy": 0.4412,
       "Hydro": 0,
-      "Solar": 0.4689,
+      "Solar": 0.469,
       "Wind": 0.0898
     }
   },
@@ -1819,7 +1819,7 @@
     "2024": {
       "Bioenergy": 0.0325,
       "Hydro": 0.0666,
-      "Solar": 0.5621,
+      "Solar": 0.5622,
       "Wind": 0.3388
     }
   },
@@ -2007,7 +2007,7 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.2831,
+      "Bioenergy": 0.2832,
       "Hydro": 0.2489,
       "Solar": 0.4679,
       "Wind": 0
@@ -2085,7 +2085,7 @@
     "2024": {
       "Bioenergy": 0.0445,
       "Hydro": 0.8366,
-      "Solar": 0.1188,
+      "Solar": 0.1189,
       "Wind": 0
     }
   },

package/data/mix/subdivision-yearly.csv

@@ -4,79 +4,79 @@ 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.0571,0.1664,0.5226,0.0247,0,0.0378,0.0021,0.0439,0.1454
+CA-AB,2024,0.0573,0.1663,0.5231,0.0245,0,0.0375,0.0016,0.0436,0.1461
 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.0073,0.0211,0.0664,0.8695,0,0.0048,0.0003,0.0001,0.0305
+CA-BC,2024,0.0073,0.0211,0.0665,0.8695,0,0.0048,0.0002,0.0001,0.0306
 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.0008,0.0025,0.9713,0,0.0002,0,0,0.0249
-CA-MB,2024,0.0003,0.0008,0.0025,0.9694,0,0.0002,0,0.0001,0.0269
+CA-MB,2024,0.0003,0.0008,0.0025,0.969,0,0.0002,0,0.0001,0.0272
 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.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.0351,0.1023,0.3214,0.2706,0.17,0.0232,0.0013,0.0002,0.0757
+CA-NB,2024,0.0351,0.1018,0.3202,0.2699,0.1732,0.023,0.001,0.0002,0.0756
 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.0016,0.0045,0.0142,0.9749,0,0.001,0,0,0.0038
+CA-NL,2024,0.0016,0.0046,0.0143,0.9747,0,0.001,0,0,0.0038
 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.0528,0.1536,0.4827,0.1049,0,0.0349,0.0018,0.0004,0.1689
+CA-NS,2024,0.0528,0.1534,0.4825,0.1057,0,0.0346,0.0015,0.0004,0.169
 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.0575,0.1675,0.5262,0.1796,0,0.038,0.002,0.0077,0.0215
+CA-NT,2024,0.0578,0.1678,0.5276,0.1783,0,0.0379,0.0016,0.0075,0.0215
 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.0727,0.2115,0.6645,0,0,0.048,0.0026,0.0007,0
+CA-NU,2024,0.0728,0.2115,0.6652,0,0,0.0478,0.002,0.0006,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.0135,0.0393,0.1234,0.2472,0.4767,0.0089,0.0005,0.0164,0.0742
+CA-ON,2024,0.0135,0.0392,0.1232,0.2477,0.4759,0.0088,0.0004,0.0163,0.0751
 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.0007,0.002,0.0062,0,0,0.0005,0,0.0677,0.9229
+CA-PE,2024,0.0007,0.002,0.0062,0,0,0.0004,0,0.0662,0.9245
 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
 CA-QC,2022,0.0007,0.002,0.0063,0.9399,0,0.0005,0,0.0001,0.0506
 CA-QC,2023,0.0007,0.0021,0.0066,0.9408,0,0.0005,0,0.0001,0.0492
-CA-QC,2024,0.0009,0.0027,0.0085,0.932,0,0.0006,0,0.0001,0.055
+CA-QC,2024,0.0009,0.0027,0.0085,0.9317,0,0.0006,0,0.0001,0.0554
 CA-SK,2019,0.0665,0.2952,0.421,0.1501,0,0.0344,0.0011,0,0.0317
 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.0598,0.174,0.5467,0.1021,0,0.0395,0.0021,0.0027,0.0731
+CA-SK,2024,0.0599,0.1741,0.5474,0.1015,0,0.0393,0.0017,0.0027,0.0734
 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.011,0.0318,0.1,0.8384,0,0.0072,0.0003,0.0021,0.0093
+CA-YT,2024,0.0111,0.0322,0.1013,0.8366,0,0.0073,0.0003,0.002,0.0092
 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
@@ -154,7 +154,7 @@ 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.0249,0,0.3186,0.4696,0,0.0041,0.005,0.0478,0.1301
-US-ID,2024,0.0194,0,0.3226,0.4236,0,0.0039,0.002,0.0716,0.1569
+US-ID,2024,0.0194,0,0.3226,0.4236,0,0.0039,0.002,0.0716,0.1568
 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
 US-IL,2021,0.002,0.2384,0.1151,0.0007,0.534,0.0017,0,0.0028,0.1053
@@ -250,13 +250,13 @@ 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
 US-NE,2022,0.0022,0.4903,0.031,0.026,0.138,0.0009,0,0.0018,0.3098
 US-NE,2023,0.0023,0.4541,0.0357,0.029,0.1756,0.0009,0,0.002,0.3004
-US-NE,2024,0.0021,0.4117,0.078,0.0234,0.1815,0.0004,0,0.0055,0.2975
+US-NE,2024,0.0021,0.4117,0.078,0.0234,0.1815,0.0004,0,0.0055,0.2974
 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.0463,0.0095,0.2511,0.0946,0.5667,0.0071,0,0.0002,0.0245
-US-NH,2024,0.0445,0.0139,0.2128,0.0653,0.6362,0.0039,0,0,0.0235
+US-NH,2024,0.0445,0.0139,0.2128,0.0652,0.6362,0.0039,0,0,0.0235
 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
 US-NJ,2021,0.0115,0.0167,0.4815,0,0.4574,0.0102,0,0.0224,0.0003
@@ -316,7 +316,7 @@ US-SC,2020,0.0211,0.1265,0.2459,0.0323,0.5557,0.0011,0,0.0175,0
 US-SC,2021,0.0204,0.1544,0.2362,0.0181,0.5466,0.0013,0,0.0232,0
 US-SC,2022,0.0202,0.1443,0.2446,0.0133,0.5507,0.0023,0,0.0245,0
 US-SC,2023,0.0173,0.1502,0.2349,0.0173,0.5515,0.0014,0,0.0274,0
-US-SC,2024,0.0189,0.1791,0.2165,0.0166,0.536,0.0015,0,0.0312,0
+US-SC,2024,0.0189,0.1792,0.2165,0.0166,0.536,0.0015,0,0.0312,0
 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
@@ -328,7 +328,7 @@ US-TN,2020,0.0092,0.1769,0.1946,0.158,0.4554,0.0015,0,0.004,0.0005
 US-TN,2021,0.0088,0.231,0.177,0.1302,0.4469,0.0014,0,0.0043,0.0004
 US-TN,2022,0.0056,0.2036,0.2119,0.1116,0.4566,0.0019,0,0.0087,0.0002
 US-TN,2023,0.0058,0.203,0.1933,0.0963,0.4877,0.0013,0,0.0124,0.0002
-US-TN,2024,0.0054,0.2372,0.2087,0.1018,0.4313,0.0011,0,0.0145,0
+US-TN,2024,0.0054,0.2373,0.2087,0.1018,0.4313,0.0011,0,0.0145,0
 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

package/data/mix/subdivision-yearly.json

@@ -56,15 +56,15 @@
       "Wind": 0.1348
     },
     "2024": {
-      "Bioenergy": 0.0571,
-      "Coal": 0.1664,
-      "Gas": 0.5226,
-      "Hydro": 0.0247,
-      "Nuclear": 0,
-      "Other Fossil": 0.0378,
-      "Other Renewables": 0.0021,
-      "Solar": 0.0439,
-      "Wind": 0.1454
+      "Bioenergy": 0.0573,
+      "Coal": 0.1663,
+      "Gas": 0.5231,
+      "Hydro": 0.0245,
+      "Nuclear": 0,
+      "Other Fossil": 0.0375,
+      "Other Renewables": 0.0016,
+      "Solar": 0.0436,
+      "Wind": 0.1461
     }
   },
   "CA-BC": {
@@ -126,13 +126,13 @@
     "2024": {
       "Bioenergy": 0.0073,
       "Coal": 0.0211,
-      "Gas": 0.0664,
+      "Gas": 0.0665,
       "Hydro": 0.8695,
       "Nuclear": 0,
       "Other Fossil": 0.0048,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0002,
       "Solar": 0.0001,
-      "Wind": 0.0305
+      "Wind": 0.0306
     }
   },
   "CA-MB": {
@@ -195,12 +195,12 @@
       "Bioenergy": 0.0003,
       "Coal": 0.0008,
       "Gas": 0.0025,
-      "Hydro": 0.9694,
+      "Hydro": 0.969,
       "Nuclear": 0,
       "Other Fossil": 0.0002,
       "Other Renewables": 0,
       "Solar": 0.0001,
-      "Wind": 0.0269
+      "Wind": 0.0272
     }
   },
   "CA-NB": {
@@ -261,14 +261,14 @@
     },
     "2024": {
       "Bioenergy": 0.0351,
-      "Coal": 0.1023,
-      "Gas": 0.3214,
-      "Hydro": 0.2706,
-      "Nuclear": 0.17,
-      "Other Fossil": 0.0232,
-      "Other Renewables": 0.0013,
+      "Coal": 0.1018,
+      "Gas": 0.3202,
+      "Hydro": 0.2699,
+      "Nuclear": 0.1732,
+      "Other Fossil": 0.023,
+      "Other Renewables": 0.001,
       "Solar": 0.0002,
-      "Wind": 0.0757
+      "Wind": 0.0756
     }
   },
   "CA-NL": {
@@ -329,9 +329,9 @@
     },
     "2024": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0045,
-      "Gas": 0.0142,
-      "Hydro": 0.9749,
+      "Coal": 0.0046,
+      "Gas": 0.0143,
+      "Hydro": 0.9747,
       "Nuclear": 0,
       "Other Fossil": 0.001,
       "Other Renewables": 0,
@@ -397,14 +397,14 @@
     },
     "2024": {
       "Bioenergy": 0.0528,
-      "Coal": 0.1536,
-      "Gas": 0.4827,
-      "Hydro": 0.1049,
+      "Coal": 0.1534,
+      "Gas": 0.4825,
+      "Hydro": 0.1057,
       "Nuclear": 0,
-      "Other Fossil": 0.0349,
-      "Other Renewables": 0.0018,
+      "Other Fossil": 0.0346,
+      "Other Renewables": 0.0015,
       "Solar": 0.0004,
-      "Wind": 0.1689
+      "Wind": 0.169
     }
   },
   "CA-NT": {
@@ -464,14 +464,14 @@
       "Wind": 0.0243
     },
     "2024": {
-      "Bioenergy": 0.0575,
-      "Coal": 0.1675,
-      "Gas": 0.5262,
-      "Hydro": 0.1796,
+      "Bioenergy": 0.0578,
+      "Coal": 0.1678,
+      "Gas": 0.5276,
+      "Hydro": 0.1783,
       "Nuclear": 0,
-      "Other Fossil": 0.038,
-      "Other Renewables": 0.002,
-      "Solar": 0.0077,
+      "Other Fossil": 0.0379,
+      "Other Renewables": 0.0016,
+      "Solar": 0.0075,
       "Wind": 0.0215
     }
   },
@@ -532,14 +532,14 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0727,
+      "Bioenergy": 0.0728,
       "Coal": 0.2115,
-      "Gas": 0.6645,
+      "Gas": 0.6652,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.048,
-      "Other Renewables": 0.0026,
-      "Solar": 0.0007,
+      "Other Fossil": 0.0478,
+      "Other Renewables": 0.002,
+      "Solar": 0.0006,
       "Wind": 0
     }
   },
@@ -601,14 +601,14 @@
     },
     "2024": {
       "Bioenergy": 0.0135,
-      "Coal": 0.0393,
-      "Gas": 0.1234,
-      "Hydro": 0.2472,
-      "Nuclear": 0.4767,
-      "Other Fossil": 0.0089,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0164,
-      "Wind": 0.0742
+      "Coal": 0.0392,
+      "Gas": 0.1232,
+      "Hydro": 0.2477,
+      "Nuclear": 0.4759,
+      "Other Fossil": 0.0088,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0163,
+      "Wind": 0.0751
     }
   },
   "CA-PE": {
@@ -673,10 +673,10 @@
       "Gas": 0.0062,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0005,
+      "Other Fossil": 0.0004,
       "Other Renewables": 0,
-      "Solar": 0.0677,
-      "Wind": 0.9229
+      "Solar": 0.0662,
+      "Wind": 0.9245
     }
   },
   "CA-QC": {
@@ -739,12 +739,12 @@
       "Bioenergy": 0.0009,
       "Coal": 0.0027,
       "Gas": 0.0085,
-      "Hydro": 0.932,
+      "Hydro": 0.9317,
       "Nuclear": 0,
       "Other Fossil": 0.0006,
       "Other Renewables": 0,
       "Solar": 0.0001,
-      "Wind": 0.055
+      "Wind": 0.0554
     }
   },
   "CA-SK": {
@@ -804,15 +804,15 @@
       "Wind": 0.0806
     },
     "2024": {
-      "Bioenergy": 0.0598,
-      "Coal": 0.174,
-      "Gas": 0.5467,
-      "Hydro": 0.1021,
+      "Bioenergy": 0.0599,
+      "Coal": 0.1741,
+      "Gas": 0.5474,
+      "Hydro": 0.1015,
       "Nuclear": 0,
-      "Other Fossil": 0.0395,
-      "Other Renewables": 0.0021,
+      "Other Fossil": 0.0393,
+      "Other Renewables": 0.0017,
       "Solar": 0.0027,
-      "Wind": 0.0731
+      "Wind": 0.0734
     }
   },
   "CA-YT": {
@@ -872,15 +872,15 @@
       "Wind": 0.0011
     },
     "2024": {
-      "Bioenergy": 0.011,
-      "Coal": 0.0318,
-      "Gas": 0.1,
-      "Hydro": 0.8384,
+      "Bioenergy": 0.0111,
+      "Coal": 0.0322,
+      "Gas": 0.1013,
+      "Hydro": 0.8366,
       "Nuclear": 0,
-      "Other Fossil": 0.0072,
+      "Other Fossil": 0.0073,
       "Other Renewables": 0.0003,
-      "Solar": 0.0021,
-      "Wind": 0.0093
+      "Solar": 0.002,
+      "Wind": 0.0092
     }
   },
   "US-AK": {
@@ -1764,7 +1764,7 @@
       "Other Fossil": 0.0039,
       "Other Renewables": 0.002,
       "Solar": 0.0716,
-      "Wind": 0.1569
+      "Wind": 0.1568
     }
   },
   "US-IL": {
@@ -2852,7 +2852,7 @@
       "Other Fossil": 0.0004,
       "Other Renewables": 0,
       "Solar": 0.0055,
-      "Wind": 0.2975
+      "Wind": 0.2974
     }
   },
   "US-NH": {
@@ -2915,7 +2915,7 @@
       "Bioenergy": 0.0445,
       "Coal": 0.0139,
       "Gas": 0.2128,
-      "Hydro": 0.0653,
+      "Hydro": 0.0652,
       "Nuclear": 0.6362,
       "Other Fossil": 0.0039,
       "Other Renewables": 0,
@@ -3593,7 +3593,7 @@
     },
     "2024": {
       "Bioenergy": 0.0189,
-      "Coal": 0.1791,
+      "Coal": 0.1792,
       "Gas": 0.2165,
       "Hydro": 0.0166,
       "Nuclear": 0.536,
@@ -3729,7 +3729,7 @@
     },
     "2024": {
       "Bioenergy": 0.0054,
-      "Coal": 0.2372,
+      "Coal": 0.2373,
       "Gas": 0.2087,
       "Hydro": 0.1018,
       "Nuclear": 0.4313,