Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[STAC] add support for GDAL VRT connection string #733

Merged
merged 4 commits into from
Sep 23, 2024
Merged

[STAC] add support for GDAL VRT connection string #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
179a622
[STAC] add support for GDAL VRT connection string
vincentsarago Sep 13, 2024
bfb75e9
Update tests/test_io_stac.py
vincentsarago Sep 17, 2024
f330787
update from main
vincentsarago Sep 23, 2024
9acc3c8
Merge branch 'feature/add-vrt-connection-string-for-STAC' of https://…
vincentsarago Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* Moved `_dst_geom_in_tms_crs` from Reader to `SpatialMixin` class **breaking change**
* Removed use of rasterio's `is_tiled` method
* Enable **Alternate** asset's HREF for STAC by using `RIO_TILER_STAC_ALTERNATE_KEY` environment variable
* Adding support for GDAL VRT Connection string for STAC Assets
* Improve type hint definition
* make `ImageData.rescale` and `ImageData.apply_color_formula` to return `self`

Expand Down
26 changes: 24 additions & 2 deletions rio_tiler/io/stac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,23 @@ def _get_reader(self, asset_info: AssetInfo) -> Tuple[Type[BaseReader], Dict]:
"""Get Asset Reader."""
return self.reader, {}

def _parse_vrt_asset(self, asset: str) -> Tuple[str, Optional[str]]:
if asset.startswith("vrt://") and asset not in self.assets:
parsed = urlparse(asset)
if not parsed.netloc:
raise InvalidAssetName(
f"'{asset}' is not valid, couldn't find valid asset"
)

if parsed.netloc not in self.assets:
raise InvalidAssetName(
f"'{parsed.netloc}' is not valid, should be one of {self.assets}"
)

return parsed.netloc, parsed.query

return asset, None

