fix: fixed style for gutils and oz

Author: jlerat

src/hydrodiy/gis/gutils.py

@@ -1,18 +1,12 @@
 import numpy as np
-import math
-import matplotlib.image as mpimg
-
-import time
-
-from hydrodiy.stat import sutils
-
 from hydrodiy import has_c_module
 
 if has_c_module("gis", False):
     import c_hydrodiy_gis
 
-def points_inside_polygon(points, polygon, inside=None, atol=1e-8, \
-                    nprint=0):
+
+def points_inside_polygon(points, polygon, inside=None, atol=1e-8,
+                          nprint=0):
     """
 
     Determines if a set of points are inside a given polygon or not
@@ -52,24 +46,24 @@ def points_inside_polygon(points, polygon, inside=None, atol=1e-8, \
         inside = np.zeros(len(points), dtype=np.int32)
     else:
         if not inside.dtype == np.int32:
-            raise ValueError("Expected inside of "+\
-                        f"dtype np.int32, got {inside.dtype}.")
+            errmess = "Expected inside of dtype np.int32, "\
+                      + f"got {inside.dtype}."
+            raise ValueError(errmess)
 
         if not len(inside) == len(points):
-            raise ValueError("Expected inside of length "+\
-                    f"{len(points)}, got {len(inside)}.")
+            errmess = f"Expected inside of length {len(points)},"\
+                      + f"got {len(inside)}."
+            raise ValueError(errmess)
 
         # To make sure that the inside vector is properly initialised
         inside.fill(0)
 
     # run C code
-    ierr = c_hydrodiy_gis.points_inside_polygon(atol, nprint, points, \
-                    polygon, inside)
+    ierr = c_hydrodiy_gis.points_inside_polygon(atol, nprint, points,
+                                                polygon, inside)
 
-    if ierr>0:
-        raise ValueError("c_hydrodiy_gis.points_inside_polygon "+\
-                            "returns "+str(ierr))
+    if ierr > 0:
+        errmess = f"c_hydrodiy_gis.points_inside_polygon returns {ierr}."
+        raise ValueError(errmess)
 
     return inside
-
-

src/hydrodiy/gis/oz.py

@@ -1,36 +1,35 @@
 """ Module to plot data on an Australia map """
 
-import re, os, json, tarfile
+import re
+import json
 from pathlib import Path
 
 import numpy as np
 import pandas as pd
 
-import matplotlib as mpl
-mpl.use("Agg")
-
 import matplotlib.pyplot as plt
-from matplotlib.patches import Polygon
-from matplotlib.collections import PatchCollection
 import matplotlib.patheffects as patheff
 
+import matplotlib as mpl
+mpl.use("Agg")
+
 HAS_PYSHP = False
 try:
     import shapefile
     HAS_PYSHP = True
-except (ImportError, FileNotFoundError) as err:
+except (ImportError, FileNotFoundError):
     pass
 
 # Decompress australia shoreline shapefile
 FHERE = Path(__file__).resolve().parent
 FDATA = FHERE / "data"
 SHAPEFILES = {
-    "ozcoast10m": FDATA / "ne_10m_admin_0_countries_australia.shp", \
-    "ozcoast50m": FDATA / "ne_50m_admin_0_countries_australia.shp", \
-    "ozstates50m": FDATA / "ne_50m_admin_1_states_australia.shp", \
-    "ozdrainage": FDATA / "drainage_divisions_lines_simplified.shp", \
+    "ozcoast10m": FDATA / "ne_10m_admin_0_countries_australia.shp",
+    "ozcoast50m": FDATA / "ne_50m_admin_0_countries_australia.shp",
+    "ozstates50m": FDATA / "ne_50m_admin_1_states_australia.shp",
+    "ozdrainage": FDATA / "drainage_divisions_lines_simplified.shp",
     "ozbasins": FDATA / "rbasin_lines_simplified.shp"
-}
+    }
 
 # Lat long coordinate boxes for regions in Australia
 freg = FDATA / "regions.json"
@@ -39,18 +38,18 @@
 
 # Capital cities
 CAPITAL_CITIES = {
-    "Brisbane": [153.026, -27.471], \
-    "Melbourne": [144.960, -37.821],\
-    "Sydney": [151.206, -33.864], \
-    "Canberra": [149.134, -35.299], \
-    "Hobart": [147.3265, -42.8818], \
-    "Adelaide": [138.60, -34.92833], \
+    "Brisbane": [153.026, -27.471],
+    "Melbourne": [144.960, -37.821],
+    "Sydney": [151.206, -33.864],
+    "Canberra": [149.134, -35.299],
+    "Hobart": [147.3265, -42.8818],
+    "Adelaide": [138.60, -34.92833],
     "Perth": [115.86134, -31.95182]
-}
+    }
 
 
-def ozlayer(ax, name, filter_field=None, filter_regex=None, proj=None, \
-                fixed_lim=True, *args, **kwargs):
+def ozlayer(ax, name, filter_field=None, filter_regex=None, proj=None,
+            fixed_lim=True, *args, **kwargs):
     """ plot Australian geographic layer in axes using data
     from Natural Earth.
     (see https://www.naturalearthdata.com/)
@@ -81,7 +80,7 @@ def ozlayer(ax, name, filter_field=None, filter_regex=None, proj=None, \
         raise ValueError("pyshp package could not be imported")
 
     # Select shapefile to draw
-    if not name in SHAPEFILES:
+    if name not in SHAPEFILES:
         names = "|".join(list(SHAPEFILES.keys()))
         raise ValueError(f"Expected name in {names}, got {name}.")
 
@@ -94,7 +93,7 @@ def ozlayer(ax, name, filter_field=None, filter_regex=None, proj=None, \
     # Plotting function
     def plotit(x, y, recs):
         # Project
-        if not proj is None:
+        if proj is not None:
             x, y = np.array([proj(xx, yy) for xx, yy in zip(x, y)]).T
 
         # Plot
@@ -112,11 +111,13 @@ def plotit(x, y, recs):
         # Get shapefile fields
         fields = np.array([f[0] for f in shp_object.fields])[1:]
 
-        if not filter_field is None:
+        if filter_field is not None:
             # Filter field
-            if not filter_field in fields:
-                raise ValueError("Expected filter_field in "+\
-                    "/".join(list(fields)) + ", got "+filter_field)
+            if filter_field not in fields:
+                ftxt = "/".join(list(fields))
+                errmess = f"Expected filter_field in {ftxt}, "\
+                          + f"got {filter_field}."
+                raise ValueError(errmess)
 
             ifilter = np.where(fields == filter_field)[0][0]
         else:
@@ -126,7 +127,7 @@ def plotit(x, y, recs):
         lines = []
         for shp, rec in zip(shp_object.shapes(), shp_object.records()):
             # Apply filter if needed
-            if not ifilter is None:
+            if ifilter is not None:
                 if not re.search(filter_regex, rec[ifilter]):
                     continue
 
@@ -159,10 +160,10 @@ def plotit(x, y, recs):
     return lines
 
 
-def ozcities(ax, cities=None, \
-                filter_regex=None, \
-                fixed_lim=True, plot_kwargs={}, \
-                text_kwargs={}, proj=None):
+def ozcities(ax, cities=None,
+             filter_regex=None,
+             fixed_lim=True, plot_kwargs={},
+             text_kwargs={}, proj=None):
     """ plot Australian capital cities.
 
     Parameters
@@ -213,12 +214,12 @@ def ozcities(ax, cities=None, \
     elements = {}
     for icity, (city, xy) in enumerate(cities.items()):
         # Skip if filtered
-        if not filter_regex is None:
+        if filter_regex is not None:
             if not re.search(filter_regex, city):
                 continue
 
         xyproj = xy
-        if not proj is None:
+        if proj is not None:
             xyproj = proj(*xyproj)
 
         lab = "Capital city" if icity == 0 else ""