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

Jump to bottom

allow using udp parameter for spatial/temporal extents #144

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −5
Open

allow using udp parameter for spatial/temporal extents #144

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
cdcfb17
allow using udp parameter for spatial/temporal extents
jdries Jul 25, 2024
b23343d
Merge branch 'main' into gfmap_udp
jdries Jul 26, 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
10 changes: 6 additions & 4 deletions src/openeo_gfmap/fetching/commons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def _load_collection(
bands: list,
collection_name: str,
spatial_extent: SpatialContext,
temporal_extent: Optional[TemporalContext],
temporal_extent: Optional[Union[TemporalContext,Parameter]],
fetch_type: FetchType,
is_stac: bool = False,
**params,
Expand All @@ -126,16 +126,18 @@ def _load_collection(
_load_collection_hybrid, is_stac=is_stac, collection_id_or_url=collection_name
)

spatial_is_param = isinstance(spatial_extent, Parameter)

if (
temporal_extent is not None
temporal_extent is not None and not isinstance(temporal_extent, Parameter)
Copy link
Collaborator

Choose a reason for hiding this comment

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

for sake of readibility, would it make sense to also introdue temporal_is_param = isinstance(temporal_extent, Parameter)

): # Can be ignored for intemporal collections such as DEM
temporal_extent = [temporal_extent.start_date, temporal_extent.end_date]

if fetch_type == FetchType.TILE:
assert isinstance(
spatial_extent, BoundingBoxExtent
), "Please provide only a bounding box for tile based fetching."
spatial_extent = dict(spatial_extent)
) or spatial_is_param, "Please provide only a bounding box for tile based fetching."
Copy link
Collaborator

Choose a reason for hiding this comment

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

reading deeper into this _load collection I think it would be useful to modularize the getting the temporal and spatial extent.

I think something like:

 # Helper function for temporal extent processing
    def process_temporal_extent(temporal_extent):
        if isinstance(temporal_extent, Parameter) or temporal_extent is None:
            return temporal_extent
        return [temporal_extent.start_date, temporal_extent.end_date]

    # Helper function for spatial extent processing
    def process_spatial_extent(spatial_extent, fetch_type):
        if fetch_type == FetchType.TILE:
            if not isinstance(spatial_extent, BoundingBoxExtent) and not isinstance(spatial_extent, Parameter):
                raise ValueError("Please provide only a bounding box for tile-based fetching.")
            return spatial_extent if isinstance(spatial_extent, Parameter) else dict(spatial_extent)

        elif fetch_type == FetchType.POINT:
            if not isinstance(spatial_extent, GeoJSON) or spatial_extent.get("type") != "FeatureCollection":
                raise ValueError("Please provide a valid GeoJSON FeatureCollection for point-based fetching.")
            return spatial_extent

        elif fetch_type == FetchType.POLYGON:
            if isinstance(spatial_extent, GeoJSON):
                if spatial.get("type") != "FeatureCollection":
                    raise ValueError("Please provide a valid FeatureCollection type of GeoJSON.")
                return spatial_extent
            elif isinstance(spatial_extent, str):
                if not (spatial_extent.startswith("https://") or spatial_extent.startswith("http://")):
                    raise ValueError("Please provide a valid URL to a GeoParquet or GeoJSON file.")
                return connection.load_url(spatial_extent, format="Parquet" if ".parquet" in spatial else "GeoJSON")
            else:
                raise ValueError("Please provide a valid URL to a GeoParquet or GeoJSON file.")
        
        return spatial_extent

should work.

The only part which would not be able to be modularized is:

    if fetch_type == FetchType.POLYGON and isinstance(spatial_extent, (str, GeoJSON)):
        cube = cube.filter_spatial(spatial_extent)

thoughts?

spatial_extent = spatial_extent if spatial_is_param else dict(spatial_extent)
cube = load_collection_method(
connection=connection,
bands=bands,
Expand Down
3 changes: 2 additions & 1 deletion src/openeo_gfmap/spatial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from geojson import GeoJSON
from shapely.geometry import Polygon, box
from openeo.rest.udp import Parameter


@dataclass
Expand Down Expand Up @@ -50,4 +51,4 @@ def to_geojson(self) -> GeoJSON:
return self.to_geometry().__geo_interface__


SpatialContext = Union[GeoJSON, BoundingBoxExtent, str]
SpatialContext = Union[GeoJSON, BoundingBoxExtent, str, Parameter]
Loading