yirgacheffe 1.7.5__py3-none-any.whl → 1.7.7__py3-none-any.whl

yirgacheffe/layers/base.py

@@ -4,10 +4,11 @@ from typing import Any, Optional, Sequence, Tuple
 import deprecation
 
 from .. import __version__
-from ..operators import DataType, LayerMathMixin
+from .._operators import LayerMathMixin
 from ..rounding import almost_equal, round_up_pixels, round_down_pixels
 from ..window import Area, MapProjection, PixelScale, Window
 from .._backends import backend
+from .._backends.enumeration import dtype as DataType
 
 class YirgacheffeLayer(LayerMathMixin):
     """The common base class for the different layer types. Most still inherit from RasterLayer as deep down

yirgacheffe/layers/constant.py

@@ -1,10 +1,9 @@
 from typing import Any, Union
 
-from ..operators import DataType
 from ..window import Area, MapProjection, PixelScale, Window
 from .base import YirgacheffeLayer
 from .._backends import backend
-
+from .._backends.enumeration import dtype as DataType
 
 class ConstantLayer(YirgacheffeLayer):
     """This is a layer that will return the identity value - can be used when an input layer is

yirgacheffe/layers/group.py

@@ -6,13 +6,12 @@ from typing import Any, List, Optional, Sequence, Union
 import numpy as np
 from numpy import ma
 
-from ..operators import DataType
 from ..rounding import round_down_pixels
 from ..window import Area, Window
 from .base import YirgacheffeLayer
 from .rasters import RasterLayer
 from .._backends import backend
-
+from .._backends.enumeration import dtype as DataType
 
 class GroupLayerEmpty(ValueError):
     def __init__(self, msg):

yirgacheffe/layers/h3layer.py

@@ -3,12 +3,12 @@ from typing import Any, Tuple
 
 import h3
 import numpy as np
-from yirgacheffe.operators import DataType
 
 from ..rounding import round_up_pixels
 from ..window import Area, MapProjection, Window
 from .base import YirgacheffeLayer
 from .._backends import backend
+from .._backends.enumeration import dtype as DataType
 
 class H3CellLayer(YirgacheffeLayer):
 

yirgacheffe/layers/rasters.py

@@ -10,8 +10,8 @@ from ..constants import WGS_84_PROJECTION
 from ..window import Area, MapProjection, PixelScale, Window
 from ..rounding import round_up_pixels
 from .base import YirgacheffeLayer
-from ..operators import DataType
 from .._backends import backend
+from .._backends.enumeration import dtype as DataType
 
 class InvalidRasterBand(Exception):
     def __init__ (self, band):
@@ -97,8 +97,6 @@ class RasterLayer(YirgacheffeLayer):
         threads: Optional[int]=None,
         bands: int=1
     ) -> RasterLayer:
-        width = layer.window.xsize
-        height = layer.window.ysize
         if area is None:
             area = layer.area
         assert area is not None
@@ -117,6 +115,12 @@ class RasterLayer(YirgacheffeLayer):
             area.left, projection.xstep, 0.0, area.top, 0.0, projection.ystep
         )
 
+        if area is None:
+            og_width = layer.window.xsize
+            og_height = layer.window.ysize
+            assert (og_width == width) and (og_height == height), \
+                f"original size ({og_width}, {og_height}) != estimated ({width}, {height})"
+
         if datatype is None:
             datatype_arg = layer.datatype
         elif isinstance(datatype, int):

yirgacheffe/layers/rescaled.py

@@ -4,11 +4,11 @@ from pathlib import Path
 from typing import Any, Optional, Union
 
 from skimage import transform
-from yirgacheffe.operators import DataType
 
 from ..window import MapProjection, PixelScale, Window
 from .rasters import RasterLayer, YirgacheffeLayer
 from .._backends import backend
+from .._backends.enumeration import dtype as DataType
 
 
 class RescaledRasterLayer(YirgacheffeLayer):

yirgacheffe/layers/vectors.py

@@ -4,13 +4,15 @@ from pathlib import Path
 from typing import Any, Optional, Tuple, Union
 from typing_extensions import NotRequired
 
+import deprecation
 from osgeo import gdal, ogr
 
-from ..operators import DataType
+from .. import __version__
 from ..window import Area, MapProjection, PixelScale
 from .base import YirgacheffeLayer
 from .rasters import RasterLayer
 from .._backends import backend
+from .._backends.enumeration import dtype as DataType
 
 def _validate_burn_value(burn_value: Any, layer: ogr.Layer) -> DataType: # pylint: disable=R0911
     if isinstance(burn_value, str):
@@ -60,6 +62,12 @@ class RasteredVectorLayer(RasterLayer):
     VectorLayer."""
 
     @classmethod
+    @deprecation.deprecated(
+        deprecated_in="1.7",
+        removed_in="2.0",
+        current_version=__version__,
+        details="Use `VectorLayer` instead."
+    )
     def layer_from_file( # type: ignore[override] # pylint: disable=W0221
         cls,
         filename: Union[Path,str],