OvertureMaps · stepps00 · Nov 3, 2025 · Nov 3, 2025 · Nov 3, 2025 · Nov 3, 2025
diff --git a/counterexamples/divisions/division/bad-capital-division-id.yaml b/counterexamples/divisions/division/bad-capital-division-id.yaml
@@ -8,13 +8,13 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: country
+  subtype: admin0
   names:
     primary: A division with an invalid capital_division_id property.
   country: ZZ
   hierarchies:
     - - division_id: counterexample:division:bad-capital-division-id
-        subtype: country
+        subtype: admin0
         name: A division with an invalid capital_division_id property.
   norms:
     driving_side: right

diff --git a/counterexamples/divisions/division/bad-class.yml b/counterexamples/divisions/division/bad-class.yml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: country
+  subtype: admin0
   class: mammalia
   division_id: counterexample:division:some-class
   names:

diff --git a/counterexamples/divisions/division/bad-country.yaml b/counterexamples/divisions/division/bad-country.yaml
@@ -8,13 +8,13 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: country
+  subtype: admin0
   names:
     primary: A division with an invalid country property.
   country: ZZZ
   hierarchies:
     - - division_id: counterexample:division:bad-country
-        subtype: country
+        subtype: admin0
         name: A division with an invalid country property.
   norms:
     driving_side: left

diff --git a/counterexamples/divisions/division/bad-geometry-coordinates.yaml b/counterexamples/divisions/division/bad-geometry-coordinates.yaml
@@ -8,13 +8,13 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: country
+  subtype: admin0
   names:
     primary: A division with invalid geometry coordinates.
   country: ZZ
   hierarchies:
     - - division_id: counterexample:division:bad-geometry-coordinates
-        subtype: country
+        subtype: admin0
         name: A division with invalid geometry coordinates.
   norms:
     driving_side: left

diff --git a/counterexamples/divisions/division/bad-geometry-type.yaml b/counterexamples/divisions/division/bad-geometry-type.yaml
@@ -8,13 +8,13 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: country
+  subtype: admin0
   names:
     primary: A division with an invalid geometry type.
   country: ZZ
   hierarchies:
     - - division_id: counterexample:division:bad-geometry-type
-        subtype: country
+        subtype: admin0
         name: A division with an invalid geometry type.
   norms:
     driving_side: left

diff --git a/counterexamples/divisions/division/bad-hierarchies.yaml b/counterexamples/divisions/division/bad-hierarchies.yaml
@@ -8,15 +8,15 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: county
+  subtype: admin2
   names:
     primary: A division with an invalid hierarchies property
   country: ZZ
   hierarchies:
     - - division_id: counterexample:division:bad-hierarchies-country
-        subtype: country
+        subtype: admin0
       - name: foo
-        subtype: region
+        subtype: admin1
       - division_id: counterexample:division:bad-hierarchies-county
         name: bar
     - []

diff --git a/counterexamples/divisions/division/bad-names.yaml b/counterexamples/divisions/division/bad-names.yaml
@@ -8,15 +8,15 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: country
+  subtype: admin0
   names:
     primary:
     common:
       a-b-c-d-e-f-g-h-i-j-k-l: foo
   country: ZZ
   hierarchies:
     - - division_id: counterexample:division:bad-names
-        subtype: country
+        subtype: admin0
         name: A division with invalid names
   norms:
     driving_side: left

diff --git a/counterexamples/divisions/division/bad-norms.yaml b/counterexamples/divisions/division/bad-norms.yaml
@@ -8,13 +8,13 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: country
+  subtype: admin0
   names:
     primary: A division with invalid norms
   country: ZZ
   hierarchies:
     - - division_id: counterexample:division:bad-names
-        subtype: country
+        subtype: admin0
         name: A division with invalid norms
   norms:
     driving_side: middle

diff --git a/counterexamples/divisions/division/bad-parent-division-id.yaml b/counterexamples/divisions/division/bad-parent-division-id.yaml
@@ -8,16 +8,16 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: region
+  subtype: admin1
   names:
     primary: A division with an invalid parent division ID
   country: ZZ
   hierarchies:
     - - division_id: counterexample:division:some-parent-division
-        subtype: country
+        subtype: admin0
         name: Some parent division
       - division_id: counterexample:division:bad-parent-division-id
-        subtype: region
+        subtype: admin1
         name: A division with an invalid parent division ID
   norms:
     driving_side: right

