updates and ensure using python 3.11

requirements.txt

@@ -14,7 +14,7 @@ imageio==2.31.5
     # via -r requirements.in
 lxml==4.9.3
     # via -r requirements.in
-numpy==1.26.0
+numpy>=1.26,<2.0
     # via
     #   -r requirements.in
     #   imageio

src/ssoss/process_road_objects.py

@@ -8,7 +8,8 @@
 from zoneinfo import ZoneInfo
 from pathlib import Path
 
-import geopy
+
+from geopy import Point
 from geopy.distance import geodesic, Distance
 
 import gpxpy
@@ -194,7 +195,7 @@ def load_generic_so_csv(self, generic_so_filename: str) -> pd.DataFrame:
                     self.generic_so_load["generic_so_obj"].append(GenericStaticObject(
                         id_num = int(row[0]),
                         street_name = str(row[1]),
-                        pt = geopy.Point(float(row[2]),float(row[3])),
+                        pt = Point(float(row[2]),float(row[3])),
                         bearing = row[4],
                         description = str(row[5]),
                         distance_ft = float(row[6])            
@@ -235,7 +236,7 @@ def load_intersection_csv(self, intersection_filename: str) -> pd.DataFrame:
                         Intersection(
                             int(row[0]),
                             tuple((str(row[1]), str(row[2]))),
-                            geopy.Point(float(row[3]), float(row[4])),
+                            Point(float(row[3]), float(row[4])),
                             spd=tuple(
                                 (
                                     int(row[5]),
@@ -269,7 +270,7 @@ def load_intersection_csv(self, intersection_filename: str) -> pd.DataFrame:
                     temp_i = Intersection(
                         int(row[0]),
                         tuple((str(row[1]), str(row[2]))),
-                        geopy.Point(float(row[3]), float(row[4])),
+                        Point(float(row[3]), float(row[4])),
                         spd=tuple(
                             (
                                 int(row[5]),
@@ -286,10 +287,10 @@ def load_intersection_csv(self, intersection_filename: str) -> pd.DataFrame:
                                 float(row[12]),
                             )
                         ),
-                        stop_bar_nb=tuple((geopy.Point(row[13], row[14]), geopy.Point(row[15], row[16]))),
-                        stop_bar_eb=tuple((geopy.Point(row[17], row[18]), geopy.Point(row[19], row[20]))),
-                        stop_bar_sb=tuple((geopy.Point(row[21], row[22]), geopy.Point(row[23], row[24]))),
-                        stop_bar_wb=tuple((geopy.Point(row[25], row[26]), geopy.Point(row[27], row[28]))),
+                        stop_bar_nb=tuple((Point(row[13], row[14]), Point(row[15], row[16]))),
+                        stop_bar_eb=tuple((Point(row[17], row[18]), Point(row[19], row[20]))),
+                        stop_bar_sb=tuple((Point(row[21], row[22]), Point(row[23], row[24]))),
+                        stop_bar_wb=tuple((Point(row[25], row[26]), Point(row[27], row[28]))),
                     )
                     temp_i.set_sb_pts_bools((nb_sb_pts,eb_sb_pts,sb_sb_pts,wb_sb_pts))
                     self.intersection_load["intersection_obj"].append(temp_i)
@@ -335,7 +336,7 @@ def load_gpx_to_obj_df(self, gpx_filename: str, gpx_ver = "1.0", use_pickle=True
         gpx_load = {"gpx_pt": []}
 
         # initialize starting variables if GPX v1.1 needs speed calcs
-        pnt1 = geopy.Point()
+        pnt1 = Point()
         t1 = None
 
         if use_pickle and Path(self.pickle_file).is_file():
@@ -385,7 +386,7 @@ def load_gpx_to_obj_df(self, gpx_filename: str, gpx_ver = "1.0", use_pickle=True
                             if point.speed is not None:
                                 point.speed = extra_data["speed"]
 
-                    p = geopy.Point(
+                    p = Point(
                         latitude=point.latitude,
                         longitude=point.longitude,
                     )
@@ -715,7 +716,7 @@ def get_location_at_timestamp(self, ts):
 
         Returns
         -------
-        geopy.Point or None
+        Point or None
             The interpolated location or ``None`` if ``ts`` is outside the
             range of the loaded GPX data.
         """
@@ -749,7 +750,7 @@ def get_location_at_timestamp(self, ts):
                 lon = p0.get_location().longitude + ratio * (
                     p1.get_location().longitude - p0.get_location().longitude
                 )
-                return geopy.Point(lat, lon)
+                return Point(lat, lon)
 
         return None