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

Lat, Lon storing mechanism updated. #121

Merged
merged 4 commits into from
Jan 22, 2024
Merged

Lat, Lon storing mechanism updated. #121

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8f817f
Tile indexes added and slices removed.
dabhicusp Jan 5, 2024
98c92a5
Lint error fixed.
dabhicusp Jan 5, 2024
9759d0f
lat. lon storing into the arr is updated.
dabhicusp Jan 9, 2024
14da6de
nit changes done.
dabhicusp Jan 11, 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
19 changes: 9 additions & 10 deletions xee/ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,18 +541,17 @@ def _get_primary_coordinates(self) -> List[Any]:
return primary_coords

def _get_tile_from_ee(
self, tile_index: Tuple[Any, Union[str, int]]
) -> Tuple[slice, np.ndarray]:
self, tile_and_band: Tuple[Tuple[int, int, int], str]
) -> Tuple[int, np.ndarray[Any, np.dtype]]:
"""Get a numpy array from EE for a specific bounding box (a 'tile')."""
tile_index, band_id = tile_index
(tile_index, tile_coords_start, tile_coords_end), band_id = tile_and_band
bbox = self.project(
(tile_index[0], 0, tile_index[1], 1)
(tile_coords_start, 0, tile_coords_end, 1)
if band_id == 'x'
else (0, tile_index[0], 1, tile_index[1])
else (0, tile_coords_start, 1, tile_coords_end)
)
tile_idx = slice(tile_index[0], tile_index[1])
target_image = ee.Image.pixelCoordinates(ee.Projection(self.crs_arg))
return tile_idx, self.image_to_array(
return tile_index, self.image_to_array(
target_image, grid=bbox, dtype=np.float32, bandIds=[band_id]
)

Expand All @@ -565,7 +564,7 @@ def _process_coordinate_data(
) -> np.ndarray:
"""Process coordinate data using multithreading for longitude or latitude."""
data = [
(tile_size * i, min(tile_size * (i + 1), end_point))
(i, tile_size * i, min(tile_size * (i + 1), end_point))
for i in range(tile_count)
]
tiles = [None] * tile_count
Expand All @@ -574,8 +573,8 @@ def _process_coordinate_data(
self._get_tile_from_ee,
list(zip(data, itertools.cycle([coordinate_type]))),
):
tiles[i] = arr.tolist() if coordinate_type == 'x' else arr.tolist()[0]
return np.concatenate(tiles)
tiles[i] = arr.flatten()
return np.array(tiles)

def get_variables(self) -> utils.Frozen[str, xarray.Variable]:
vars_ = [(name, self.open_store_variable(name)) for name in self._bands()]
Expand Down
Loading