Skip to content

Commit 878498a

Browse files
Merge branch 'staging' into feature/python-cog-access
2 parents 41096cb + 7e253a0 commit 878498a

File tree

23 files changed

+5933
-59
lines changed

23 files changed

+5933
-59
lines changed

.github/workflows/preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency: preview-${{ github.ref }}
1414

1515
jobs:
1616
deploy-preview:
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v3

_quarto.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ website:
1414
page-footer:
1515
right: "This page is built with ❤️ and [Quarto](https://quarto.org/)."
1616
center: '<a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>. <img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg?ref=chooser-v1"><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/by.svg?ref=chooser-v1">'
17-
left: '&copy; [Cloud-Native Geospatial Foundation](https://cloudnativegeo.org/), 2023'
17+
left: '&copy; [Cloud-Native Geospatial Forum](https://cloudnativegeo.org/), 2023'
1818
sidebar:
1919
pinned: true
2020
align: center
@@ -41,6 +41,8 @@ website:
4141
- cloud-optimized-geotiffs/cogs-overview_resampling.ipynb
4242
- cloud-optimized-geotiffs/accessing-cogs-in-python.ipynb
4343
- cloud-optimized-geotiffs/writing-cogs-in-python.ipynb
44+
- cloud-optimized-geotiffs/accessing-cogs-in-r-stars.ipynb
45+
- cloud-optimized-geotiffs/accessing-cogs-in-r-terra.ipynb
4446
- section: Zarr
4547
contents:
4648
- zarr/intro.qmd
@@ -73,6 +75,15 @@ website:
7375
text: Glossary
7476
- href: cookbooks/index.qmd
7577
text: Cookbooks
78+
contents:
79+
- text: Zarr Visualization Report ↗
80+
href: https://nasa-impact.github.io/zarr-visualization-report/
81+
- section: Zarr + STAC Report
82+
contents:
83+
- cookbooks/zarr-stac-report/index.qmd
84+
- cookbooks/zarr-stac-report/data-producers/index.qmd
85+
- cookbooks/zarr-stac-report/data-consumers/index.qmd
86+
7687
- href: contributing.qmd
7788
text: Get Involved
7889

_thankyous.qmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
This guide has been made possible through the support of:
66

7-
::: {layout="[15,-5,25,-3,20]" layout-valign="center"}
7+
::: {layout="[15,-5,25,-3,15]" layout-valign="center"}
88
[![](./images/thankyous-impact-logo.png){fig-alt="NASA Impact Logo" fig-align="left" width=40%}](https://impact.earthdata.nasa.gov)
99

1010
[![](./images/thankyous-devseed-logo.png){fig-alt="Development Seed Logo" fig-align="left" width=40%}](https://developmentseed.org)
1111

12-
[![](./images/thankyous-cng-logo.png){fig-alt="Cloud-Native Geospatial Foundation" fig-align="left" width=40%}](https://cloudnativegeo.org)
12+
[![](./images/thankyous-cng-logo.png){fig-alt="Cloud-Native Geospatial Forum" fig-align="left" width=40%}](https://cloudnativegeo.org)
1313
:::

cloud-optimized-geotiffs/accessing-cogs-in-r-stars.ipynb

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

cloud-optimized-geotiffs/accessing-cogs-in-r-terra.ipynb

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

cloud-optimized-geotiffs/environment.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ dependencies:
1313
- boto3
1414
- numpy
1515
- rio-xarray
16+
- r-base
17+
- r-essentials
18+
- r-terra
19+
- r-stars

cloud-optimized-geotiffs/intro.qmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Cloud-Optimized GeoTIFF (COG), a raster format, is a variant of the TIFF image f
88

99
For more details see [https://www.cogeo.org/](https://www.cogeo.org/)
1010

11-
<img alt="COG Diagram" src="../images/cog-diagram-1.png" width=300/>
11+
<img alt="COG Diagram" src="../images/cog-diagram-2.png" width=100%/>
1212

1313
## Dimensions
1414

cloud-optimized-netcdf4-hdf5/index.qmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Cloud-Optimized HDF/NetCDF
33
bibliography: references.bib
4-
author: Aimee Barciauskas, Alexey Shikmonalov, Luis Lopez
4+
author: Aimee Barciauskas, Alexey Shiklomanov, Luis Lopez
55
toc-depth: 3
66
---
77

@@ -140,7 +140,7 @@ For example, the following library defaults will impact performance and may be i
140140
* HDF5 library:
141141
* **Chunk cache:** The size of the HDF5's chunk cache by default is 1MB. This value is configurable. Chunks that don't fit into the chunk cache are discarded and must be re-read from the storage location each time. See also: [Improve HDF5 performance using caching](https://www.hdfgroup.org/2022/10/17/improve-hdf5-performance-using-caching/) and [h5py documentation: Chunk cache](https://docs.h5py.org/en/stable/high/file.html#chunk-cache).
142142
* **Page buffer size:** The [H5Pset_page_buffer_size](https://hdfgroup.github.io/hdf5/develop/group___f_a_p_l.html#title89) and [the page_buf_size argument to h5py.File](https://docs.h5py.org/en/stable/high/file.html) should match up with the page size to optimize reading the data in pages.
143-
* S3FS library: The S3FS library is a popular library for accessing data on AWS's cloud object storage S3. It has a default block size of 5MB ([S3FS API docs](https://s3fs.readthedocs.io/en/stable/api.html#s3fs.core.S3FileSystem)).
143+
* S3FS library: The S3FS library is a popular library for accessing data on AWS's cloud object storage S3. Note that S3FS has a default block size, which may change, so please refer to the [S3FS API docs](https://s3fs.readthedocs.io/en/stable/api.html#s3fs.core.S3FileSystem) for the default setting. And note it can be set upon instantiation of an S3FileSystem object.
144144
* Additional guidance on h5py, fsspec, and ROS3 libraries for creating and reading HDF5 can be found in @jelenak2024.
145145

146146
### Additional research

contributing.qmd

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ We encourage contributions to this guide. The guide's goal is to provide documen
1010

1111
If you wish to preview the site locally, install [quarto](https://quarto.org/). You will also need to be familiar with [quarto markdown](https://quarto.org/docs/authoring/markdown-basics.html).
1212

13+
## Contribution Workflow
14+
15+
Due to previews only working from branches within the repository and not external forks (see: [#74](https://github.com/cloudnativegeo/cloud-optimized-geospatial-formats-guide/issues/74)), all PRs should target staging. More specifically, the contribution workflow follows these steps:
16+
17+
1. PR is made with `staging` as target.
18+
19+
2. Maintainer will merge the PR to staging and then open a PR to main (build preview will run).
20+
21+
3. Maintainers merge to main which triggers the production deployment.
22+
23+
The process is not ideal, and we are open to suggestions on how to improve upon it. The main constraint is the [`pr-preview-action`](https://github.com/rossjrw/pr-preview-action) not supporting previews on external contributions.
24+
1325
## Communication Channels
1426

1527
Discussions can occur in [GitHub Discussions](https://github.com/cloudnativegeo/cloud-optimized-geospatial-formats-guide/discussions) and issues can be raised at [GitHub Issues](https://github.com/cloudnativegeo/cloud-optimized-geospatial-formats-guide/issues).

cookbooks/index.qmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ Cookbooks should address common questions and present solutions for cloud-optimi
1111
Cookbooks:
1212

1313
* [Zarr Visualization Report (in development)](https://nasa-impact.github.io/zarr-visualization-report/)
14+
* [Zarr + STAC Report (in development)](./zarr-stac-report/index.qmd)

0 commit comments

Comments
 (0)