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

Updated deprecated import statements.

updated __version__
parent 85a389f1
......@@ -77,7 +77,7 @@ CR.calculate_spatial_shifts()
```python
from py_tools_ds.ptds import GeoArray
from geoarray import GeoArray
from CoReg_Sat import COREG
im_reference = '/path/to/your/ref_image.bsq'
......@@ -169,7 +169,7 @@ CR.correct_shifts()
[ 0, 0, 0, ..., 760, 763, 749],
[9999, 9999, 9999, ..., 9999, 9999, 9999]], dtype=uint16)),
('GeoArray_shifted',
<py_tools_ds.ptds.io.raster.GeoArray.GeoArray at 0x7f6c5a1cabe0>)])
<py_tools_ds.io.raster.GeoArray.GeoArray at 0x7f6c5a1cabe0>)])
......@@ -219,7 +219,7 @@ DESHIFTER(im_target2, CR.coreg_info).correct_shifts()
[ 0, 0, 0, ..., 760, 763, 749],
[9999, 9999, 9999, ..., 9999, 9999, 9999]], dtype=uint16)),
('GeoArray_shifted',
<py_tools_ds.ptds.io.raster.GeoArray.GeoArray at 0x7f6c5a1caa58>)])
<py_tools_ds.io.raster.GeoArray.GeoArray at 0x7f6c5a1caa58>)])
......@@ -318,7 +318,7 @@ CRL.correct_shifts()
[ 0, 0, 0, ..., 762, 755, 765],
[ 0, 0, 0, ..., 0, 0, 0]], dtype=uint16)),
('GeoArray_shifted',
<py_tools_ds.ptds.io.raster.GeoArray.GeoArray at 0x7f451ac14a90>)])
<py_tools_ds.io.raster.GeoArray.GeoArray at 0x7f451ac14a90>)])
......
......@@ -9,7 +9,7 @@ from .components import utilities
from .components import geometry
__author__ = 'Daniel Scheffler'
__version__= '2017-05-03_01'
__version__= '2017-06-09_01'
__all__=['COREG',
'COREG_LOCAL',
......
......@@ -36,17 +36,17 @@ from . import io as IO
from . import plotting as PLT
from geoarray import GeoArray
from py_tools_ds.ptds.convenience.object_oriented import alias_property
from py_tools_ds.ptds.geo.coord_calc import corner_coord_to_minmax, get_corner_coordinates
from py_tools_ds.ptds.geo.vector.topology import get_overlap_polygon, get_smallest_boxImYX_that_contains_boxMapYX
from py_tools_ds.ptds.geo.projection import prj_equal, get_proj4info
from py_tools_ds.ptds.geo.vector.geometry import boxObj, round_shapelyPoly_coords
from py_tools_ds.ptds.geo.coord_grid import move_shapelyPoly_to_image_grid
from py_tools_ds.ptds.geo.coord_trafo import pixelToMapYX, reproject_shapelyGeometry, mapXY2imXY
from py_tools_ds.ptds.geo.raster.reproject import warp_ndarray
from py_tools_ds.ptds.geo.map_info import geotransform2mapinfo
from py_tools_ds.ptds.numeric.vector import find_nearest
from py_tools_ds.ptds.similarity.raster import calc_ssim
from py_tools_ds.convenience.object_oriented import alias_property
from py_tools_ds.geo.coord_calc import corner_coord_to_minmax, get_corner_coordinates
from py_tools_ds.geo.vector.topology import get_overlap_polygon, get_smallest_boxImYX_that_contains_boxMapYX
from py_tools_ds.geo.projection import prj_equal, get_proj4info
from py_tools_ds.geo.vector.geometry import boxObj, round_shapelyPoly_coords
from py_tools_ds.geo.coord_grid import move_shapelyPoly_to_image_grid
from py_tools_ds.geo.coord_trafo import pixelToMapYX, reproject_shapelyGeometry, mapXY2imXY
from py_tools_ds.geo.raster.reproject import warp_ndarray
from py_tools_ds.geo.map_info import geotransform2mapinfo
from py_tools_ds.numeric.vector import find_nearest
from py_tools_ds.similarity.raster import calc_ssim
......
......@@ -20,7 +20,7 @@ from mpl_toolkits.axes_grid1 import make_axes_locatable
from .Tie_Point_Grid import Tie_Point_Grid
from .CoReg import COREG
from .DeShifter import DESHIFTER
from py_tools_ds.ptds.geo.coord_trafo import transform_any_prj, reproject_shapelyGeometry
from py_tools_ds.geo.coord_trafo import transform_any_prj, reproject_shapelyGeometry
from geoarray import GeoArray
......@@ -456,7 +456,7 @@ class COREG_LOCAL(object):
# get image to plot
image2plot = self.im2shift[:,:,0] # FIXME hardcoded band
from py_tools_ds.ptds.geo.raster.reproject import warp_ndarray
from py_tools_ds.geo.raster.reproject import warp_ndarray
image2plot, gt, prj = warp_ndarray(image2plot, self.im2shift.geotransform, self.im2shift.projection,
in_nodata=self.nodata[1], out_nodata=self.nodata[1],
out_XYdims=(1000, 1000), q=True, out_prj='epsg:3857') # image must be transformed into web mercator projection
......
......@@ -13,11 +13,11 @@ except ImportError:
# internal modules
from geoarray import GeoArray
from py_tools_ds.ptds.geo.map_info import mapinfo2geotransform, geotransform2mapinfo
from py_tools_ds.ptds.geo.coord_grid import is_coord_grid_equal
from py_tools_ds.ptds.geo.projection import prj_equal
from py_tools_ds.ptds.geo.raster.reproject import warp_ndarray
from py_tools_ds.ptds.numeric.vector import find_nearest
from py_tools_ds.geo.map_info import mapinfo2geotransform, geotransform2mapinfo
from py_tools_ds.geo.coord_grid import is_coord_grid_equal
from py_tools_ds.geo.projection import prj_equal
from py_tools_ds.geo.raster.reproject import warp_ndarray
from py_tools_ds.numeric.vector import find_nearest
_dict_rspAlg_rsp_Int = {'nearest': 0, 'bilinear': 1, 'cubic': 2, 'cubic_spline': 3, 'lanczos': 4, 'average': 5,
'mode': 6, 'max': 7, 'min': 8 , 'med': 9, 'q1':10, 'q2':11,
......
......@@ -23,10 +23,10 @@ from skimage.transform import AffineTransform, PolynomialTransform
# internal modules
from .CoReg import COREG
from . import io as IO
from py_tools_ds.ptds.geo.projection import isProjectedOrGeographic, get_UTMzone, dict_to_proj4, proj4_to_WKT
from py_tools_ds.ptds.io.pathgen import get_generic_outpath
from py_tools_ds.ptds.processing.progress_mon import ProgressBar
from py_tools_ds.ptds.geo.vector.conversion import points_to_raster
from py_tools_ds.geo.projection import isProjectedOrGeographic, get_UTMzone, dict_to_proj4, proj4_to_WKT
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
from geoarray import GeoArray
......
......@@ -18,8 +18,8 @@ except ImportError:
from osgeo import ogr
# internal modules
from py_tools_ds.ptds.geo.coord_calc import calc_FullDataset_corner_positions
from py_tools_ds.ptds.geo.coord_trafo import pixelToMapYX, imYX2mapYX
from py_tools_ds.geo.coord_calc import calc_FullDataset_corner_positions
from py_tools_ds.geo.coord_trafo import pixelToMapYX, imYX2mapYX
from geoarray import GeoArray
......
......@@ -14,9 +14,9 @@ from spectral.io import envi
# internal modules
from .utilities import get_image_tileborders, convertGdalNumpyDataType
from py_tools_ds.ptds.geo.map_info import geotransform2mapinfo
from py_tools_ds.ptds.geo.projection import EPSG2WKT
from py_tools_ds.ptds.dtypes.conversion import get_dtypeStr
from py_tools_ds.geo.map_info import geotransform2mapinfo
from py_tools_ds.geo.projection import EPSG2WKT
from py_tools_ds.dtypes.conversion import get_dtypeStr
......
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