Skip to content

Enable opening datasets with gcps even if no valid crs is present #182

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

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Enable opening datasets with gcps even if no valid crs is present #182

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66f3781
Enable opening datasets with gcps even if no valid crs is present
weiji14 Sep 23, 2022
4f656fe
Get src_crs from last index position of gcps tuple
weiji14 Sep 23, 2022
edbf3a9
Add a unit test to check that reading GeoTIFFs with gcps work
weiji14 Sep 23, 2022
cc0cd1f
Add an inline comment about trying to make VRT when gcps are present
weiji14 Sep 23, 2022
1b3c47c
Remove duplicated WarpedVRT instantiation
weiji14 Sep 23, 2022
1fb37c7
avoid mutating `spec.vrt_params`
gjoseph92 Oct 24, 2022
fca7961
fix up test imports
gjoseph92 Oct 24, 2022
d7b0820
fix conditional
gjoseph92 Oct 24, 2022
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
35 changes: 19 additions & 16 deletions stackstac/rio_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import numpy as np
import rasterio as rio
import rasterio.errors
from rasterio.vrt import WarpedVRT

from .rio_env import LayeredEnv
Expand Down Expand Up @@ -323,9 +324,7 @@ def _open(self) -> ThreadsafeRioDataset:
with self.gdal_env.open:
with time(f"Initial read for {self.url!r} on {_curthread()}: {{t}}"):
try:
ds = SelfCleaningDatasetReader(
self.url, sharing=False
)
ds = SelfCleaningDatasetReader(self.url, sharing=False)
except Exception as e:
msg = f"Error opening {self.url!r}: {e!r}"
if exception_matches(e, self.errors_as_nodata):
Expand All @@ -343,26 +342,30 @@ def _open(self) -> ThreadsafeRioDataset:
"a separate STAC asset), so you'll need to exclude this asset from your analysis."
)

# Set source crs from ground control points (gcps) if present
if not hasattr(ds.crs, "to_epsg") and ds.gcps is not None:
self.spec.vrt_params["src_crs"] = ds.gcps[-1]
ds_epsg: int | None
try:
ds_epsg = ds.crs.to_epsg() if ds.crs is not None else None
except rasterio.errors.CRSError:
ds_epsg = None

# Only make a VRT if the dataset doesn't match the spatial spec we want
if "src_crs" in self.spec.vrt_params or (
hasattr(ds.crs, "to_epsg")
and self.spec.vrt_params
!= {
"crs": ds.crs.to_epsg(),
"transform": ds.transform,
"height": ds.height,
"width": ds.width,
}
):
if ds_epsg is None or self.spec.vrt_params != {
"crs": ds_epsg,
"transform": ds.transform,
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MIght need to set src_transform in addition to transform as mentioned by @vincentsarago in #181 (comment)?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So looking at the code it might be a bit more complex.

What I do in rio-tiler, is automatically create a WarpedVRT when we have gcps (which in stackstac case should replace the ds) and then I create another WarpedVRT on top of it if I need warping

"height": ds.height,
"width": ds.width,
}:
# Set source crs from ground control points (gcps) if present
src_crs = (
ds.gcps[-1] if ds.crs is None and ds.gcps is not None else None
)

with self.gdal_env.open_vrt:
vrt = WarpedVRT(
ds,
sharing=False,
resampling=self.resampling,
src_crs=src_crs,
**self.spec.vrt_params,
)
else:
Expand Down
5 changes: 3 additions & 2 deletions stackstac/tests/test_rio_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import tempfile

import numpy as np
import rasterio
import rasterio.enums
from rasterio.control import GroundControlPoint
from rasterio.crs import CRS
from rasterio.enums import Resampling
from rasterio.windows import Window
from stackstac.raster_spec import RasterSpec
from stackstac.rio_reader import AutoParallelRioReader
Expand Down Expand Up @@ -41,7 +42,7 @@ def test_dataset_read_with_gcps():
epsg=4326, bounds=(90, -10, 110, 10), resolutions_xy=(10, 10)
),
resampling=rasterio.enums.Resampling.bilinear,
dtype=np.float32,
dtype=np.dtype("float32"),
fill_value=np.nan,
rescale=True,
)
Expand Down