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

chore(zones): Merge CA-NL-LB and CA-NL-NF into CA-NL #7582

Merged
merged 5 commits into from
Jan 8, 2025
Merged

chore(zones): Merge CA-NL-LB and CA-NL-NF into CA-NL #7582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a52610
chore(zones): Merge CA-NL-LB and CA-NL-NF into CA-NL
VIKTORVAV99 Dec 19, 2024
1511fae
add bounding box
VIKTORVAV99 Dec 19, 2024
5f46351
Merge branch 'master' into vik/merge_CA-NL-LB_and_CA-NL-NF
VIKTORVAV99 Jan 6, 2025
afcce23
Merge branch 'master' into vik/merge_CA-NL-LB_and_CA-NL-NF
VIKTORVAV99 Jan 6, 2025
bd91806
Merge branch 'master' into vik/merge_CA-NL-LB_and_CA-NL-NF
VIKTORVAV99 Jan 8, 2025
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
0 config/exchanges/CA-NL-NF_CA-NS.yaml → config/exchanges/CA-NL_CA-NS.yaml
View file
Open in desktop
File renamed without changes.
0 config/zones/CA-NL-LB.yaml → config/retired_zones/CA-NL-LB.yaml
View file
Open in desktop
File renamed without changes.
0 config/zones/CA-NL-NF.yaml → config/retired_zones/CA-NL-NF.yaml
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions config/zones/CA-NL.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
bounding_box:
- - -68.3084780847808
- 46.117712095699915
- - -52.12712627126267
- 60.80458831011339
country: CA
region: Americas
timezone: America/St_Johns
2 changes: 1 addition & 1 deletion parsers/CA_NS.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def fetch_exchange(
raise ParserException(PARSER, "Unable to fetch historical data", ZONE_KEY)

sorted_zone_keys = ZoneKey("->".join(sorted((zone_key1, zone_key2))))
if sorted_zone_keys not in (ZoneKey("CA-NB->CA-NS"), ZoneKey("CA-NL-NF->CA-NS")):
if sorted_zone_keys not in (ZoneKey("CA-NB->CA-NS"), ZoneKey("CA-NL->CA-NS")):
raise ParserException(PARSER, "Unimplemented exchange pair", sorted_zone_keys)

session = session or Session()
Expand Down
767 changes: 375 additions & 392 deletions web/geo/world.geojson
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions web/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,6 @@
"countryName": "Canada",
"zoneName": "Newfoundland and Labrador"
},
"CA-NL-LB": {
"countryName": "Canada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canada",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Canada",
"zoneName": "Nova Scotia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,14 +667,6 @@
"countryName": "Canada",
"zoneName": "Newfoundland og Labrador"
},
"CA-NL-LB": {
"countryName": "Canada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canada",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Canada",
"zoneName": "Nova Scotia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,14 +450,6 @@
"countryName": "Kanada",
"zoneName": "Newfoundland and Labrador"
},
"CA-NL-LB": {
"countryName": "Kanada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Kanada",
"zoneName": "Neufundland"
},
"CA-NB": {
"countryName": "Kanada",
"zoneName": "New Brunswick"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,14 +711,6 @@
"countryName": "Canada",
"zoneName": "Newfoundland and Labrador"
},
"CA-NL-LB": {
"countryName": "Canada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canada",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Canada",
"zoneName": "Nova Scotia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/et.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,14 +340,6 @@
"countryName": "Kanada",
"zoneName": "Newfoundland ja Labrador"
},
"CA-NL-LB": {
"countryName": "Kanada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Kanada",
"zoneName": "Newfoundland"
},
"CA-NB": {
"countryName": "Kanada",
"zoneName": "New Brunswick"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,14 +697,6 @@
"countryName": "Canada",
"zoneName": "Terre-Neuve-et-Labrador"
},
"CA-NL-LB": {
"countryName": "Canada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canada",
"zoneName": "Terre-Neuve"
},
"CA-NB": {
"countryName": "Canada",
"zoneName": "Nouveau-Brunswick"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,14 +401,6 @@
"countryName": "Canada",
"zoneName": "Terranova e Labrador"
},
"CA-NL-LB": {
"countryName": "Canada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canada",
"zoneName": "Terranova"
},
"CA-NS": {
"countryName": "Canada",
"zoneName": "Nuova Scozia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/no-NB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,14 +429,6 @@
"countryName": "Canada",
"zoneName": "Newfoundland og Labrador"
},
"CA-NL-LB": {
"countryName": "Canada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canada",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Canada",
"zoneName": "Nova Scotia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,14 +1415,6 @@
"countryName": "Australia",
"zoneName": "Rottnest Island"
},
"CA-NL-LB": {
"countryName": "Kanada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Kanada",
"zoneName": "Newfoundland"
},
"CC": {
"zoneName": "Wyspy Kokosowe"
},
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,14 +1671,6 @@
"countryName": "Austrália",
"zoneName": "Ilha Rottnest"
},
"CA-NL-LB": {
"countryName": "Canadá",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canadá",
"zoneName": "Newfoundland"
},
"CL-CHP": {
"countryName": "Chile",
"zoneName": "Ilha de Páscoa"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/pt-PT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,14 +598,6 @@
"countryName": "Canadá",
"zoneName": "Terra Nova e Labrador"
},
"CA-NL-LB": {
"countryName": "Canadá",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canadá",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Canadá",
"zoneName": "Nova Escócia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/ro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,6 @@
"countryName": "Canada",
"zoneName": "Newfoundland and Labrador"
},
"CA-NL-LB": {
"countryName": "Canada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Canada",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Canada",
"zoneName": "Nova Scotia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/sl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,14 +383,6 @@
"countryName": "Kanada",
"zoneName": "Newfoundland in Labrador"
},
"CA-NL-LB": {
"countryName": "Kanada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Kanada",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Kanada",
"zoneName": "Nova Scotia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/sv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,14 +638,6 @@
"countryName": "Kanada",
"zoneName": "Newfoundland och Labrador"
},
"CA-NL-LB": {
"countryName": "Kanada",
"zoneName": "Labrador"
},
"CA-NL-NF": {
"countryName": "Kanada",
"zoneName": "Newfoundland"
},
"CA-NS": {
"countryName": "Kanada",
"zoneName": "Nova Scotia"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,6 @@
"zoneName": "纽芬兰与拉布拉多",
"countryName": "加拿大"
},
"CA-NL-LB": {
"zoneName": "拉布拉多",
"countryName": "加拿大"
},
"CA-NL-NF": {
"zoneName": "纽芬兰",
"countryName": "加拿大"
},
"CA-NS": {
"zoneName": "新斯科舍",
"countryName": "加拿大"
Expand Down
8 changes: 0 additions & 8 deletions web/src/locales/zh-TW.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,14 +550,6 @@
"countryName": "加拿大",
"zoneName": "紐芬蘭-拉布拉多省"
},
"CA-NL-LB": {
"countryName": "加拿大",
"zoneName": "拉布拉多"
},
"CA-NL-NF": {
"countryName": "加拿大",
"zoneName": "紐芬蘭"
},
"CA-NT": {
"countryName": "加拿大",
"zoneName": "西北地方"
Expand Down
Loading