From 263ced179713c25cc28691b93ad4053e181288d6 Mon Sep 17 00:00:00 2001
From: Tom Russell <tom.russell@ouce.ox.ac.uk>
Date: Mon, 13 Nov 2023 15:37:51 +0000
Subject: [PATCH] Typing for Python 3.8

---
 src/snkit/network.py | 11 +++++++----
 src/snkit/utils.py   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/snkit/network.py b/src/snkit/network.py
index 40979f2..202e664 100644
--- a/src/snkit/network.py
+++ b/src/snkit/network.py
@@ -9,6 +9,7 @@
 
 import geopandas
 import numpy as np
+import numpy.typing as npt
 import pandas
 import pyproj
 import shapely.errors
@@ -643,7 +644,7 @@ def matching_gdf_from_geoms(gdf: GeoDataFrame, geoms: List[Geometry]) -> GeoData
 
 def geoms_to_array(
     geoms: List[Geometry],
-) -> np.ndarray[List[int], Geometry]:
+) -> npt.ArrayLike:
     geom_arr = np.empty(len(geoms), dtype="object")
     geom_arr[:] = geoms
 
@@ -867,7 +868,7 @@ def split_line(
     line: LineString,
     points: Union[Point, MultiPoint],
     tolerance: Optional[Number] = 1e-9,
-) -> list[LineString]:
+) -> List[LineString]:
     """Split line at point or multipoint, within some tolerance"""
     to_split = snap_line(line, points, tolerance)
     # when the splitter is a self-intersection point, shapely splits in
@@ -881,7 +882,9 @@ def split_line(
 
 
 def snap_line(
-    line: LineString, points: Point | MultiPoint, tolerance: Optional[Number] = 1e-9
+    line: LineString,
+    points: Union[Point, MultiPoint],
+    tolerance: Optional[Number] = 1e-9,
 ) -> LineString:
     """Snap a line to points within tolerance, inserting vertices as necessary"""
     if points.geom_type == "Point":
@@ -958,7 +961,7 @@ def set_precision(geom: Geometry, precision: int) -> Geometry:
 
 def to_networkx(
     network: Network, directed: bool = False, weight_col: Optional[str] = None
-) -> nx.Graph | nx.DiGraph:
+) -> Union[nx.Graph, nx.DiGraph]:
     """Return a networkx graph"""
     if not USE_NX:
         raise ImportError("No module named networkx")
diff --git a/src/snkit/utils.py b/src/snkit/utils.py
index 459fc95..ed2df35 100644
--- a/src/snkit/utils.py
+++ b/src/snkit/utils.py
@@ -4,6 +4,6 @@
 from typing import Any
 
 
-def tqdm_standin(iterator: Iterator[Any], *_: Any, **__: Any) -> Iterator[Any]:
+def tqdm_standin(iterator: "Iterator[Any]", *_: Any, **__: Any) -> "Iterator[Any]":
     """Alternative to tqdm, with no progress bar - ignore any arguments after the first"""
     return iterator