Commit 00982360 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'bugfix/fix_shapely_1.7.0' into 'master'

Bugfix/fix shapely 1.7.0

Closes #34

See merge request !6
parents 404fd90b f674f7a8
Pipeline #7805 failed with stages
in 12 minutes and 56 seconds
......@@ -17,7 +17,7 @@ test_arosics:
- source activate ci_env
- export GDAL_DATA=/root/miniconda3/envs/ci_env/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- pip install "py_tools_ds>=0.14.25" # FIXME remove as soon as docker runner has been updated
- pip install "py_tools_ds>=0.14.27" # FIXME remove as soon as docker runner has been updated
- make nosetests
# create the docs
- pip install sphinx_rtd_theme # Read-the-docs theme for SPHINX documentation
......@@ -56,7 +56,7 @@ test_arosics_install:
- conda create -y -q --name arosics_testinstall python=3
- source activate arosics_testinstall
# resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj "shapely<=1.6.4" geopandas pandas
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj shapely geopandas pandas
- 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
......
......@@ -3,7 +3,7 @@ GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
AROSICS - An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data
Copyright (C) 2017 Daniel Scheffler
Copyright (C) 2020 Daniel Scheffler
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......@@ -115,6 +115,7 @@ class GeoArray_CoReg(GeoArray):
# footprint_poly is calculated automatically by GeoArray
if not CoReg_params['q']:
print('Calculating actual data corner coordinates for %s...' % self.imName)
self.calc_mask_nodata(fromBand=self.band4match) # this avoids that all bands have to be read
# validate footprint poly
......@@ -480,6 +481,9 @@ class COREG(object):
self.ref.reproject_to_new_grid(prototype=self.shift, CPUs=self.CPUs)
self.ref.band4match = 0 # after resampling there is only one band in the GeoArray
# self.ref.gt = (self.ref.gt[0], 1, self.ref.gt[2], self.ref.gt[3], self.ref.gt[4], -1)
# self.shift.gt = (self.shift.gt[0], 1, self.shift.gt[2], self.shift.gt[3], self.shift.gt[4], -1)
def show_image_footprints(self):
"""Show a web map containing the calculated footprints and overlap area of the input images.
......@@ -723,7 +727,7 @@ class COREG(object):
matchBox.buffer_imXY(-1 if xLarger else 0, -1 if yLarger else 0)
# matching_win direkt auf grid2use (Rundungsfehler bei Koordinatentrafo beseitigen)
matchBox.imPoly = round_shapelyPoly_coords(matchBox.imPoly, precision=0, out_dtype=int)
matchBox.imPoly = round_shapelyPoly_coords(matchBox.imPoly, precision=0)
# Check, ob match Fenster größer als anderes Fenster
if not (matchBox.mapPoly.within(otherBox.mapPoly) or matchBox.mapPoly == otherBox.mapPoly):
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -3,7 +3,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -65,7 +65,7 @@ master_doc = 'index'
# General information about the project.
project = u'arosics'
copyright = u"2019, Daniel Scheffler"
copyright = u"2020, Daniel Scheffler"
# The version info for the project you're documenting, acts as replacement
# for |version| and |release|, also used in various other places throughout
......
......@@ -20,7 +20,7 @@ Using conda_, the recommended approach is:
.. code-block:: bash
$ conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj "shapely<=1.6.4" geopandas pandas cmocean
$ conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj shapely geopandas pandas cmocean
3. Install optional libraries for AROSICS (only needed for some specific functions):
......
......@@ -3,7 +3,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......@@ -39,8 +39,8 @@ version = {}
with open("arosics/version.py") as version_file:
exec(version_file.read(), version)
requirements = ['numpy', 'gdal', 'shapely<=1.6.4', 'scikit-image', 'matplotlib', 'geopandas', 'pandas', 'geoarray>=0.8.17',
'py_tools_ds>=0.14.25', 'plotly', 'cmocean', 'six', 'folium>=0.6.0', 'geojson'
requirements = ['numpy', 'gdal', 'shapely', 'scikit-image', 'matplotlib', 'geopandas', 'pandas',
'geoarray>=0.8.17', 'py_tools_ds>=0.14.27', 'plotly', 'cmocean', 'six', 'folium>=0.6.0', 'geojson'
# 'pykrige' # conda install --yes -c conda-forge pykrige
# 'pyfftw', # conda install --yes -c conda-forge pyfftw=0.10.4 ; \
# 'basemap', # conda install --yes -c conda-forge basemap; \
......
......@@ -15,7 +15,7 @@ dependencies:
- geopandas
- pandas
- ipython
- shapely<=1.6.4
- shapely
- matplotlib
- basemap
- holoviews
......@@ -47,4 +47,4 @@ dependencies:
- rednose
- plotly
- geoarray>=0.8.17
- py_tools_ds>=0.14.25
- py_tools_ds>=0.14.27
......@@ -2,7 +2,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -3,7 +3,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -3,7 +3,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
......@@ -3,7 +3,7 @@
# AROSICS - Automated and Robust Open-Source Image Co-Registration Software
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
# Copyright (C) 2020 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
#
# This software was developed within the context of the GeoMultiSens project funded
# by the German Federal Ministry of Education and Research
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment