Remove 'borough', 'macroregion', and 'macrocountry' from the subtype enum

counterexamples/divisions/division_boundary/missing-class.yaml

@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_boundary
   version: 0
-  subtype: macroregion
+  subtype: region
   is_territorial: true
   is_land: false
   country: "XX"

counterexamples/divisions/division_boundary/missing-division_ids.yaml

@@ -11,7 +11,7 @@ properties:
   class: land
   is_territorial: false
   is_land: true
-  subtype: macrocounty
+  subtype: county
   country: "XX"
   ext_expected_errors:
     - "missing property 'division_ids'"

examples/divisions/division/hierarchies-multiple.yaml

@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: borough
+  subtype: macrohood
   local_type:
     en: borough
   names:
@@ -26,7 +26,7 @@ properties:
         subtype: locality
         name: New York City
       - division_id: example:division:borough:bronx
-        subtype: borough
+        subtype: macrohood
         name: The Bronx
     - - division_id: example:division:country:us
         subtype: country
@@ -38,6 +38,6 @@ properties:
         subtype: county
         name: Bronx County
       - division_id: example:division:borough:bronx
-        subtype: borough
+        subtype: macrohood
         name: The Bronx
   parent_division_id: example:division:locality:nyc   # Parent from default hierarchy.

schema/divisions/defs.yaml

@@ -18,17 +18,11 @@ description: Common schema definitions for divisions theme
                         # for defence, passport control, etc., e.g.
                         # Puerto Rico.
 
-        - macroregion   # A bundle of regions, e.g. England, Scotland,
-                        # Île-de-France. These exist mainly in Europe.
-
         - region        # A state, province, region, etc. Largest
                         # sub-country administrative unit in most
                         # countries, except those that have dependencies
                         # or macro-regions.
 
-        - macrocounty   # A bundle of counties, e.g. Inverness. These
-                        # exist mainly in Europe.
-
         - county        # Largest sub-region administrative unit in most
                         # countries, unless they have macrocounties.
 
@@ -42,9 +36,6 @@ description: Common schema definitions for divisions theme
         - locality      # A populated place that may or may not have its
                         # own administrative authority.
 
-        - borough       # A local government unit subordinate to a
-                        # locality.
-
         - macrohood     # A super-neighborhood that contains smaller
                         # divisions of type neighborhood, e.g. BoCaCa
                         # (Boerum Hill, Cobble Hill, and Carroll
@@ -63,7 +54,7 @@ description: Common schema definitions for divisions theme
         each subsequent entry, if any, being a division that is a direct
         child of the previous entry; and the last entry representing
         the division that contains the hierarchy.
-  
+
         For example, a hierarchy for the United States is simply
         [United States]. A hierarchy for the U.S. state of New Hampshire
         would be [United States, New Hampshire], and a hierarchy for the