Merge pull request #737 from radiantearth/dev

Release 0.9.0 RC2

CHANGELOG.md

@@ -6,25 +6,61 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## [v0.9.0-rc2] - 2020-02-12
+
+### Added
+- [Basics](item-spec/common-metadata.md#basics) added to Common Metadata definitions with new `description` field for
+Item properties
+- New fields to the `link` object to facilitate [pagination support for POST requests](api-spec/api-spec.md#paging-extension)
+- Data role, as a suggestion for a common role for data files to be used in case data providers don't come up with their own names and semantics
+- Clarification text on HTTP verbs in STAC API
+- [View Geometry Extension](extensions/view/README.md)
+
+### Changed
+- Item `title` definition moved from core Item fields to [Common Metadata Basics](item-spec/common-metadata.md#basics) 
+fields. No change is required for STAC Items.
+- `putFeature` can return a `PreconditionFailed` to provide more explicit information when the resource has changed in the server
+- [Sort extension](api-spec/extensions/sort) now uses "+" and "-" prefixes for GET requests to denote sort order. 
+- Clarified how `/search` links must be added to `/` and changed that links to both GET and POST must be provided now that the method can be specified in links.
+- Moved angle definitions between extensions `view` and `sat`
+  - `sat:off_nadir_angle` -> `view:off_nadir`
+  - `sat:azimuth_angle` -> `view:azimuth`
+  - `sat:incidence_angle` -> `view:incidence_angle`
+  - `sat:sun_azimuth_angle` -> `view:sun_azimuth`
+  - `sat:sun_elevation_angle` -> `view:sun_elevation`
+
+
+### Removed
+- In API, removed any mention of using media type `multipart/form-data` and `x-www-form-urlencoded`
+
+### Fixed
+- Fixed Item JSON Schema now `allOf` optional Common Metadata properties are evaluated
+- Clarified usage of optional Common Metadata fields for STAC Items
+- Clarified usage of paging options, especially in relation to what OGC API - Features offers
+- Allow Commonmark in asset description, as it's allowed everywhere else
+- Put asset description in the API
+- Fixed API spec regarding license expressions
+- Added missing schema in the API Version extension
+
 ## [v0.9.0-rc1] - 2020-01-06
 
 ### Added
 - ItemCollection requires `stac_version` field, `stac_extensions` has also been added
-- A `description` field has been added to Item assets (also Asset definitions extension). 
+- A `description` field has been added to Item assets (also Asset definitions extension)
 - Field `mission` to [Common Metadata fields](item-spec/common-metadata.md).
 - Extensions:
     - [Version Indicators extension](extensions/version/README.md), adds `version` and `deprecated` fields to STAC Items and Collections
     - Data Cube extension can be used in Collections, added new field `description`
     - Added `description` and `roles` fields to the Asset in the [Asset Extension](extensions/asset/README.md)
-    - Projection Extension to describe Items with Assets that have an associated geospatial projection.
+    - Projection Extension to describe Items with Assets that have an associated geospatial projection
 - STAC API:
     - Added the [Item and Collection API Version extension](api-spec/extensions/version/README.md) to support versioning in the API specification
-    - Run `npm run serve` or `npm run serve-ext` to quickly render development versions of the OpenAPI spec in the browser.
+    - Run `npm run serve` or `npm run serve-ext` to quickly render development versions of the OpenAPI spec in the browser
 
 ### Changed
 - Support for [CommonMark 0.29 instead of CommonMark 0.28](https://spec.commonmark.org/0.29/changes.html)
 - Collection field `property` and the merge ability moved to a new extension 'Commons'
-- Added attribute `roles` to Item assets (also Asset definitions extension), to be used similarly to Link `rel`.
+- Added attribute `roles` to Item assets (also Asset definitions extension), to be used similarly to Link `rel`
 - Updated API yaml to clarify bbox filter should be implemented without brackets. Example: `bbox=160.6,-55.95,-170,-25.89`
 - Collection `summaries` merge array fields now.
 - Several fields have been moved from extensions or item fields to the [Common Metadata fields](item-spec/common-metadata.md):
@@ -44,7 +80,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - Fields extension has a simplified format for GET parameters
     - `search` extension renamed to `context` extension. JSON object renamed from `search:metadata` to `context`
     - Removed "next" from the search metadata and query parameter, added POST body and headers to the links for paging support
-    - Query Extension - type restrictions on query predicates are more accurate, which may require additional implementation support. 
+    - Query Extension - type restrictions on query predicates are more accurate, which may require additional implementation support.
 
 ### Removed
 - `version` field in STAC Collections. Use [Version Extension](extensions/version/README.md) instead
@@ -59,7 +95,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - `data_type` and `unit` from the `sar:bands` object in the [SAR extension](extensions/sar/README.md)
     - Datetime Range (`dtr`) extension. Use the [Common Metadata fields](item-spec/common-metadata.md) instead.
 - STAC API:
-    - `next` from the search metadata and query parameter, added POST body and headers to the links for paging support
+    - `next` from the search metadata and query parameter
 
 ### Fixed
 
@@ -275,6 +311,7 @@ Thanks @hgs-msmith, @matthewhanson, @hgs-trutherford, @rouault, @joshfix, @alkam
 
 
 [Unreleased]: https://github.com/radiantearth/stac-spec/compare/master...dev
+[v0.9.0-rc2]: https://github.com/radiantearth/stac-spec/compare/v0.9.0-rc1...v0.9.0-rc2
 [v0.9.0-rc1]: https://github.com/radiantearth/stac-spec/compare/v0.8.0...v0.9.0-rc1
 [v0.8.1]: https://github.com/radiantearth/stac-spec/compare/v0.8.0...v0.8.1
 [v0.8.0]: https://github.com/radiantearth/stac-spec/compare/v0.7.0...v0.8.0

README.md

@@ -29,7 +29,7 @@ The minimal amount is specified right now, but best practices should emerge with
 ## Current version and branches
 
 The [master branch](https://github.com/radiantearth/stac-spec/tree/master) is the 'stable' version of the spec. It is currently version 
-**0.9.0-rc1** of the specification. The 
+**0.9.0-rc2** of the specification. The 
 [dev](https://github.com/radiantearth/stac-spec/tree/dev) branch is where active development takes place, and may have inconsistent examples. 
 Whenever dev stabilizes a release is cut and we merge dev in to master. So master should be stable at any given time.
 It is possible that there may be small releases in quick succession, especially if they are nice improvements that do 

STAC-UML.drawio

@@ -1 +1 @@
-<mxfile modified="2019-08-21T19:28:22.887Z" host="www.draw.io" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36" etag="c2AS-wCsO1R91q1Tu4M_" version="11.2.1" type="device" pages="1"><diagram id="TgNYBds_Jc586sA2aelI" name="STAC 0.7.0">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</diagram></mxfile>
+<mxfile modified="2020-02-06T18:18:50.517Z" host="www.draw.io" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36" etag="9s0Qtcw_RUp8045FP3N5" version="12.6.5" type="device"><diagram id="TgNYBds_Jc586sA2aelI" name="STAC 0.7.0">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</diagram></mxfile>