Skip to content

Make a valid 2020-12 schema #80

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

Open
neilmb wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Make a valid 2020-12 schema #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e74868
Define Catalog using definitions with id values
zopalmer14 Mar 5, 2026
f293675
Update schema test program to use
neilmb Mar 11, 2026
166e077
Fix merge conflict, remove one more $id
neilmb Mar 12, 2026
4ed1c27
Review feedback: use array for type where possible, flatten a few mor…
neilmb Mar 13, 2026
04e1589
Review feedback: more type arrays
neilmb Mar 13, 2026
521915f
Review feedback: type array, flattening, CatalogRecord description, a…
neilmb Mar 13, 2026
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
319 changes: 131 additions & 188 deletions jsonschema/definitions/Catalog.json → jsonschema/Catalog.json
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 0 additions & 104 deletions jsonschema/dcat_us_3.0.0_schema.json
View file
Open in desktop

This file was deleted.

48 changes: 19 additions & 29 deletions jsonschema/definitions/AccessRestriction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://resources.data.gov/dcat-us/3.0.0/definitions/accessrestriction",
"title": "AccessRestriction",
"description": "A restriction on the permitted access to a resource",
"type": "object",
"properties": {
"@id": {
Expand All @@ -12,62 +14,50 @@
"default": "AccessRestriction"
},
"restrictionNote": {
"$id": "http://data.resources.gov/ontology/dcat-us#restrictionNote",
"title": "restriction note",
"description": "A note related to the access restriction",
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
"type": [
"null",
"string"
]
},
"restrictionNoteMap": {
"$id": "http://data.resources.gov/ontology/dcat-us#restrictionNote_lang_map",
"description": "Language map for property title. E.g. {'es': 'spanish words', 'fr': 'french words'}",
"description": "Language map for the restriction note. E.g. {'es': 'spanish words', 'fr': 'french words'}",
"type": [
"null",
"object"
]
},
"restrictionStatus": {
"$id": "http://data.resources.gov/ontology/dcat-us#restrictionStatus",
"title": "restriction status",
"description": "The indication of whether or not there are access restrictions on the data.",
"description": "The indication of whether or not there are access restrictions on the item",
"oneOf": [
{
"$ref": "#/definitions/Concept",
"description": "inline description of Concept"
"$ref": "/dcat-us/3.0.0/definitions/concept",
"description": "inline description of restriction status"
},
{
"type": "string",
"description": "reference iri of Concept",
"description": "reference iri of restriction status",
"format": "iri"
}
]
},
"specificRestriction": {
"$id": "http://data.resources.gov/ontology/dcat-us#specificRestriction",
"title": "specific restriction",
"description": "The specific NARA restriction associated with the access restriction",
"description": "The specific NARA restriction associated with this restriction",
"oneOf": [
{
"type": "null"
},
{
"oneOf": [
{
"$ref": "#/definitions/Concept",
"description": "inline description of Concept"
},
{
"type": "string",
"description": "reference iri of Concept",
"format": "iri"
}
]
"$ref": "/dcat-us/3.0.0/definitions/concept",
"description": "inline description of the specific restriction"
},
{
"type": "string",
"description": "reference iri of the specific restriction",
"format": "iri"
}
]
}
Expand Down
43 changes: 17 additions & 26 deletions jsonschema/definitions/Activity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://resources.data.gov/dcat-us/3.0.0/definitions/activity",
"title": "Activity",
"description": "An activity which a resource could be related to",
"type": "object",
"properties": {
"@id": {
Expand All @@ -12,44 +14,33 @@
"default": "Activity"
},
"category": {
"$id": "http://purl.org/dc/terms/type",
"title": "category",
"description": "The category of the Activity ",
"oneOf": [
"description": "The category of the Activity",
"anyOf": [
{
"type": "null"
},
{
"oneOf": [
{
"$ref": "#/definitions/Concept",
"description": "inline description of Concept"
},
{
"type": "string",
"description": "reference iri of Concept",
"format": "iri"
}
]
"$ref": "/dcat-us/3.0.0/definitions/concept",
"description": "inline description of the category"
},
{
"type": "string",
"description": "reference iri of the category",
"format": "iri"
}
]
},
"label": {
"$id": "http://www.w3.org/2000/01/rdf-schema#label",
"title": "label",
"description": "This property is used to give a human-readable label for the activity.",
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
"description": "A human-readable label for the activity",
"type": [
"null",
"string"
]
},
"labelMap": {
"$id": "http://www.w3.org/2000/01/rdf-schema#label_lang_map",
"description": "Language map for property title. E.g. {'es': 'spanish words', 'fr': 'french words'}",
"description": "Language map for the label. E.g. {'es': 'spanish words', 'fr': 'french words'}",
"type": [
"null",
"object"
Expand Down
69 changes: 23 additions & 46 deletions jsonschema/definitions/Address.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://resources.data.gov/dcat-us/3.0.0/definitions/address",
"title": "Address",
"description": "A single physical address",
"type": "object",
"properties": {
"@id": {
Expand All @@ -12,68 +14,43 @@
"default": "Address"
},
"country-name": {
"$id": "http://www.w3.org/2006/vcard/ns#country-name",
"title": "country",
"description": "The country of an Address of the Kind.",
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
"description": "The country of the Address",
"type": [
"null",
"string"
]
},
"locality": {
"$id": "http://www.w3.org/2006/vcard/ns#locality",
"title": "locality",
"description": "The city of an Address of the Kind.",
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
"description": "The city of the Address",
"type": [
"null",
"string"
]
},
"postal-code": {
"$id": "http://www.w3.org/2006/vcard/ns#postal-code",
"title": "postal code",
"description": "The postal code of an Address of the Kind.",
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
"description": "The postal code of the Address",
"type": [
"null",
"string"
]
},
"region": {
"$id": "http://www.w3.org/2006/vcard/ns#region",
"title": "administrative area",
"description": "The administrative area of an Address of the Kind. Depending on the country, this corresponds to a province, a county, a region, or a state.",
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
"description": "The administrative area of the Address. Depending on the country, this corresponds to a province, a county, a region, or a state",
"type": [
"null",
"string"
]
},
"street-address": {
"$id": "http://www.w3.org/2006/vcard/ns#street-address",
"title": "street address",
"description": "The street name and civic number of an Address of the Kind.",
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
"description": "The street name and civic number of an Address",
"type": [
"null",
"string"
]
}
},
Expand Down
Loading
Loading