Merge pull request #572 from radiantearth/dev

Merge dev to master for 0.8.0-RC1 release

CHANGELOG.md

@@ -6,7 +6,40 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
-None yet.
+## [v0.8.0-RC1] - 2019-08-23
+
+### Changed
+- Updated specification to base on WFS3 draft 2 (OGC API - Features - Part 1: Core, v1.0.0-draft.2). This leads to many changes in the API and one change in STAC collections, notably:
+	- The structure of the field `extent` in STAC and WFS Collections changed.
+ 	- Query parameter `time` was renamed to `datetime` and accepts slightly different values.
+	- WFS links have additional fields `hreflang` and `length`.
+	- WFS Collections have additional fields `crs` and `itemType`.
+	- `time` API parameter changed to `datetime`
+- The API intersects parameter now accepts a GeoJSON Geometry (any type) *instead* of a GeoJSON Feature.
+- API: Clarification on `include` and `exclude` parameters in the field extension and notes on default values.
+- API: queries should contain either `bbox` or `intersects`.
+- API: Core API now has reserved parameters to prevent overlap with extensions
+- Updated bbox definitions in API, Item, and Collection specs to include support for optional elevation values.
+- Moved Single Item Extension to core (`license` and `providers` properties for Items).
+- Allow `various` for the `license` fields.
+- Clarified meaning of SAR and EO platform, constellation, and instrument
+- Numerous typos, clarification and general word-smithing
+
+### Added
+- **stac_version**: Each Item must specify the STAC version.
+- **stac_extensions**: Introduced this field for Items, Catalogs and Collections.
+- Property `summaries` have been added to catalogs and collections.
+- API Transaction extension supports optimistic locking through use of the ETag header.
+- Asset Definition Extension added to Collections to allow specifying details about Assets that may appear in member Items.
+- [Single File Catalog extension](extensions/single-file-stac/README.md) added as a format to have a set of Collections and Items in a single file.
+- [Label extension](extensions/label/README.md) added with additional fields for describing labeled data, such as used for training data or from the output of a classification
+- Timestamp fields added to `Item`: `created` and `updated` to refer to the datetime the metadata file was created or updated.
+- Added Search Metadata API extension which adds fields to a response from a STAC API such as the number of items found and how many were returned.
+- ItemCollection class added to spec that is a GeoJSON FeatureCollection of Items, such as what would be returned from a search. Located in item directory.
+- `in` operator added to the query extension (to check if value is in a list of values)
+- New bands added to the [common band names](extensions/eo/README.md#common-band-names) for the EO extension: yellow, rededge, and 2 narrow NIR bands
+- [Scientific extension](extensions/scientific/README.md) can be used in Collections.
+
 
 ## [v0.7.0] - 2019-05-06
 

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.7.0** of the specification. The 
+**0.8.0-RC1** 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 
@@ -63,11 +63,10 @@ In the context of STAC it is most likely a collection of STAC Items that is made
 It includes things like the spatial and temporal extent of the data, the license, keywords, etc.
 It enables discovery at a higher level than individual items, providing a simple way to describe sets of data.
 
-**[api-spec/](api-spec/)** extends the core publishing capabilities of STAC with an active REST search endpoint that returns
-just the Items a user requests in their query. It is specified as a couple [OpenAPI](http://openapis.org) documents, one
-[standalone](api-spec/STAC-standalone.yaml) and one that is [integrated with WFS3](api-spec/WFS3core%2BSTAC.yaml) 
-(see [WFS3 on GitHub](https://github.com/opengeospatial/wfs_fes) for info on it). The documents also include the `/stac/` 
-endpoint which is a way for a dynamic server to provide catalog and collection browsing.
+**[api-spec/](api-spec/)** extends the core publishing capabilities of [WFS 3](https://github.com/opengeospatial/wfs_fes) with two 
+STAC-related endpoints. They add catalog and collection browsing and an active STAC REST search endpoint that returns
+just the Items a user requests in their query. The API is specified as a couple [OpenAPI](http://openapis.org) documents, one is just the
+[minimal core API](api-spec/STAC.yaml) and the other one [integrates the API extensions](api-spec/STAC-extensions.yaml).
 
 **Extensions:** The *[extensions/](extensions/)* folder is where extensions live. Extensions can extend the 
 functionality of the core spec or add fields for specific domains.

STAC-UML.drawio

@@ -1 +1 @@
-<mxfile modified="2019-05-02T22:15:20.207Z" host="www.draw.io" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36" etag="X3IN4gN4FBmbly-o-h6u" version="10.6.6" type="device"><diagram id="TgNYBds_Jc586sA2aelI" name="STAC 0.7.0">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</diagram></mxfile>
+<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>