chore(geo): Merge Mexico (again) (#7804)

electricitymaps · Feb 5, 2025 · 60853ac · 60853ac
1 parent 916484d
commit 60853ac
Show file tree

Hide file tree

Showing 27 changed files with 322 additions and 889 deletions.
diff --git a/config/exchanges/BZ_MX-PN.yaml → config/exchanges/BZ_MX.yaml b/config/exchanges/BZ_MX-PN.yaml → config/exchanges/BZ_MX.yaml
diff --git a/config/exchanges/GT_MX-OR.yaml b/config/exchanges/GT_MX-OR.yaml
diff --git a/config/exchanges/GT_MX.yaml b/config/exchanges/GT_MX.yaml
@@ -1,4 +1,6 @@
 lonlat:
   - -90.967
   - 16.035
+parsers:
+  exchange: ENTE.fetch_exchange
 rotation: -55
diff --git a/config/exchanges/MX-CE_MX-OC.yaml b/config/exchanges/MX-CE_MX-OC.yaml
diff --git a/config/exchanges/MX-CE_MX-OR.yaml b/config/exchanges/MX-CE_MX-OR.yaml
diff --git a/config/exchanges/MX-NE_MX-NO.yaml b/config/exchanges/MX-NE_MX-NO.yaml
diff --git a/config/exchanges/MX-NE_MX-OC.yaml b/config/exchanges/MX-NE_MX-OC.yaml
diff --git a/config/exchanges/MX-NE_MX-OR.yaml b/config/exchanges/MX-NE_MX-OR.yaml
diff --git a/config/exchanges/MX-NE_US-TEX-ERCO.yaml b/config/exchanges/MX-NE_US-TEX-ERCO.yaml
diff --git a/config/exchanges/MX-NO_MX-NW.yaml b/config/exchanges/MX-NO_MX-NW.yaml
diff --git a/config/exchanges/MX-NO_MX-OC.yaml b/config/exchanges/MX-NO_MX-OC.yaml
diff --git a/config/exchanges/MX-NW_MX-OC.yaml b/config/exchanges/MX-NW_MX-OC.yaml
diff --git a/config/exchanges/MX-OC_MX-OR.yaml b/config/exchanges/MX-OC_MX-OR.yaml
diff --git a/config/exchanges/MX-OR_MX-PN.yaml b/config/exchanges/MX-OR_MX-PN.yaml
diff --git a/config/exchanges/MX-BC_US-CAL-CISO.yaml → config/exchanges/MX_US-CAL-CISO.yaml b/config/exchanges/MX-BC_US-CAL-CISO.yaml → config/exchanges/MX_US-CAL-CISO.yaml
diff --git a/config/exchanges/MX-NO_US-TEX-ERCO.yaml → config/exchanges/MX_US-TEX-ERCO.yaml b/config/exchanges/MX-NO_US-TEX-ERCO.yaml → config/exchanges/MX_US-TEX-ERCO.yaml
diff --git a/config/zones/MX-BC.yaml → config/retired_zones/MX-BC.yaml b/config/zones/MX-BC.yaml → config/retired_zones/MX-BC.yaml
diff --git a/config/zones/MX-BCS.yaml → config/retired_zones/MX-BCS.yaml b/config/zones/MX-BCS.yaml → config/retired_zones/MX-BCS.yaml
diff --git a/config/zones/MX-CE.yaml → config/retired_zones/MX-CE.yaml b/config/zones/MX-CE.yaml → config/retired_zones/MX-CE.yaml
diff --git a/config/zones/MX-NE.yaml → config/retired_zones/MX-NE.yaml b/config/zones/MX-NE.yaml → config/retired_zones/MX-NE.yaml
diff --git a/config/zones/MX-NO.yaml → config/retired_zones/MX-NO.yaml b/config/zones/MX-NO.yaml → config/retired_zones/MX-NO.yaml
diff --git a/config/zones/MX-NW.yaml → config/retired_zones/MX-NW.yaml b/config/zones/MX-NW.yaml → config/retired_zones/MX-NW.yaml
diff --git a/config/zones/MX-OC.yaml → config/retired_zones/MX-OC.yaml b/config/zones/MX-OC.yaml → config/retired_zones/MX-OC.yaml
diff --git a/config/zones/MX-OR.yaml → config/retired_zones/MX-OR.yaml b/config/zones/MX-OR.yaml → config/retired_zones/MX-OR.yaml
diff --git a/config/zones/MX-PN.yaml → config/retired_zones/MX-PN.yaml b/config/zones/MX-PN.yaml → config/retired_zones/MX-PN.yaml
diff --git a/config/zones/MX.yaml b/config/zones/MX.yaml
@@ -83,14 +83,4 @@ region: Americas
 sources:
   IEA, Electricity generation mix in Mexico, 1 Jan - 30 Sep, 2019 and 2020, IEA, Paris:
     link: https://www.iea.org/data-and-statistics/charts/electricity-generation-mix-in-mexico-1-jan-30-sep-2019-and-2020
-subZoneNames:
-  - MX-BC
-  - MX-BCS
-  - MX-CE
-  - MX-NE
-  - MX-NO
-  - MX-NW
-  - MX-OC
-  - MX-OR
-  - MX-PN
 timezone: America/Mexico_City