diff --git a/counterexamples/divisions/division/bad-region.yaml b/counterexamples/divisions/division/bad-region.yaml
@@ -8,17 +8,17 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: region
+  subtype: admin1
   names:
     primary: A division with an invalid region
   country: ZZ
   region: foo
   hierarchies:
     - - division_id: counterexample:division:some-parent-division
-        subtype: country
+        subtype: admin0
         name: Some parent division
       - division_id: counterexample:division:bad-region
-        subtype: region
+        subtype: admin1
         name: A division with an invalid ISO 3166-2 primary subdivision code ('region')
   parent_division_id: counterexample:division:some-parent-division
   ext_expected_errors:

diff --git a/counterexamples/divisions/division/bad-subtype.yaml b/counterexamples/divisions/division/bad-subtype.yaml
@@ -17,5 +17,5 @@ properties:
         subtype: foo
         name: A division with an invalid subtype
   ext_expected_errors:
-    - "/propertyDefinitions/placetype/enum]: value must be one of 'country',"
-    - "/propertyDefinitions/placetype/enum]: value must be one of 'country',"
+    - "/propertyDefinitions/placetype/enum]: value must be one of 'admin0',"
+    - "/propertyDefinitions/placetype/enum]: value must be one of 'admin0',"
diff --git a/counterexamples/divisions/division/parent-not-allowed-on-country.yaml b/counterexamples/divisions/division/parent-not-allowed-on-country.yaml
diff --git a/...ision/parent-required-on-sub-country.yaml → ...vision/parent-required-on-sub-admin0.yaml b/...ision/parent-required-on-sub-country.yaml → ...vision/parent-required-on-sub-admin0.yaml
@@ -1,5 +1,5 @@
 ---
-id: counterexample:division:parent-required-on-sub-country
+id: counterexample:division:parent-required-on-sub-admin0
 type: Feature
 geometry:
   type: Point
@@ -8,17 +8,17 @@ properties:
   theme: divisions
   type: division
   version: 0
-  subtype: region
+  subtype: admin1
   names:
-    primary: A sub-country division that lacks a parent ID
+    primary: A sub-admin0 division that lacks a parent ID
   country: ZZ
   region: ZZ-ABC
   hierarchies:
     - - division_id: counterexample:division:some-parent-division
-        subtype: country
+        subtype: admin0
         name: Some parent division
-      - division_id: counterexample:division:parent-required-on-sub-country
-        subtype: region
-        name: A sub-country division that lacks a parent ID
+      - division_id: counterexample:division:parent-required-on-sub-admin0
+        subtype: admin1
+        name: A sub-admin0 division that lacks a parent ID
   ext_expected_errors:
     - "missing property 'parent_division_id'"
diff --git a/counterexamples/divisions/division_area/bad-class.yaml b/counterexamples/divisions/division_area/bad-class.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: country
+  subtype: admin0
   class: mammalia
   division_id: counterexample:division:some-division
   names:

diff --git a/counterexamples/divisions/division_area/bad-country.yaml b/counterexamples/divisions/division_area/bad-country.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: country
+  subtype: admin0
   class: land
   division_id: counterexample:division:some-division
   names:

diff --git a/counterexamples/divisions/division_area/bad-division-id.yaml b/counterexamples/divisions/division_area/bad-division-id.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: country
+  subtype: admin0
   class: maritime
   division_id: 'abc '
   names:

diff --git a/counterexamples/divisions/division_area/bad-geometry-coordinates.yaml b/counterexamples/divisions/division_area/bad-geometry-coordinates.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: country
+  subtype: admin0
   class: maritime
   division_id: counterexample:division:some-division
   names:

diff --git a/counterexamples/divisions/division_area/bad-geometry-type.yaml b/counterexamples/divisions/division_area/bad-geometry-type.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: country
+  subtype: admin0
   class: land
   division_id: counterexample:division:some-division
   names:

diff --git a/counterexamples/divisions/division_area/bad-is-land.yaml b/counterexamples/divisions/division_area/bad-is-land.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: country
+  subtype: admin0
   division_id: counterexample:division_boundary:some-division
   is_land: yes
   country: ZZ

diff --git a/counterexamples/divisions/division_area/bad-is-territorial.yaml b/counterexamples/divisions/division_area/bad-is-territorial.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: country
+  subtype: admin0
   division_id: counterexample:division_boundary:some-division
   is_territorial: no
   is_land: true

