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.

Sign up for GitHub

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

Remove JSON configuration files (zones, exchanges, co2 params) #4655

Merged
merged 27 commits into from
Oct 18, 2022
Merged

Remove JSON configuration files (zones, exchanges, co2 params) #4655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3f41d69
Remove simple references to zones.json
pierresegonne Oct 10, 2022
44aae32
Update remove zone script
pierresegonne Oct 10, 2022
5920158
Remove small references
pierresegonne Oct 10, 2022
bc26fe7
Update ENTSOE capacity update script
pierresegonne Oct 10, 2022
53d7e41
Remove last references and files
pierresegonne Oct 10, 2022
e46a6d4
Remove new reference to getZonesJSON
pierresegonne Oct 10, 2022
172fd22
Update workflows
pierresegonne Oct 10, 2022
754dc13
Update ref to exchanges in generate exchanges to exclude
pierresegonne Oct 10, 2022
95552fb
Prettify
pierresegonne Oct 10, 2022
f900c13
Fix references to autogen config
pierresegonne Oct 11, 2022
f181815
Merge branch 'master' into ps/remove_references_to_json_config
pierresegonne Oct 11, 2022
5b6547d
Fix scripts extra for xmltodict
pierresegonne Oct 11, 2022
72ea5c0
Merge branch 'master' into ps/remove_references_to_json_config
tonypls Oct 12, 2022
96f23d1
Add mergeRatiosParameters
pierresegonne Oct 12, 2022
9d93436
Merge branch 'ps/remove_references_to_json_config' of https://github.…
pierresegonne Oct 12, 2022
0443a20
Rename ratios to ratio
pierresegonne Oct 12, 2022
da2b73d
Remove specific ref to zones in BUILD
pierresegonne Oct 12, 2022
a26a9b3
Merge branch 'master' into ps/remove_references_to_json_config
pierresegonne Oct 13, 2022
db5882d
Update DATA_SOURCES.md
pierresegonne Oct 13, 2022
00d7699
Update DATA_SOURCES.md
pierresegonne Oct 13, 2022
06e3d03
Update scripts/ENTSOE_capacity_update.py
pierresegonne Oct 13, 2022
85fe21e
Update scripts/ENTSOE_capacity_update.py
pierresegonne Oct 13, 2022
64ebf9c
Update scripts/ENTSOE_capacity_update.py
pierresegonne Oct 13, 2022
9e84ad3
Merge branch 'master' into ps/remove_references_to_json_config
pierresegonne Oct 14, 2022
bbe5465
Update web/geo/generate-exchanges-to-exclude.js
pierresegonne Oct 17, 2022
3e4fd30
Merge branch 'master' into ps/remove_references_to_json_config
pierresegonne Oct 18, 2022
fff11ce
Remove unicode arrow for underscore for exchanges
pierresegonne Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- run:
command: |
npm install -g jsonlint-mod
jsonlint -q config/*.json web/public/locales/*.json
jsonlint -q web/public/locales/*.json

verify_web_js:
executor: js-exec
Expand Down
3 changes: 0 additions & 3 deletions .github/labeler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ parser:
archived parser:
- parsers/archive/**/*

science:
- config/co2eq_parameters.json

VIKTORVAV99 marked this conversation as resolved.
Show resolved Hide resolved
mobile app 📱:
- mobileapp/**/*

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jsonlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
npm install -g jsonlint-mod
- name: Lint json
run: |
jsonlint -q config/*.json web/public/locales/*.json
jsonlint -q web/public/locales/*.json
4 changes: 2 additions & 2 deletions DATA_SOURCES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Real-time electricity data is obtained using [parsers](https://github.com/tmrowc

### Production capacity data sources

Production capacities are centralized in the [zones.json](https://github.com/tmrowco/electricitymap-contrib/blob/master/config/zones.json) file. Values in the `capacity` maps are in MW.
Production capacities are centralized in the [config/zones](https://github.com/electricitymaps/electricitymaps-contrib/tree/master/config/zones) folder. Capacities are included in the respective zone configurations. Values in the `capacity` maps are in MW.

#### International sources

Expand Down Expand Up @@ -402,7 +402,7 @@ For many European countries, data is available from [ENTSO-E](https://transparen

### Cross-border transmission capacity data sources

Cross-border transmission capacities between the zones are centralized in the [exchanges.json](https://github.com/tmrowco/electricitymap-contrib/blob/master/config/exchanges.json) file. Values in the `capacity` maps are in MW.
Cross-border transmission capacities between the zones are centralized in the [config/exchanges](https://github.com/electricitymaps/electricitymaps-contrib/tree/master/config/exchanges) folder. Capacities are included in the respective exchange configurations. Values in the `capacity` maps are in MW.

#### For the nordic and baltic countries capacities are availible from [Nord Pool](https://www.nordpoolgroup.com/en/Market-data1/Dayahead/Capacities1/Capacities/KEY/Norway/?view=table)

Expand Down
Loading