diff --git a/counterexamples/divisions/division/bad-capital-division-id.yaml b/counterexamples/divisions/division/bad-capital-division-id.yaml index fa6822397..44f183391 100644 --- 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 index d3140a8c0..cdd65078a 100644 --- 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 index f0e9566b8..59a7a1e52 100644 --- 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 index dc1cb3615..738d32d4a 100644 --- 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 index 5071b949b..9e7284931 100644 --- 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 index a75612536..4bb0078d2 100644 --- 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 index fe2987feb..9ff8568cc 100644 --- a/counterexamples/divisions/division/bad-names.yaml +++ b/counterexamples/divisions/division/bad-names.yaml @@ -8,7 +8,7 @@ properties: theme: divisions type: division version: 0 - subtype: country + subtype: admin0 names: primary: common: @@ -16,7 +16,7 @@ properties: 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 index bdc9847d9..fcb55978b 100644 --- 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 index bb5d89ec1..bf8239d50 100644 --- 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 index 27faecb21..30039d533 100644 --- 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 index 848957030..00168c810 100644 --- 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 deleted file mode 100644 index 9f0ef2cee..000000000 --- a/counterexamples/divisions/division/parent-not-allowed-on-country.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -id: counterexample:division:parent-not-allowed-on-country -type: Feature -geometry: - type: Point - coordinates: [0, 1] -properties: - theme: divisions - type: division - version: 0 - subtype: country - names: - primary: A country division that has a parent ID, which is not allowed - country: ZZ - hierarchies: - - - division_id: counterexample:division:parent-not-allowed-on-country - subtype: country - name: A country division that has a parent ID, which is not allowed - parent_division_id: counterexample:division:some-parent-division - ext_expected_errors: - - "[S#/properties/properties/allOf/3/then]: not failed" diff --git a/counterexamples/divisions/division/parent-required-on-sub-country.yaml b/counterexamples/divisions/division/parent-required-on-sub-admin0.yaml similarity index 61% rename from counterexamples/divisions/division/parent-required-on-sub-country.yaml rename to counterexamples/divisions/division/parent-required-on-sub-admin0.yaml index cd58ef39a..f84c3deb7 100644 --- a/counterexamples/divisions/division/parent-required-on-sub-country.yaml +++ b/counterexamples/divisions/division/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 index fd1a0e58c..7b40f04cd 100644 --- 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 index a32280d71..444c58b6f 100644 --- 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 index 56fa81d24..9aadf545c 100644 --- 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 index 109efaa70..33bf1efed 100644 --- 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 index 4c5352743..e606042fa 100644 --- 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 index d83b8b2f1..0d54d8ab2 100644 --- 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 index 31282ee4a..35c4499a5 100644 --- 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 index 3c7018342..b06ee3d82 100644 --- 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 \ No newline at end of file diff --git a/counterexamples/divisions/division_area/bad-region.yaml b/counterexamples/divisions/division_area/bad-region.yaml index c35633c40..05aaead50 100644 --- 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 index e5d1e23c2..811fba7c0 100644 --- 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 index 698be511e..fe55e9519 100644 --- 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 index e72f326d2..092c9d092 100644 --- 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 index 3bfedeee5..01b22921b 100644 --- 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 index be02980e0..c9ea05fd3 100644 --- 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 index 11835e6ab..438af4473 100644 --- 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 diff --git a/counterexamples/divisions/division_boundary/bad-is-territorial.yaml b/counterexamples/divisions/division_boundary/bad-is-territorial.yaml index 4ee7d2afc..5e34a9e28 100644 --- a/counterexamples/divisions/division_boundary/bad-is-territorial.yaml +++ b/counterexamples/divisions/division_boundary/bad-is-territorial.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"] class: land is_territorial: no is_land: true diff --git a/counterexamples/divisions/division_boundary/bad-not-both.yaml b/counterexamples/divisions/division_boundary/bad-not-both.yaml index bee287fe9..97311ac98 100644 --- a/counterexamples/divisions/division_boundary/bad-not-both.yaml +++ b/counterexamples/divisions/division_boundary/bad-not-both.yaml @@ -1,5 +1,5 @@ --- -id: example:division_boundary:is_land:country:us +id: example:division_boundary:is_land:admin0:us type: Feature geometry: type: LineString @@ -8,10 +8,10 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: country + subtype: admin0 is_land: true is_territorial: true class: land - division_ids: ["example:division:country:left", "example:division:country:right"] + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] ext_expected_errors: - "division_boundary.yaml#/properties/properties/oneOf]: oneOf failed, subschemas 0, 1 matched" \ No newline at end of file diff --git a/counterexamples/divisions/division_boundary/bad-subtype.yaml b/counterexamples/divisions/division_boundary/bad-subtype.yaml index 4c7c4e73a..db2adc7a0 100644 --- a/counterexamples/divisions/division_boundary/bad-subtype.yaml +++ b/counterexamples/divisions/division_boundary/bad-subtype.yaml @@ -10,6 +10,9 @@ properties: version: 0 subtype: foo class: land - divisions: ["example:division:country:left", "example:division:country:right"] + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] + is_land: true + is_territorial: false + country: ZZ 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/missing-class.yaml b/counterexamples/divisions/division_boundary/missing-class.yaml index 287516eb2..16612c579 100644 --- a/counterexamples/divisions/division_boundary/missing-class.yaml +++ b/counterexamples/divisions/division_boundary/missing-class.yaml @@ -8,10 +8,10 @@ properties: theme: divisions type: division_boundary version: 0 - subtype: macroregion + subtype: admin1 is_territorial: true is_land: false country: "XX" - division_ids: ["example:division:country:left", "example:division:country:right"] + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] ext_expected_errors: - "missing property 'class'" diff --git a/counterexamples/divisions/division_boundary/missing-country.yaml b/counterexamples/divisions/division_boundary/missing-country.yaml index 73462f91a..57ad6eb6b 100644 --- a/counterexamples/divisions/division_boundary/missing-country.yaml +++ b/counterexamples/divisions/division_boundary/missing-country.yaml @@ -8,10 +8,10 @@ properties: theme: divisions type: division_boundary version: 0 - subtype: region + subtype: admin1 is_territorial: true is_land: false class: land - division_ids: ["example:division:country:left", "example:division:country:right"] + division_ids: ["example:division:admin1:left", "example:division:admin1:right"] ext_expected_errors: - "missing property 'country'" \ No newline at end of file diff --git a/counterexamples/divisions/division_boundary/missing-division_ids.yaml b/counterexamples/divisions/division_boundary/missing-division_ids.yaml index 96f014e57..a1d46895c 100644 --- a/counterexamples/divisions/division_boundary/missing-division_ids.yaml +++ b/counterexamples/divisions/division_boundary/missing-division_ids.yaml @@ -11,7 +11,7 @@ properties: class: land is_territorial: false is_land: true - subtype: macrocounty + subtype: admin2 country: "XX" ext_expected_errors: - "missing property 'division_ids'" diff --git a/counterexamples/divisions/division_boundary/missing-subtype.yaml b/counterexamples/divisions/division_boundary/missing-subtype.yaml index b06c8106a..2b1e4b102 100644 --- a/counterexamples/divisions/division_boundary/missing-subtype.yaml +++ b/counterexamples/divisions/division_boundary/missing-subtype.yaml @@ -11,6 +11,6 @@ properties: class: land is_territorial: false is_land: true - division_ids: ["example:division:country:left", "example:division:country:right"] + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] ext_expected_errors: - "missing property 'subtype'" diff --git a/docs/schema/reference/divisions/division.mdx b/docs/schema/reference/divisions/division.mdx index 3062fe56c..1d313ae69 100644 --- a/docs/schema/reference/divisions/division.mdx +++ b/docs/schema/reference/divisions/division.mdx @@ -9,10 +9,9 @@ import yamlLoad from "@site/src/components/yamlLoad" import divisions_division_schema from '!!raw-loader!@site/docs/_schema/divisions/division.yaml'; import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; -import division_example_country from '!!raw-loader!@site/docs/_examples/divisions/division/country.yaml'; -import division_example_region from '!!raw-loader!@site/docs/_examples/divisions/division/region.yaml'; +import division_example_admin0 from '!!raw-loader!@site/docs/_examples/divisions/division/admin0.yaml'; +import division_example_admin1 from '!!raw-loader!@site/docs/_examples/divisions/division/admin1.yaml'; import division_example_hierarchies_multiple from '!!raw-loader!@site/docs/_examples/divisions/division/hierarchies-multiple.yaml'; -import division_example_dependency from '!!raw-loader!@site/docs/_examples/divisions/division/dependency.yaml'; import division_example_population from '!!raw-loader!@site/docs/_examples/divisions/division/population.yaml'; import division_example_perspectives from '!!raw-loader!@site/docs/_examples/divisions/division/perspectives.yaml'; @@ -44,88 +43,71 @@ While the schema for the divisions theme contains an comprehensive list of subty Currently, the following subtypes are available in the `division` feature type: -- `country` -- `dependency` -- `region` -- `county` -- `localadmin` +- `admin0` +- `admin1` +- `admin2` +- `admin3` - `locality` - `macrohood` - `neighborhood` - `microhood` - + - +
subtypecountryadmin0
-A country is the largest unit of independent sovereignty. The border of a country, if known, is given by [division boundary](/schema/reference/divisions/division_boundary) features. Example: United States +An admin0 division represents the highest level of administrative organization, covering countries and country-like dependencies. An admin0 may optionally reference another admin0 in `parent_division_id` (for example, dependencies that inherit from a sovereign state). The border of an admin0 division, if known, is given by [division boundary](/schema/reference/divisions/division_boundary) features. Examples: United States, Puerto Rico - + - +
subtypedependencyadmin1
- - A dependency is a place that is not exactly a sub-region of a country but is dependent on a parent country for defense, passport control, etc. Example: Puerto Rico - - - - - - - - - - - - -
subtyperegion
- -A region is the largest administrative unit within most countries and a first-level administrative subdivision. Example: Alberta +An admin1 division is the largest administrative unit within most countries and is typically the first-level administrative subdivision. Example: Alberta - + - +
subtypecountyadmin2
-A county is a second-level administrative subdivision. Example: Kings County, NY +An admin2 division is a second-level administrative subdivision. Example: Kings County, NY - + - +
subtypelocaladminadmin3
-Localadmin is a level of government in some parts of the world that contains localities or populated places that themselves have no authority. Often but not exclusively found in Europe. Localadmin is a third-level administrative subdivision. Example: [Paris](https://spelunker.whosonfirst.org/id/1159322569/) +An admin3 division is an administrative unit in some parts of the world that contains localities or populated places that themselves have no authority. Often but not exclusively found in Europe. Example: [Paris](https://spelunker.whosonfirst.org/id/1159322569/) @@ -205,11 +187,11 @@ A microhood is a mini-neighborhood that is contained within a neighborhood. Exam ## Examples - - { JSON.stringify(yamlLoad(division_example_country), null, 2) } + + { JSON.stringify(yamlLoad(division_example_admin0), null, 2) } - - { JSON.stringify(yamlLoad(division_example_region), null, 2) } + + { JSON.stringify(yamlLoad(division_example_admin1), null, 2) } { JSON.stringify(yamlLoad(division_example_population), null, 2) } diff --git a/docs/schema/reference/divisions/division_area.mdx b/docs/schema/reference/divisions/division_area.mdx index 677d7a4e8..357e7b0ce 100644 --- a/docs/schema/reference/divisions/division_area.mdx +++ b/docs/schema/reference/divisions/division_area.mdx @@ -9,9 +9,9 @@ import yamlLoad from "@site/src/components/yamlLoad" import divisions_division_area_schema from '!!raw-loader!@site/docs/_schema/divisions/division_area.yaml'; import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; -import division_area_example_country_land from '!!raw-loader!@site/docs/_examples/divisions/division_area/country_land.yaml'; -import division_area_example_region_land from '!!raw-loader!@site/docs/_examples/divisions/division_area/region_land.yaml'; -import division_area_example_country_maritime from '!!raw-loader!@site/docs/_examples/divisions/division_area/country_maritime.yaml'; +import division_area_example_admin0_land from '!!raw-loader!@site/docs/_examples/divisions/division_area/admin0_land.yaml'; +import division_area_example_admin1_land from '!!raw-loader!@site/docs/_examples/divisions/division_area/admin1_land.yaml'; +import division_area_example_admin0_maritime from '!!raw-loader!@site/docs/_examples/divisions/division_area/admin0_maritime.yaml'; # Division area @@ -42,87 +42,72 @@ While the schema for the divisions theme contains an comprehensive list of subty Currently, the following subtypes are available in the `division_area` feature type: -- `country` -- `dependency` -- `region` -- `county` -- `localadmin` +- `admin0` +- `admin1` +- `admin2` +- `admin3` - `locality` - `macrohood` - `neighborhood` - + - +
subtypecountryadmin0
-A country is the largest unit of independent sovereignty. The border of a country, if known, is given by [divsion boundary](/schema/reference/divisions/division_boundary) features. Example: United States +An admin0 division is the highest-level administrative unit, covering countries and country-like dependencies. The border of an admin0 division, if known, is given by [division boundary](/schema/reference/divisions/division_boundary) features. Examples: United States, Puerto Rico - + - +
subtypedependencyadmin1
- A dependency is a place that is not exactly a sub-region of a country but is dependent on a parent country for defense, passport control, etc. Example: Puerto Rico +An admin1 division is the largest administrative unit within most countries and a first-level administrative subdivision. Example: Alberta - + - +
subtyperegionadmin2
-A region is the largest administrative unit within most countries and a first-level administrative subdivision. Example: Alberta - - - - - - - - - - -
subtypecounty
- - -A county is a second-level administrative subdivision. Example: Kings County, NY +An admin2 division is a second-level administrative subdivision. Example: Kings County, NY - + - +
subtypelocaladminadmin3
-Localadmin is a level of government in some parts of the world that contains localities or populated places that themselves have no authority. Often but not exclusively found in Europe. Localadmin is a third-level administrative subdivision. Example: [Paris](https://spelunker.whosonfirst.org/id/1159322569/) +An admin3 division is an administrative unit in some parts of the world that contains localities or populated places that themselves have no authority. Often but not exclusively found in Europe. Example: [Paris](https://spelunker.whosonfirst.org/id/1159322569/) @@ -189,13 +174,13 @@ A neighborhood is a geographically localized community within a city, town, subu ## Examples - - { JSON.stringify(yamlLoad(division_area_example_country_land), null, 2) } + + { JSON.stringify(yamlLoad(division_area_example_admin0_land), null, 2) } - - { JSON.stringify(yamlLoad(division_area_example_country_maritime), null, 2) } + + { JSON.stringify(yamlLoad(division_area_example_admin0_maritime), null, 2) } - - { JSON.stringify(yamlLoad(division_area_example_region_land), null, 2) } + + { JSON.stringify(yamlLoad(division_area_example_admin1_land), null, 2) } diff --git a/docs/schema/reference/divisions/division_boundary.mdx b/docs/schema/reference/divisions/division_boundary.mdx index c28788d7e..b58e986f2 100644 --- a/docs/schema/reference/divisions/division_boundary.mdx +++ b/docs/schema/reference/divisions/division_boundary.mdx @@ -7,8 +7,8 @@ import JSONSchemaViewer from "@theme/JSONSchemaViewer"; import generateResolverOptions from "@site/src/components/shared-libs/generateResolverOptions" import yamlLoad from "@site/src/components/yamlLoad" import divisions_boundary_schema from '!!raw-loader!@site/docs/_schema/divisions/division_boundary.yaml'; -import divisions_boundary_example_land from '!!raw-loader!@site/docs/_examples/divisions/division_boundary/land_region.yaml'; -import divisions_boundary_example_maritime from '!!raw-loader!@site/docs/_examples/divisions/division_boundary/maritime_country.yaml'; +import divisions_boundary_example_land from '!!raw-loader!@site/docs/_examples/divisions/division_boundary/land_admin1.yaml'; +import divisions_boundary_example_maritime from '!!raw-loader!@site/docs/_examples/divisions/division_boundary/maritime_admin0.yaml'; import divisions_disputed_boundary_example_both from '!!raw-loader!@site/docs/_examples/divisions/division_boundary/disputed_both.yaml'; import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; @@ -47,51 +47,51 @@ While the schema for the divisions theme contains an comprehensive list of subty Currently, the following subtypes are available in the `division_boundary` feature type: -- `country` -- `region` -- `county` +- `admin0` +- `admin1` +- `admin2` - + - +
subtypecountryadmin0
-A country is the largest unit of independent sovereignty. The border of a country, if known, is given by [divsion boundary](/schema/reference/divisions/division_boundary) features. Example: United States +An admin0 division is the highest level of administrative organization, covering countries and country-like dependencies. The border of an admin0 division, if known, is given by [division boundary](/schema/reference/divisions/division_boundary) features. Example: United States - + - +
subtyperegionadmin1
-A region is the largest administrative unit within most countries and a first-level administrative subdivision. Example: Alberta +An admin1 division is the largest administrative unit within most countries and a first-level administrative subdivision. Example: Alberta - + - +
subtypecountyadmin2
-A county is a second-level administrative subdivision. Example: Kings County, NY +An admin2 division is a second-level administrative subdivision. Example: Kings County, NY diff --git a/examples/divisions/division/country.yaml b/examples/divisions/division/admin0.yaml similarity index 73% rename from examples/divisions/division/country.yaml rename to examples/divisions/division/admin0.yaml index c2c4d4a54..d9b088193 100644 --- a/examples/divisions/division/country.yaml +++ b/examples/divisions/division/admin0.yaml @@ -1,5 +1,5 @@ --- -id: example:division:country:us +id: example:division:admin0:us type: Feature geometry: type: Point @@ -8,13 +8,13 @@ properties: theme: divisions type: division version: 0 - subtype: country + subtype: admin0 names: primary: United States country: US hierarchies: - - - division_id: example:division:country:us - subtype: country + - - division_id: example:division:admin0:us + subtype: admin0 name: United States norms: driving_side: right diff --git a/examples/divisions/division/dependency.yaml b/examples/divisions/division/admin0_dependency.yaml similarity index 71% rename from examples/divisions/division/dependency.yaml rename to examples/divisions/division/admin0_dependency.yaml index 98292a535..a1c7c53f4 100644 --- a/examples/divisions/division/dependency.yaml +++ b/examples/divisions/division/admin0_dependency.yaml @@ -1,5 +1,5 @@ --- -id: example:division:dependency:pr +id: example:division:admin0:pr type: Feature geometry: type: Point @@ -8,7 +8,7 @@ properties: theme: divisions type: division version: 0 - subtype: dependency + subtype: admin0 local_type: en: territory names: @@ -29,10 +29,13 @@ properties: country: PR region: US-PR hierarchies: - - - division_id: example:division:country:us - subtype: country + - - division_id: example:division:admin0:us + subtype: admin0 name: United States + - division_id: example:division:admin0:pr + subtype: admin0 + name: Puerto Rico norms: driving_side: right capital_division_ids: [ example:division:locality:san_juan ] - parent_division_id: example:division:country:us + parent_division_id: example:division:admin0:us diff --git a/examples/divisions/division/region.yaml b/examples/divisions/division/admin1.yaml similarity index 64% rename from examples/divisions/division/region.yaml rename to examples/divisions/division/admin1.yaml index c38bbfb42..ed672c748 100644 --- a/examples/divisions/division/region.yaml +++ b/examples/divisions/division/admin1.yaml @@ -1,5 +1,5 @@ --- -id: example:division:region:us-ny +id: example:division:admin1:us-ny type: Feature geometry: type: Point @@ -8,7 +8,7 @@ properties: theme: divisions type: division version: 0 - subtype: region + subtype: admin1 local_type: en: state names: @@ -20,11 +20,11 @@ properties: country: US region: US-NY hierarchies: - - - division_id: example:division:country:us - subtype: country + - - division_id: example:division:admin0:us + subtype: admin0 name: United States - - division_id: example:division:region:us-ny - subtype: region + - division_id: example:division:admin1:us-ny + subtype: admin1 name: New York capital_division_ids: [ example:division:locality:albany ] - parent_division_id: example:division:country:us + parent_division_id: example:division:admin0:us diff --git a/examples/divisions/division/capital_of.yaml b/examples/divisions/division/capital_of.yaml index f6709f226..790eecc3f 100644 --- a/examples/divisions/division/capital_of.yaml +++ b/examples/divisions/division/capital_of.yaml @@ -19,11 +19,11 @@ properties: record_id: N6968827.V76 country: SI hierarchies: - - - division_id: example:division:country:si - subtype: country + - - division_id: example:division:admin0:si + subtype: admin0 name: Slovenia capital_of_divisions: - - division_id: example:division:country:si - subtype: country - parent_division_id: example:division:country:si + - division_id: example:division:admin0:si + subtype: admin0 + parent_division_id: example:division:admin0:si population: 335509 diff --git a/examples/divisions/division/class.yaml b/examples/divisions/division/class.yaml index cdf920092..d55d25e3e 100644 --- a/examples/divisions/division/class.yaml +++ b/examples/divisions/division/class.yaml @@ -19,12 +19,12 @@ properties: record_id: N21040334 country: DK hierarchies: - - - division_id: example:division:country:dk - subtype: country + - - division_id: example:division:admin0:dk + subtype: admin0 name: Denmark capital_of_divisions: - - division_id: example:division:country:dk - subtype: country - parent_division_id: example:division:country:dk + - division_id: example:division:admin0:dk + subtype: admin0 + parent_division_id: example:division:admin0:dk population: 50781 class: city diff --git a/examples/divisions/division/hierarchies-multiple.yaml b/examples/divisions/division/hierarchies-multiple.yaml index 88f9f1584..cac4e034c 100644 --- a/examples/divisions/division/hierarchies-multiple.yaml +++ b/examples/divisions/division/hierarchies-multiple.yaml @@ -16,11 +16,11 @@ properties: country: US region: US-NY hierarchies: - - - division_id: example:division:country:us # Default hierarchy is first. - subtype: country + - - division_id: example:division:admin0:us # Default hierarchy is first. + subtype: admin0 name: United States - - division_id: example:division:region:us-ny - subtype: region + - division_id: example:division:admin1:us-ny + subtype: admin1 name: New York - division_id: example:division:locality:nyc subtype: locality @@ -28,14 +28,14 @@ properties: - division_id: example:division:borough:bronx subtype: borough name: The Bronx - - - division_id: example:division:country:us - subtype: country + - - division_id: example:division:admin0:us + subtype: admin0 name: United States - - division_id: example:division:region:us-ny - subtype: region + - division_id: example:division:admin1:us-ny + subtype: admin1 name: New York - - division_id: example:division:county:bronx - subtype: county + - division_id: example:division:admin2:bronx + subtype: admin2 name: Bronx County - division_id: example:division:borough:bronx subtype: borough diff --git a/examples/divisions/division/multiple_capital_division.yaml b/examples/divisions/division/multiple_capital_division.yaml index 0e8e890be..87c48372f 100644 --- a/examples/divisions/division/multiple_capital_division.yaml +++ b/examples/divisions/division/multiple_capital_division.yaml @@ -1,5 +1,5 @@ --- -id: example:division:region:pl-04 +id: example:division:admin1:pl-04 type: Feature geometry: type: Point @@ -8,7 +8,7 @@ properties: theme: divisions type: division version: 0 - subtype: region + subtype: admin1 local_type: en: province names: @@ -20,11 +20,11 @@ properties: country: PL region: PL-04 hierarchies: - - - division_id: example:division:country:pl - subtype: country + - - division_id: example:division:admin0:pl + subtype: admin0 name: Poland - - division_id: example:division:region:pl-04 - subtype: region + - division_id: example:division:admin1:pl-04 + subtype: admin1 name: Woj Kujawsko-Pomorskie capital_division_ids: [ example:division:locality:bydgoszcz, example:division:locality:torun] - parent_division_id: example:division:country:pl + parent_division_id: example:division:admin0:pl diff --git a/examples/divisions/division/perspectives.yaml b/examples/divisions/division/perspectives.yaml index d00468248..f7ee274c5 100644 --- a/examples/divisions/division/perspectives.yaml +++ b/examples/divisions/division/perspectives.yaml @@ -8,7 +8,7 @@ properties: theme: divisions type: division version: 0 - subtype: country + subtype: admin0 names: primary: Kuzey Kıbrıs common: @@ -22,7 +22,7 @@ properties: country: XX hierarchies: - - division_id: example:perspectives:trnc - subtype: country + subtype: admin0 name: Kuzey Kıbrıs perspectives: mode: accepted_by diff --git a/examples/divisions/division/population.yaml b/examples/divisions/division/population.yaml index d1044f221..ae8e09fa2 100644 --- a/examples/divisions/division/population.yaml +++ b/examples/divisions/division/population.yaml @@ -1,5 +1,5 @@ --- -id: example:division:region:ca-on +id: example:division:admin1:ca-on type: Feature geometry: type: Point @@ -8,7 +8,7 @@ properties: theme: divisions type: division version: 0 - subtype: region + subtype: admin1 local_type: en: province names: @@ -20,12 +20,12 @@ properties: country: CA region: CA-ON hierarchies: - - - division_id: example:division:country:ca - subtype: country + - - division_id: example:division:admin0:ca + subtype: admin0 name: Canada - - division_id: example:division:region:ca-on - subtype: region + - division_id: example:division:admin1:ca-on + subtype: admin1 name: Ontario capital_division_ids: [ example:division:locality:toronto ] - parent_division_id: example:division:country:ca + parent_division_id: example:division:admin0:ca population: 13550900 diff --git a/examples/divisions/division/prominence.yaml b/examples/divisions/division/prominence.yaml index 5986e201c..b1760a0b2 100644 --- a/examples/divisions/division/prominence.yaml +++ b/examples/divisions/division/prominence.yaml @@ -19,13 +19,13 @@ properties: record_id: N21040334 country: DK hierarchies: - - - division_id: example:division:country:dk - subtype: country + - - division_id: example:division:admin0:dk + subtype: admin0 name: Denmark capital_of_divisions: - - division_id: example:division:country:dk - subtype: country - parent_division_id: example:division:country:dk + - division_id: example:division:admin0:dk + subtype: admin0 + parent_division_id: example:division:admin0:dk population: 50781 cartography: prominence: 5 diff --git a/examples/divisions/division_area/country_land.yaml b/examples/divisions/division_area/admin0_land.yaml similarity index 98% rename from examples/divisions/division_area/country_land.yaml rename to examples/divisions/division_area/admin0_land.yaml index f7620a998..8232ca907 100644 --- a/examples/divisions/division_area/country_land.yaml +++ b/examples/divisions/division_area/admin0_land.yaml @@ -1,5 +1,5 @@ --- -id: example:division_area:land:country:us +id: example:division_area:land:admin0:us type: Feature geometry: type: MultiPolygon @@ -302,11 +302,11 @@ properties: theme: divisions type: division_area version: 0 - subtype: country + subtype: admin0 class: land is_land: true is_territorial: false - division_id: example:division:country:us + division_id: example:division:admin0:us names: primary: United States country: US diff --git a/examples/divisions/division_area/country_maritime.yaml b/examples/divisions/division_area/admin0_maritime.yaml similarity index 95% rename from examples/divisions/division_area/country_maritime.yaml rename to examples/divisions/division_area/admin0_maritime.yaml index 6da93d96a..f5d11ec2c 100644 --- a/examples/divisions/division_area/country_maritime.yaml +++ b/examples/divisions/division_area/admin0_maritime.yaml @@ -1,5 +1,5 @@ --- -id: example:division_area:maritime:country:fi +id: example:division_area:maritime:admin0:fi type: Feature geometry: type: Polygon @@ -76,11 +76,11 @@ properties: theme: divisions type: division_area version: 0 - subtype: country + subtype: admin0 class: maritime is_territorial: true is_land: false - division_id: example:division:country:fi + division_id: example:division:admin0:fi names: primary: Suomi common: diff --git a/examples/divisions/division_area/region_land.yaml b/examples/divisions/division_area/admin1_land.yaml similarity index 95% rename from examples/divisions/division_area/region_land.yaml rename to examples/divisions/division_area/admin1_land.yaml index 6fa857863..e5a19e6f4 100644 --- a/examples/divisions/division_area/region_land.yaml +++ b/examples/divisions/division_area/admin1_land.yaml @@ -1,5 +1,5 @@ --- -id: example:division_area:land:region:it-umbria +id: example:division_area:land:admin1:it-umbria type: Feature geometry: type: MultiPolygon @@ -71,11 +71,11 @@ properties: theme: divisions type: division_area version: 0 - subtype: region + subtype: admin1 class: land is_land: true is_territorial: false - division_id: example:division:country:it + division_id: example:division:admin0:it names: primary: Umbria country: IT diff --git a/examples/divisions/division_area/is_land.yaml b/examples/divisions/division_area/is_land.yaml index 6ade21cbb..eb57e329a 100644 --- a/examples/divisions/division_area/is_land.yaml +++ b/examples/divisions/division_area/is_land.yaml @@ -1,5 +1,5 @@ --- -id: example:division_area:is_land:country:us +id: example:division_area:is_land:admin0:us type: Feature geometry: type: MultiPolygon @@ -301,12 +301,12 @@ geometry: properties: theme: divisions type: division_area - subtype: country + subtype: admin0 is_land: true is_territorial: false country: US version: 0 class: land - division_id: example:division:country:us + division_id: example:division:admin0:us names: primary: United States \ No newline at end of file diff --git a/examples/divisions/division_area/is_territorial.yaml b/examples/divisions/division_area/is_territorial.yaml index 18b8edda6..00a2c2052 100644 --- a/examples/divisions/division_area/is_territorial.yaml +++ b/examples/divisions/division_area/is_territorial.yaml @@ -1,5 +1,5 @@ --- -id: example:division_area:is_territorial:country:fi +id: example:division_area:is_territorial:admin0:fi type: Feature geometry: type: Polygon @@ -75,12 +75,12 @@ geometry: properties: theme: divisions type: division_area - subtype: country + subtype: admin0 is_territorial: true is_land: false country: FI version: 0 class: land - division_id: example:division:country:fi + division_id: example:division:admin0:fi names: primary: Finland diff --git a/examples/divisions/division_boundary/disputed.yaml b/examples/divisions/division_boundary/disputed.yaml index 525a80bbb..84ff3aadb 100644 --- a/examples/divisions/division_boundary/disputed.yaml +++ b/examples/divisions/division_boundary/disputed.yaml @@ -8,11 +8,11 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: country + subtype: admin0 class: land is_land: true is_territorial: false - division_ids: ["example:division:country:left", "example:division:country:right"] + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] is_disputed: true perspectives: mode: disputed_by diff --git a/examples/divisions/division_boundary/disputed_both.yaml b/examples/divisions/division_boundary/disputed_both.yaml index ee491390b..79c0df0d9 100644 --- a/examples/divisions/division_boundary/disputed_both.yaml +++ b/examples/divisions/division_boundary/disputed_both.yaml @@ -8,11 +8,11 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: country + subtype: admin0 class: land is_land: true is_territorial: false - division_ids: ["example:division:country:left", "example:division:country:right"] + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] is_disputed: true perspectives: mode: disputed_by diff --git a/examples/divisions/division_boundary/is_land.yaml b/examples/divisions/division_boundary/is_land.yaml index 418a89f90..ca60035b0 100644 --- a/examples/divisions/division_boundary/is_land.yaml +++ b/examples/divisions/division_boundary/is_land.yaml @@ -1,5 +1,5 @@ --- -id: example:division_boundary:is_land:country:us +id: example:division_boundary:is_land:admin0:us type: Feature geometry: type: LineString @@ -8,8 +8,8 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: country + subtype: admin0 is_land: true is_territorial: false class: land - division_ids: ["example:division:country:left", "example:division:country:right"] \ No newline at end of file + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] \ No newline at end of file diff --git a/examples/divisions/division_boundary/is_territorial.yaml b/examples/divisions/division_boundary/is_territorial.yaml index f5d8b34b4..6a2b2fe4b 100644 --- a/examples/divisions/division_boundary/is_territorial.yaml +++ b/examples/divisions/division_boundary/is_territorial.yaml @@ -1,5 +1,5 @@ --- -id: example:division_boundary:is_territorial:country:fi +id: example:division_boundary:is_territorial:admin0:fi type: Feature geometry: @@ -9,8 +9,8 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: country + subtype: admin0 is_territorial: true is_land: false class: maritime - division_ids: ["example:division:country:left", "example:division:country:right"] \ No newline at end of file + division_ids: ["example:division:admin0:left", "example:division:admin0:right"] \ No newline at end of file diff --git a/examples/divisions/division_boundary/land_region.yaml b/examples/divisions/division_boundary/land_admin1.yaml similarity index 71% rename from examples/divisions/division_boundary/land_region.yaml rename to examples/divisions/division_boundary/land_admin1.yaml index a4e8a52fe..d2c2fa92f 100644 --- a/examples/divisions/division_boundary/land_region.yaml +++ b/examples/divisions/division_boundary/land_admin1.yaml @@ -8,9 +8,9 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: region + subtype: admin1 class: land country: "XX" is_land: true is_territorial: false - division_ids: ["example:division:region:left", "example:division:region:right"] + division_ids: ["example:division:admin1:left", "example:division:admin1:right"] diff --git a/examples/divisions/division_boundary/land_county.yaml b/examples/divisions/division_boundary/land_admin2.yaml similarity index 72% rename from examples/divisions/division_boundary/land_county.yaml rename to examples/divisions/division_boundary/land_admin2.yaml index a9dc67197..927287162 100644 --- a/examples/divisions/division_boundary/land_county.yaml +++ b/examples/divisions/division_boundary/land_admin2.yaml @@ -8,10 +8,10 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: region + subtype: admin1 class: land country: "XX" region: "XX-01" is_land: true is_territorial: false - division_ids: ["example:division:region:left", "example:division:region:right"] + division_ids: ["example:division:admin1:left", "example:division:admin1:right"] diff --git a/examples/divisions/division_boundary/maritime_country.yaml b/examples/divisions/division_boundary/maritime_admin0.yaml similarity index 70% rename from examples/divisions/division_boundary/maritime_country.yaml rename to examples/divisions/division_boundary/maritime_admin0.yaml index 13d73ed4d..923bb5912 100644 --- a/examples/divisions/division_boundary/maritime_country.yaml +++ b/examples/divisions/division_boundary/maritime_admin0.yaml @@ -8,8 +8,8 @@ properties: theme: divisions type: division_boundary version: 1 - subtype: country + subtype: admin0 class: maritime is_territorial: true is_land: false - division_ids: ["example:division:region:left", "example:division:region:right"] + division_ids: ["example:division:admin1:left", "example:division:admin1:right"] diff --git a/schema/divisions/defs.yaml b/schema/divisions/defs.yaml index 4b3e3ec5d..5f615677a 100644 --- a/schema/divisions/defs.yaml +++ b/schema/divisions/defs.yaml @@ -6,33 +6,22 @@ description: Common schema definitions for divisions theme placetype: description: Category of the division from a finite, hierarchical, ordered - list of categories (e.g. country, region, locality, etc.) + list of categories (e.g. admin0, admin1, locality, etc.) similar to a Who's on First placetype. type: string enum: - - country # Largest unit of independent sovereignty, e.g. - # the United States, France. + - admin0 # Highest-level administrative divisions such as + # countries or country-like dependencies, e.g. + # the United States, Puerto Rico, France. - - dependency # A place that is not exactly a sub-region of a - # country but is dependent on a parent country - # 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 + - admin1 # 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. + # countries. - - county # Largest sub-region administrative unit in most - # countries, unless they have macrocounties. + - admin2 # Largest sub-region administrative unit in most + # countries below the admin1 level. - - localadmin # An administrative unit existing in some parts + - admin3 # An administrative unit existing in some parts # of the world that contains localities or # populated places, e.g. département de Paris. # Often the contained places do not have @@ -59,7 +48,7 @@ description: Common schema definitions for divisions theme # division of type neighborhood. hierarchy: description: - A hierarchy of divisions, with the first entry being a country; + A hierarchy of divisions, with the first entry being an admin0; 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. diff --git a/schema/divisions/division.yaml b/schema/divisions/division.yaml index f4eb4d008..d9a127d20 100644 --- a/schema/divisions/division.yaml +++ b/schema/divisions/division.yaml @@ -25,10 +25,9 @@ properties: # JSON Schema: Top-level object properties. - "$ref": ../defs.yaml#/$defs/propertyContainers/cartographyContainer - if: properties: - subtype: { enum: [country] } + subtype: { enum: [admin0] } then: required: [names, subtype, country, hierarchies] - not: { required: [parent_division_id] } else: required: [names, subtype, country, hierarchies, parent_division_id] properties: # JSON Schema: properties within GeoJSON top-level object 'properties' property @@ -57,14 +56,14 @@ properties: # JSON Schema: Top-level object properties. Local name for the subtype property, optionally localized. For example, the Canadian province of Quebec has the subtype - 'region', but in the local administrative hierarchy it is + 'admin1', but in the local administrative hierarchy it is referred to as a 'province'. Similarly, the Canadian Yukon - territory also has subtype 'region', but is locally called + territory also has subtype 'admin1', but is locally called a 'territory'. This property is localized using a standard Overture names structure. So for example, in Switzerland the top-level - administrative subdivision corresponding to subtype 'region' + administrative subdivision corresponding to subtype 'admin1' is the canton, which is may be translated in each of Switzerland's official languages as, 'canton' in French, 'kanton' in German, 'cantone' in Italian, and 'chantun' in @@ -139,14 +138,15 @@ properties: # JSON Schema: Top-level object properties. description: Division ID of this division's parent division. - Not allowed for top-level divisions (countries) and required - for all other divisions. - The default parent division is the parent division as seen from the default political perspective, if there is one, and is otherwise chosen somewhat arbitrarily. The hierarchies property can be used to inspect the exhaustive list of parent divisions. + + For admin0 divisions, the field is optional but, when present, + must reference another admin0 (e.g., a dependency pointing to + its sovereign state). allOf: - "$ref": "../defs.yaml#/$defs/propertyDefinitions/id" perspectives: diff --git a/schema/divisions/division_boundary.yaml b/schema/divisions/division_boundary.yaml index f03134116..a4f0d61be 100644 --- a/schema/divisions/division_boundary.yaml +++ b/schema/divisions/division_boundary.yaml @@ -21,7 +21,7 @@ properties: # JSON Schema: Top-level object properties. - "$ref": ../defs.yaml#/$defs/propertyContainers/overtureFeaturePropertiesContainer - if: properties: - subtype: { enum: [country] } + subtype: { enum: [admin0] } then: required: [subtype, class, division_ids, is_land, is_territorial] not: { required: [country] } @@ -77,7 +77,7 @@ properties: # JSON Schema: Top-level object properties. ISO 3166-1 alpha-2 country code of the country or country-like entity that both sides of the boundary share. - This property will be present on boundaries between two regions, counties, + This property will be present on boundaries between two admin1s, admin2s, or similar entities within the same country, but will not be present on boundaries between two countries or country-like entities. allOf: @@ -87,7 +87,7 @@ properties: # JSON Schema: Top-level object properties. ISO 3166-2 principal subdivision code of the subdivision-like entity that both sides of the boundary share. - This property will be present on boundaries between two counties, localadmins + This property will be present on boundaries between two admin2s, admin3s, or similar entities within the same principal subdivision, but will not be present on boundaries between different principal subdivisions or countries. allOf: