yirgacheffe 1.7.1__tar.gz → 1.7.3__tar.gz

{yirgacheffe-1.7.1/yirgacheffe.egg-info → yirgacheffe-1.7.3}/PKG-INFO

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

{yirgacheffe-1.7.1 → yirgacheffe-1.7.3}/pyproject.toml

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

{yirgacheffe-1.7.1 → yirgacheffe-1.7.3}/tests/test_intersection.py

@@ -1,9 +1,12 @@
+import tempfile
+from pathlib import Path
+
 import pytest
 from osgeo import gdal
 
-from tests.helpers import gdal_dataset_of_region, gdal_empty_dataset_of_region
+from tests.helpers import gdal_dataset_of_region, gdal_empty_dataset_of_region, make_vectors_with_id
 from yirgacheffe.window import Area, MapProjection, Window
-from yirgacheffe.layers import RasterLayer, ConstantLayer, H3CellLayer
+from yirgacheffe.layers import RasterLayer, ConstantLayer, H3CellLayer, VectorLayer
 from yirgacheffe import WGS_84_PROJECTION
 
 
@@ -56,6 +59,36 @@ def test_find_intersection_with_constant() -> None:
     intersection = RasterLayer.find_intersection(layers)
     assert intersection == layers[0].area
 
+def test_find_intersection_with_vector_unbound() -> None:
+    with tempfile.TemporaryDirectory() as tempdir:
+        path = Path(tempdir) / "test.gpkg"
+        area = Area(left=58, top=74, right=180, bottom=42)
+        make_vectors_with_id(42, {area}, path)
+        assert path.exists
+
+        raster = RasterLayer(gdal_dataset_of_region(Area(left=-180.05, top=90.09, right=180.05, bottom=-90.09), 0.13))
+        vector = VectorLayer.layer_from_file(path, None, None, None)
+        assert vector.area == area
+
+        layers = [raster, vector]
+        intersection = RasterLayer.find_intersection(layers)
+        assert intersection == vector.area
+
+def test_find_intersection_with_vector_bound() -> None:
+    with tempfile.TemporaryDirectory() as tempdir:
+        path = Path(tempdir) / "test.gpkg"
+        area = Area(left=58, top=74, right=180, bottom=42)
+        make_vectors_with_id(42, {area}, path)
+        assert path.exists
+
+        raster = RasterLayer(gdal_dataset_of_region(Area(left=-180.05, top=90.09, right=180.05, bottom=-90.09), 0.13))
+        vector = VectorLayer.layer_from_file(path, None, raster.map_projection.scale, raster.map_projection.name)
+        assert vector.area != area
+
+        layers = [raster, vector]
+        intersection = RasterLayer.find_intersection(layers)
+        assert intersection == vector.area
+
 def test_find_intersection_different_pixel_pitch() -> None:
     layers = [
         RasterLayer(gdal_dataset_of_region(Area(-10, 10, 10, -10), 0.02)),
@@ -143,7 +176,7 @@ def test_find_intersection_nearly_same() -> None:
         assert layers[0].window.xsize == other.window.xsize
         assert layers[0].window.ysize == other.window.ysize
 
-def test_intersection_stability():
+def test_intersection_stability() -> None:
     # This test uses h3 tiles as a lazy way to get some bounded regions,
     # but the bug this test exercises is not h3 specific. This was another case of
     # a rounding error that causes set_window_for_* methods to wobble depending on how far

{yirgacheffe-1.7.1 → yirgacheffe-1.7.3}/tests/test_operators.py

@@ -1472,42 +1472,54 @@ def test_to_geotiff_single_thread_and_sum() -> None:
             assert (expected == actual).all()
 
 @pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
-def test_to_geotiff_parallel_thread(monkeypatch) -> None:
-    data1 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]])
-    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
-
-    calc = layer1 * 2
-
-    with tempfile.TemporaryDirectory() as tempdir:
-        filename = os.path.join(tempdir, "test.tif")
-        with monkeypatch.context() as m:
-            m.setattr(yirgacheffe.constants, "YSTEP", 1)
-            calc.to_geotiff(filename, parallelism=2)
-
-        with RasterLayer.layer_from_file(filename) as result:
-            expected = data1 * 2
-            actual = result.read_array(0, 0, 4, 2)
-            assert (expected == actual).all()
+@pytest.mark.parametrize("parallelism", [
+    2,
+    True,
+])
+def test_to_geotiff_parallel_thread(monkeypatch, parallelism) -> None:
+    with monkeypatch.context() as m:
+        m.setattr(yirgacheffe.constants, "YSTEP", 1)
+        m.setattr(LayerOperation, "save", None)
+        with tempfile.TemporaryDirectory() as tempdir:
+            data1 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]])
+            src_filename = os.path.join("src.tif")
+            dataset = gdal_dataset_with_data((0.0, 0.0), 0.02, data1, filename=src_filename)
+            dataset.Close()
+            with yirgacheffe.read_raster(src_filename) as layer1:
+                calc = layer1 * 2
+                filename = os.path.join(tempdir, "test.tif")
+                calc.to_geotiff(filename, parallelism=parallelism)
+
+                with RasterLayer.layer_from_file(filename) as result:
+                    expected = data1 * 2
+                    actual = result.read_array(0, 0, 4, 2)
+                    assert (expected == actual).all()
 
 @pytest.mark.skipif(yirgacheffe._backends.BACKEND != "NUMPY", reason="Only applies for numpy")
-def test_to_geotiff_parallel_thread_and_sum(monkeypatch) -> None:
-    data1 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]])
-    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
-
-    calc = layer1 * 2
-
-    with tempfile.TemporaryDirectory() as tempdir:
-        filename = os.path.join(tempdir, "test.tif")
-        with monkeypatch.context() as m:
-            m.setattr(yirgacheffe.constants, "YSTEP", 1)
-            actual_sum = calc.to_geotiff(filename, and_sum=True)
-
-        assert (data1.sum() * 2) == actual_sum
-
-        with RasterLayer.layer_from_file(filename) as result:
-            expected = data1 * 2
-            actual = result.read_array(0, 0, 4, 2)
-            assert (expected == actual).all()
+@pytest.mark.parametrize("parallelism", [
+    2,
+    True,
+])
+def test_to_geotiff_parallel_thread_and_sum(monkeypatch, parallelism) -> None:
+    with monkeypatch.context() as m:
+        m.setattr(yirgacheffe.constants, "YSTEP", 1)
+        m.setattr(LayerOperation, "save", None)
+        with tempfile.TemporaryDirectory() as tempdir:
+            data1 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]])
+            src_filename = os.path.join("src.tif")
+            dataset = gdal_dataset_with_data((0.0, 0.0), 0.02, data1, filename=src_filename)
+            dataset.Close()
+            with yirgacheffe.read_raster(src_filename) as layer1:
+                filename = os.path.join(tempdir, "test.tif")
+                calc = layer1 * 2
+                actual_sum = calc.to_geotiff(filename, and_sum=True, parallelism=parallelism)
+
+                assert (data1.sum() * 2) == actual_sum
+
+                with RasterLayer.layer_from_file(filename) as result:
+                    expected = data1 * 2
+                    actual = result.read_array(0, 0, 4, 2)
+                    assert (expected == actual).all()
 
 def test_raster_and_vector() -> None:
     with tempfile.TemporaryDirectory() as tempdir:

{yirgacheffe-1.7.1 → yirgacheffe-1.7.3}/tests/test_union.py

@@ -1,8 +1,11 @@
+import tempfile
+from pathlib import Path
+
 import pytest
 
-from tests.helpers import gdal_dataset_of_region
+from tests.helpers import gdal_dataset_of_region, make_vectors_with_id
 from yirgacheffe.window import Area, Window
-from yirgacheffe.layers import ConstantLayer, RasterLayer
+from yirgacheffe.layers import ConstantLayer, RasterLayer, VectorLayer
 
 
 def test_find_union_empty_list() -> None:
@@ -62,6 +65,36 @@ def test_find_union_different_pixel_pitch() -> None:
     with pytest.raises(ValueError):
         _ = RasterLayer.find_union(layers)
 
+def test_find_union_with_vector_unbound() -> None:
+    with tempfile.TemporaryDirectory() as tempdir:
+        path = Path(tempdir) / "test.gpkg"
+        area = Area(left=58, top=74, right=180, bottom=42)
+        make_vectors_with_id(42, {area}, path)
+        assert path.exists
+
+        raster = RasterLayer(gdal_dataset_of_region(Area(left=59.93, top=70.07, right=170.04, bottom=44.98), 0.13))
+        vector = VectorLayer.layer_from_file(path, None, None, None)
+        assert vector.area == area
+
+        layers = [raster, vector]
+        union = RasterLayer.find_union(layers)
+        assert union == vector.area
+
+def test_find_union_with_vector_bound() -> None:
+    with tempfile.TemporaryDirectory() as tempdir:
+        path = Path(tempdir) / "test.gpkg"
+        area = Area(left=58, top=74, right=180, bottom=42)
+        make_vectors_with_id(42, {area}, path)
+        assert path.exists
+
+        raster = RasterLayer(gdal_dataset_of_region(Area(left=59.93, top=70.07, right=170.04, bottom=44.98), 0.13))
+        vector = VectorLayer.layer_from_file(path, None, raster.map_projection.scale, raster.map_projection.name)
+        assert vector.area != area
+
+        layers = [raster, vector]
+        union = RasterLayer.find_union(layers)
+        assert union == vector.area
+
 @pytest.mark.parametrize("scale", [0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09])
 def test_set_union_self(scale) -> None:
     layer = RasterLayer(gdal_dataset_of_region(Area(-10, 10, 10, -10), scale))

{yirgacheffe-1.7.1 → yirgacheffe-1.7.3}/yirgacheffe/layers/base.py

@@ -91,7 +91,7 @@ class YirgacheffeLayer(LayerMathMixin):
         else:
             return self._underlying_area
 
-    def _get_operation_area(self, projection: Optional[MapProjection]) -> Area:
+    def _get_operation_area(self, projection: Optional[MapProjection]=None) -> Area:
         if self._projection is not None and projection is not None and self._projection != projection:
             raise ValueError("Calculation projection does not match layer projection")
         return self.area
@@ -119,11 +119,12 @@ class YirgacheffeLayer(LayerMathMixin):
         if not all(projections[0] == x for x in projections[1:]):
             raise ValueError("Not all layers are at the same projectin or pixel scale")
 
+        layer_areas = [x._get_operation_area() for x in layers]
         intersection = Area(
-            left=max(x._underlying_area.left for x in layers),
-            top=min(x._underlying_area.top for x in layers),
-            right=min(x._underlying_area.right for x in layers),
-            bottom=max(x._underlying_area.bottom for x in layers)
+            left=max(x.left for x in layer_areas),
+            top=min(x.top for x in layer_areas),
+            right=min(x.right for x in layer_areas),
+            bottom=max(x.bottom for x in layer_areas)
         )
         if (intersection.left >= intersection.right) or (intersection.bottom >= intersection.top):
             raise ValueError('No intersection possible')
@@ -142,11 +143,12 @@ class YirgacheffeLayer(LayerMathMixin):
         if not all(projections[0] == x for x in projections[1:]):
             raise ValueError("Not all layers are at the same projectin or pixel scale")
 
+        layer_areas = [x._get_operation_area() for x in layers]
         return Area(
-            left=min(x._underlying_area.left for x in layers),
-            top=max(x._underlying_area.top for x in layers),
-            right=max(x._underlying_area.right for x in layers),
-            bottom=min(x._underlying_area.bottom for x in layers)
+            left=min(x.left for x in layer_areas),
+            top=max(x.top for x in layer_areas),
+            right=max(x.right for x in layer_areas),
+            bottom=min(x.bottom for x in layer_areas)
         )
 
     @property

{yirgacheffe-1.7.1 → yirgacheffe-1.7.3}/yirgacheffe/operators.py

@@ -251,7 +251,7 @@ class LayerMathMixin:
         self,
         filename: Union[Path,str],
         and_sum: bool = False,
-        parallelism:Optional[int]=None
+        parallelism:Optional[Union[int,bool]]=None
     ) -> Optional[float]:
         return LayerOperation(self).to_geotiff(filename, and_sum, parallelism)
 
@@ -659,7 +659,9 @@ class LayerOperation(LayerMathMixin):
 
         if (computation_window.xsize != destination_window.xsize) \
                 or (computation_window.ysize != destination_window.ysize):
-            raise ValueError("Destination raster window size does not match input raster window size.")
+            raise ValueError((f"Destination raster window size does not match input raster window size: "
+                f"{(destination_window.xsize, destination_window.ysize)} vs "
+                f"{(computation_window.xsize, computation_window.ysize)}"))
 
         total = 0.0
 
@@ -899,7 +901,7 @@ class LayerOperation(LayerMathMixin):
         self,
         filename: Union[Path,str],
         and_sum: bool = False,
-        parallelism:Optional[int]=None
+        parallelism:Optional[Union[int,bool]] = None
     ) -> Optional[float]:
         """Saves a calculation to a raster file, optionally also returning the sum of pixels.
 
@@ -909,8 +911,9 @@ class LayerOperation(LayerMathMixin):
             Path of the raster to save the result to.
         and_sum : bool, default=False
             If true then the function will also calculate the sum of the raster as it goes and return that value.
-        parallelism : int, optional, default=None
-            If passed, attempt to use multiple CPU cores up to the number provided.
+        parallelism : int or bool, optional, default=None
+            If passed, attempt to use multiple CPU cores up to the number provided, or if set to True, yirgacheffe
+            will pick a sensible value.
 
         Returns
         -------
@@ -932,6 +935,9 @@ class LayerOperation(LayerMathMixin):
                 if parallelism is None:
                     result = self.save(layer, and_sum=and_sum)
                 else:
+                    if isinstance(parallelism, bool):
+                        # Parallel save treats None as "work it out"
+                        parallelism = None
                     result = self.parallel_save(layer, and_sum=and_sum, parallelism=parallelism)
 
             os.makedirs(target_dir, exist_ok=True)

{yirgacheffe-1.7.1 → yirgacheffe-1.7.3/yirgacheffe.egg-info}/PKG-INFO

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