yirgacheffe 1.3.4__tar.gz → 1.4.0__tar.gz

{yirgacheffe-1.3.4/yirgacheffe.egg-info → yirgacheffe-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.3.4
+Version: 1.4.0
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yirgacheffe"
-version = "1.3.4"
+version = "1.4.0"
 description = "Abstraction of gdal datasets for doing basic math operations"
 readme = "README.md"
 authors = [{ name = "Michael Dales", email = "mwd24@cam.ac.uk" }]

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_auto_windowing.py

@@ -251,7 +251,7 @@ def test_vector_layers_multiply() -> None:
         expected = np.array([[2, 0], [0, 8]])
         assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_save_windows() -> None:
     data1 = np.array([[1, 2], [3, 4]])
     data2 = np.array([[10, 20, 30, 40], [50, 60, 70, 80], [90, 100, 110, 120], [130, 140, 150, 160]])

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_datatypes.py

@@ -4,7 +4,7 @@ import pytest
 from osgeo import gdal
 
 from yirgacheffe.operators import DataType
-from yirgacheffe.backends import backend, BACKEND
+from yirgacheffe._backends import backend, BACKEND
 from yirgacheffe.layers import RasterLayer
 
 from tests.helpers import gdal_dataset_with_data

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_h3layer.py

@@ -6,7 +6,7 @@ from osgeo import gdal
 from yirgacheffe import WGS_84_PROJECTION
 from yirgacheffe.layers import RasterLayer, H3CellLayer
 from yirgacheffe.window import Area, PixelScale
-from yirgacheffe.backends import backend
+from yirgacheffe._backends import backend
 
 # work around of pylint
 demote_array = backend.demote_array

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_intersection.py

@@ -3,8 +3,7 @@ from osgeo import gdal
 
 from tests.helpers import gdal_dataset_of_region, gdal_empty_dataset_of_region
 from yirgacheffe.window import Area, PixelScale, Window
-from yirgacheffe.layers import RasterLayer, ConstantLayer
-from yirgacheffe.h3layer import H3CellLayer
+from yirgacheffe.layers import RasterLayer, ConstantLayer, H3CellLayer
 from yirgacheffe import WGS_84_PROJECTION
 
 

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_operators.py

@@ -9,7 +9,7 @@ import torch
 import yirgacheffe
 from yirgacheffe.layers import RasterLayer, ConstantLayer
 from yirgacheffe.operators import LayerOperation, DataType
-from yirgacheffe.backends import backend
+from yirgacheffe._backends import backend
 from tests.helpers import gdal_dataset_with_data
 
 def test_add_byte_layers() -> None:
@@ -584,7 +584,7 @@ def test_direct_layer_save_and_sum() -> None:
     assert (data1 == actual_data).all()
     assert expected_sum == actual_sum
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_add_to_float_layer_by_np_array() -> None:
     data1 = np.array([[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0]])
     layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
@@ -619,7 +619,7 @@ def test_write_mulitband_raster() -> None:
 
             assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_save_and_sum_float32(monkeypatch) -> None:
     random.seed(42)
     data = []
@@ -643,7 +643,7 @@ def test_save_and_sum_float32(monkeypatch) -> None:
                 actual = layer1.save(store, and_sum=True)
             assert expected == actual
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_save_and_sum_float32(monkeypatch) -> None:
     random.seed(42)
     data = []
@@ -671,7 +671,7 @@ def test_parallel_save_and_sum_float32(monkeypatch) -> None:
                     actual = layer1.parallel_save(store, and_sum=True)
                 assert expected == actual
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_sum_float32(monkeypatch) -> None:
     random.seed(42)
     data = []

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_optimisation.py

@@ -4,8 +4,7 @@ import numpy as np
 import pytest
 
 from yirgacheffe import WGS_84_PROJECTION
-from yirgacheffe.h3layer import H3CellLayer
-from yirgacheffe.layers import PixelScale, RasterLayer
+from yirgacheffe.layers import PixelScale, RasterLayer, H3CellLayer
 from yirgacheffe.window import Area
 import yirgacheffe.operators as yo
 

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_parallel_operators.py

@@ -43,7 +43,7 @@ def test_add_byte_layers_with_one_thread_uses_regular_save(monkeypatch) -> None:
                 comp.parallel_save(result)
 
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_add_byte_layers(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -71,7 +71,7 @@ def test_add_byte_layers(monkeypatch) -> None:
 
             assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_add_byte_layers_and_sum(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -100,7 +100,7 @@ def test_add_byte_layers_and_sum(monkeypatch) -> None:
             assert (expected == actual).all()
             assert sum_total == expected.sum()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_sum(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -125,7 +125,7 @@ def test_parallel_sum(monkeypatch) -> None:
             expected = data1 + data2
             assert sum_total == expected.sum()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 @pytest.mark.parametrize("skip,expected_steps", [
     (1, [0.0, 0.25, 0.5, 0.75, 1.0]),
     (2, [0.0, 0.5, 1.0]),
@@ -162,7 +162,7 @@ def test_parallel_with_different_skip(monkeypatch, skip, expected_steps) -> None
 
             assert callback_possitions == expected_steps
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_equality(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -182,7 +182,7 @@ def test_parallel_equality(monkeypatch) -> None:
 
                     assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_equality_to_file(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -202,7 +202,7 @@ def test_parallel_equality_to_file(monkeypatch) -> None:
                 actual = actual_result.read_array(0, 0, 4, 2)
                 assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_unary_numpy_apply_with_function(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -228,7 +228,7 @@ def test_parallel_unary_numpy_apply_with_function(monkeypatch) -> None:
 
             assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_unary_numpy_apply_with_lambda(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -251,7 +251,7 @@ def test_parallel_unary_numpy_apply_with_lambda(monkeypatch) -> None:
 
             assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_where_simple(monkeypatch) -> None:
     with monkeypatch.context() as m:
         m.setattr(yirgacheffe.constants, "YSTEP", 1)
@@ -273,7 +273,7 @@ def test_parallel_where_simple(monkeypatch) -> None:
             actual = result.read_array(0, 0, 4, 2)
             assert (expected == actual).all()
 
-@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+@pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
 def test_parallel_conv2d() -> None:
     with tempfile.TemporaryDirectory() as tempdir:
 

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_pickle.py

@@ -12,7 +12,7 @@ from yirgacheffe.window import Area, PixelScale, Window
 from yirgacheffe.layers import ConstantLayer, GroupLayer, RasterLayer, RescaledRasterLayer, \
     UniformAreaLayer, VectorLayer
 from yirgacheffe import WGS_84_PROJECTION
-from yirgacheffe.backends import backend
+from yirgacheffe._backends import backend
 
 
 def test_pickle_raster_layer() -> None:

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_raster.py

@@ -38,16 +38,6 @@ def test_make_basic_layer() -> None:
 
     assert close_called
 
-def test_make_basic_layer_old_name() -> None:
-    from yirgacheffe.layers import Layer # pylint: disable=C0415
-
-    area = Area(-10, 10, 10, -10)
-    with Layer(gdal_dataset_of_region(area, 0.02)) as layer:
-        assert layer.area == area
-        assert layer.pixel_scale == (0.02, -0.02)
-        assert layer.geo_transform == (-10, 0.02, 0.0, 10, 0.0, -0.02)
-        assert layer.window == Window(0, 0, 1000, 1000)
-
 def test_layer_from_null() -> None:
     # Seems a petty test, but gdal doesn't throw exceptions
     # so you often get None datasets if you're not careful

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/tests/test_vectors.py

@@ -5,7 +5,7 @@ import pytest
 
 from tests.helpers import make_vectors_with_mutlile_ids, make_vectors_with_id, make_vectors_with_empty_feature
 from yirgacheffe import WGS_84_PROJECTION
-from yirgacheffe.layers import RasterLayer, RasteredVectorLayer, VectorLayer, VectorRangeLayer, DynamicVectorRangeLayer
+from yirgacheffe.layers import RasterLayer, RasteredVectorLayer, VectorLayer
 from yirgacheffe.window import Area, PixelScale, Window
 from yirgacheffe.operators import DataType
 
@@ -31,18 +31,6 @@ def test_basic_dyanamic_vector_layer() -> None:
             assert layer.window == Window(0, 0, 20, 10)
             assert layer.projection == WGS_84_PROJECTION
 
-def test_old_dyanamic_vector_layer() -> None:
-    with tempfile.TemporaryDirectory() as tempdir:
-        path = os.path.join(tempdir, "test.gpkg")
-        area = Area(-10.0, 10.0, 10.0, 0.0)
-        make_vectors_with_id(42, {area}, path)
-
-        with DynamicVectorRangeLayer(path, "id_no = 42", PixelScale(1.0, -1.0), WGS_84_PROJECTION) as layer:
-            assert layer.area == area
-            assert layer.geo_transform == (area.left, 1.0, 0.0, area.top, 0.0, -1.0)
-            assert layer.window == Window(0, 0, 20, 10)
-            assert layer.projection == WGS_84_PROJECTION
-
 def test_rastered_vector_layer() -> None:
     with tempfile.TemporaryDirectory() as tempdir:
         path = os.path.join(tempdir, "test.gpkg")
@@ -55,18 +43,6 @@ def test_rastered_vector_layer() -> None:
             assert layer.window == Window(0, 0, 20, 10)
             assert layer.projection == WGS_84_PROJECTION
 
-def test_old_rastered_vector_layer() -> None:
-    with tempfile.TemporaryDirectory() as tempdir:
-        path = os.path.join(tempdir, "test.gpkg")
-        area = Area(-10.0, 10.0, 10.0, 0.0)
-        make_vectors_with_id(42, {area}, path)
-
-        with VectorRangeLayer(path, "id_no = 42", PixelScale(1.0, -1.0), WGS_84_PROJECTION) as layer:
-            assert layer.area == area
-            assert layer.geo_transform == (area.left, 1.0, 0.0, area.top, 0.0, -1.0)
-            assert layer.window == Window(0, 0, 20, 10)
-            assert layer.projection == WGS_84_PROJECTION
-
 def test_basic_dynamic_vector_layer_no_filter_match() -> None:
     with tempfile.TemporaryDirectory() as tempdir:
         path = os.path.join(tempdir, "test.gpkg")
@@ -385,7 +361,7 @@ def test_read_array_size(size, expect_success):
         area = Area(-10.0, 10.0, 10.0, 0.0)
         make_vectors_with_id(42, {area}, path)
 
-        source = VectorRangeLayer(path, "id_no = 42", PixelScale(1.0, -1.0), WGS_84_PROJECTION)
+        source = RasteredVectorLayer.layer_from_file(path, "id_no = 42", PixelScale(1.0, -1.0), WGS_84_PROJECTION)
 
         if expect_success:
             data = source.read_array(0, 0, size[0], size[1])

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/yirgacheffe/__init__.py

@@ -12,6 +12,3 @@ WGS_84_PROJECTION = 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,
     'AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],'\
     'UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],'\
     'AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]'
-
-# For legacy reasons [facepalm]
-WSG_84_PROJECTION = WGS_84_PROJECTION

{yirgacheffe-1.3.4/yirgacheffe/backends → yirgacheffe-1.4.0/yirgacheffe/_backends}/__init__.py

@@ -8,6 +8,6 @@ match BACKEND:
         backend = mlx
     case "NUMPY":
         from . import numpy
-        backend = numpy
+        backend = numpy # type: ignore[misc]
     case _:
         raise NotImplementedError("Only NUMPY and MLX backends supported")

{yirgacheffe-1.3.4/yirgacheffe/backends → yirgacheffe-1.4.0/yirgacheffe/_backends}/mlx.py

@@ -1,6 +1,6 @@
 
 import numpy as np
-import mlx.core as mx # pylint: disable=E0001,E0611,E0401
+import mlx.core as mx # type: ignore
 import mlx.nn
 
 from .enumeration import operators as op

yirgacheffe-1.4.0/yirgacheffe/layers/__init__.py

@@ -0,0 +1,14 @@
+from osgeo import ogr
+
+from ..window import PixelScale
+from .base import YirgacheffeLayer
+from .rasters import RasterLayer, InvalidRasterBand
+from .rescaled import RescaledRasterLayer
+from .vectors import RasteredVectorLayer, VectorLayer
+from .area import UniformAreaLayer
+from .constant import ConstantLayer
+from .group import GroupLayer, TiledGroupLayer
+try:
+    from .h3layer import H3CellLayer
+except ModuleNotFoundError:
+    pass

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/yirgacheffe/layers/base.py

@@ -25,7 +25,7 @@ class YirgacheffeLayer(LayerMathMixin):
 
         self.reset_window()
 
-    def close(self):
+    def close(self) -> None:
         pass
 
     def __enter__(self):
@@ -34,6 +34,16 @@ class YirgacheffeLayer(LayerMathMixin):
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
 
+    def _park(self) -> None:
+        pass
+
+    def _unpark(self) -> None:
+        pass
+
+    @property
+    def _raster_dimensions(self) -> Tuple[int,int]:
+        raise AttributeError("Does not have raster")
+
     @property
     def datatype(self) -> DataType:
         raise NotImplementedError("Must be overridden by subclass")
@@ -131,9 +141,10 @@ class YirgacheffeLayer(LayerMathMixin):
             raise ValueError('Window has negative offset')
         # If there is an underlying raster for this layer, do a sanity check
         try:
-            if ((new_window.xoff + new_window.xsize) > self._raster_xsize) or \
-                ((new_window.yoff + new_window.ysize) > self._raster_ysize):
-                raise ValueError(f'Window is bigger than dataset: raster is {self._raster_xsize}x{self._raster_ysize}'\
+            raster_xsize, raster_ysize = self._raster_dimensions
+            if ((new_window.xoff + new_window.xsize) > raster_xsize) or \
+                ((new_window.yoff + new_window.ysize) > raster_ysize):
+                raise ValueError(f'Window is bigger than dataset: raster is {raster_xsize}x{raster_ysize}'\
                     f', new window is {new_window.xsize - new_window.xoff}x{new_window.ysize - new_window.yoff}')
         except AttributeError:
             pass
@@ -162,9 +173,10 @@ class YirgacheffeLayer(LayerMathMixin):
             raise ValueError('Window has positive offset')
         # If there is an underlying raster for this layer, do a sanity check
         try:
-            if ((new_window.xsize - new_window.xoff) < self._raster_xsize) or \
-                ((new_window.ysize - new_window.yoff) < self._raster_ysize):
-                raise ValueError(f'Window is smaller than dataset: raster is {self._raster_xsize}x{self._raster_ysize}'\
+            raster_xsize, raster_ysize = self._raster_dimensions
+            if ((new_window.xsize - new_window.xoff) < raster_xsize) or \
+                ((new_window.ysize - new_window.yoff) <raster_ysize):
+                raise ValueError(f'Window is smaller than dataset: raster is {raster_xsize}x{raster_ysize}'\
                     f', new window is {new_window.xsize - new_window.xoff}x{new_window.ysize - new_window.yoff}')
         except AttributeError:
             pass
@@ -219,6 +231,7 @@ class YirgacheffeLayer(LayerMathMixin):
         raise NotImplementedError("Must be overridden by subclass")
 
     def read_array_for_area(self, target_area: Area, x: int, y: int, width: int, height: int) -> Any:
+        assert self._pixel_scale is not None
 
         target_window = Window(
             xoff=round_down_pixels((target_area.left - self._underlying_area.left) / self._pixel_scale.xstep,

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/yirgacheffe/layers/constant.py

@@ -3,7 +3,7 @@ from typing import Any, Union
 from ..operators import DataType
 from ..window import Area, PixelScale, Window
 from .base import YirgacheffeLayer
-from ..backends import backend
+from .._backends import backend
 from .. import WGS_84_PROJECTION
 
 

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/yirgacheffe/layers/group.py

@@ -1,7 +1,8 @@
+from __future__ import annotations
 import copy
 import glob
 import os
-from typing import Any, List, Optional, TypeVar
+from typing import Any, List, Optional
 
 import numpy as np
 from yirgacheffe.operators import DataType
@@ -10,9 +11,8 @@ from ..rounding import are_pixel_scales_equal_enough, round_down_pixels
 from ..window import Area, Window
 from .base import YirgacheffeLayer
 from .rasters import RasterLayer
-from ..backends import backend
+from .._backends import backend
 
-GroupLayerT = TypeVar("GroupLayerT", bound="GroupLayer")
 
 class GroupLayerEmpty(ValueError):
     def __init__(self, msg):
@@ -26,7 +26,7 @@ class GroupLayer(YirgacheffeLayer):
         directory_path: str,
         name: Optional[str] = None,
         matching: str = "*.tif"
-    ) -> GroupLayerT:
+    ) -> GroupLayer:
         if directory_path is None:
             raise ValueError("Directory path is None")
         files = [os.path.join(directory_path, x) for x in glob.glob(matching, root_dir=directory_path)]
@@ -35,12 +35,12 @@ class GroupLayer(YirgacheffeLayer):
         return cls.layer_from_files(files, name)
 
     @classmethod
-    def layer_from_files(cls, filenames: List[str], name: Optional[str] = None) -> GroupLayerT:
+    def layer_from_files(cls, filenames: List[str], name: Optional[str] = None) -> GroupLayer:
         if filenames is None:
             raise ValueError("filenames argument is None")
         if len(filenames) < 1:
             raise GroupLayerEmpty("No files found")
-        rasters = [RasterLayer.layer_from_file(x) for x in filenames]
+        rasters: List[YirgacheffeLayer] = [RasterLayer.layer_from_file(x) for x in filenames]
         return cls(rasters, name)
 
     def __init__(self, layers: List[YirgacheffeLayer], name: Optional[str] = None) -> None:
@@ -65,7 +65,7 @@ class GroupLayer(YirgacheffeLayer):
         self._underlying_layers.reverse()
         self.layers = self._underlying_layers
 
-    def _park(self):
+    def _park(self) -> None:
         for layer in self.layers:
             try:
                 layer._park()
@@ -157,7 +157,7 @@ class GroupLayer(YirgacheffeLayer):
 class TileData:
     """This class exists just to let me sort the tiles into the correct order for processing."""
 
-    def __init__(self, data, x, y):
+    def __init__(self, data: Any, x: int, y: int):
         self.data = data
         self.x = x
         self.y = y
@@ -219,7 +219,7 @@ class TiledGroupLayer(GroupLayer):
             ysize
         )
 
-        partials = []
+        partials: List[TileData] = []
         for layer in self.layers:
             # Normally this is hidden with set_window_for_...
             adjusted_layer_window = Window(
@@ -251,7 +251,7 @@ class TiledGroupLayer(GroupLayer):
         # the "obvious" tile. In which case, we should reject the smaller section. If we have
         # two tiles at the same offset and one is not a perfect subset of the other then the
         # tile set we were given is not regularly shaped, and so we should give up.
-        combed_partials = []
+        combed_partials: List[TileData] = []
         previous_tile = None
         for tile in sorted_partials:
             if previous_tile is None:
@@ -276,7 +276,7 @@ class TiledGroupLayer(GroupLayer):
         expected_next_x = 0
         expected_next_y = 0
         data = None
-        row_chunk = None
+        row_chunk: Optional[np.ndarray] = None
 
         # Allow for reading off top
         if combed_partials:
@@ -337,6 +337,7 @@ class TiledGroupLayer(GroupLayer):
                             data = np.vstack((data, row_chunk))
                             expected_next_y += last_y_height
                         else:
+                            assert last_y_offset is not None
                             diff = expected_next_y - last_y_offset
                             assert diff > 0, f"{expected_next_y} - {last_y_offset} <= 0 (aka {diff})"
                             subdata = np.delete(row_chunk, np.s_[0:diff], 0)
@@ -351,8 +352,10 @@ class TiledGroupLayer(GroupLayer):
                     last_y_height = tile.data.shape[0]
                     expected_next_x = tile.data.shape[1] + tile.x
 
+        assert last_y_offset is not None
         if (last_y_offset + last_y_height) < ysize:
             data = np.vstack((data, np.zeros((ysize - (last_y_offset + last_y_height), xsize))))
 
+        assert data is not None
         assert data.shape == (ysize, xsize)
         return backend.promote(data)

{yirgacheffe-1.3.4 → yirgacheffe-1.4.0}/yirgacheffe/layers/h3layer.py

@@ -1,5 +1,5 @@
 from math import ceil, floor
-from typing import Any
+from typing import Any, Tuple
 
 import h3
 import numpy as np
@@ -8,7 +8,7 @@ from yirgacheffe.operators import DataType
 from ..rounding import round_up_pixels
 from ..window import Area, PixelScale, Window
 from .base import YirgacheffeLayer
-from ..backends import backend
+from .._backends import backend
 
 class H3CellLayer(YirgacheffeLayer):
 
@@ -74,12 +74,17 @@ class H3CellLayer(YirgacheffeLayer):
             (sorted_lats[1] / abs_ystep) * abs_ystep,
         )
 
+    @property
+    def _raster_dimensions(self) -> Tuple[int,int]:
+        return (self._raster_xsize, self._raster_ysize)
 
     @property
     def datatype(self) -> DataType:
         return DataType.Float64
 
     def read_array_with_window(self, xoffset: int, yoffset: int, xsize: int, ysize: int, window: Window) -> Any:
+        assert self._pixel_scale is not None
+
         if (xsize <= 0) or (ysize <= 0):
             raise ValueError("Request dimensions must be positive and non-zero")