Merge pull request #830 from radiantearth/dev

release 1.0.0-beta.1

Author: cholmes

CHANGELOG.md

@@ -8,11 +8,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [v1.0.0-beta.1] - 2020-05-29
 
-### Changed
-
-- Extensions:
-  - [Label extension](extensions/label/README.md) types were clarified and types in README and JSON schema were brought into alignment
-
 ### Removed
 - The API portion of STAC has been split off into a [new repository: stac-api-spec](https://github.com/radiantearth/stac-api-spec) and will start being versioned and released separately than the core STAC spec.
 - proj4 string from proj extension
@@ -35,13 +30,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [Tiled Assets extension](extensions/tiled-assets/README.md), for representing data that has been split into tiles
 
 ### Changed
+- [Label extension](extensions/label/README.md) types were clarified and types in README and JSON schema were brought into alignment
 - Moved item recommendations to best practices, and added a bit more in item spec about 'search'
 - Moved `eo:gsd` from `eo` extension to core `gsd` field in Item common metadata
 - `asset` extension renamed to `item-assets` and renamed `assets` field in Collections to `item_assets`
 - `item-assets` extension only requires any two fields to be available, not the two specific fields `title` and `type`
 - `datetime` allows `null` as value, but requires `start_datetime` and `end_datetime` then
 - Extensions `sat`, `scientific` and `view`: At least one field is required to be specified.
 - [Single File STAC extension](extensions/single-file-stac/README.md) changed to be a complete STAC catalog + GeoJSON FeatureCollection that contains collections and items.
+- Improved several JSON Schemas
 
 ### Fixed
 - Datacube extension: `cube:dimensions` was not flagged as required.

catalog-spec/json-schema/catalog.json

@@ -37,12 +37,7 @@
               },
               {
                 "title": "Reference to a core extension",
-                "type": "string",
-                "enum": [
-                  "checksum",
-                  "single-file-stac",
-                  "tiled-assets"
-                ]
+                "type": "string"
               }
             ]
           }

collection-spec/collection-spec.md

@@ -10,7 +10,7 @@ STAC Collections are meant to be compatible with *OGC API - Features* Collection
 
 * [Examples](examples/):
   * Sentinel 2: A basic standalone example of a [Collection](examples/sentinel2.json) without items.
-  * Landsat 8: A [Collection](examples/landsat-collection.json) that holds shared data from an [Item](examples/landsat-item.json).
+  * Landsat 8: A [Collection](examples/landsat-collection.json) with corresponding Item [Item](../item-spec/examples/landsat8-sample.json).
 * [JSON Schema](json-schema/collection.json) - please see the [validation instructions](../validation/README.md)
 
 ## Collection fields

collection-spec/examples/landsat-collection.json

