Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

French regions #4853

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c2eb0f8
parser for French regions
Aug 4, 2020
77955b9
fixing import error on lib.validation
Aug 4, 2020
973490b
added french regions to zones.json
Aug 7, 2020
04f205d
fixed alpabethical order of zones
Aug 7, 2020
70712ba
bounding boxes rechecked + exchanges added in exchanges.json
Aug 11, 2020
4b73904
geojson for regions added
Aug 13, 2020
46e355f
geojson imported to generate-geometries script and zone definitions a…
Aug 13, 2020
d088702
moved FR-COR
Aug 13, 2020
58a675f
map generated
Aug 13, 2020
7558f23
lib validation corrected
Aug 13, 2020
dc6c7e2
merge master and upgrade installations
Aug 13, 2020
6485299
err
Aug 16, 2020
46daf1c
Revert "moved FR-COR", uncommitting build/*
Aug 24, 2020
42c4b8b
Revert "merge master and upgrade installations" - uncommiting node_mo…
Aug 24, 2020
2064538
Merge branch 'master' into France_regional_parser
Aug 24, 2020
afff915
Merge remote-tracking branch 'origin/master' into France_regional_parser
FelixDQ Sep 15, 2020
551a684
revert changes to unintended files
FelixDQ Sep 15, 2020
61c1e80
j rocks
Nov 18, 2020
59b01b7
Merge
corradio Jan 23, 2021
486e409
fix polygons and zones, fixes #2954
corradio Jan 23, 2021
63cd078
wip
corradio Jan 23, 2021
484b4c6
Merge
corradio Aug 26, 2022
050ac10
Rewrite parsers
corradio Aug 26, 2022
31c7a88
Merge
corradio Dec 8, 2022
ae235df
Update ECO2MIX
corradio Dec 12, 2022
4b43587
Add geometries
VIKTORVAV99 Dec 13, 2022
0396582
Add English zone names
corradio Dec 14, 2022
d63764c
Move exchanges to proper order
corradio Dec 14, 2022
5a2b8dd
Fix contributors
corradio Dec 14, 2022
2e42784
Add exchange to parser
corradio Dec 14, 2022
fcbd29f
Update exchange configs
corradio Dec 14, 2022
e7b5426
Format parser
corradio Dec 14, 2022
6fb18e6
formatting
corradio Dec 14, 2022
ec834a1
update-world
corradio Dec 14, 2022
b7af94b
isort
corradio Dec 14, 2022
7ae1ca3
Fix missing exchanges
corradio Dec 15, 2022
322843b
update-world
corradio Dec 15, 2022
6e5fd4c
Update parsers/ECO2MIX.py
corradio Dec 16, 2022
e4edc62
Update parsers/ECO2MIX.py
corradio Dec 16, 2022
899f7b4
Update parsers/ECO2MIX.py
corradio Dec 16, 2022
88aa263
Remove unused exchanges
corradio Dec 19, 2022
444a0ab
Merge branch 'olc/split-FR' of github.com:tmrowco/electricitymap-cont…
corradio Dec 19, 2022
471abc1
Merge remote-tracking branch 'upstream/master' into olc/split-FR
VIKTORVAV99 Feb 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions config/exchanges/BE_FR-ACA.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 5.108765
- 49.747632
parsers:
exchange: ECO2MIX.fetch_exchange
rotation: -135
6 changes: 6 additions & 0 deletions config/exchanges/BE_FR-NPP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 3.440
- 50.469
rotation: -135
6 changes: 6 additions & 0 deletions config/exchanges/CH_FR-ACA.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 7.422418
- 47.450034
parsers:
exchange: ECO2MIX.fetch_exchange
rotation: -30
6 changes: 6 additions & 0 deletions config/exchanges/CH_FR-ARA.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 6.866
- 46.180
rotation: -135
6 changes: 6 additions & 0 deletions config/exchanges/CH_FR-BFC.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 6.678
- 47.046
rotation: -45
6 changes: 6 additions & 0 deletions config/exchanges/DE_FR-ACA.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 8.165
- 48.973
parsers:
exchange: ECO2MIX.fetch_exchange
rotation: -110
6 changes: 6 additions & 0 deletions config/exchanges/ES_FR-ALP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- -1.000
- 42.990
rotation: 10
6 changes: 6 additions & 0 deletions config/exchanges/ES_FR-LRM.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 0.974
- 42.756
rotation: 0
6 changes: 6 additions & 0 deletions config/exchanges/FR-ACA_FR-BFC.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 5.156872
- 47.730817
parsers:
exchange: ECO2MIX.fetch_exchange
rotation: 45
6 changes: 6 additions & 0 deletions config/exchanges/FR-ACA_FR-IDF.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 3.460808
- 48.625303
parsers:
exchange: ECO2MIX.fetch_exchange
rotation: -100
6 changes: 6 additions & 0 deletions config/exchanges/FR-ACA_FR-NPP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 3.874506
- 49.367433
parsers:
exchange: ECO2MIX.fetch_exchange
rotation: -80
6 changes: 6 additions & 0 deletions config/exchanges/FR-ACA_LU.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 6.100579
- 49.45306
parsers:
exchange: ECO2MIX.fetch_exchange
rotation: -160
6 changes: 6 additions & 0 deletions config/exchanges/FR-ALP_FR-ARA.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 2.605
- 45.761
rotation: 90
6 changes: 6 additions & 0 deletions config/exchanges/FR-ALP_FR-CEN.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 0.861
- 46.737
rotation: 45
6 changes: 6 additions & 0 deletions config/exchanges/FR-ALP_FR-LRM.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 0.936
- 44.325
rotation: 90
6 changes: 6 additions & 0 deletions config/exchanges/FR-ALP_FR-PLO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- -0.419
- 47.046
rotation: -20
6 changes: 6 additions & 0 deletions config/exchanges/FR-ARA_FR-BFC.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 5.059
- 46.518
rotation: 0
6 changes: 6 additions & 0 deletions config/exchanges/FR-ARA_FR-CEN.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 2.630
- 46.686
rotation: -45
6 changes: 6 additions & 0 deletions config/exchanges/FR-ARA_FR-LRM.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 3.911
- 44.567
rotation: -135
6 changes: 6 additions & 0 deletions config/exchanges/FR-ARA_FR-PAC.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 5.755
- 44.714
rotation: 135
6 changes: 6 additions & 0 deletions config/exchanges/FR-ARA_IT-NO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 7.092
- 45.405
rotation: 90
6 changes: 6 additions & 0 deletions config/exchanges/FR-BFC_FR-CEN.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 2.894
- 47.468
rotation: -90
6 changes: 6 additions & 0 deletions config/exchanges/FR-BFC_FR-IDF.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 3.158
- 48.338
rotation: -45
6 changes: 6 additions & 0 deletions config/exchanges/FR-BRE_FR-NOR.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- -1.398
- 48.526
rotation: 45
6 changes: 6 additions & 0 deletions config/exchanges/FR-BRE_FR-PLO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- -1.342
- 47.798
rotation: 135
6 changes: 6 additions & 0 deletions config/exchanges/FR-CEN_FR-IDF.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 2.292
- 48.301
rotation: 0
6 changes: 6 additions & 0 deletions config/exchanges/FR-CEN_FR-NOR.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 1.219
- 48.750
rotation: -45
6 changes: 6 additions & 0 deletions config/exchanges/FR-CEN_FR-PLO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 0.390
- 47.658
rotation: -90
6 changes: 6 additions & 0 deletions config/exchanges/FR-IDF_FR-NOR.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 1.5899
- 49.1347
rotation: -45
6 changes: 6 additions & 0 deletions config/exchanges/FR-IDF_FR-NPP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 2.5423
- 49.0958
rotation: 0
6 changes: 6 additions & 0 deletions config/exchanges/FR-LRM_FR-PAC.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 4.626
- 43.824
rotation: 90
6 changes: 6 additions & 0 deletions config/exchanges/FR-NOR_FR-NPP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 1.746
- 49.635
rotation: 90
6 changes: 6 additions & 0 deletions config/exchanges/FR-NOR_FR-PLO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- -0.231
- 48.513
rotation: 180
6 changes: 6 additions & 0 deletions config/exchanges/FR-NOR_GB.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- -0.551
- 50.133
rotation: 0
6 changes: 6 additions & 0 deletions config/exchanges/FR-NPP_GB.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 1.463
- 50.958
rotation: -45
6 changes: 6 additions & 0 deletions config/exchanges/FR-PAC_IT-NO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parsers:
exchange: ECO2MIX.fetch_exchange
lonlat:
- 6.8865
- 44.4211
rotation: 90
18 changes: 18 additions & 0 deletions config/zones/FR-ACA.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bounding_box:
- - 3.3883584814447
- 47.422198455938
- - 8.2303986615424
- 50.168317417174
capacity:
biomass: 237
hydro: 2312
nuclear: 12580
solar: 541
unknown: 3157
wind: 3603
contributors:
- AilinvandenHonigkuchenpferdlande
- corradio
parsers:
production: ECO2MIX.fetch_production
timezone: Europe/Paris
18 changes: 18 additions & 0 deletions config/zones/FR-ALP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bounding_box:
- - -1.7908870919282
- 42.777515930774
- - 2.6107853057918
- 47.175754285742
capacity:
biomass: 326
hydro: 1765
nuclear: 6630
solar: 2455
unknown: 576
wind: 1049
contributors:
- AilinvandenHonigkuchenpferdlande
- corradio
parsers:
production: ECO2MIX.fetch_production
timezone: Europe/Paris
18 changes: 18 additions & 0 deletions config/zones/FR-ARA.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bounding_box:
- - 2.0629079799591
- 44.115716677493
- - 7.1842712160815
- 46.803872076205
capacity:
biomass: 183
hydro: 11641
nuclear: 13570
solar: 1069
unknown: 1083
wind: 552
contributors:
- AilinvandenHonigkuchenpferdlande
- corradio
parsers:
production: ECO2MIX.fetch_production
timezone: Europe/Paris
18 changes: 18 additions & 0 deletions config/zones/FR-BFC.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bounding_box:
- - 2.8451871650071
- 46.156946471815
- - 7.1398015507652
- 48.39970411104
capacity:
biomass: 74
hydro: 523
nuclear: 0
solar: 294
unknown: 385
wind: 808
contributors:
- AilinvandenHonigkuchenpferdlande
- corradio
parsers:
production: ECO2MIX.fetch_production
timezone: Europe/Paris
18 changes: 18 additions & 0 deletions config/zones/FR-BRE.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bounding_box:
- - -5.138001239929
- 47.283069445657
- - -1.0168893967587
- 48.867411825697
capacity:
biomass: 74
hydro: 275
nuclear: 0
solar: 236
unknown: 975
wind: 1047
contributors:
- AilinvandenHonigkuchenpferdlande
- corradio
parsers:
production: ECO2MIX.fetch_production
timezone: Europe/Paris
18 changes: 18 additions & 0 deletions config/zones/FR-CEN.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bounding_box:
- - 0.053277684947378
- 46.347214822447
- - 3.1284487900515
- 48.941051842112
capacity:
biomass: 86
hydro: 93
nuclear: 11630
solar: 317
unknown: 220
wind: 1255
contributors:
- AilinvandenHonigkuchenpferdlande
- corradio
parsers:
production: ECO2MIX.fetch_production
timezone: Europe/Paris
18 changes: 18 additions & 0 deletions config/zones/FR-IDF.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bounding_box:
- - 1.4472851104304
- 48.122204261229
- - 3.555613758785
- 49.232197221792
capacity:
biomass: 317
hydro: 20
nuclear: 0
solar: 123
unknown: 2220
wind: 89
contributors:
- AilinvandenHonigkuchenpferdlande
- corradio
parsers:
production: ECO2MIX.fetch_production
timezone: Europe/Paris
Loading