run black, minor improvements

Author: yzh211

README.md

@@ -77,19 +77,19 @@ baseline = pyosp.datasets.get_path("homo_baseline.shp") # the path to baseline s
 raster = pyosp.datasets.get_path("homo_mount.tif")  # the path to raster file
 
 orig = pyosp.Orig_curv(line, raster, width=100,
-                       line_stepsize=3, cross_stepsize=none)
+                       line_stepsize=3, cross_stepsize=None)
 
 elev = pyosp.Elev_curv(line, raster, width=100,
                        min_elev=0.01,
-                       line_stepsize=3, cross_stepsize=none)
+                       line_stepsize=3, cross_stepsize=None)
 
 slope = pyosp.Slope_curv(line, raster, width=100,
                          min_slope=1,
-                         line_stepsize=3, cross_stepsize=none)
+                         line_stepsize=3, cross_stepsize=None)
 
 tpi = pyosp.Tpi_curv(line, raster, width=100,
                      tpi_radius=50, min_tpi=0,
-                     line_stepsize=3, cross_stepsize=none)
+                     line_stepsize=3, cross_stepsize=None)
 ```
 
 We can plot with matplotlib, or open in GIS software.

docs/conf.py

@@ -17,7 +17,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'pyosp'
-copyright = '2020, PyOSP developers'
+copyright = '2021, PyOSP developers'
 author = 'PyOSP developers'
 
 # The full version, including alpha/beta/rc tags

pyosp/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.1.5'
+__version__ = "0.1.5"
 
 from .curvsp import *
 from .cirsp import *

pyosp/_elevation.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-class Point_elevation():
+
+class Point_elevation:
     """Get point elevation by given raster.
 
     :param point: point coordinates
     :type point: array-like
     :param raster: GeoRaster read by GDAL
     :type raster: GDAL dataset
     """
+
     def __init__(self, point, raster):
         self.p = point
         self.raster = raster
@@ -17,7 +19,7 @@ def point_position(self):
         x = int((self.p[0] - self.geoTransform[0]) / self.geoTransform[1])
         y = int((self.geoTransform[3] - self.p[1]) / -self.geoTransform[5])
         return x, y
-    
+
     @property
     def value(self):
         px, py = self.point_position()

pyosp/_slope.py

@@ -2,7 +2,8 @@
 
 import numpy as np
 
-class Geo_slope():
+
+class Geo_slope:
     def __init__(self, point, raster, cell_size):
         """Return a geo-slope value of the point.
 
@@ -17,32 +18,33 @@ def __init__(self, point, raster, cell_size):
         self.raster = raster
         self.geoTransform = self.raster.GetGeoTransform()
         self.cell_size = cell_size
-        
+
     def point_position(self):
         x = int((self.p[0] - self.geoTransform[0]) / self.geoTransform[1])
         y = int((self.geoTransform[3] - self.p[1]) / -self.geoTransform[5])
         return y, x
-    
+
     def raster_window(self):
         py, px = self.point_position()
         rasterMatrix = self.raster.ReadAsArray()
-        
-        #pad to the edge
-        rasterPad = np.pad(rasterMatrix, (1,), 'edge')   
-                
-        return rasterPad[py:py+3, px:px+3]
-    
+
+        # pad to the edge
+        rasterPad = np.pad(rasterMatrix, (1,), "edge")
+
+        return rasterPad[py : py + 3, px : px + 3]
+
     @property
     def value(self):
         window = self.raster_window()
-        
-        rise = ((window[0,2] + 2*window[1,2] + window[2,2]) -
-                (window[0,0] + 2*window[1,0] + window[2,0])) / \
-                (8 * self.cell_size)
-        run =  ((window[2,0] + 2*window[2,1] + window[2,2]) -
-                (window[0,0] + 2*window[0,1] + window[0,2])) / \
-                (8 * self.cell_size)
+
+        rise = (
+            (window[0, 2] + 2 * window[1, 2] + window[2, 2])
+            - (window[0, 0] + 2 * window[1, 0] + window[2, 0])
+        ) / (8 * self.cell_size)
+        run = (
+            (window[2, 0] + 2 * window[2, 1] + window[2, 2])
+            - (window[0, 0] + 2 * window[0, 1] + window[0, 2])
+        ) / (8 * self.cell_size)
         dist = np.sqrt(np.square(rise) + np.square(run))
-        
-        return np.arctan(dist)*180 / np.pi
-    
+
+        return np.arctan(dist) * 180 / np.pi

pyosp/_tpi.py

@@ -2,47 +2,50 @@
 
 import numpy as np
 
-class Tpi():
+
+class Tpi:
     def __init__(self, point_coord, raster, radius):
         """Calculate the TPI value of the point
 
         :param point_coord: point coodinates
         :type point_coord: array-like
         :param raster: GeoRaster read by GDAL
         :type raster: GDAL dataset
-        :param radius: radius of TPI window 
-        :type radius: float 
+        :param radius: radius of TPI window
+        :type radius: float
         """
         self.p = point_coord
         self.raster = raster
         self.cols = raster.RasterXSize
         self.rows = raster.RasterYSize
         self.geoTransform = raster.GetGeoTransform()
         self.radiusInPixel = int(radius / self.geoTransform[1])
-        
+
     def point_position(self):
         " Define the point position on the raster"
         x = int((self.p[0] - self.geoTransform[0]) / self.geoTransform[1])
         y = int((self.geoTransform[3] - self.p[1]) / -self.geoTransform[5])
         return y, x
-    
+
     def avg_window(self):
         "Calculate the average raster value within the window, exclude the central point."
         py, px = self.point_position()
-        xmin = max(0, px-self.radiusInPixel)
-        xmax = min(self.cols, px+self.radiusInPixel+1)
-        ymin = max(0, py-self.radiusInPixel)
-        ymax = min(self.rows, py+self.radiusInPixel+1)
-        arr = self.raster.ReadAsArray(xoff=xmin, yoff=ymin, xsize=xmax-xmin, ysize=ymax-ymin)
+        xmin = max(0, px - self.radiusInPixel)
+        xmax = min(self.cols, px + self.radiusInPixel + 1)
+        ymin = max(0, py - self.radiusInPixel)
+        ymax = min(self.rows, py + self.radiusInPixel + 1)
+        arr = self.raster.ReadAsArray(
+            xoff=xmin, yoff=ymin, xsize=xmax - xmin, ysize=ymax - ymin
+        )
         # Treat small values as no data
         arr[arr < -1e20] = np.nan
-        avg = (np.nansum(arr)-self.point_value()) / (np.sum(~np.isnan(arr))-1)
-        return avg 
-    
+        avg = (np.nansum(arr) - self.point_value()) / (np.sum(~np.isnan(arr)) - 1)
+        return avg
+
     def point_value(self):
-        py, px =self.point_position()
+        py, px = self.point_position()
         return self.raster.ReadAsArray(xoff=px, yoff=py, xsize=1, ysize=1)[0]
-    
+
     @property
     def value(self):
-        return self.point_value() - self.avg_window() 
+        return self.point_value() - self.avg_window()