diff --git a/counterexamples/divisions/division_area/bad-missing-is-land.yaml b/counterexamples/divisions/division_area/bad-missing-is-land.yaml
@@ -1,14 +1,14 @@
----
-id: counterexample:division_area:bad-is-territorial
-type: Feature
-geometry:
-  type: LineString
-  coordinates: [[0, 1], [1, 2]]
-properties:
-  theme: divisions
-  type: division_area
-  version: 0
-  subtype: country
-  division_id: counterexample:division_boundary:some-division
-  is_territorial: false
+---
+id: counterexample:division_area:bad-is-territorial
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 1], [1, 2]]
+properties:
+  theme: divisions
+  type: division_area
+  version: 0
+  subtype: admin0
+  division_id: counterexample:division_boundary:some-division
+  is_territorial: false
   country: ZZ
diff --git a/counterexamples/divisions/division_area/bad-region.yaml b/counterexamples/divisions/division_area/bad-region.yaml
@@ -8,7 +8,7 @@ properties:
   theme: divisions
   type: division_area
   version: 0
-  subtype: region
+  subtype: admin1
   class: maritime
   division_id: counterexample:division:some-division
   names:

diff --git a/counterexamples/divisions/division_area/bad-subtype.yaml b/counterexamples/divisions/division_area/bad-subtype.yaml
@@ -15,5 +15,7 @@ properties:
     primary: A division area with an invalid subtype property.
   country: ZZ
   region: ZZ-AB
+  is_land: true
+  is_territorial: false
   ext_expected_errors:
-    - "/propertyDefinitions/placetype/enum]: value must be one of 'country',"
+    - "/propertyDefinitions/placetype/enum]: value must be one of 'admin0',"
diff --git a/counterexamples/divisions/division_boundary/bad-class.yaml b/counterexamples/divisions/division_boundary/bad-class.yaml
@@ -8,9 +8,9 @@ properties:
   theme: divisions
   type: division_boundary
   version: 0
-  subtype: country
+  subtype: admin0
   class: foo
-  divisions: ["example:division:country:left", "example:division:country:right"]
+  divisions: ["example:division:admin0:left", "example:division:admin0:right"]
   is_disputed: false
   ext_expected_errors:
     - "value must be one of 'land', 'maritime'"
diff --git a/counterexamples/divisions/division_boundary/bad-division_ids-1.yaml b/counterexamples/divisions/division_boundary/bad-division_ids-1.yaml
@@ -8,10 +8,10 @@ properties:
   theme: divisions
   type: division_boundary
   version: 1
-  subtype: region
+  subtype: admin1
   class: land
   country: "XX"
-  division_ids: ["example:division:country:left", "example:division:country:right", "example:division:country:right", 123]
+  division_ids: ["example:division:admin0:left", "example:division:admin0:right", "example:division:admin0:right", 123]
   is_disputed: "true"
   ext_expected_errors:
     - "maxItems: got 4, want 2"

diff --git a/counterexamples/divisions/division_boundary/bad-division_ids-2.yaml b/counterexamples/divisions/division_boundary/bad-division_ids-2.yaml
@@ -8,9 +8,9 @@ properties:
   theme: divisions
   type: division_boundary
   version: 1
-  subtype: county
+  subtype: admin2
   country: "XX"
   class: land
-  division_ids: ["example:division:country:lonelylhsdivision"]
+  division_ids: ["example:division:admin0:lonelylhsdivision"]
   ext_expected_errors:
     - "minItems: got 1, want 2"
diff --git a/counterexamples/divisions/division_boundary/bad-geometry-type.yaml b/counterexamples/divisions/division_boundary/bad-geometry-type.yaml
@@ -11,6 +11,6 @@ properties:
   subtype: neighborhood
   class: land
   country: "XX"
-  divisions: ["example:division:country:left", "example:division:country:right"]
+  divisions: ["example:division:admin0:left", "example:division:admin0:right"]
   ext_expected_errors:
     - "value must be 'LineString'"
diff --git a/counterexamples/divisions/division_boundary/bad-is-land.yaml b/counterexamples/divisions/division_boundary/bad-is-land.yaml
@@ -8,8 +8,8 @@ properties:
   theme: divisions
   type: division_boundary
   version: 0
-  subtype: country
-  division_ids: ["example:division:country:left", "example:division:country:right"]
+  subtype: admin0
+  division_ids: ["example:division:admin0:left", "example:division:admin0:right"]
   is_land: yes
   is_territorial: false
   class: land