Merge branch 'master' into master

Author: VIKTORVAV99

config/zones/AF.yaml

@@ -17,17 +17,17 @@ capacity:
       value: 350.0
     - datetime: '2021-01-01'
       source: Ember, Yearly electricity data
-      value: 360.0
+      value: 370.0
     - datetime: '2022-01-01'
       source: Ember, Yearly electricity data
-      value: 460.0
+      value: 470.0
   solar:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
       value: 20.0
     - datetime: '2019-01-01'
       source: Ember, Yearly electricity data
-      value: 30.0
+      value: 50.0
   unknown:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data

config/zones/AM.yaml

@@ -11,10 +11,10 @@ capacity:
   gas:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
-      value: 1790.0
+      value: 1570.0
     - datetime: '2021-01-01'
       source: Ember, Yearly electricity data
-      value: 2050.0
+      value: 1830.0
   hydro:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -28,6 +28,9 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 1360.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 1350.0
   nuclear:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -54,6 +57,9 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 400.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 490.0
   wind:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data

config/zones/AR.yaml

@@ -36,19 +36,25 @@ capacity:
   gas:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
-      value: 17050.0
+      value: 17280.0
     - datetime: '2018-01-01'
       source: Ember, Yearly electricity data
-      value: 18850.0
+      value: 18150.0
     - datetime: '2019-01-01'
       source: Ember, Yearly electricity data
-      value: 19050.0
+      value: 18300.0
     - datetime: '2020-01-01'
       source: Ember, Yearly electricity data
-      value: 20940.0
+      value: 20180.0
     - datetime: '2021-01-01'
       source: Ember, Yearly electricity data
-      value: 20990.0
+      value: 20630.0
+    - datetime: '2023-01-01'
+      source: Ember, Yearly electricity data
+      value: 21480.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 22150.0
   hydro:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -65,14 +71,17 @@ capacity:
     - datetime: '2022-01-01'
       source: Ember, Yearly electricity data
       value: 10390.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 9200.0
   nuclear:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
       value: 1750.0
   solar:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
-      value: 20.0
+      value: 10.0
     - datetime: '2018-01-01'
       source: Ember, Yearly electricity data
       value: 200.0
@@ -87,10 +96,13 @@ capacity:
       value: 1080.0
     - datetime: '2022-01-01'
       source: Ember, Yearly electricity data
-      value: 1120.0
+      value: 1110.0
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 1410.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 1740.0
   unknown:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -113,6 +125,9 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 4540.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 4470.0
   wind:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -135,6 +150,9 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 3710.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 4320.0
 contributors:
   - systemcatch
   - corradio

config/zones/AU-NT.yaml

@@ -10,6 +10,7 @@ capacity:
 contributors:
   - unitrium
   - amv213
+  - alejandranavcas
 country: AU
 delays:
   consumption: 30
@@ -237,5 +238,6 @@ parsers:
   consumption: NTESMO.fetch_consumption
   price: NTESMO.fetch_price
   production: NTESMO.fetch_production
+  consumptionForecast: NTESMO.fetch_consumption_forecast
 region: Oceania
 timezone: Australia/Darwin

config/zones/AZ.yaml

@@ -37,6 +37,9 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 1300.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 1410.0
   solar:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -50,6 +53,9 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 280.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 290.0
   unknown:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -67,6 +73,9 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 70.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 60.0
 country: AZ
 fallbackZoneMixes:
   _source: https://ourworldindata.org/grapher/electricity-prod-source-stacked?time=earliest..latest&country=~AZE

config/zones/BD.yaml

@@ -7,7 +7,7 @@ capacity:
   biomass:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
-      value: 10.0
+      value: 50.0
   coal:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -24,25 +24,34 @@ capacity:
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 4770.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 6040.0
   gas:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
-      value: 8230.0
+      value: 8300.0
     - datetime: '2018-01-01'
       source: Ember, Yearly electricity data
-      value: 9040.0
+      value: 9120.0
     - datetime: '2019-01-01'
       source: Ember, Yearly electricity data
