Merge pull request #1128 from radiantearth/dev

Release v1.0.0-rc.4
radiantearth · May 11, 2021 · 4ecbabc · 4ecbabc
2 parents f81324f + 7363844
commit 4ecbabc
Show file tree

Hide file tree

Showing 24 changed files with 289 additions and 233 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v1.0.0-rc.4] - 2021-05-11
+
+### Changed
+
+- An empty Catalog is now allowed, removed the requirement that it must have a child or item link. ([#1115](https://github.com/radiantearth/stac-spec/issues/1115))
+- An open date range to both sides is now allowed in the Collection's temporal extents. ([#1125](https://github.com/radiantearth/stac-spec/issues/1125))
+- Catalog and Collection JSON Schemas don't have a common JSON Schema any more. ([#1122](https://github.com/radiantearth/stac-spec/pull/1122))
+
+### Removed 
+
+- Catalogs don't support summaries any more. ([#1122](https://github.com/radiantearth/stac-spec/pull/1122))
+
+### Fixed
+
+- Added clarification around when an extension should be included in `stac_extensions`. ([#1123](https://github.com/radiantearth/stac-spec/pull/1123))
+- JSON Schemas don't allow "shortcuts" for core extensions any longer. ([#1121](https://github.com/radiantearth/stac-spec/pull/1121))
+- Various examples fixes.
+
 ## [v1.0.0-rc.3] - 2021-04-29
 
 ### Added
@@ -423,6 +441,7 @@ See the [milestone 0.4.0 in the issue tracker](https://github.com/radiantearth/s
 Thanks @hgs-msmith, @matthewhanson, @hgs-trutherford, @rouault, @joshfix, @alkamin, @hemphillda, @jeffnaus  and @fredliporace for contributing to the spec directly, and to [everyone](https://github.com/opengeospatial/wfs3hackathon/blob/master/notes/introductions.md#participants) who participated in the [Ft Collins sprint](https://github.com/radiantearth/community-sprints/tree/master/03072018-ft-collins-co) and brought great ideas.
 
 [Unreleased]: <https://github.com/radiantearth/stac-spec/compare/master...dev>
+[v1.0.0-rc.4]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.3..v1.0.0-rc.4>
 [v1.0.0-rc.3]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.2..v1.0.0-rc.3>
 [v1.0.0-rc.2]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.1..v1.0.0-rc.2>
 [v1.0.0-rc.1]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-beta.2..v1.0.0-rc.1>

diff --git a/catalog-spec/catalog-spec.md b/catalog-spec/catalog-spec.md
@@ -50,7 +50,6 @@ values for `type` and `stac_extensions`.
 | id              | string        | **REQUIRED.** Identifier for the Catalog.                    |
 | title           | string        | A short descriptive one-line title for the Catalog.          |
 | description     | string        | **REQUIRED.** Detailed multi-line description to fully explain the Catalog. [CommonMark 0.29](http://commonmark.org/) syntax MAY be used for rich text representation. |
-| summaries       | Map<string, \[\*]\|[Range Object](../collection-spec/collection-spec.md#range-object)\|[JSON Schema Object](../collection-spec/collection-spec.md#json-schema-object)> | A map of property summaries, either a set of values, a range of values or a [JSON Schema](https://json-schema.org). More info in the [Collection spec](../collection-spec/collection-spec.md#summaries). |
 | links           | [[Link Object](#link-object)] | **REQUIRED.** A list of references to other documents.       |
 
 ### Additional Field Information
@@ -94,7 +93,8 @@ The following types are commonly used as `rel` types in the Link Object of a STA
 | child   | URL to a child STAC entity (Catalog or Collection). |
 | item    | URL to a STAC Item. |
 
-**Note:** A link to at least one `item` or `child` (Catalog or Collection) is **REQUIRED**.
+**Note:** A link to at least one `item` or `child` (Catalog or Collection) is **RECOMMENDED**, but empty catalogs are
+allowed if there is an intent to populate it or its children were removed.
 
 There are additional `rel` types in the [Using Relation Types](../best-practices.md#using-relation-types) best practice, but as 
 they are more typically used in Collections, as Catalogs tend to just be used to structure STAC organization, so tend to just use

diff --git a/catalog-spec/json-schema/catalog-core.json b/catalog-spec/json-schema/catalog-core.json
diff --git a/catalog-spec/json-schema/catalog.json b/catalog-spec/json-schema/catalog.json
@@ -1,45 +1,94 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schemas.stacspec.org/v1.0.0-rc.3/catalog-spec/json-schema/catalog.json#",
+  "$id": "https://schemas.stacspec.org/v1.0.0-rc.4/catalog-spec/json-schema/catalog.json#",
   "title": "STAC Catalog Specification",
   "description": "This object represents Catalogs in a SpatioTemporal Asset Catalog.",
   "allOf": [
-    {
-      "$ref": "catalog-core.json"
-    },
     {
       "$ref": "#/definitions/catalog"
     }
   ],
   "definitions": {
     "catalog": {
-      "title": "Catalog",
+      "title": "STAC Catalog",
       "type": "object",
       "required": [
-        "type"
+        "stac_version",
+        "type",
+        "id",
+        "description",
+        "links"
       ],
       "properties": {
+        "stac_version": {
+          "title": "STAC version",
+          "type": "string",
+          "const": "1.0.0-rc.4"
+        },
+        "stac_extensions": {
+          "title": "STAC extensions",
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "title": "Reference to a JSON Schema",
+            "type": "string",
+            "format": "iri"
+          }
+        },
         "type": {
           "title": "Type of STAC entity",
           "const": "Catalog"
         },
+        "id": {
+          "title": "Identifier",
+          "type": "string",
+          "minLength": 1
+        },
+        "title": {
+          "title": "Title",
+          "type": "string"
+        },
+        "description": {
+          "title": "Description",
+          "type": "string",
+          "minLength": 1
+        },
         "links": {
           "title": "Links",
           "type": "array",
-          "contains": {
-            "description": "A link to at least one `item` or `child` is REQUIRED in Catalogs.",
-            "type": "object",
-            "properties": {
-              "rel": {
-                "enum": [
-                  "child",
-                  "item"
-                ]
-              }
-            }
+          "items": {
+            "$ref": "#/definitions/link"
           }
         }
       }
+    },
+    "link": {
+      "type": "object",
+      "required": [
+        "rel",
+        "href"
+      ],
+      "properties": {
+        "href": {
+          "title": "Link reference",
+          "type": "string",
+          "format": "iri-reference",
+          "minLength": 1
+        },
+        "rel": {
+          "title": "Link relation type",
+          "type": "string",
+          "minLength": 1
+        },
+        "type": {
+          "title": "Link type",
+          "type": "string"
+        },
+        "title": {
+          "title": "Link title",
+          "type": "string"
+        }
+      }
     }
   }
 }
diff --git a/collection-spec/collection-spec.md b/collection-spec/collection-spec.md
@@ -202,12 +202,17 @@ Clients only interested in the overall extent will only need to access the first
 It is recommended to only use multiple temporal extents if a union of them would then include a large
 uncovered time span (e.g. only having data for the years 2000, 2010 and 2020).
 
-Each inner array consists of exactly two dates and times, each in UTC.
-Each date and time MUST be formatted according to [RFC 3339, section 5.6](https://tools.ietf.org/html/rfc3339#section-5.6).
+Each inner array consists of exactly two elements, either a timestamp or `null`.
+
+Timestamps consist of a date and time in UTC and MUST be formatted according to
+[RFC 3339, section 5.6](https://tools.ietf.org/html/rfc3339#section-5.6).
 The temporal reference system is the Gregorian calendar.
 
-Open date ranges are supported by setting either the start or the end time to `null`.
-Example for data from the beginning of 2019 until now: `[["2009-01-01T00:00:00Z", null]]`. 
+Open date ranges are supported by setting the start and/or the end time to `null`.
+Example for data from the beginning of 2019 until now: `[["2019-01-01T00:00:00Z", null]]`.
+It is recommended to provide at least a rough guideline on the temporal extent and thus
+it's not recommended to set both start and end time to `null`. Nevertheless, this is possible
+if there's a strong use case for an open date range to both sides.
 
 ### Provider Object