Skip to content
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

Jump to bottom

Fix additional lint errors #3

Merged
merged 3 commits into from
May 24, 2024
Merged

Fix additional lint errors #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0790876
Update schema ID in two additional places
kurtmckee May 22, 2024
0c344eb
Fix a schema definition reference
kurtmckee May 22, 2024
ef4699d
Removing pid and index node
rhysrevans3 May 24, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CMIP6 Extension Specification

- **Title:** CMIP6
- **Identifier:** <https://cedadev.github.io/cmip6/v0.1.0/schema.json>
- **Identifier:** <https://stac-extensions.github.io/cmip6/v1.0.0/schema.json>
- **Field Name Prefix:** cmip6
- **Scope:** Item
- **Extension [Maturity Classification](https://github.com/radiantearth/stac-spec/tree/master/extensions/README.md#extension-maturity):** Proposal
Expand Down
6 changes: 2 additions & 4 deletions examples/CMIP6.ScenarioMIP.UA.MCM-UA-1-0.ssp245.r1i1p1f2.Amon.psl.gn.v20190731.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "Feature",
"stac_version": "1.0.0",
"stac_extensions": [
"https://cedadev.github.io/cmip6/v0.1.0/schema.json"
"https://stac-extensions.github.io/cmip6/v1.0.0/schema.json"
],
"id": "CMIP6.ScenarioMIP.UA.MCM-UA-1-0.ssp245.r1i1p1f2.Amon.psl.gn.v20190731",
"collection": "cmip6",
Expand Down Expand Up @@ -46,9 +46,7 @@
"cmip6:access": [
"HTTPServer"
],
"cmip6:index_node": null,
"cmip6:latest": true,
"cmip6:pid": null,
"cmip6:replica": false,
"cmip6:retracted": false,
"cmip6:instance_id": "CMIP6.ScenarioMIP.UA.MCM-UA-1-0.ssp245.r1i1p1f2.Amon.psl.gn.v20190731",
Expand All @@ -73,7 +71,7 @@
"cmip6:table_id": "Amon",
"cmip6:variable_id": "psl",
"cmip6:variant_label": "r1i1p1f2",
"cmip6:levels": null,
"cmip6:levels": 0,
"cmip6:updated": "2024-02-20T19:28:19.804842Z",
"cmip6:created": "2024-02-20T19:28:19.804842Z"
},
Expand Down
192 changes: 158 additions & 34 deletions json-schema/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"properties": {
"allOf": [
{
"$ref": "#/definitions/require_any"
"$ref": "#/definitions/require_any_field"
},
{
"$ref": "#/definitions/fields"
Expand Down Expand Up @@ -53,37 +53,161 @@
"require_any_field": {
"$comment": "Please list all fields here so that we can force the existence of one of them in other parts of the schemas.",
"anyOf": [
{"required": ["cmip6:access"]},
{"required": ["cmip6:index_node"]},
{"required": ["cmip6:latest"]},
{"required": ["cmip6:pid"]},
{"required": ["cmip6:replica"]},
{"required": ["cmip6:retracted"]},
{"required": ["cmip6:instance_id"]},
{"required": ["cmip6:citation_url"]},
{"required": ["cmip6:variable_long_name"]},
{"required": ["cmip6:variable_units"]},
{"required": ["cmip6:cf_standard_name"]},
{"required": ["cmip6:activity_id"]},
{"required": ["cmip6:data_specs_version"]},
{"required": ["cmip6:experiment_title"]},
{"required": ["cmip6:frequency"]},
{"required": ["cmip6:further_info_url"]},
{"required": ["cmip6:grid"]},
{"required": ["cmip6:grid_label"]},
{"required": ["cmip6:institution_id"]},
{"required": ["cmip6:mip_era"]},
{"required": ["cmip6:source_id"]},
{"required": ["cmip6:source_type"]},
{"required": ["cmip6:experiment_id"]},
{"required": ["cmip6:sub_experiment_id"]},
{"required": ["cmip6:nominal_resolution"]},
{"required": ["cmip6:table_id"]},
{"required": ["cmip6:variable_id"]},
{"required": ["cmip6:variant_label"]},
{"required": ["cmip6:levels"]},
{"required": ["cmip6:updated"]},
{"required": ["cmip6:created"]}
{
"required": [
"cmip6:access"
]
},
{
"required": [
"cmip6:index_node"
]
},
{
"required": [
"cmip6:latest"
]
},
{
"required": [
"cmip6:pid"
]
},
{
"required": [
"cmip6:replica"
]
},
{
"required": [
"cmip6:retracted"
]
},
{
"required": [
"cmip6:instance_id"
]
},
{
"required": [
"cmip6:citation_url"
]
},
{
"required": [
"cmip6:variable_long_name"
]
},
{
"required": [
"cmip6:variable_units"
]
},
{
"required": [
"cmip6:cf_standard_name"
]
},
{
"required": [
"cmip6:activity_id"
]
},
{
"required": [
"cmip6:data_specs_version"
]
},
{
"required": [
"cmip6:experiment_title"
]
},
{
"required": [
"cmip6:frequency"
]
},
{
"required": [
"cmip6:further_info_url"
]
},
{
"required": [
"cmip6:grid"
]
},
{
"required": [
"cmip6:grid_label"
]
},
{
"required": [
"cmip6:institution_id"
]
},
{
"required": [
"cmip6:mip_era"
]
},
{
"required": [
"cmip6:source_id"
]
},
{
"required": [
"cmip6:source_type"
]
},
{
"required": [
"cmip6:experiment_id"
]
},
{
"required": [
"cmip6:sub_experiment_id"
]
},
{
"required": [
"cmip6:nominal_resolution"
]
},
{
"required": [
"cmip6:table_id"
]
},
{
"required": [
"cmip6:variable_id"
]
},
{
"required": [
"cmip6:variant_label"
]
},
{
"required": [
"cmip6:levels"
]
},
{
"required": [
"cmip6:updated"
]
},
{
"required": [
"cmip6:created"
]
}
]
},
"fields": {
Expand Down Expand Up @@ -175,7 +299,7 @@
"type": "string"
},
"cmip6:levels": {
"type": "string"
"type": "integer"
},
"cmip6:updated": {
"type": "string"
Expand All @@ -190,4 +314,4 @@
"additionalProperties": false
}
}
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"remark-validate-links": "^13.0.0",
"stac-node-validator": "^1.3.0"
}
}
}