Skip to content

Commit

Permalink
fixup: Format Python code with Black
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Jan 8, 2024
1 parent 2c21d4c commit 446b2d0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
32 changes: 14 additions & 18 deletions src/geofabrics/dem.py
Original file line number Diff line number Diff line change
Expand Up @@ -1203,16 +1203,12 @@ def _load_dem(self, filename: pathlib.Path) -> xarray.Dataset:
self._write_netcdf_conventions_in_place(dem, self.catchment_geometry.crs)

if "data_source" in dem.keys():
dem["data_source"] = dem.data_source.astype(
geometry.RASTER_TYPE
)
dem["data_source"] = dem.data_source.astype(geometry.RASTER_TYPE)
if "lidar_source" in dem.keys():
dem["lidar_source"] = dem.lidar_source.astype(
geometry.RASTER_TYPE
)
dem["lidar_source"] = dem.lidar_source.astype(geometry.RASTER_TYPE)
if "z" in dem.keys():
dem["z"] = dem.z.astype(geometry.RASTER_TYPE)

return dem

def save_dem(self, filename: pathlib.Path, dem: xarray.Dataset):
Expand All @@ -1238,13 +1234,12 @@ def save_dem(self, filename: pathlib.Path, dem: xarray.Dataset):
f"{filename} before re-raising error."
)
raise caught_exception

def save_and_load_dem(
self,
filename: pathlib.Path,
):
"""Update the saved file cache for the DEM (self._dem) as a netCDF file.
"""
"""Update the saved file cache for the DEM (self._dem) as a netCDF file."""

logging.info(
"In LidarBase.save_and_load_dem saving _dem as NetCDF file to "
Expand Down Expand Up @@ -2011,7 +2006,7 @@ class RoughnessDem(LidarBase):
lidar_interpolation_method
The interpolation method to apply to LiDAR. Options are: mean, median, IDW.
"""

def __init__(
self,
catchment_geometry: geometry.CatchmentGeometry,
Expand Down Expand Up @@ -2054,9 +2049,9 @@ def __init__(

# Clip to the catchment extents to ensure performance
catchment = self.catchment_geometry.catchment
'''hydrological_dem = hydrological_dem.rio.clip_box(**catchment.bounds.iloc[0])
"""hydrological_dem = hydrological_dem.rio.clip_box(**catchment.bounds.iloc[0])
mask = clip_mask(hydrological_dem.z, catchment.geometry, self.chunk_size)
hydrological_dem = hydrological_dem.where(mask)'''
hydrological_dem = hydrological_dem.where(mask)"""
hydrological_dem = hydrological_dem.rio.clip(
self.catchment_geometry.catchment.geometry, drop=True
)
Expand Down Expand Up @@ -2145,10 +2140,10 @@ def add_lidar(
raster_options=raster_options,
metadata=metadata,
)
'''self.save_dem(
"""self.save_dem(
filename=self.temp_folder / "raw_lidar_zo.nc",
reload=True,
)'''
)"""
self.save_and_load_dem(
filename=self.temp_folder / "raw_lidar_zo.nc",
)
Expand Down Expand Up @@ -2182,12 +2177,13 @@ def add_lidar(
# If any NaN remain apply nearest neighbour interpolation
if numpy.isnan(self._dem.zo.data).any():
self._dem["zo"] = self._dem.zo.rio.interpolate_na(method="nearest")
'''mask = clip_mask(
"""mask = clip_mask(
self._dem.z, self.catchment_geometry.catchment.geometry, self.chunk_size
)
self._dem = self._dem.where(mask)'''
self._dem = self._dem.where(mask)"""
self._dem = self._dem.rio.clip(
self.catchment_geometry.catchment.geometry, drop=True)
self.catchment_geometry.catchment.geometry, drop=True
)

def _add_tiled_lidar_chunked(
self,
Expand Down
4 changes: 3 additions & 1 deletion src/geofabrics/processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,9 @@ def run(self):

# compute and save raw DEM
logging.info("In processor.DemGenerator - write out the raw DEM to netCDF")
self.raw_dem.save_dem(self.get_instruction_path("raw_dem"), dem=self.raw_dem._dem)
self.raw_dem.save_dem(
self.get_instruction_path("raw_dem"), dem=self.raw_dem._dem
)
logging.info(f"Remove folder {temp_folder} for temporary files")
shutil.rmtree(temp_folder)

Expand Down

0 comments on commit 446b2d0

Please sign in to comment.