-      value: 10190.0
+      value: 10270.0
     - datetime: '2020-01-01'
       source: Ember, Yearly electricity data
-      value: 10310.0
+      value: 10380.0
     - datetime: '2021-01-01'
       source: Ember, Yearly electricity data
-      value: 11120.0
+      value: 11350.0
     - datetime: '2022-01-01'
       source: Ember, Yearly electricity data
-      value: 11390.0
+      value: 11700.0
+    - datetime: '2023-01-01'
+      source: Ember, Yearly electricity data
+      value: 12030.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 13050.0
   hydro:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
@@ -53,10 +62,10 @@ capacity:
       value: 2910.0
     - datetime: '2018-01-01'
       source: Ember, Yearly electricity data
-      value: 4850.0
+      value: 4860.0
     - datetime: '2019-01-01'
       source: Ember, Yearly electricity data
-      value: 6390.0
+      value: 6400.0
     - datetime: '2020-01-01'
       source: Ember, Yearly electricity data
       value: 6920.0
@@ -65,7 +74,7 @@ capacity:
       value: 7280.0
     - datetime: '2022-01-01'
       source: Ember, Yearly electricity data
-      value: 7550.0
+      value: 7560.0
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
       value: 7720.0
@@ -90,16 +99,18 @@ capacity:
       value: 520.0
     - datetime: '2023-01-01'
       source: Ember, Yearly electricity data
-      value: 770.0
+      value: 750.0
+    - datetime: '2024-01-01'
+      source: Ember, Yearly electricity data
+      value: 850.0
   wind:
     - datetime: '2017-01-01'
       source: Ember, Yearly electricity data
       value: 0.0
-    - datetime: '2024-03-08'
+    - _comment: https://www.tbsnews.net/bangladesh/energy/countrys-first-commercial-wind-power-plant-starts-production-810678
+      datetime: '2024-03-08'
       source: TBS News
       value: 60.0
-      _comment: https://www.tbsnews.net/bangladesh/energy/countrys-first-commercial-wind-power-plant-starts-production-810678
-
 contributors:
   - systemcatch
   - alixunderplatz

config/zones/BE.yaml

@@ -5,6 +5,10 @@ bounding_box:
   - - 6.15665815596
     - 51.4750237087
 capacity:
+  battery storage:
+    - datetime: '2025-01-01'
+      source: entsoe.eu
+      value: 1077.0
   biomass:
     - datetime: '2017-01-01'
       source: entsoe.eu
@@ -29,7 +33,7 @@ capacity:
       value: 1115.0
     - datetime: '2025-01-01'
       source: entsoe.eu
-      value: 1070.0
+      value: 842.0
   gas:
     - datetime: '2017-01-01'
       source: entsoe.eu
@@ -57,7 +61,7 @@ capacity:
       value: 6995.0
     - datetime: '2025-01-01'
       source: entsoe.eu
-      value: 6928.0
+      value: 7706.0
   hydro:
     - datetime: '2017-01-01'
       source: entsoe.eu
@@ -82,7 +86,7 @@ capacity:
       value: 186.0
     - datetime: '2025-01-01'
       source: entsoe.eu
-      value: 190.0
+      value: 181.0
   hydro storage:
     - datetime: '2017-01-01'
       source: entsoe.eu
@@ -146,14 +150,17 @@ capacity:
       value: 9986.05
     - datetime: '2025-01-01'
       source: entsoe.eu
-      value: 10794.0
+      value: 7055.0
   unknown:
     - datetime: '2019-01-01'
       source: entsoe.eu
       value: 19.0
     - datetime: '2023-01-01'
       source: entsoe.eu
       value: 27.0
+    - datetime: '2025-01-01'
+      source: entsoe.eu
+      value: 228.0
   wind:
     - datetime: '2017-01-01'
       source: entsoe.eu
@@ -178,7 +185,7 @@ capacity:
       value: 5315.0
     - datetime: '2025-01-01'
       source: entsoe.eu
-      value: 5439.0
+      value: 5657.0
 contributors:
   - corradio
   - nessie2013