From 348c03fd18d46f922cb023ab8eeffb527cbc6095 Mon Sep 17 00:00:00 2001 From: Matthias Mohr Date: Wed, 19 Feb 2025 13:58:22 +0100 Subject: [PATCH 1/2] Remove osc:name --- CHANGELOG.md | 4 ++++ README.md | 3 --- examples/project/collection.json | 1 - json-schema/schema.json | 10 ---------- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3948311..fae0e24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Removed + +- `osc:name` + ## [1.0.0-rc.4] ### Added diff --git a/README.md b/README.md index 37cc2e7..cccf346 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,6 @@ As such the extension does not validate Collection summaries. | Field Name | Type | Description | | ------------- | --------- | ----------- | | osc:type | string | **REQUIRED.** The underlying type of this resource. Either `"project"` or `"product"`. This field then defines what other fields are allowed and required. | -| osc:name | string | The descriptive name. Can be distinct from `title` or `id`, but is available for historic reasons. | | osc:status | string | **REQUIRED.** This field details whether the project or product is `planned`, `ongoing`, or has been `completed`. | | osc:project | string | **REQUIRED (for products).** The name of the project the product is associated with. | | osc:region | string | The name of the geographic region the project or product is dealing with if any, e.g `"Arctic"` or `"Agulhas"`. | @@ -76,7 +75,6 @@ As such the extension does not validate Collection summaries. Fields that apply when the `osc:type` is set to `product`: -- osc:name - osc:status - **REQUIRED** - osc:project - **REQUIRED** - osc:region @@ -86,7 +84,6 @@ Fields that apply when the `osc:type` is set to `product`: Fields that apply when the `osc:type` is set to `project`: -- osc:name - osc:status - **REQUIRED** - osc:region - [themes](#themes) diff --git a/examples/project/collection.json b/examples/project/collection.json index ea98715..72ef831 100644 --- a/examples/project/collection.json +++ b/examples/project/collection.json @@ -55,7 +55,6 @@ "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json" ], - "osc:name": "3D-Earth", "osc:status": "completed", "themes": [ { diff --git a/json-schema/schema.json b/json-schema/schema.json index 64baf03..65346f4 100644 --- a/json-schema/schema.json +++ b/json-schema/schema.json @@ -75,9 +75,6 @@ "type": "string", "const": "project" }, - "osc:name": { - "$ref": "#/definitions/name" - }, "osc:status": { "$ref": "#/definitions/status" }, @@ -102,9 +99,6 @@ "type": "string", "const": "product" }, - "osc:name": { - "$ref": "#/definitions/name" - }, "osc:status": { "$ref": "#/definitions/status" }, @@ -126,10 +120,6 @@ }, "additionalProperties": false }, - "name": { - "type": "string", - "minLength": 1 - }, "status": { "type": "string", "enum": [ From 6f1f6527309b53bfde23a646e83b00b659b970ef Mon Sep 17 00:00:00 2001 From: Matthias Mohr Date: Wed, 19 Feb 2025 14:00:45 +0100 Subject: [PATCH 2/2] Release v1.0.0 --- CHANGELOG.md | 5 ++++- README.md | 2 +- examples/product/collection.json | 2 +- examples/product/item.json | 2 +- examples/project/collection.json | 2 +- json-schema/schema.json | 4 ++-- package.json | 6 +++--- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fae0e24..d873114 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.0] + ### Removed - `osc:name` @@ -46,7 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - First release -[Unreleased]: +[Unreleased]: +[1.0.0]: [1.0.0-rc.4]: [1.0.0-rc.3]: [1.0.0-rc.2]: diff --git a/README.md b/README.md index cccf346..0353e95 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Open Science Catalog Extension Specification - **Title:** Open Science Catalog -- **Identifier:** +- **Identifier:** - **Field Name Prefix:** osc - **Scope:** Catalog, Collection, Item - **Extension [Maturity Classification](https://github.com/radiantearth/stac-spec/tree/master/extensions/README.md#extension-maturity):** Proposal diff --git a/examples/product/collection.json b/examples/product/collection.json index cd1b1dd..32d83cf 100644 --- a/examples/product/collection.json +++ b/examples/product/collection.json @@ -64,7 +64,7 @@ } ], "stac_extensions": [ - "https://stac-extensions.github.io/osc/v1.0.0-rc.4/schema.json", + "https://stac-extensions.github.io/osc/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/cf/v0.2.0/schema.json" ], diff --git a/examples/product/item.json b/examples/product/item.json index e9de71e..a4ea4da 100644 --- a/examples/product/item.json +++ b/examples/product/item.json @@ -3,7 +3,7 @@ "id": "example", "stac_version": "1.0.0", "stac_extensions": [ - "https://stac-extensions.github.io/osc/v1.0.0-rc.4/schema.json", + "https://stac-extensions.github.io/osc/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ], "geometry": null, diff --git a/examples/project/collection.json b/examples/project/collection.json index 72ef831..b4ab27b 100644 --- a/examples/project/collection.json +++ b/examples/project/collection.json @@ -51,7 +51,7 @@ } ], "stac_extensions": [ - "https://stac-extensions.github.io/osc/v1.0.0-rc.4/schema.json", + "https://stac-extensions.github.io/osc/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json" ], diff --git a/json-schema/schema.json b/json-schema/schema.json index 65346f4..33bc30f 100644 --- a/json-schema/schema.json +++ b/json-schema/schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://stac-extensions.github.io/osc/v1.0.0-rc.4/schema.json#", + "$id": "https://stac-extensions.github.io/osc/v1.0.0/schema.json#", "title": "Open Science Catalog Extension", "description": "STAC Open Science Catalog Extension for STAC Items and STAC Collections.", "type": "object", @@ -11,7 +11,7 @@ "stac_extensions": { "type": "array", "contains": { - "const": "https://stac-extensions.github.io/osc/v1.0.0-rc.4/schema.json" + "const": "https://stac-extensions.github.io/osc/v1.0.0/schema.json" } } }, diff --git a/package.json b/package.json index acc6375..1d4d6b5 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "stac-extensions", - "version": "1.0.0-rc.4", + "version": "1.0.0", "scripts": { "test": "npm run check-markdown && npm run check-examples", "check-markdown": "remark . -f -r .github/remark.yaml", - "check-examples": "stac-node-validator examples --lint --verbose --schemaMap https://stac-extensions.github.io/osc/v1.0.0-rc.4/schema.json=./json-schema/schema.json", - "format-examples": "stac-node-validator examples --format --schemaMap https://stac-extensions.github.io/osc/v1.0.0-rc.4/schema.json=./json-schema/schema.json" + "check-examples": "stac-node-validator examples --lint --verbose --schemaMap https://stac-extensions.github.io/osc/v1.0.0/schema.json=./json-schema/schema.json", + "format-examples": "stac-node-validator examples --format --schemaMap https://stac-extensions.github.io/osc/v1.0.0/schema.json=./json-schema/schema.json" }, "dependencies": { "remark-cli": "^8.0.0",