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

use reproject_shape instead of reproject_geom (deprecated) #152

Merged
merged 2 commits into from
Dec 14, 2023
Merged

use reproject_shape instead of reproject_geom (deprecated) #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2ca83f
use reproject_shape instead of reproject_geom (deprecated)
Dec 14, 2023
8de8403
changelog
Dec 14, 2023
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
8 changes: 7 additions & 1 deletion CHANGELOG.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project attempts to match the major and minor versions of [stactools](https://github.com/stac-utils/stactools) and increments the patch number as needed.

## [Unreleased] - TBD

### Changed

- use reproject_shape instead of reproject_geom (deprecated)

## [0.6.0] - 2023-12-13

### Fixed
Expand Down Expand Up @@ -107,7 +113,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Modified Item IDs to include product discriminator ([#7](https://github.com/stactools-packages/sentinel2/pull/7))
- Upgrade to stactools 0.2.1.a2 (supporting PySTAC 1.0.0)

<!-- [Unreleased]: <https://github.com/stactools-packages/sentinel2/compare/v0.4.2..main> -->
[Unreleased]: <https://github.com/stactools-packages/sentinel2/compare/v0.4.2..main>
[0.6.0]: <https://github.com/stactools-packages/sentinel2/compare/v0.5.0..v0.6.0>
[0.5.0]: <https://github.com/stactools-packages/sentinel2/compare/v0.4.2..v0.5.0>
[0.4.2]: <https://github.com/stactools-packages/sentinel2/compare/v0.4.1..v0.4.2>
Expand Down
8 changes: 3 additions & 5 deletions src/stactools/sentinel2/stac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from shapely.geometry import shape as shapely_shape
from shapely.validation import make_valid
from stactools.core.io import ReadHrefModifier
from stactools.core.projection import reproject_geom, transform_from_bbox
from stactools.core.projection import reproject_shape, transform_from_bbox
from stactools.sentinel2.constants import (
ASSET_TO_TITLE,
BANDS_TO_ASSET_NAME,
Expand Down Expand Up @@ -578,10 +578,8 @@ def metadata_from_granule_metadata(
)
product_metadata = ProductMetadata(f, read_href_modifier)

geometry = shapely_shape(
reproject_geom(
f"epsg:{granule_metadata.epsg}", "epsg:4326", tileinfo_metadata.geometry
)
geometry = reproject_shape(
f"epsg:{granule_metadata.epsg}", "epsg:4326", tileinfo_metadata.geometry
).simplify(tolerance)

extra_assets = dict(
Expand Down
4 changes: 2 additions & 2 deletions tests/test_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from pystac.extensions.view import ViewExtension
from pystac.utils import is_absolute_href
from shapely.geometry import box, mapping, shape
from stactools.core.projection import reproject_geom
from stactools.core.projection import reproject_shape
from stactools.sentinel2.commands import create_sentinel2_command
from stactools.sentinel2.constants import (
COORD_ROUNDING,
Expand Down Expand Up @@ -72,7 +72,7 @@ def proj_bbox_area_difference(item):
visual_asset = item.assets.get("visual_10m") or item.assets.get("visual")
asset_projection = ProjectionExtension.ext(visual_asset)
pb = mapping(box(*asset_projection.bbox))
proj_geom = shape(reproject_geom(f"epsg:{projection.epsg}", "epsg:4326", pb))
proj_geom = reproject_shape(f"epsg:{projection.epsg}", "epsg:4326", pb)

item_geom = shape(item.geometry)

Expand Down