Skip to content

Fix JSON Schemas #832

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
m-mohr merged 9 commits into from
Jun 4, 2020
Merged

Fix JSON Schemas #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
becd02a
Fix $id in datetime.json
m-mohr Jun 3, 2020
c14b1b2
Remove invalid comma in instrument.json
m-mohr Jun 3, 2020
d3d6a51
Removed reduntant additionalProperties from item.json
m-mohr Jun 3, 2020
ab17966
Added missing definitions to datetime.json
m-mohr Jun 3, 2020
128fd1c
Fix two more schemas
m-mohr Jun 3, 2020
18dde8f
Further fixes for single-file-stac schema
m-mohr Jun 3, 2020
94a9a36
Update CHANGELOG
m-mohr Jun 3, 2020
e5eb954
Link to latest version of PROJJSON schema
m-mohr Jun 3, 2020
c5aee7c
Merge branch 'dev' into json-schemas
matthewhanson Jun 3, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Removed

### Fixed
- Fixed several JSON Schemas
- Fixed examples

## [v1.0.0-beta.1] - 2020-05-29
Expand Down
182 changes: 90 additions & 92 deletions extensions/datacube/json-schema/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,19 @@
]
},
"description": {
"$ref": "#/definitions/fields/description"
"$ref": "#/definitions/description"
},
"extent": {
"$ref": "#/definitions/fields/extent_open"
"$ref": "#/definitions/extent_open"
},
"values": {
"$ref": "#/definitions/fields/values"
"$ref": "#/definitions/values"
},
"step": {
"$ref": "#/definitions/fields/step"
"$ref": "#/definitions/step"
},
"unit": {
"$ref": "#/definitions/fields/unit"
"$ref": "#/definitions/unit"
},
"reference_system": {
"type": "string"
Expand All @@ -146,25 +146,25 @@
],
"properties": {
"type": {
"$ref": "#/definitions/fields/type_spatial"
"$ref": "#/definitions/type_spatial"
},
"axis": {
"$ref": "#/definitions/fields/axis_xy"
"$ref": "#/definitions/axis_xy"
},
"description": {
"$ref": "#/definitions/fields/description"
"$ref": "#/definitions/description"
},
"extent": {
"$ref": "#/definitions/fields/extent_closed"
"$ref": "#/definitions/extent_closed"
},
"values": {
"$ref": "#/definitions/fields/values_numeric"
"$ref": "#/definitions/values_numeric"
},
"step": {
"$ref": "#/definitions/fields/step"
"$ref": "#/definitions/step"
},
"reference_system": {
"$ref": "#/definitions/fields/reference_system_spatial"
"$ref": "#/definitions/reference_system_spatial"
}
}
},
Expand All @@ -189,28 +189,28 @@
],
"properties": {
"type": {
"$ref": "#/definitions/fields/type_spatial"
"$ref": "#/definitions/type_spatial"
},
"axis": {
"$ref": "#/definitions/fields/axis_z"
"$ref": "#/definitions/axis_z"
},
"description": {
"$ref": "#/definitions/fields/description"
"$ref": "#/definitions/description"
},
"extent": {
"$ref": "#/definitions/fields/extent_open"
"$ref": "#/definitions/extent_open"
},
"values": {
"$ref": "#/definitions/fields/values"
"$ref": "#/definitions/values"
},
"step": {
"$ref": "#/definitions/fields/step"
"$ref": "#/definitions/step"
},
"unit": {
"$ref": "#/definitions/fields/unit"
"$ref": "#/definitions/unit"
},
"reference_system": {
"$ref": "#/definitions/fields/reference_system_spatial"
"$ref": "#/definitions/reference_system_spatial"
}
}
},
Expand All @@ -230,7 +230,7 @@
"const": "temporal"
},
"description": {
"$ref": "#/definitions/fields/description"
"$ref": "#/definitions/description"
},
"values": {
"type": "array",
Expand Down Expand Up @@ -259,82 +259,80 @@
}
}
},
"fields": {
"type_spatial": {
"type": "string",
"const": "spatial"
},
"axis_xy": {
"type": "string",
"enum": [
"x",
"y"
]
},
"axis_z": {
"type": "string",
"const": "z"
},
"extent_closed": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"items": {
"type": "number"
}
},
"extent_open": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"items": {
"type": [
"number",
"null"
]
}
},
"values_numeric": {
"type": "array",
"minItems": 1,
"items": {
"type": "number"
}
},
"values": {
"type": "array",
"minItems": 1,
"items": {
"oneOf": [
{
"type": "number"
},
{
"type": "string"
}
]
}
},
"step": {
"type_spatial": {
"type": "string",
"const": "spatial"
},
"axis_xy": {
"type": "string",
"enum": [
"x",
"y"
]
},
"axis_z": {
"type": "string",
"const": "z"
},
"extent_closed": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"items": {
"type": "number"
}
},
"extent_open": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"items": {
"type": [
"number",
"null"
]
},
"unit": {
"type": "string"
},
"reference_system_spatial": {
"type": [
"string",
"number",
"object"
],
"default": 4326
},
"description": {
"type": "string"
}
},
"values_numeric": {
"type": "array",
"minItems": 1,
"items": {
"type": "number"
}
},
"values": {
"type": "array",
"minItems": 1,
"items": {
"oneOf": [
{
"type": "number"
},
{
"type": "string"
}
]
}
},
"step": {
"type": [
"number",
"null"
]
},
"unit": {
"type": "string"
},
"reference_system_spatial": {
"type": [
"string",
"number",
"object"
],
"default": 4326
},
"description": {
"type": "string"
}
}
}
6 changes: 3 additions & 3 deletions extensions/single-file-stac/json-schema/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Single File STAC Extension to combine Collections and Items in single file catalog",
"allOf": [
{
"$ref": "../../catalog-spec/json-schema/catalog.json"
"$ref": "../../../catalog-spec/json-schema/catalog.json"
},
{
"$ref": "https://geojson.org/schema/FeatureCollection.json"
Expand All @@ -31,13 +31,13 @@
"collections": {
"type": "array",
"items": {
"$ref": "../../collection-spec/json-schema/collection.json"
"$ref": "../../../collection-spec/json-schema/collection.json"
}
},
"features": {
"type": "array",
"items": {
"$ref": "../../item-spec/json-schema/item.json"
"$ref": "../../../item-spec/json-schema/item.json"
}
}
}
Expand Down
24 changes: 21 additions & 3 deletions item-spec/json-schema/datetime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "schema.json#",
"$id": "datetime.json#",
"title": "Date and Time Fields",
"type": "object",
"allOf": [
Expand All @@ -22,7 +22,7 @@
],
"properties": {
"datetime": {
"$ref": "#/definitions/datetime_string"
"$ref": "#/definitions/datetime"
},
"start_datetime": {
"$ref": "#/definitions/start_datetime"
Expand Down Expand Up @@ -54,7 +54,7 @@
"datetime": {
"oneOf": [
{
"$ref": "#/definitions/datetime_string"
"$ref": "#/definitions/datetime"
},
{
"type": ["null"],
Expand All @@ -74,6 +74,24 @@
}
],
"definitions": {
"datetime": {
"title": "Date and Time",
"description": "The searchable date/time of the assets, in UTC (Formatted in RFC 3339) ",
"type": "string",
"format": "date-time"
},
"start_datetime": {
"title": "Start Date and Time",
"description": "The searchable start date/time of the assets, in UTC (Formatted in RFC 3339) ",
"type": "string",
"format": "date-time"
},
"end_datetime": {
"title": "End Date and Time",
"description": "The searchable end date/time of the assets, in UTC (Formatted in RFC 3339) ",
"type": "string",
"format": "date-time"
},
"created": {
"title": "Creation Time",
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion item-spec/json-schema/instrument.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"gsd": {
"title": "Ground Sample Distance",
"type": "number"
},
}
}
}
1 change: 0 additions & 1 deletion item-spec/json-schema/item.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"title": "STAC Item",
"type": "object",
"description": "This object represents the metadata for an item in a SpatioTemporal Asset Catalog.",
"additionalProperties": true,
"allOf": [
{
"$ref": "#/definitions/core"
Expand Down