Skip to content

Commit

Permalink
Update version numbers to v1.1.0 and update projection extension in e…
Browse files Browse the repository at this point in the history
…xamples (#1303)

* Update version numbers, incl. projection extension

* Small corrections

* Update to beta.1

* npm run check -> npm test

* Fix outdated examples

* Fix validation, upgrade CI

* Guess a release date

---------

Co-authored-by: Emmanuel Mathot <[email protected]>
  • Loading branch information
m-mohr and emmanuelmathot authored Aug 5, 2024
1 parent 53fa030 commit 590e392
Show file tree
Hide file tree
Showing 32 changed files with 1,162 additions and 539 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
test_examples_node:
working_directory: ~/stac
docker:
- image: cimg/node:18.18.0
- image: cimg/node:lts
steps:
- checkout
- run:
Expand All @@ -27,7 +27,7 @@ jobs:
test_docs:
working_directory: ~/stac
docker:
- image: cimg/node:18.18.0
- image: cimg/node:lts
steps:
- checkout
- run:
Expand All @@ -39,7 +39,7 @@ jobs:
publish_schemas:
working_directory: ~/stac
docker:
- image: cimg/node:18.18.0
- image: cimg/node:lts
steps:
- checkout
- run:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<!--lint disable maximum-line-length-->
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [v1.1.0-beta.1] - 2024-08-08

### Added

- `bands` is a new field in common metadata to replace `eo:bands` and `raster:bands` ([#1213](https://github.com/radiantearth/stac-spec/discussions/1213))
Expand Down Expand Up @@ -499,6 +502,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.1.0-beta.1]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0..v1.1.0-beta.1>
[v1.0.0]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.4..v1.0.0>
[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>
Expand Down
6 changes: 3 additions & 3 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ preferred-citation:
type: standard
title: "SpatioTemporal Asset Catalog (STAC) specification"
abstract: "Making geospatial assets openly searchable and crawlable."
version: 1.0.0
year: 2021
date-released: 2021-05-21
version: 1.1.0-beta.1
year: 2024
date-released: 2024-08-08
license: Apache-2.0
url: https://stacspec.org
repository: https://github.com/radiantearth/stac-spec
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ you to change the base in GitHub's PR creation page.
select breaking changes, but after 1.0 this will change)

All pull requests should submit clean markdown, which is checked by the continuous integration
system. Please use `npm run check` locally, as described in the [next section](#check-files),
system. Please use `npm test` locally, as described in the [next section](#check-files),
to ensure that the checks on the pull request succeed. If it does not then you can look at the
mistakes online, which are the same as running `npm run check` locally would surface.
mistakes online, which are the same as running `npm test` locally would surface.

All pull requests that modify or create JSON schema files or examples should use
[JSON formatter](https://jsonformatter.org/) to keep files consistent across the repo.
Expand All @@ -59,7 +59,7 @@ npm install
Then to do the check for markdown and examples you run:

```bash
npm run check
npm test
```

This will spit out the same texts that you see online, and you can then go and fix your markdown or examples.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ with additional web service endpoints and object attributes.
## 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 **1.0.0** of the specification. The STAC specification
version of the spec. It is currently version **1.1.0-beta.1** of the specification. The STAC specification
follows [Semantic Versioning](https://semver.org/), so any breaking change will require the spec to
go to 2.0.0.

Expand Down
620 changes: 619 additions & 1 deletion STAC-UML.drawio

Large diffs are not rendered by default.

Binary file modified STAC-UML.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ providing them at the Asset level can prove to be very useful for using the data
extension](https://github.com/stac-extensions/raster) for that use case.
- `bands` (e.g. in combination with the [EO extension](https://github.com/stac-extensions/eo/)):
Provide spectral band information, and order of bands, within an individual asset.
- `proj:epsg`/`proj:wkt2`/`proj:projjson` ([projection extension](https://github.com/stac-extensions/projection/)):
- `proj:code`/`proj:wkt2`/`proj:projjson` ([projection extension](https://github.com/stac-extensions/projection/)):
Specify different projection for some assets. If the projection is different
for all assets it should probably not be provided as an Item property. If most assets are one projection, and there is
a single reprojected version (such as a Web Mercator preview image), it is sensible to specify the main projection in the
Expand Down
4 changes: 2 additions & 2 deletions catalog-spec/json-schema/catalog.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://schemas.stacspec.org/v1.0.0/catalog-spec/json-schema/catalog.json",
"$id": "https://schemas.stacspec.org/v1.1.0-beta.1/catalog-spec/json-schema/catalog.json",
"title": "STAC Catalog Specification",
"description": "This object represents Catalogs in a SpatioTemporal Asset Catalog.",
"allOf": [
Expand All @@ -27,7 +27,7 @@
"stac_version": {
"title": "STAC version",
"type": "string",
"const": "1.0.0"
"const": "1.1.0-beta.1"
},
"stac_extensions": {
"title": "STAC extensions",
Expand Down
4 changes: 2 additions & 2 deletions collection-spec/collection-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Oftentimes it is possible to model data and assets with either a Collection or a
Items as much as is feasible, as they designed for assets. Using Collection-level assets should only be used if there is not another
option.

#### Item Asset Defintion
#### Item Asset Definition

This serves two purposes:

Expand Down Expand Up @@ -371,6 +371,6 @@ A STAC Collection is a JSON file ([RFC 8259](https://tools.ietf.org/html/rfc8259
STAC Collections which don't link to any Item are called **standalone Collections**.
To describe them with more fields than the Collection fields has to offer,
it is allowed to re-use the metadata fields defined by extensions for Items in the `summaries` field.
This makes much sense for fields such as `platform` or `proj:epsg`, which are often the same for a whole Collection,
This makes much sense for fields such as `platform` or `proj:code`, which are often the same for a whole Collection,
but doesn't make much sense for `eo:cloud_cover`, which usually varies heavily across a Collection.
The data provider is free to decide, which fields are reasonable to be used.
4 changes: 2 additions & 2 deletions collection-spec/json-schema/collection.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://schemas.stacspec.org/v1.0.0/collection-spec/json-schema/collection.json",
"$id": "https://schemas.stacspec.org/v1.1.0-beta.1/collection-spec/json-schema/collection.json",
"title": "STAC Collection Specification",
"description": "This object represents Collections in a SpatioTemporal Asset Catalog.",
"allOf": [
Expand Down Expand Up @@ -30,7 +30,7 @@
"stac_version": {
"title": "STAC version",
"type": "string",
"const": "1.0.0"
"const": "1.1.0-beta.1"
},
"stac_extensions": {
"title": "STAC extensions",
Expand Down
4 changes: 2 additions & 2 deletions examples/catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "examples",
"type": "Catalog",
"title": "Example Catalog",
"stac_version": "1.0.0",
"stac_version": "1.1.0-beta.1",
"description": "This catalog is a simple demonstration of an example catalog that is used to organize a hierarchy of collections and their items.",
"links": [
{
Expand Down Expand Up @@ -36,7 +36,7 @@
},
{
"rel": "self",
"href": "https://raw.githubusercontent.com/radiantearth/stac-spec/v1.0.0/examples/catalog.json",
"href": "https://raw.githubusercontent.com/radiantearth/stac-spec/v1.1.0-beta.1/examples/catalog.json",
"type": "application/json"
}
]
Expand Down
2 changes: 1 addition & 1 deletion examples/collection-only/collection-with-schemas.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"stac_version": "1.0.0",
"stac_version": "1.1.0-beta.1",
"stac_extensions": [
"https://stac-extensions.github.io/eo/v2.0.0-beta.1/schema.json",
"https://stac-extensions.github.io/sat/v1.0.0/schema.json",
Expand Down
126 changes: 63 additions & 63 deletions examples/collection-only/collection.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"type": "Collection",
"stac_version": "1.0.0",
"stac_version": "1.1.0-beta.1",
"stac_extensions": [
"https://stac-extensions.github.io/eo/v2.0.0-beta.1/schema.json",
"https://stac-extensions.github.io/projection/v1.0.0/schema.json",
"https://stac-extensions.github.io/projection/v2.0.0/schema.json",
"https://stac-extensions.github.io/view/v1.0.0/schema.json"
],
"id": "sentinel-2",
Expand Down Expand Up @@ -87,67 +87,67 @@
30,
60
],
"proj:epsg": [
32601,
32602,
32603,
32604,
32605,
32606,
32607,
32608,
32609,
32610,
32611,
32612,
32613,
32614,
32615,
32616,
32617,
32618,
32619,
32620,
32621,
32622,
32623,
32624,
32625,
32626,
32627,
32628,
32629,
32630,
32631,
32632,
32633,
32634,
32635,
32636,
32637,
32638,
32639,
32640,
32641,
32642,
32643,
32644,
32645,
32646,
32647,
32648,
32649,
32650,
32651,
32652,
32653,
32654,
32655,
32656,
32657,
32658,
32659,
32660
"proj:code": [
"EPSG:32601",
"EPSG:32602",
"EPSG:32603",
"EPSG:32604",
"EPSG:32605",
"EPSG:32606",
"EPSG:32607",
"EPSG:32608",
"EPSG:32609",
"EPSG:32610",
"EPSG:32611",
"EPSG:32612",
"EPSG:32613",
"EPSG:32614",
"EPSG:32615",
"EPSG:32616",
"EPSG:32617",
"EPSG:32618",
"EPSG:32619",
"EPSG:32620",
"EPSG:32621",
"EPSG:32622",
"EPSG:32623",
"EPSG:32624",
"EPSG:32625",
"EPSG:32626",
"EPSG:32627",
"EPSG:32628",
"EPSG:32629",
"EPSG:32630",
"EPSG:32631",
"EPSG:32632",
"EPSG:32633",
"EPSG:32634",
"EPSG:32635",
"EPSG:32636",
"EPSG:32637",
"EPSG:32638",
"EPSG:32639",
"EPSG:32640",
"EPSG:32641",
"EPSG:32642",
"EPSG:32643",
"EPSG:32644",
"EPSG:32645",
"EPSG:32646",
"EPSG:32647",
"EPSG:32648",
"EPSG:32649",
"EPSG:32650",
"EPSG:32651",
"EPSG:32652",
"EPSG:32653",
"EPSG:32654",
"EPSG:32655",
"EPSG:32656",
"EPSG:32657",
"EPSG:32658",
"EPSG:32659",
"EPSG:32660"
],
"bands": [
{
Expand Down
10 changes: 5 additions & 5 deletions examples/collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"type": "Collection",
"stac_extensions": [
"https://stac-extensions.github.io/eo/v2.0.0-beta.1/schema.json",
"https://stac-extensions.github.io/projection/v1.0.0/schema.json",
"https://stac-extensions.github.io/projection/v2.0.0/schema.json",
"https://stac-extensions.github.io/view/v1.0.0/schema.json"
],
"stac_version": "1.0.0",
"stac_version": "1.1.0-beta.1",
"description": "A simple collection demonstrating core catalog fields with links to a couple of items",
"title": "Simple Example Collection",
"keywords": [
Expand Down Expand Up @@ -66,8 +66,8 @@
"minimum": 1.2,
"maximum": 1.2
},
"proj:epsg": [
32659
"proj:cpde": [
"EPSG:32659"
],
"view:sun_elevation": {
"minimum": 54.9,
Expand Down Expand Up @@ -109,7 +109,7 @@
},
{
"rel": "self",
"href": "https://raw.githubusercontent.com/radiantearth/stac-spec/v1.0.0/examples/collection.json",
"href": "https://raw.githubusercontent.com/radiantearth/stac-spec/v1.1.0-beta.1/examples/collection.json",
"type": "application/json"
}
]
Expand Down
Loading

0 comments on commit 590e392

Please sign in to comment.