@@ -1,9 +1,6 @@
 {
     "stac_version": "1.0.0-beta.1",
-    "stac_extensions": [
-      "view",
-      "eo"
-    ],
+    "stac_extensions": [],
     "id": "landsat-8-l1",
     "title": "Landsat 8 L1",
     "description": "Landat 8 imagery radiometrically calibrated and orthorectified using gound points and Digital Elevation Model (DEM) data to correct relief displacement.",
@@ -63,7 +60,6 @@
     "summaries": {
       "platform": ["landsat-8"],
       "instruments": ["oli", "tirs"],
-      "view:off_nadir": [0],
       "gsd": [30],
       "eo:bands": [
         {

collection-spec/examples/landsat-item.json

@@ -34,16 +34,7 @@
               },
               {
                 "title": "Reference to a core extension",
-                "type": "string",
-                "enum": [
-                  "collection-assets",
-                  "checksum",
-                  "datacube",
-                  "item-assets",
-                  "scientific",
-                  "tiled-assets",
-                  "version"
-                ]
+                "type": "string"
               }
             ]
           }

collection-spec/json-schema/collection.json

@@ -49,7 +49,7 @@ An extension can add new fields to STAC entities (content extension), or can add
 | [Checksum](checksum/README.md)                   | checksum          | checksum            | Item, Catalog, Collection | *Proposal* | Provides a way to specify file checksums for assets and links in Items, Catalogs and Collections. |
 | [Collection Assets](collection-assets/README.md) | collection-assets | -                   | Collection                | *Proposal* | Provides a way to specify assets available on the collection-level. |
 | [Data Cube](datacube/README.md)                  | datacube          | cube                | Item, Collection          | *Proposal* | Data Cube related metadata, especially to describe their dimensions. |
-| [Electro-Optical](eo/README.md)                  | eo                | eo                  | Item                      | *Pilot*    | Covers electro-optical data that represents a snapshot of the earth for a single date and time. It could consist of multiple spectral bands, for example visible bands, infrared bands, red edge bands and panchromatic bands. The extension provides common fields like bands, cloud cover, gsd and more. |
+| [Electro-Optical](eo/README.md)                  | eo                | eo                  | Item                      | *Proposal* | Covers electro-optical data that represents a snapshot of the earth for a single date and time. It could consist of multiple spectral bands, for example visible bands, infrared bands, red edge bands and panchromatic bands. The extension provides common fields like bands, cloud cover, gsd and more. |
 | [Item Asset Definition](item-assets/README.md)   | item-assets       | -                   | Collection                | *Proposal* | Provides a way to specify details about what assets may be found in Items belonging to a collection. |
 | [Label](label/README.md)                         | label             | label               | Item                      | *Proposal* | Items that relate labeled AOIs with source imagery |
 | [Point Cloud](pointcloud/README.md)              | pointcloud        | pc                  | Item                      | *Proposal* | Provides a way to describe point cloud datasets. The point clouds can come from either active or passive sensors, and data is frequently acquired using tools such as LiDAR or coincidence-matched imagery. |

extensions/README.md

@@ -17,6 +17,8 @@ Provides a way to specify file checksums (e.g. BLAKE2, MD5, SHA1, SHA2, SHA3) fo
 | ------------------ | ------ | ------------------------------------------------------------ |
 | checksum:multihash | string | Multihash for the corresponding file, encoded as hexadecimal (base 16) string with lowercase letters. |
 
+This extension can OPTIONALLY be used with the [Collection Assets Extension](../collection-assets/README.md). Checksums MUST NOT be part of the [Item Assets Definition](../item-assets/README.md) in Collections.
+
 ### Examples
 
 Checksum for a text file with file content `test`.

extensions/checksum/README.md

@@ -3,27 +3,83 @@
   "$id": "schema.json#",
   "title": "Checksum Extension Specification",
   "description": "STAC Checksum Extension to a STAC Item",
-  "allOf": [
+  "oneOf": [
     {
-      "$ref": "../../../item-spec/json-schema/item.json#/definitions/core"
+      "allOf": [
+        {
+          "$ref": "../../../item-spec/json-schema/item.json"
+        },
+        {
+          "$ref": "#/definitions/stac_extensions"
+        },
+        {
+          "$ref": "#/definitions/checksum_links"
+        },
+        {
+          "$ref": "#/definitions/checksum_assets"
+        }
+      ]
     },
     {
-      "$ref": "#/definitions/checksum"
+      "allOf": [
+        {
+          "$ref": "../../../catalog-spec/json-schema/catalog.json"
+        },
+        {
+          "$ref": "#/definitions/stac_extensions"
+        },
+        {
+          "$ref": "#/definitions/checksum_links"
+        }
+      ]
+    },
+    {
+      "allOf": [
+        {
+          "$ref": "../../../collection-spec/json-schema/collection.json"
+        },
+        {
+          "$ref": "#/definitions/stac_extensions"
+        },
+        {
+          "$ref": "#/definitions/checksum_links"
+        },
+        {
+          "$ref": "#/definitions/checksum_assets"
+        }
+      ]
     }
   ],
   "definitions": {
-    "checksum": {
+    "stac_extensions": {
+      "type": "object",
+      "required": [
+        "stac_extensions"
+      ],
+      "properties": {
+        "stac_extensions": {
+          "type": "array",
+          "contains": {
+            "const": "checksum"
+          }
+        }
+      }
+    },
+    "checksum_links": {
       "type": "object",
       "properties": {
         "links": {
-          "title": "Links",
           "type": "array",
           "items": {
             "$ref": "#/definitions/checksums"
           }
-        },
+        }
+      }
+    },
+    "checksum_assets": {
+      "type": "object",
+      "properties": {
         "assets": {
-          "title": "Assets",
           "type": "object",
           "patternProperties": {
             ".+": {

extensions/checksum/json-schema/schema.json

@@ -10,9 +10,16 @@
     {
       "type": "object",
       "required": [
+        "stac_extensions",
         "assets"
       ],
       "properties": {
+        "stac_extensions": {
+          "type": "array",
+          "contains": {
+            "const": "collection-assets"
+          }
+        },
         "assets": {
           "$ref": "../../../item-spec/json-schema/item.json#/definitions/assets"
         }