Skip to content

Commit

Permalink
Merge branch 'master' into issue-electricitymaps#6966-Branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Xeno-Tek authored Oct 16, 2024
2 parents 63a1a3b + 252312c commit 0811d55
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions config/exchanges/AD_FR.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
lonlat:
- 1.7963181
- 42.58837
rotation: 38
6 changes: 6 additions & 0 deletions config/zones/HU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ capacity:
- datetime: '2024-01-01'
source: entsoe.eu
value: 263.0
- datetime: '2024-10-01'
source: mavir.hu
value: 384.5
coal:
- datetime: '2023-01-01'
source: entsoe.eu
Expand Down Expand Up @@ -49,6 +52,9 @@ capacity:
- datetime: '2024-01-01'
source: entsoe.eu
value: 3888.0
- datetime: '2024-10-01'
source: mavir.hu
value: 3964.8
unknown:
- datetime: '2023-01-01'
source: entsoe.eu
Expand Down

0 comments on commit 0811d55

Please sign in to comment.