Merge pull request #380 from opencivicdata/fix-ca

fix(ca): Disambiguate federal districts from provincial districts using fed type
opencivicdata · May 21, 2024 · 4b90fa8 · 4b90fa8
2 parents ad6d7dc + 62b64fd
commit 4b90fa8
Show file tree

Hide file tree

Showing 7 changed files with 4,265 additions and 4,259 deletions.
diff --git a/identifiers/country-ca.csv b/identifiers/country-ca.csv
diff --git a/identifiers/country-ca/aliases.csv b/identifiers/country-ca/aliases.csv
diff --git a/identifiers/country-ca/ca_federal_electoral_districts-abolished.csv b/identifiers/country-ca/ca_federal_electoral_districts-abolished.csv
diff --git a/identifiers/country-ca/ca_federal_electoral_districts-aliases.csv b/identifiers/country-ca/ca_federal_electoral_districts-aliases.csv
diff --git a/identifiers/country-ca/ca_federal_electoral_districts-current.csv b/identifiers/country-ca/ca_federal_electoral_districts-current.csv
diff --git a/scripts/country-ca/README.md b/scripts/country-ca/README.md
@@ -24,6 +24,7 @@ For specific files:
 
 * `province`: province
 * `territory`: territory
+* `fed`: federal electoral district
 * `ed`: electoral district
 * `cd`: census division
 * `csd`: census subdivision

diff --git a/scripts/country-ca/ca_federal_electoral_districts.py b/scripts/country-ca/ca_federal_electoral_districts.py
@@ -28,20 +28,20 @@
     "Terrebonne": "Terrebonne—Blainville",
 }
 alias_corrections = {
-    "Argenteuil": "ocd-division/country:ca/province:qc/ed:argenteuil-deux-montagnes",
-    "Beauharnois": "ocd-division/country:ca/province:qc/ed:beauharnois-salaberry",
-    "Charlesbourg": "ocd-division/country:ca/province:qc/ed:charlesbourg-haute-saint-charles",
-    "Chicoutimi": "ocd-division/country:ca/province:qc/ed:chicoutimi-le_fjord",
-    "Gloucester—Carleton": "ocd-division/country:ca/province:on/ed:orléans",
-    "Huron": "ocd-division/country:ca/province:on/ed:huron-bruce",
-    "Longueuil": "ocd-division/country:ca/province:qc/ed:longueuil-saint-hubert",
-    "Maisonneuve": "ocd-division/country:ca/province:qc/ed:maisonneuve-rosemont",
-    "Missisquoi": "ocd-division/country:ca/province:qc/ed:brome-missisquoi",
-    "North Okanagan—Shuswap": "ocd-division/country:ca/province:bc/ed:okanagan-shuswap",
-    "Richelieu": "ocd-division/country:ca/province:qc/ed:bas-richelieu-nicolet-bécancour",
-    "Rimouski": "ocd-division/country:ca/province:qc/ed:rimouski-mitis",
-    "Sarnia": "ocd-division/country:ca/province:on/ed:sarnia-lambton",
-    "Témiscouata": "ocd-division/country:ca/province:qc/ed:rivière-du-loup-témiscouata"
+    "Argenteuil": "ocd-division/country:ca/province:qc/fed:argenteuil-deux-montagnes",
+    "Beauharnois": "ocd-division/country:ca/province:qc/fed:beauharnois-salaberry",
+    "Charlesbourg": "ocd-division/country:ca/province:qc/fed:charlesbourg-haute-saint-charles",
+    "Chicoutimi": "ocd-division/country:ca/province:qc/fed:chicoutimi-le_fjord",
+    "Gloucester—Carleton": "ocd-division/country:ca/province:on/fed:orléans",
+    "Huron": "ocd-division/country:ca/province:on/fed:huron-bruce",
+    "Longueuil": "ocd-division/country:ca/province:qc/fed:longueuil-saint-hubert",
+    "Maisonneuve": "ocd-division/country:ca/province:qc/fed:maisonneuve-rosemont",
+    "Missisquoi": "ocd-division/country:ca/province:qc/fed:brome-missisquoi",
+    "North Okanagan—Shuswap": "ocd-division/country:ca/province:bc/fed:okanagan-shuswap",
+    "Richelieu": "ocd-division/country:ca/province:qc/fed:bas-richelieu-nicolet-bécancour",
+    "Rimouski": "ocd-division/country:ca/province:qc/fed:rimouski-mitis",
+    "Sarnia": "ocd-division/country:ca/province:on/fed:sarnia-lambton",
+    "Témiscouata": "ocd-division/country:ca/province:qc/fed:rivière-du-loup-témiscouata"
 }
 
 pd.set_option("display.max_columns", None)
@@ -157,7 +157,7 @@
             "Yukon": "yt",
         }
     )
-    + "/ed:"
+    + "/fed:"
     # - Assiniboia West
     # - "Uppercase characters must be converted to lowercase."
     # - "Spaces must be converted to underscores."