Commit 4487d7fb authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

AROSICS now uses pyproj>2.2 under the hood for projection transformations....


AROSICS now uses pyproj>2.2 under the hood for projection transformations. Added minimal version of pyproj. Updated version info and HISTORY.rst.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent c2204209
......@@ -58,7 +58,7 @@ test_arosics_install:
- source activate arosics_testinstall
# resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj shapely geopandas pandas
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib 'pyproj>2.2.0' shapely geopandas pandas
# run installer
- python setup.py install
......
......@@ -43,7 +43,7 @@ from skimage.transform import AffineTransform
# internal modules
from .CoReg import COREG
from py_tools_ds.geo.projection import isProjectedOrGeographic, isLocal, get_UTMzone, dict_to_proj4, proj4_to_WKT
from py_tools_ds.geo.projection import isProjectedOrGeographic, isLocal, get_UTMzone
from py_tools_ds.io.pathgen import get_generic_outpath
from py_tools_ds.processing.progress_mon import ProgressBar
from py_tools_ds.geo.vector.conversion import points_to_raster
......@@ -690,13 +690,13 @@ class Tie_Point_Grid(object):
xshift_arr, gt, prj = points_to_raster(points=self.CoRegPoints_table['geometry'],
values=self.CoRegPoints_table[attr_b1],
tgt_res=self.shift.xgsd * self.grid_res,
prj=proj4_to_WKT(dict_to_proj4(self.CoRegPoints_table.crs)),
prj=self.CoRegPoints_table.crs.to_wkt(),
fillVal=self.outFillVal)
yshift_arr, gt, prj = points_to_raster(points=self.CoRegPoints_table['geometry'],
values=self.CoRegPoints_table[attr_b2],
tgt_res=self.shift.xgsd * self.grid_res,
prj=proj4_to_WKT(dict_to_proj4(self.CoRegPoints_table.crs)),
prj=self.CoRegPoints_table.crs.to_wkt(),
fillVal=self.outFillVal)
out_GA = GeoArray(np.dstack([xshift_arr, yshift_arr]), gt, prj, nodata=self.outFillVal)
......
......@@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.9.19'
__versionalias__ = '2020-08-21_01'
__version__ = '0.9.20'
__versionalias__ = '2020-08-26_01'
......@@ -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 geopandas pandas cmocean
$ conda install -c conda-forge numpy gdal scikit-image matplotlib 'pyproj>2.2.0' shapely geopandas pandas cmocean
3. Install optional libraries for AROSICS (only needed for some specific functions):
......
......@@ -10,7 +10,7 @@ dependencies:
- gdal
- conda-forge::libgdal # force to use conda-forge for libgdal to avoid package version incompatiblies due to mixed channels
- scikit-image
- pyproj
- pyproj>2.2.0
- geopandas
- pandas
- ipython
......@@ -46,4 +46,4 @@ dependencies:
- rednose
- plotly
- geoarray>=0.8.30
- py_tools_ds>=0.14.28
- py_tools_ds>=0.15.0
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