def _get_asset_info(self, asset: str) -> AssetInfo:
"""Validate asset names and return asset's info.

Expand All @@ -303,6 +320,7 @@ def _get_asset_info(self, asset: str) -> AssetInfo:
AssetInfo: STAC asset info.

"""
asset, vrt_options = self._parse_vrt_asset(asset)
if asset not in self.assets:
raise InvalidAssetName(
f"'{asset}' is not valid, should be one of {self.assets}"
Expand All @@ -313,7 +331,7 @@ def _get_asset_info(self, asset: str) -> AssetInfo:

info = AssetInfo(
url=asset_info.get_absolute_href() or asset_info.href,
metadata=extras,
metadata=extras if not vrt_options else None,
)

if STAC_ALTERNATE_KEY and extras.get("alternate"):
Expand All @@ -328,7 +346,8 @@ def _get_asset_info(self, asset: str) -> AssetInfo:
info["env"] = {"GDAL_INGESTED_BYTES_AT_OPEN": head}

# https://github.com/stac-extensions/raster
if bands := extras.get("raster:bands"):
if extras.get("raster:bands") and not vrt_options:
bands = extras.get("raster:bands")
stats = [
(b["statistics"]["minimum"], b["statistics"]["maximum"])
for b in bands
Expand All @@ -346,4 +365,7 @@ def _get_asset_info(self, asset: str) -> AssetInfo:
"Some statistics data in STAC are invalid, they will be ignored."
)

if vrt_options:
info["url"] = f"vrt://{info['url']}?{vrt_options}"

return info
Binary file added tests/fixtures/gfs.t06z.pgrb2.10p0.f010.grib2
View file
Open in desktop
Binary file not shown.
304 changes: 304 additions & 0 deletions tests/fixtures/stac_grib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,304 @@
{
"type": "Feature",
"stac_version": "1.0.0",
"id": "gribfile",
"properties": {
"proj:geometry": {
"type": "Polygon",
"coordinates": [
[
[
-180.125,
-89.875
],
[
179.875,
-89.875
],
[
179.875,
90.125
],
[
-180.125,
90.125
],
[
-180.125,
-89.875
]
]
]
},
"proj:bbox": [
-180.125,
-89.875,
179.875,
90.125
],
"proj:shape": [
18,
36
],
"proj:transform": [
10.0,
0.0,
-180.125,
0.0,
-10.0,
90.125,
0.0,
0.0,
1.0
],
"proj:wkt2": "GEOGCS[\"Coordinate System imported from GRIB file\",DATUM[\"unnamed\",SPHEROID[\"Sphere\",6371229,0]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST]]",
"datetime": "2024-09-13T11:08:36.893626Z"
},
"geometry": {
"type": "Polygon",
"coordinates": [
[
[
-180.125,
-89.875
],
[
179.875,
-89.875
],
[
179.875,
90.125
],
[
-180.125,
90.125
],
[
-180.125,
-89.875
]
]
]
},
"links": [],
"assets": {
"asset": {
"href": "gfs.t06z.pgrb2.10p0.f010.grib2",
"raster:bands": [
{
"data_type": "float64",
"scale": 1.0,
"offset": 0.0,
"statistics": {
"mean": -12.643815520808767,
"minimum": -20.000003814697266,
"maximum": 32.659996032714844,
"stddev": 12.448285782027321,
"valid_percent": 0.15432098765432098
},
"histogram": {
"count": 11,
"min": -20.000003814697266,
"max": 32.659996032714844,
"buckets": [
449,
27,
29,
31,
35,
29,
15,
21,
9,
3
]
}
},
{
"data_type": "float64",
"scale": 1.0,
"offset": 0.0,
"statistics": {
"mean": -12.609587132580073,
"minimum": -20.000003814697266,
"maximum": 32.66999435424805,
"stddev": 12.450450829609293,
"valid_percent": 0.15432098765432098
},
"histogram": {
"count": 11,
"min": -20.000003814697266,
"max": 32.66999435424805,
"buckets": [
447,
27,
31,
29,
39,
28,
14,
21,
9,
3
]
}
},
{
"data_type": "float64",
"scale": 1.0,
"offset": 0.0,
"statistics": {
"mean": -10.566084066483503,
"minimum": -20.000003814697266,
"maximum": 32.76999282836914,
"stddev": 13.981093035778388,
"valid_percent": 0.15432098765432098
},
"histogram": {
"count": 11,
"min": -20.000003814697266,
"max": 32.76999282836914,
"buckets": [
412,
25,
31,
27,
34,
49,
32,
20,
11,
7
]
}
},
{
"data_type": "float64",
"scale": 1.0,
"offset": 0.0,
"statistics": {
"mean": 20302.916205571022,
"minimum": 24.859272003173828,
"maximum": 24134.859375,
"stddev": 7731.471190491879,
"valid_percent": 0.15432098765432098
},
"histogram": {
"count": 11,
"min": 24.859272003173828,
"max": 24134.859375,
"buckets": [
49,
24,
17,
11,
8,
6,
11,
11,
11,
500
]
}
},
{
"data_type": "float64",
"scale": 1.0,
"offset": 0.0,
"statistics": {
"mean": -0.13451403068101184,
"minimum": -18.402570724487305,
"maximum": 29.097431182861328,
"stddev": 7.346453975073525,
"valid_percent": 0.15432098765432098
},
"histogram": {
"count": 11,
"min": -18.402570724487305,
"max": 29.097431182861328,
"buckets": [
16,
47,
120,
191,
153,
64,
32,
15,
8,
2
]
}
},
{
"data_type": "float64",
"scale": 1.0,
"offset": 0.0,
"statistics": {
"mean": 0.3850667698676755,
"minimum": -27.066476821899414,
"maximum": 20.933523178100586,
"stddev": 6.63843088754233,
"valid_percent": 0.15432098765432098
},
"histogram": {
"count": 11,
"min": -27.066476821899414,
"max": 20.933523178100586,
"buckets": [
2,
7,
15,
34,
106,
212,
175,
64,
25,
8
]
}
}
],
"eo:bands": [
{
"name": "b1",
"description": "1[-] HYBL=\"Hybrid level\""
},
{
"name": "b2",
"description": "2[-] HYBL=\"Hybrid level\""
},
{
"name": "b3",
"description": "0[-] EATM=\"Entire Atmosphere\""
},
{
"name": "b4",
"description": "0[-] SFC=\"Ground or water surface\""
},
{
"name": "b5",
"description": "0[-] RESERVED(220) (Reserved for local use)"
},
{
"name": "b6",
"description": "0[-] RESERVED(220) (Reserved for local use)"
}
],
"roles": []
}
},
"bbox": [
-180.125,
-89.875,
179.875,
90.125
],
"stac_extensions": [
"https://stac-extensions.github.io/projection/v1.1.0/schema.json",
"https://stac-extensions.github.io/raster/v1.1.0/schema.json",
"https://stac-extensions.github.io/eo/v1.1.0/schema.json"
]
}
Loading
Loading