Skip to content

Commit a2b8536

Browse files
MatthewDiGiovanni24William-Lianggjaortega527
authored
Updated CMR STAC conformance from 1.0 to 1.1 (#415)
* Migration to stac 1.1 changed version values removed # from $id small syntax errors * changed jsons to 1.1 3 errors * Added all jsons needed and fixed tests due to schemas breaking into pieces * imports * fixed empty string description * link change updates * upgraded license to be 1.1 compliant * updated license to be v1.1 compliant * test suite mistake fix * updated root to json from geo+json * license deprecation updates * added license tests * prettier code * jceaser comments * json new lines * capitalization * Update src/domains/collections.ts Co-authored-by: Anthony Ortega <33133876+jaortega527@users.noreply.github.com> * form data --------- Co-authored-by: William Liang <williamliang0520@gmail.com> Co-authored-by: Anthony Ortega <33133876+jaortega527@users.noreply.github.com>
1 parent dce937a commit a2b8536

39 files changed

Lines changed: 828 additions & 722 deletions

cdk/cmr-stac-dev/lib/cmr-stac-dev-stack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class CmrStacDevStack extends cdk.Stack {
4343
CMR_LB_URL: (process.env.CMR_LB_URL = ""),
4444
GRAPHQL_URL: (process.env.URS_ROOT_URL = ""),
4545
NODE_ENV: "development",
46-
STAC_VERSION: "1.0.0",
46+
STAC_VERSION: "1.1.0",
4747
LOG_LEVEL: "INFO",
4848
PAGE_SIZE: "100",
4949
};

cdk/cmr-stac-dev/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"inlineSources": true,
1818
"experimentalDecorators": true,
1919
"strictPropertyInitialization": false,
20-
"typeRoots": ["./node_modules/@types"]
20+
"typeRoots": ["./node_modules/@types"],
21+
"types": ["node"]
2122
},
2223
"exclude": ["node_modules", "cdk.out"]
2324
}

cdk/cmr-stac/lib/cmr-stac-stack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const {
2020
CMR_URL = "cmr-local",
2121
CMR_LB_URL = "cmr-lb-local",
2222
GRAPHQL_URL = "graphql-local",
23-
STAC_VERSION = "1.0.0",
23+
STAC_VERSION = "1.1.0",
2424
PAGE_SIZE = "100",
2525
LOG_LEVEL = "INFO",
2626
LOG_DESTINATION_ARN = "local-arn",

cdk/cmr-stac/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"inlineSources": true,
1818
"experimentalDecorators": true,
1919
"strictPropertyInitialization": false,
20-
"typeRoots": ["./node_modules/@types"]
20+
"typeRoots": ["./node_modules/@types"],
21+
"types": ["node"]
2122
},
2223
"exclude": ["node_modules", "cdk.out"]
2324
}

docs/index/index.html

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

package-lock.json

Lines changed: 47 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@types/express": "^4.17.14",
4343
"@types/mocha": "^10.0.0",
4444
"@types/morgan": "^1.9.3",
45-
"@types/node": "^18.11.9",
45+
"@types/node": "^18.19.130",
4646
"@types/serverless": "^3.12.8",
4747
"@types/sinon": "^10.0.13",
4848
"@types/sinon-chai": "^3.2.9",
@@ -83,6 +83,7 @@
8383
"dotenv": "^16.1.4",
8484
"eslint-plugin-import": "^2.28.0",
8585
"express": "^4.22.0",
86+
"form-data": "^4.0.6",
8687
"graphql": "^16.8.1",
8788
"graphql-request": "^5.2.0",
8889
"helmet": "^6.2.0",

resources/catalog-spec/json-schema/catalog.json

Lines changed: 8 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "https://schemas.stacspec.org/v1.0.0/catalog-spec/json-schema/catalog.json#",
3+
"$id": "https://schemas.stacspec.org/v1.1.0/catalog-spec/json-schema/catalog.json",
44
"title": "STAC Catalog Specification",
55
"description": "This object represents Catalogs in a SpatioTemporal Asset Catalog.",
66
"allOf": [
77
{
88
"$ref": "#/definitions/catalog"
9+
},
10+
{
11+
"$ref": "../../item-spec/json-schema/common.json"
912
}
1013
],
1114
"definitions": {
1215
"catalog": {
1316
"title": "STAC Catalog",
1417
"type": "object",
15-
"required": [
16-
"stac_version",
17-
"type",
18-
"id",
19-
"description",
20-
"links"
21-
],
18+
"$comment": "Title and description is validated through the common metadata.",
19+
"required": ["stac_version", "type", "id", "description", "links"],
2220
"properties": {
2321
"stac_version": {
2422
"title": "STAC version",
2523
"type": "string",
26-
"const": "1.0.0"
24+
"const": "1.1.0"
2725
},
2826
"stac_extensions": {
2927
"title": "STAC extensions",
@@ -44,49 +42,8 @@
4442
"type": "string",
4543
"minLength": 1
4644
},
47-
"title": {
48-
"title": "Title",
49-
"type": "string"
50-
},
51-
"description": {
52-
"title": "Description",
53-
"type": "string",
54-
"minLength": 1
55-
},
5645
"links": {
57-
"title": "Links",
58-
"type": "array",
59-
"items": {
60-
"$ref": "#/definitions/link"
61-
}
62-
}
63-
}
64-
},
65-
"link": {
66-
"type": "object",
67-
"required": [
68-
"rel",
69-
"href"
70-
],
71-
"properties": {
72-
"href": {
73-
"title": "Link reference",
74-
"type": "string",
75-
"format": "iri-reference",
76-
"minLength": 1
77-
},
78-
"rel": {
79-
"title": "Link relation type",
80-
"type": "string",
81-
"minLength": 1
82-
},
83-
"type": {
84-
"title": "Link type",
85-
"type": "string"
86-
},
87-
"title": {
88-
"title": "Link title",
89-
"type": "string"
46+
"$ref": "../../item-spec/json-schema/item.json#/definitions/links"
9047
}
9148
}
9249
}

0 commit comments

Comments
 (0)