vincenty: no squeeze outputs

Author: scivision

src/pymap3d/timeconv.py

@@ -6,7 +6,6 @@
 
 from ._typing import DatetimeArray, DatetimeLike
 
-
 __all__ = ["str2dt"]
 
 

src/pymap3d/vincenty.py

@@ -6,30 +6,18 @@
 
 import warnings
 
+from ._typing import FloatArray, FloatLike
 import logging
 from copy import copy
-from math import nan, pi, tau
 
 from .ellipsoid import Ellipsoid, resolve_ellipsoid
-from .mathfun import (
-    asin,
-    atan,
-    atan2,
-    cos,
-    degrees,
-    isnan,
-    linspace,
-    radians,
-    sign,
-    sin,
-    sqrt,
-    tan,
-)
+from .mathfun import isnan, linspace, degrees, radians, sign, sqrt, atan2, cos, sin, tan, asin, atan
+from math import pi, tau, nan
 
 __all__ = ["vdist", "vreckon", "track2"]
 
 
-def vdist(Lat1, Lon1, Lat2, Lon2, ell: Ellipsoid | None = None, deg: bool = True) -> tuple:
+def vdist(lat1, lon1, lat2, lon2, ell: Ellipsoid | None = None, deg: bool = True) -> tuple:
     """
     Using the reference ellipsoid, compute the distance between two points
     within a few millimeters of accuracy, compute forward azimuth,
@@ -43,13 +31,13 @@ def vdist(Lat1, Lon1, Lat2, Lon2, ell: Ellipsoid | None = None, deg: bool = True
     Parameters
     ----------
 
-    Lat1 : float
+    lat1 : float
         Geodetic latitude of first point (degrees)
-    Lon1 : float
+    lon1 : float
         Geodetic longitude of first point (degrees)
-    Lat2 : float
+    lat2 : float
         Geodetic latitude of second point (degrees)
-    Lon2 : float
+    lon2 : float
         Geodetic longitude of second point (degrees)
     ell : Ellipsoid, optional
           reference ellipsoid
@@ -108,13 +96,10 @@ def vdist(Lat1, Lon1, Lat2, Lon2, ell: Ellipsoid | None = None, deg: bool = True
     f = ell.flattening
 
     if deg:
-        Lat1 = radians(Lat1)
-        Lon1 = radians(Lon1)
-        Lat2 = radians(Lat2)
-        Lon2 = radians(Lon2)
-
-    # keep old variable names in case someone is using them
-    lat1, lon1, lat2, lon2 = Lat1, Lon1, Lat2, Lon2
+        lat1 = radians(lat1)
+        lon1 = radians(lon1)
+        lat2 = radians(lat2)
+        lon2 = radians(lon2)
 
     try:
         if (abs(lat1) > pi / 2).any() | (abs(lat2) > pi / 2).any():
@@ -264,13 +249,17 @@ def vdist(Lat1, Lon1, Lat2, Lon2, ell: Ellipsoid | None = None, deg: bool = True
     if deg:
         a12 = degrees(a12)
 
-    try:
-        return dist_m.squeeze()[()], a12.squeeze()[()]
-    except AttributeError:
-        return dist_m, a12
+    return dist_m, a12
 
 
-def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = True) -> tuple:
+def vreckon(
+    lat1,
+    lon1,
+    rng,
+    azim,
+    ell: Ellipsoid | None = None,
+    deg: bool = True,
+) -> tuple:
     """
     This is the Vincenty "forward" solution.
 
@@ -285,13 +274,13 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
     Parameters
     ----------
 
-    Lat1 : float
+    lat1 : float
         inital geodetic latitude (degrees)
-    Lon1 : float
+    lon1 : float
         initial geodetic longitude (degrees)
-    Rng : float
+    rng : float
         ground distance (meters)
-    Azim : float
+    azim : float
         intial azimuth (degrees) clockwide from north.
     ell : Ellipsoid, optional
           reference ellipsoid
@@ -301,9 +290,9 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
     Results
     -------
 
-    Lat2 : float
+    lat2 : float
         final geodetic latitude (degrees)
-    Lon2 : float
+    lon2 : float
         final geodetic longitude (degrees)
 
 
@@ -331,10 +320,10 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
     """
 
     try:
-        if (Rng < 0.0).any():
+        if (rng < 0.0).any():
             raise ValueError("Ground distance must be positive")
     except AttributeError:
-        if Rng < 0.0:
+        if rng < 0.0:
             raise ValueError("Ground distance must be positive")
 
     ell = resolve_ellipsoid(ell)
@@ -344,12 +333,9 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
     f = ell.flattening
 
     if deg:
-        Lat1 = radians(Lat1)  # intial latitude in radians
-        Lon1 = radians(Lon1)  # intial longitude in radians
-        Azim = radians(Azim)
-
-    # in case someone is using the old variable names
-    lat1, lon1 = Lat1, Lon1
+        lat1 = radians(lat1)  # intial latitude in radians
+        lon1 = radians(lon1)  # intial longitude in radians
+        azim = radians(azim)
 
     try:
         if (abs(lat1) > pi / 2).any():
@@ -366,7 +352,7 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
         if abs(pi / 2 - abs(lat1)) < 1e-10:
             lat1 = sign(lat1) * (pi / 2 - (1e-10))
 
-    alpha1 = Azim  # inital azimuth in radians
+    alpha1 = azim  # inital azimuth in radians
     sinAlpha1 = sin(alpha1)
     cosAlpha1 = cos(alpha1)
 
@@ -380,7 +366,7 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
     A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
     B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
 
-    sigma = Rng / (b * A)
+    sigma = rng / (b * A)
     sigmaP = 2 * pi
 
     sinSigma = nan
@@ -414,7 +400,7 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
             )
         )
         sigmaP = sigma
-        sigma = Rng / (b * A) + deltaSigma
+        sigma = rng / (b * A) + deltaSigma
         try:
             i = (abs(sigma - sigmaP) > 1e-12).any()
         except AttributeError:
@@ -448,10 +434,7 @@ def vreckon(Lat1, Lon1, Rng, Azim, ell: Ellipsoid | None = None, deg: bool = Tru
         lat2 = degrees(lat2)
         lon2 = degrees(lon2)
 
-    try:
-        return lat2.squeeze()[()], lon2.squeeze()[()]
-    except AttributeError:
-        return lat2, lon2
+    return lat2, lon2
 
 
 def track2(