type anno

Author: scivision

Examples/lox_stability.py

@@ -3,7 +3,6 @@
 import logging
 from pathlib import Path
 from math import isclose, nan
-import numpy as np
 
 from pymap3d.lox import loxodrome_direct
 
@@ -20,13 +19,13 @@
     raise EnvironmentError("Matlab does not have Mapping Toolbox")
 
 
-def matlab_func(lat1, lon1, rng, az) -> tuple[float, float]:
+def matlab_func(lat1: float, lon1: float, rng: float, az: float) -> tuple[float, float]:
     """Using Matlab Engine to do same thing as Pymap3d"""
     return eng.reckon("rh", lat1, lon1, rng, az, eng.wgs84Ellipsoid(), nargout=2)  # type: ignore
 
 
 lat_last, lon_last = nan, nan
-clat, clon, rng = np.array(40.0), np.array(-80.0), np.array(10.0)  # arbitrary
+clat, clon, rng = 40.0, -80.0, 10.0  # arbitrary
 
 for i in range(20):
     azi = 90.0 + 10.0 ** (-i)

src/pymap3d/latitude.py

@@ -164,7 +164,9 @@ def geocentric2geodetic(
     return degrees(geodetic_lat) if deg else geodetic_lat
 
 
-def geodetic2isometric(geodetic_lat: ndarray, ell: Ellipsoid = None, deg: bool = True) -> float:
+def geodetic2isometric(
+    geodetic_lat: float | ndarray, ell: Ellipsoid = None, deg: bool = True
+) -> float:
     """
     computes isometric latitude on an ellipsoid
 
@@ -345,7 +347,9 @@ def geodetic2conformal(geodetic_lat: ndarray, ell: Ellipsoid = None, deg: bool =
 
 
 # %% rectifying
-def geodetic2rectifying(geodetic_lat: ndarray, ell: Ellipsoid = None, deg: bool = True) -> float:
+def geodetic2rectifying(
+    geodetic_lat: float | ndarray, ell: Ellipsoid = None, deg: bool = True
+) -> float:
     """
     converts from geodetic latitude to rectifying latitude
 

src/pymap3d/lox.py

@@ -164,10 +164,10 @@ def loxodrome_inverse(
 
 
 def loxodrome_direct(
-    lat1: ndarray,
-    lon1: ndarray,
-    rng: ndarray,
-    a12: float,
+    lat1: float | ndarray,
+    lon1: float | ndarray,
+    rng: float | ndarray,
+    a12: float | float,
     ell: Ellipsoid = None,
     deg: bool = True,
 ) -> tuple[ndarray, ndarray]:

src/pymap3d/rcurve.py

@@ -92,7 +92,7 @@ def meridian(lat: ndarray, ell: Ellipsoid = None, deg: bool = True) -> ndarray:
     return f1 / sqrt(f2 ** 3)
 
 
-def transverse(lat: ndarray, ell: Ellipsoid = None, deg: bool = True) -> ndarray:
+def transverse(lat: float | ndarray, ell: Ellipsoid = None, deg: bool = True) -> ndarray:
     """computes the radius of the curve formed by a plane
     intersecting the ellipsoid at the latitude which is
     normal to the surface of the ellipsoid

src/pymap3d/utils.py

@@ -60,7 +60,9 @@ def sph2cart(az: ndarray, el: ndarray, r: ndarray) -> tuple[ndarray, ndarray, nd
     return x, y, z
 
 
-def sanitize(lat: ndarray, ell: typing.Optional[Ellipsoid], deg: bool) -> tuple[ndarray, Ellipsoid]:
+def sanitize(
+    lat: float | ndarray, ell: typing.Optional[Ellipsoid], deg: bool
+) -> tuple[float | ndarray, Ellipsoid]:
     if ell is None:
         ell = Ellipsoid()
     if asarray is not None: