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 filter instead of image IDs when slicing a collection. #152

Closed
wants to merge 1 commit into from
Closed

Use filter instead of image IDs when slicing a collection. #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions xee/ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def get_info(self) -> Dict[str, Any]:
# (few) values of the primary dim (read: time) and interpolate the rest
# client-side. Ideally, this would live behind a xarray-backend-specific
# feature flag, since it's not guaranteed that data is this consistent.
columns = ['system:id', self.primary_dim_property]
columns = ['system:index', self.primary_dim_property]
rpcs.append((
'properties',
(
Expand All @@ -331,9 +331,9 @@ def image_collection_properties(self) -> Tuple[List[str], List[str]]:
return (system_ids, primary_coord)

@property
def image_ids(self) -> List[str]:
image_ids, _ = self.image_collection_properties
return image_ids
def image_indices(self) -> List[str]:
image_indices, _ = self.image_collection_properties
return image_indices

def _max_itemsize(self) -> int:
return max(
Expand Down Expand Up @@ -801,18 +801,15 @@ def _slice_collection(self, image_slice: slice) -> ee.Image:
# a range of images...
self._ee_init_check()
start, stop, stride = image_slice.indices(self.shape[0])

# If the input images have IDs, just slice them. Otherwise, we need to do
# an expensive `toList()` operation.
if self.store.image_ids:
imgs = self.store.image_ids[start:stop:stride]
else:
# TODO(alxr, mahrsee): Find a way to make this case more efficient.
list_range = stop - start
col0 = self.store.image_collection
imgs = col0.toList(list_range, offset=start).slice(0, list_range, stride)

col = ee.ImageCollection(imgs)
indices = self.store.image_indices
idx_filter = ee.Filter.rangeContains(
'system:index', indices[start], indices[stop - 1]
)
col = ee.ImageCollection(
self.store.image_collection.filter(idx_filter)
.toList(stop - start)
.slice(0, step=stride)
)

# For a more efficient slice of the series of images, we reduce each
# image in the collection to bands on a single image.
Expand Down
Loading