Removed pyresample dependency (not needed anymore).

Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

.gitlab-ci.yml

@@ -51,7 +51,7 @@ test_specclassify_install:
     - conda create -y -q --name specclassify_testinstall python=3
     - source activate specclassify_testinstall
      # resolve some requirements with conda
-    - conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas pyresample>=1.11.0
+    - conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas
     - conda install --yes -q -c conda-forge libgdal ncurses # Fix for libgdal installed from defaults channel causing libkea.so.1.4.7: cannot open shared object file: No such file or directory
     # run installer
     - python setup.py install

specclassify/classify.py

@@ -47,11 +47,12 @@ def classify_image(image, train_spectra, train_labels, classif_alg, in_nodataVal
     :param classif_alg:     algorithm to be used for image classification
                             (to define which cluster each pixel belongs to)
                             'MinDist':      Minimum Distance (Nearest Centroid)
-                            'kNN_MinDist':  Minimum Distance (Nearest Centroid)
+                            'kNN_MinDist':  k-nearest Minimum Distance (Nearest Centroid)
                             'kNN':          k-nearest-neighbour
                             'SAM':          spectral angle mapping
                             'kNN_SAM':      k-nearest neighbour spectral angle mapping
                             'FEDSA':        fused euclidian distance / spectral angle
+                            'kNN_FEDSA':    k-nearest neighbour fused euclidian distance / spectral angle
                             'SID':          spectral information divergence
                             'RF':           random forest
     :param in_nodataVal:

specclassify/version.py

@@ -22,5 +22,5 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-__version__ = '0.2.2'
-__versionalias__ = '20190822.02'
+__version__ = '0.2.3'
+__versionalias__ = '20190108.01'

tests/CI_docker/context/environment_specclassify.yml

@@ -23,7 +23,6 @@ dependencies:
   - rasterio
   - scikit-image
   - shapely
-  - pyresample>=1.11.0
 
   - pip:
     - tqdm