From 446b2d0fbd2b750b83667503fdf3b54ba266a338 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 8 Jan 2024 23:53:42 +0000 Subject: [PATCH] fixup: Format Python code with Black --- src/geofabrics/dem.py | 32 ++++++++++++++------------------ src/geofabrics/processor.py | 4 +++- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/geofabrics/dem.py b/src/geofabrics/dem.py index dcae425d..67bc931e 100644 --- a/src/geofabrics/dem.py +++ b/src/geofabrics/dem.py @@ -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): @@ -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 " @@ -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, @@ -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 ) @@ -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", ) @@ -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, diff --git a/src/geofabrics/processor.py b/src/geofabrics/processor.py index 5b08c6b8..af55ea2d 100644 --- a/src/geofabrics/processor.py +++ b/src/geofabrics/processor.py @@ -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)