Merge branch 'bugfix/fix_issue43_AttributeError' into 'master'

Bugfix/fix issue43 attribute error

Closes #43

See merge request !12

.gitlab-ci.yml

@@ -16,7 +16,7 @@ test_arosics:
     - conda install -c conda-forge cartopy  # FIXME remove as soon as docker container is rebuilt
 
     # update py_tools_ds and geoarray
-    # - pip install "py_tools_ds>=0.15.8"
+    # - pip install "py_tools_ds>=0.15.10"
     - pip install "geoarray>=0.9.0"
 
     # run tests

arosics/Tie_Point_Grid.py

@@ -420,6 +420,7 @@ class Tie_Point_Grid(object):
             TPR = Tie_Point_Refiner(GDF[GDF.ABS_SHIFT != self.outFillVal], **self.outlDetect_settings)
             GDF_filt, new_columns = TPR.run_filtering(level=self.tieP_filter_level)
             GDF = GDF.merge(GDF_filt[['POINT_ID'] + new_columns], on='POINT_ID', how="outer")
+
         GDF = GDF.replace([np.nan, None], int(self.outFillVal))  # fillna fails with geopandas==0.6.0
 
         self.CoRegPoints_table = GDF
@@ -428,7 +429,8 @@ class Tie_Point_Grid(object):
             if GDF.empty:
                 warnings.warn('No valid GCPs could by identified.')
             else:
-                print("%d valid tie points remain after filtering." % len(GDF[GDF.OUTLIER.__eq__(False)]))
+                if self.tieP_filter_level > 0:
+                    print("%d valid tie points remain after filtering." % len(GDF[GDF.OUTLIER.__eq__(False)]))
 
         return self.CoRegPoints_table
 

requirements.txt

@@ -11,7 +11,7 @@ pandas
 plotly
 pyfftw
 pykrige
-py_tools_ds>=0.15.8
+py_tools_ds>=0.15.10
 scikit-image
 shapely
 six

setup.py

@@ -51,7 +51,7 @@ req = [
     'plotly',
     'pyfftw',
     'pykrige',
-    'py_tools_ds>=0.15.8',
+    'py_tools_ds>=0.15.10',
     'scikit-image',
     'shapely',
     'six',

tests/CI_docker/context/environment_arosics.yml

@@ -18,7 +18,7 @@ dependencies:
   - pandas
   - pyfftw
   - pykrige
-  - py_tools_ds>=0.15.8
+  - py_tools_ds>=0.15.10
   - scikit-image
   - shapely