set gdal>=3.6.2 and shapely>=2.0.2 in dependencies.txt

Author: noellehmcheng

.github/workflows/linting_and_testing.yml

@@ -37,19 +37,9 @@ jobs:
             conda-remove-defaults: "true"
 
 
-      - name: Install dependencies for windows python 3.10
-        if: ${{ matrix.os == 'windows-latest' && matrix.python-version == '3.10' }}
-        run: |
-            conda run -n test conda info
-            conda run -n test conda install -c loop3d -c conda-forge "gdal=3.4.3" python=${{ matrix.python-version }} -y
-            conda run -n test conda install -c loop3d -c conda-forge --file dependencies.txt python=${{ matrix.python-version }} -y
-            conda run -n test conda install pytest python=${{ matrix.python-version }} -y
-
-      - name: Install dependencies for other environments
-        if: ${{ matrix.os != 'windows-latest' || matrix.python-version != '3.10' }}
+      - name: Install dependencies
         run: |
             conda run -n test conda info
-            conda run -n test conda install -c loop3d -c conda-forge gdal python=${{ matrix.python-version }} -y
             conda run -n test conda install -c loop3d -c conda-forge --file dependencies.txt python=${{ matrix.python-version }} -y
             conda run -n test conda install pytest python=${{ matrix.python-version }} -y
 

dependencies.txt

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

map2loop/thickness_calculator.py

@@ -365,8 +365,7 @@ 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)
-                        indices= numpy.array([shapely.distance(short_line[0],point)<= (line_length * 0.25) for point in interp_points])
+                        indices = shapely.dwithin(short_line, interp_points, line_length * 0.25)
                         # get the dip of the points that are within
                         _dip = numpy.deg2rad(dip[indices])
                         _dips.append(_dip)