change back to shapely>=2 in dependencies.txt

Author: noellehmcheng

dependencies.txt

@@ -2,7 +2,7 @@ gdal>=3.6.2
 numpy
 scipy
 geopandas
-shapely>=2.0.2
+shapely>=2
 networkx
 owslib
 loopprojectfile==0.2.2

map2loop/thickness_calculator.py

@@ -23,7 +23,7 @@
 import geopandas
 import shapely
 import math
-
+from shapely.errors import UnsupportedGEOSVersionError
 
 class ThicknessCalculator(ABC):
     """
@@ -365,7 +365,11 @@ def compute(
                         # calculate the length of the shortest line
                         line_length = scipy.spatial.distance.euclidean(p1, p2)
                         # find the indices of the points that are within 5% of the length of the shortest line
-                        indices = shapely.dwithin(short_line, interp_points, line_length * 0.25)
+                        try:
+                            # GEOS 3.10.0+
+                            indices = shapely.dwithin(short_line, interp_points, line_length * 0.25)
+                        except UnsupportedGEOSVersionError:
+                            indices= numpy.array([shapely.distance(short_line[0],point)<= (line_length * 0.25) for point in interp_points])
                         # get the dip of the points that are within
                         _dip = numpy.deg2rad(dip[indices])
                         _dips.append(_dip)