cleaned up PEP-8 issues #125

localdevices · May 21, 2023 · ee38bfe · ee38bfe
1 parent e791d82
commit ee38bfe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/pyorc/api/velocimetry.py b/pyorc/api/velocimetry.py
@@ -1,4 +1,3 @@
-import copy
 import numpy as np
 import rasterio
 import xarray as xr
@@ -58,6 +57,8 @@ def is_velocimetry(self):
             return False
         return True
 
+    mask = utils.UncachedAccessor(_Velocimetry_MaskMethods)
+
     def get_transect(
             self, x, y, z=None, s=None,
             crs=None,
@@ -132,7 +133,7 @@ def get_transect(
         """
         transform = helpers.affine_from_grid(self._obj[xs].values, self._obj[ys].values)
         if crs is not None:
-            # transform coordinates of cross section
+            # transform coordinates of cross-section
             x, y = zip(*helpers.xyz_transform(
                 list(zip(*(x, y))),
                 crs_from=crs,
@@ -158,11 +159,6 @@ def get_transect(
         )  # ensure we get rows and columns in fractions instead of whole numbers
         rows, cols = np.array(rows), np.array(cols)
 
-        # select x and y coordinates from axes
-        idx = np.all(
-            np.array([cols >= 0, cols < len(self._obj["x"]), rows >= 0, rows < len(self._obj["y"])]),
-            axis=0,
-        )
         # compute transect coordinates in the local grid coordinate system (can be outside the grid)
         f_x = interp1d(np.arange(0, len(self._obj["x"])), self._obj["x"], fill_value="extrapolate")
         f_y = interp1d(np.arange(0, len(self._obj["y"])), self._obj["y"], fill_value="extrapolate")
@@ -187,8 +183,6 @@ def get_transect(
                 wdw_y_max=wdw_y_max
 
             )
-            # ds_wdw = xr.concat([self._obj.shift(x=x_stride, y=y_stride) for x_stride in range(wdw_x_min, wdw_x_max + 1) for y_stride in
-            #                     range(wdw_y_min, wdw_y_max + 1)], dim="stride")
             # use the median (not mean) to prevent a large influence of serious outliers
             missing_tolerance = ds_wdw.mean(dim="time").count(dim="stride") > tolerance * len(ds_wdw.stride)
             # missing_tolerance = ds_wdw.count(dim="stride") > tolerance*len(ds_wdw.stride)
@@ -204,10 +198,11 @@ def get_transect(
             ds_points = ds_effective.interp(x=_x, y=_y)
         if np.isnan(ds_points["v_x"].mean(dim="time")).all():
             warnings.warn(
-                "No valid velocimetry points found over bathymetry. Check if the bathymetry is within the camera objective or anything is visible in objective."
+                "No valid velocimetry points found over bathymetry. Check if the bathymetry is within the camera "
+                "objective or anything is visible in objective. "
             )
-        # add the xcoords and ycoords (and zcoords if available) originally assigned so that even points outside the grid covered by ds can be
-        # found back from this dataset
+        # add the xcoords and ycoords (and zcoords if available) originally assigned so that even points outside the
+        # grid covered by ds can be found back from this dataset
         ds_points = ds_points.assign_coords(xcoords=("points", list(x)))
         ds_points = ds_points.assign_coords(ycoords=("points", list(y)))
         ds_points = ds_points.assign_coords(scoords=("points", list(s)))

diff --git a/tests/test_velocimetry.py b/tests/test_velocimetry.py
@@ -47,5 +47,3 @@ def test_plot(piv, mode, method):
     if plot:
         piv.mean(dim="time", keep_attrs=True).velocimetry.plot(method=method, mode=mode)
     plt.close("all")
-
-