Skip to content

Commit

Permalink
Merge pull request #13 from openearth/coastal-mask-and-update-stac-ve…
Browse files Browse the repository at this point in the history
…rsion



    - coastal-mask stac
    - set StacIO to default StacIO.default() instead of the customized class that we previously used. In the customized class we fixed windows paths, but that should be fixed by pystac now that we use pystac=>1.8.
    - Pystac=>1.8 returns n validated items from the validate_all() method, so the pytest validate.py() is adjusted
    - the requirements (pytest, pystac) are upgraded 
    - the CI now runs using Python 3.11
  • Loading branch information
FlorisCalkoen authored Aug 30, 2023
2 parents a960b06 + de42e74 commit a5f3e20
Show file tree
Hide file tree
Showing 331 changed files with 76,702 additions and 46,926 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]
python-version: [3.11]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
working-directory: ./main
strategy:
matrix:
python-version: [3.9]
python-version: [3.11]

steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,4 @@ dmypy.json

# Dask
*dask-worker-space*
.virtual_documents/*
244 changes: 125 additions & 119 deletions current/catalog.json
Original file line number Diff line number Diff line change
@@ -1,124 +1,130 @@
{
"type": "Catalog",
"id": "coclico-catalog",
"stac_version": "1.0.0",
"description": "CoCliCo Catalog",
"links": [
{
"rel": "root",
"href": "./catalog.json",
"type": "application/json",
"title": "CoCliCo STAC Catalog"
},
{
"rel": "child",
"href": "./ssl/collection.json",
"type": "application/json",
"title": "Extreme surge level"
},
{
"rel": "child",
"href": "./wef/collection.json",
"type": "application/json",
"title": "Wave energy flux"
},
{
"rel": "child",
"href": "./eesl/collection.json",
"type": "application/json",
"title": "Extreme sea level"
},
{
"rel": "child",
"href": "./floodmaps/collection.json",
"type": "application/json",
"title": "Floodmaps"
},
{
"rel": "child",
"href": "./sc/collection.json",
"type": "application/json",
"title": "Shoreline change"
},
{
"rel": "child",
"href": "./cbca/collection.json",
"type": "application/json",
"title": "Cost benefit coastal adaptation"
},
{
"rel": "child",
"href": "./cfr/collection.json",
"type": "application/json",
"title": "Coastal flood risk"
},
{
"rel": "child",
"href": "./cm/collection.json",
"type": "application/json",
"title": "Coastal mask"
},
{
"rel": "child",
"href": "./smd/collection.json",
"type": "application/json",
"title": "Global shoreline morphodynamics"
},
{
"rel": "child",
"href": "./cisi/collection.json",
"type": "application/json",
"title": "Critical Infrastructure Spatial Index"
},
{
"rel": "child",
"href": "./slp5/collection.json",
"type": "application/json",
"title": "AR5 sea level rise projections"
},
{
"rel": "child",
"href": "./slp6/collection.json",
"type": "application/json",
"title": "AR6 sea level rise projections"
}
],
"assets": {
"metadata": {
"href": "https://www.deltares.nl/en/news/development-of-a-new-european-platform-on-climate-services-for-coastal-risks-and-adaptation/",
"type": "application/html",
"title": "Deltares Website",
"description": "Deltares Website about CoCliCo",
"roles": [
"metadata"
]
}
"type": "Catalog",
"id": "coclico-catalog",
"stac_version": "1.0.0",
"description": "CoCliCo Catalog",
"links": [
{
"rel": "root",
"href": "./catalog.json",
"type": "application/json",
"title": "CoCliCo STAC Catalog"
},
"summaries": {
"keywords": [
"CoCliCo"
]
{
"rel": "child",
"href": "./ssl/collection.json",
"type": "application/json",
"title": "Extreme surge level"
},
{
"rel": "child",
"href": "./wef/collection.json",
"type": "application/json",
"title": "Wave energy flux"
},
{
"rel": "child",
"href": "./eesl/collection.json",
"type": "application/json",
"title": "Extreme sea level"
},
{
"rel": "child",
"href": "./floodmaps/collection.json",
"type": "application/json",
"title": "Floodmaps"
},
{
"rel": "child",
"href": "./sc/collection.json",
"type": "application/json",
"title": "Shoreline change"
},
{
"rel": "child",
"href": "./cbca/collection.json",
"type": "application/json",
"title": "Cost benefit coastal adaptation"
},
{
"rel": "child",
"href": "./cfr/collection.json",
"type": "application/json",
"title": "Coastal flood risk"
},
"extent": {
"spatial": {
"bbox": [
[
-180,
-90,
180,
90
]
]
},
"temporal": {
"interval": [
[
"2015-10-22T00:00:00Z",
null
]
]
}
{
"rel": "child",
"href": "./cm/collection.json",
"type": "application/json",
"title": "Coastal mask"
},
"license": "various",
"title": "CoCliCo STAC Catalog"
{
"rel": "child",
"href": "./smd/collection.json",
"type": "application/json",
"title": "Global shoreline morphodynamics"
},
{
"rel": "child",
"href": "./cisi/collection.json",
"type": "application/json",
"title": "Critical Infrastructure Spatial Index"
},
{
"rel": "child",
"href": "./slp5/collection.json",
"type": "application/json",
"title": "AR5 sea level rise projections"
},
{
"rel": "child",
"href": "./slp6/collection.json",
"type": "application/json",
"title": "AR6 sea level rise projections"
},
{
"rel": "child",
"href": "./coastal-mask/collection.json",
"type": "application/json",
"title": "Coastal Mask"
}
],
"assets": {
"metadata": {
"href": "https://www.deltares.nl/en/news/development-of-a-new-european-platform-on-climate-services-for-coastal-risks-and-adaptation/",
"type": "application/html",
"title": "Deltares Website",
"description": "Deltares Website about CoCliCo",
"roles": [
"metadata"
]
}
},
"summaries": {
"keywords": [
"CoCliCo"
]
},
"extent": {
"spatial": {
"bbox": [
[
-180,
-90,
180,
90
]
]
},
"temporal": {
"interval": [
[
"2015-10-22T00:00:00Z",
null
]
]
}
},
"license": "various",
"title": "CoCliCo STAC Catalog"
}
Loading

0 comments on commit a5f3e20

Please sign in to comment.