Skip to content

[Minor] Add is_land and is_territorial to divisions #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcschapp merged 5 commits into from
Jan 15, 2025
Merged

[Minor] Add is_land and is_territorial to divisions #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c6aefc
add is_land and is_territorial properties to divisions
stepps00 Dec 2, 2024
d7fb233
fix indentation, descriptions, add req fields and anyOf requirements
stepps00 Dec 5, 2024
f4e2356
add counterexamples, format schema descriptions
stepps00 Dec 5, 2024
034d174
Few fixes to make schema validation pass
Dec 5, 2024
bb753bd
Change is_land & is_terrirotial to be always requried
Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions counterexamples/divisions/division_area/bad-is-land.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
id: counterexample:division_area:bad-is-land
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_land: yes
country: ZZ
ext_expected_errors:
- "is_land/type]: got string, want boolean"
17 changes: 17 additions & 0 deletions counterexamples/divisions/division_area/bad-is-territorial.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
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: no
is_land: true
country: ZZ
ext_expected_errors:
- "is_territorial/type]: got string, want boolean"
14 changes: 14 additions & 0 deletions counterexamples/divisions/division_area/bad-missing-is-land.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +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
country: ZZ
18 changes: 18 additions & 0 deletions counterexamples/divisions/division_boundary/bad-is-land.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
id: counterexample:division_boundary:bad-is-land
type: Feature
geometry:
type: LineString
coordinates: [[0, 1], [1, 2]]
properties:
theme: divisions
type: division_boundary
version: 0
subtype: country
division_ids: ["example:division:country:left", "example:division:country:right"]
is_land: yes
is_territorial: false
class: land
country: ZZ
ext_expected_errors:
- "is_land/type]: got string, want boolean"
18 changes: 18 additions & 0 deletions counterexamples/divisions/division_boundary/bad-is-territorial.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
id: counterexample:division_boundary:bad-is-territorial
type: Feature
geometry:
type: LineString
coordinates: [[0, 1], [1, 2]]
properties:
theme: divisions
type: division_boundary
version: 0
subtype: country
division_ids: ["example:division:country:left", "example:division:country:right"]
class: land
is_territorial: no
is_land: true
country: ZZ
ext_expected_errors:
- "is_territorial/type]: got string, want boolean"
17 changes: 17 additions & 0 deletions counterexamples/divisions/division_boundary/bad-not-both.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
id: example:division_boundary:is_land:country:us
type: Feature
geometry:
type: LineString
coordinates: [[0, 1], [1, 2]]
properties:
theme: divisions
type: division_boundary
version: 1
subtype: country
is_land: true
is_territorial: true
class: land
division_ids: ["example:division:country:left", "example:division:country:right"]
ext_expected_errors:
- "division_boundary.yaml#/properties/properties/oneOf]: oneOf failed, subschemas 0, 1 matched"
2 changes: 2 additions & 0 deletions counterexamples/divisions/division_boundary/missing-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ properties:
type: division_boundary
version: 0
subtype: macroregion
is_territorial: true
is_land: false
division_ids: ["example:division:country:left", "example:division:country:right"]
ext_expected_errors:
- "missing property 'class'"
2 changes: 2 additions & 0 deletions counterexamples/divisions/division_boundary/missing-division_ids.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ properties:
type: division_boundary
version: 0
class: land
is_territorial: false
is_land: true
subtype: macrocounty
ext_expected_errors:
- "missing property 'division_ids'"
2 changes: 2 additions & 0 deletions counterexamples/divisions/division_boundary/missing-subtype.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ properties:
type: division_boundary
version: 0
class: land
is_territorial: false
is_land: true
division_ids: ["example:division:country:left", "example:division:country:right"]
ext_expected_errors:
- "missing property 'subtype'"
2 changes: 2 additions & 0 deletions examples/divisions/division_area/country_land.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ properties:
version: 0
subtype: country
class: land
is_land: true
is_territorial: false
division_id: example:division:country:us
names:
primary: United States
Expand Down
2 changes: 2 additions & 0 deletions examples/divisions/division_area/country_maritime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ properties:
version: 0
subtype: country
class: maritime
is_territorial: true
is_land: false
division_id: example:division:country:fi
names:
primary: Suomi
Expand Down
Loading
Loading