Skip to content

Commit 156b645

Browse files
author
Phil Varner
authored
Merge branch 'main' into pv/remove-context-extension-by-default
2 parents b181f74 + 6626c35 commit 156b645

23 files changed

+454
-131
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1010
### Removed
1111

1212
- Context Extension is not disabled by default, and can be enabled with ENABLE_CONTEXT_EXTENSION
13+
- Removed configurability of the Root / Landing Page Catalog stac_version via the
14+
STAC_VERSION environment variable. This is now fixed at 1.1.0.
1315

1416
### Changed
1517

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,6 @@ There are some settings that should be reviewed and updated as needeed in the se
565565
| Name | Description | Default Value |
566566
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
567567
| OPENSEARCH_HOST | The URL of the OpenSearch cluster. | |
568-
| STAC_VERSION | The STAC version for the STAC objects returned by server. This should not be confused with the STAC API version. | 1.1.0 |
569568
| STAC_ID | ID of this catalog | stac-server |
570569
| STAC_TITLE | Title of this catalog | STAC API |
571570
| STAC_DESCRIPTION | Description of this catalog | A STAC API |

‎src/lambdas/api/openapi.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ components:
798798
- type: string
799799
- type: number
800800
example:
801-
stac_version: 1.0.0
801+
stac_version: 1.1.0
802802
stac_extensions: []
803803
type: Collection
804804
id: Sentinel-2
@@ -1226,7 +1226,7 @@ components:
12261226
assets:
12271227
$ref: '#/components/schemas/assets'
12281228
example:
1229-
stac_version: 1.0.0
1229+
stac_version: 1.1.0
12301230
stac_extensions:
12311231
- https://stac-extensions.github.io/eo/v1.0.0/schema.json
12321232
- https://stac-extensions.github.io/view/v1.0.0/schema.json
@@ -1709,7 +1709,7 @@ components:
17091709
$ref: '#/components/schemas/landingPage'
17101710
example:
17111711
type: Catalog
1712-
stac_version: 1.0.0
1712+
stac_version: 1.1.0
17131713
id: sentinel
17141714
title: Copernicus Sentinel Imagery
17151715
description: Catalog of Copernicus Sentinel 1 and 2 imagery.

‎src/lib/api.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,12 +480,11 @@ export const addItemLinks = function (results, endpoint) {
480480
}
481481

482482
const collectionsToCatalogLinks = function (results, endpoint) {
483-
const stacVersion = process.env['STAC_VERSION'] || '1.1.0'
484483
const catalogId = process.env['STAC_ID'] || 'stac-server'
485484
const catalogTitle = process.env['STAC_TITLE'] || 'A STAC API'
486485
const catalogDescription = process.env['STAC_DESCRIPTION'] || 'A STAC API running on stac-server'
487486
const catalog = {
488-
stac_version: stacVersion,
487+
stac_version: '1.1.0',
489488
type: 'Catalog',
490489
id: catalogId,
491490
title: catalogTitle,

‎tests/fixtures/item.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,5 @@
167167
"view",
168168
"landsat"
169169
],
170-
"stac_version": "1.0.0"
170+
"stac_version": "1.1.0"
171171
}

