Skip to content

Commit

Permalink
Issue #134 #100 some more cleanups of legacy ImageCollection stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
soxofaan committed Mar 14, 2023
1 parent 8ee0339 commit f80e064
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions openeo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ class BaseOpenEoException(Exception):


from openeo._version import __version__

# TODO remove this import #100 #134
from openeo.imagecollection import ImageCollection
from openeo.rest.datacube import DataCube, UDF
from openeo.rest.connection import connect, session, Connection
Expand Down
1 change: 1 addition & 0 deletions openeo/imagecollection.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from openeo.rest.vectorcube import VectorCube


# TODO: this base class has no implementation anymore in openeo package: remove all together #100
class ImageCollection(ABC):
"""Class representing Processes. """

Expand Down
3 changes: 1 addition & 2 deletions openeo/rest/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -1220,12 +1220,11 @@ def load_disk_collection(
self, format: str, glob_pattern: str, options: Optional[dict] = None
) -> DataCube:
"""
Loads image data from disk as an ImageCollection.
Loads image data from disk as a :py:class:`DataCube`.
:param format: the file format, e.g. 'GTiff'
:param glob_pattern: a glob pattern that matches the files to load from disk
:param options: options specific to the file format
:return: the data as an ImageCollection
"""
return DataCube.load_disk_collection(
self, format, glob_pattern, **(options or {})
Expand Down
3 changes: 1 addition & 2 deletions openeo/rest/datacube.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@ def filter_temporal(
:param start_date: start date of the filter (inclusive), as a string or date object
:param end_date: end date of the filter (exclusive), as a string or date object
:param extent: two element list/tuple start and end date of the filter
:return: An ImageCollection filtered by date.
https://open-eo.github.io/openeo-api/processreference/#filter_temporal
"""
Expand Down Expand Up @@ -1404,7 +1403,7 @@ def aggregate_temporal(
:param dimension: The temporal dimension for aggregation. All data along the dimension will be passed through the specified reducer. If the dimension is not set, the data cube is expected to only have one temporal dimension.
:param context: Additional data to be passed to the reducer. Not set by default.
:return: An ImageCollection containing a result for each time window
:return: A :py:class:`DataCube` containing a result for each time window
"""
return self.process(
process_id="aggregate_temporal",
Expand Down

0 comments on commit f80e064

Please sign in to comment.