Skip to content

Commit 95dde18

Browse files
committed
Minor code refactoring and reformatting
1 parent a462bb1 commit 95dde18

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

xrenmap/xrenmap.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def open_dataset(
4545
drop_variables: str | Iterable[str] | None = None,
4646
) -> xr.Dataset:
4747
self.temp_dir = tempfile.mkdtemp(prefix="xrenmap-")
48-
ds = process(filename_or_obj, self.temp_dir)
48+
ds = read_dataset_from_archive(filename_or_obj, self.temp_dir)
4949
ds.set_close(self.close)
5050
return ds
5151

@@ -54,15 +54,9 @@ def close(self):
5454
shutil.rmtree(self.temp_dir)
5555

5656

57-
def process(
58-
input_filename: str,
59-
temp_dir: str,
60-
):
61-
return convert(input_filename, temp_dir)
62-
63-
64-
def convert(
65-
input_filename: str, temp_dir: str) -> xr.Dataset:
57+
def read_dataset_from_archive(
58+
input_filename: str, temp_dir: str
59+
) -> xr.Dataset:
6660
data_dirs = list(extract_archives(input_filename, temp_dir))
6761
if len(data_dirs) > 1:
6862
LOGGER.warning("Multiple data archives found; reading the first.")
@@ -72,9 +66,7 @@ def convert(
7266
def read_dataset_from_directory(data_dir):
7367
LOGGER.info(f"Processing {data_dir}")
7468
arrays = {
75-
name: rioxarray.open_rasterio(
76-
data_dir / (filename + ".TIF")
77-
).squeeze()
69+
name: rioxarray.open_rasterio(data_dir / (filename + ".TIF")).squeeze()
7870
for name, filename in VAR_MAP.items()
7971
}
8072
ds = xr.Dataset(arrays)

0 commit comments

Comments
 (0)