‎tests/fixtures/landsat-8-l1-collection.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "landsat-8-l1",
33
"type": "Collection",
4-
"stac_version": "1.0.0",
4+
"stac_version": "1.1.0",
55
"description": "Landat-8 L1 Collection-1 imagery radiometrically calibrated and orthorectified using gound points and Digital Elevation Model (DEM) data to correct relief displacement.",
66
"links": [
77
{

‎tests/fixtures/stac/LC80100102015050LGN00.json‎

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015050LGN00/LC80100102015050LGN00_ANG.txt",
55
"title": "Angle coefficients file",
66
"type": "text/plain",
7-
"roles": ["metadata"]
7+
"roles": [
8+
"metadata"
9+
]
810
},
911
"B1": {
1012
"eo:bands": [
@@ -156,13 +158,17 @@
156158
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015050LGN00/LC80100102015050LGN00_BQA.TIF",
157159
"title": "Band quality data",
158160
"type": "image/tiff; application=geotiff",
159-
"roles": ["quality"]
161+
"roles": [
162+
"quality"
163+
]
160164
},
161165
"MTL": {
162166
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015050LGN00/LC80100102015050LGN00_MTL.txt",
163167
"title": "original metadata file",
164168
"type": "text/plain",
165-
"roles": ["metadata"]
169+
"roles": [
170+
"metadata"
171+
]
166172
},
167173
"index": {
168174
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015050LGN00/index.html",
@@ -173,18 +179,40 @@
173179
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015050LGN00/LC80100102015050LGN00_thumb_large.jpg",
174180
"title": "Thumbnail image",
175181
"type": "image/jpeg",
176-
"roles": ["thumbnail"]
182+
"roles": [
183+
"thumbnail"
184+
]
177185
}
178186
},
179-
"bbox": [-52.68296, 69.68409, -45.19691, 72.07674],
187+
"bbox": [
188+
-52.68296,
189+
69.68409,
190+
-45.19691,
191+
72.07674
192+
],
180193
"geometry": {
181194
"coordinates": [
182195
[
183-
[-52.68296, 72.07674],
184-
[-45.19691, 71.99758],
185-
[-45.83578, 69.68409],
186-
[-52.4967, 69.75356],
187-
[-52.68296, 72.07674]
196+
[
197+
-52.68296,
198+
72.07674
199+
],
200+
[
201+
-45.19691,
202+
71.99758
203+
],
204+
[
205+
-45.83578,
206+
69.68409
207+
],
208+
[
209+
-52.4967,
210+
69.75356
211+
],
212+
[
213+
-52.68296,
214+
72.07674
215+
]
188216
]
189217
],
190218
"type": "Polygon"
@@ -223,6 +251,11 @@
223251
"landsat:scene_id": "LC80100102015050LGN00"
224252
},
225253
"type": "Feature",
226-
"stac_extensions": ["eo", "projection", "view", "landsat"],
227-
"stac_version": "1.0.0"
254+
"stac_extensions": [
255+
"eo",
256+
"projection",
257+
"view",
258+
"landsat"
259+
],
260+
"stac_version": "1.1.0"
228261
}

‎tests/fixtures/stac/LC80100102015082LGN00.json‎

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015082LGN00/LC80100102015082LGN00_ANG.txt",
55
"title": "Angle coefficients file",
66
"type": "text/plain",
7-
"roles": ["metadata"]
7+
"roles": [
8+
"metadata"
9+
]
810
},
911
"B1": {
1012
"eo:bands": [
@@ -156,13 +158,17 @@
156158
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015082LGN00/LC80100102015082LGN00_BQA.TIF",
157159
"title": "Band quality data",
158160
"type": "image/tiff; application=geotiff",
159-
"roles": ["quality"]
161+
"roles": [
162+
"quality"
163+
]
160164
},
161165
"MTL": {
162166
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015082LGN00/LC80100102015082LGN00_MTL.txt",
163167
"title": "original metadata file",
164168
"type": "text/plain",
165-
"roles": ["metadata"]
169+
"roles": [
170+
"metadata"
171+
]
166172
},
167173
"index": {
168174
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015082LGN00/index.html",
@@ -173,18 +179,40 @@
173179
"href": "https://s3-us-west-2.amazonaws.com/landsat-pds/L8/010/010/LC80100102015082LGN00/LC80100102015082LGN00_thumb_large.jpg",
174180
"title": "Thumbnail image",
175181
"type": "image/jpeg",
176-
"roles": ["thumbnail"]
182+
"roles": [
183+
"thumbnail"
184+
]
177185
}
178186
},
179-
"bbox": [-52.70915, 69.68455, -45.21422, 72.07651],
187+
"bbox": [
188+
-52.70915,
189+
69.68455,
190+
-45.21422,
191+
72.07651
192+
],
180193
"geometry": {
181194
"coordinates": [
182195
[
183-
[-52.70915, 72.07651],
184-
[-45.21422, 71.9981],
185-
[-45.8512, 69.68455],
186-
[-52.52, 69.75337],
187-
[-52.70915, 72.07651]
196+
[
197+
-52.70915,
198+
72.07651
199+
],
200+
[
201+
-45.21422,
202+
71.9981
203+
],
204+
[
205+
-45.8512,
206+
69.68455
207+
],
208+
[
209+
-52.52,
210+
69.75337
211+
],
212+
[
213+
-52.70915,
214+
72.07651
215+
]
188216
]
189217
],
190218
"type": "Polygon"
@@ -223,6 +251,11 @@
223251
"landsat:scene_id": "LC80100102015082LGN00"
224252
},
225253
"type": "Feature",
226-
"stac_extensions": ["eo", "projection", "view", "landsat"],
227-
"stac_version": "1.0.0"
254+
"stac_extensions": [
255+
"eo",
256+
"projection",
257+
"view",
258+
"landsat"
259+
],
260+
"stac_version": "1.1.0"
228261
}

0 commit comments

Comments
 (0)