From 73e4de86cfba7fe5a65a945d61e6c1e7992a9817 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Tue, 14 May 2024 09:02:23 +0200 Subject: [PATCH 1/3] Remove .vscode/settings.json --- .gitignore | 3 ++- .vscode/settings.json | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index b68addb..0d19804 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /package-lock.json -/node_modules \ No newline at end of file +/node_modules +.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7709bc6..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "jira-plugin.workingProject": "" -} \ No newline at end of file From 64daa268800c4fcf9aa34537d637104273f17c69 Mon Sep 17 00:00:00 2001 From: Matthias Mohr Date: Wed, 22 May 2024 20:49:53 +0200 Subject: [PATCH 2/3] Simplify schema --- json-schema/schema.json | 170 ++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 93 deletions(-) diff --git a/json-schema/schema.json b/json-schema/schema.json index 7294566..7e515b0 100644 --- a/json-schema/schema.json +++ b/json-schema/schema.json @@ -3,122 +3,106 @@ "$id": "https://stac-extensions.github.io/sat/v1.0.0/schema.json", "title": "Satellite Extension", "description": "STAC Sat Extension to a STAC Item.", + "type": "object", + "required": [ + "stac_extensions" + ], + "properties": { + "stac_extensions": { + "type": "array", + "contains": { + "const": "https://stac-extensions.github.io/sat/v1.0.0/schema.json" + } + } + }, "oneOf": [ { "$comment": "This is the schema for STAC Items.", - "allOf": [ - { - "type": "object", - "required": [ - "type", - "properties", - "assets" - ], - "properties": { - "type": { - "const": "Feature" - }, - "properties": { - "allOf": [ + "type": "object", + "required": [ + "type", + "properties", + "assets" + ], + "properties": { + "type": { + "const": "Feature" + }, + "properties": { + "allOf": [ + { + "anyOf": [ { - "anyOf": [ - { - "required": [ - "sat:platform_international_designator" - ] - }, - { - "required": [ - "sat:orbit_state" - ] - }, - { - "required": [ - "sat:absolute_orbit" - ] - }, - { - "required": [ - "sat:relative_orbit" - ] - }, - { - "required": [ - "sat:anx_datetime" - ] - }, - { - "required": [ - "sat:orbit_cycle" - ] - } + "required": [ + "sat:platform_international_designator" ] }, { - "$ref": "#/definitions/fields" + "required": [ + "sat:orbit_state" + ] + }, + { + "required": [ + "sat:absolute_orbit" + ] + }, + { + "required": [ + "sat:relative_orbit" + ] + }, + { + "required": [ + "sat:anx_datetime" + ] + }, + { + "required": [ + "sat:orbit_cycle" + ] } ] }, - "assets": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/fields" - } + { + "$ref": "#/definitions/fields" } - } + ] }, - { - "$ref": "#/definitions/stac_extensions" + "assets": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/fields" + } } - ] + } }, { "$comment": "This is the schema for STAC Collections.", - "allOf": [ - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "const": "Collection" - }, - "assets": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/fields" - } - }, - "item_assets": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/fields" - } - } - } - }, - { - "$ref": "#/definitions/stac_extensions" - } - ] - } - ], - "definitions": { - "stac_extensions": { "type": "object", "required": [ - "stac_extensions" + "type" ], "properties": { - "stac_extensions": { - "type": "array", - "contains": { - "const": "https://stac-extensions.github.io/sat/v1.0.0/schema.json" + "type": { + "const": "Collection" + }, + "assets": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/fields" + } + }, + "item_assets": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/fields" } } } - }, + } + ], + "definitions": { "fields": { "type": "object", "properties": { From 3e4cd2e2047cb62a2a07cfee8ccdb2df25c73d07 Mon Sep 17 00:00:00 2001 From: Matthias Mohr Date: Wed, 22 May 2024 20:56:57 +0200 Subject: [PATCH 3/3] Update STAC version in the examples --- examples/example-landsat8.json | 2 +- examples/example-sentinel1.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/example-landsat8.json b/examples/example-landsat8.json index 009e463..4e9a01c 100644 --- a/examples/example-landsat8.json +++ b/examples/example-landsat8.json @@ -1,5 +1,5 @@ { - "stac_version": "1.0.0-rc.2", + "stac_version": "1.0.0", "stac_extensions": [ "https://stac-extensions.github.io/sat/v1.0.0/schema.json", "https://stac-extensions.github.io/view/v1.0.0/schema.json" diff --git a/examples/example-sentinel1.json b/examples/example-sentinel1.json index 785cae7..4b1bfd3 100644 --- a/examples/example-sentinel1.json +++ b/examples/example-sentinel1.json @@ -1,5 +1,5 @@ { - "stac_version": "1.0.0-rc.1", + "stac_version": "1.0.0", "stac_extensions": [ "https://stac-extensions.github.io/sar/v1.0.0/schema.json", "https://stac-extensions.github.io/sat/v1.0.0/schema.json"