yirgacheffe 1.7.3__tar.gz → 1.7.4__tar.gz

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

@@ -1,10 +1,13 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.7.3
+Version: 1.7.4
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC
 Project-URL: Homepage, https://github.com/quantifyearth/yirgacheffe
+Project-URL: Repository, https://github.com/quantifyearth/yirgacheffe.git
+Project-URL: Issues, https://github.com/quantifyearth/yirgacheffe/issues
+Project-URL: Changelog, https://github.com/quantifyearth/yirgacheffe/blob/main/CHANGES.md
 Keywords: gdal,numpy,math
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yirgacheffe"
-version = "1.7.3"
+version = "1.7.4"
 description = "Abstraction of gdal datasets for doing basic math operations"
 readme = "README.md"
 authors = [{ name = "Michael Dales", email = "mwd24@cam.ac.uk" }]
@@ -28,6 +28,9 @@ dev = ["mypy", "pylint", "pytest", "h3", "pytest-cov", "mlx"]
 
 [project.urls]
 Homepage = "https://github.com/quantifyearth/yirgacheffe"
+Repository = "https://github.com/quantifyearth/yirgacheffe.git"
+Issues = "https://github.com/quantifyearth/yirgacheffe/issues"
+Changelog = "https://github.com/quantifyearth/yirgacheffe/blob/main/CHANGES.md"
 
 [project.scripts]
 realpython = "reader.__main__:main"

{yirgacheffe-1.7.3 → yirgacheffe-1.7.4}/tests/test_nodata.py

@@ -62,3 +62,31 @@ def test_group_layer_with_nodata_values_ignore_nodata() -> None:
             with GroupLayer([layer1, layer2]) as group:
                 actual = group.read_array(0, 0, 4, 2)
                 assert np.array_equal(data1, actual, equal_nan=True)
+
+def test_group_layer_with_nodata_read_from_empty_area() -> None:
+    data1 = np.array([[1.0, 2.0, 3.0, 4.0], [5.0, 5.0, 5.0, 5.0]])
+    dataset1 = gdal_dataset_with_data((0.0, 10.0), 1.0, data1)
+    dataset1.GetRasterBand(1).SetNoDataValue(5.0)
+
+    data2 = np.array([[1.0, 1.0, 1.0, 1.0], [5.0, 6.0, 7.0, 8.0]])
+    dataset2 = gdal_dataset_with_data((0.0, -8.0), 1.0, data2)
+    dataset2.GetRasterBand(1).SetNoDataValue(1.0)
+
+    with RasterLayer(dataset1) as layer1:
+        with RasterLayer(dataset2) as layer2:
+            with GroupLayer([layer1, layer2]) as group:
+
+                assert group.window.xsize == 4
+                assert group.window.ysize == 20
+
+                actual = group.read_array(0, 0, 4, 2)
+                expected = np.array([[1.0, 2.0, 3.0, 4.0], [0.0, 0.0, 0.0, 0.0]])
+                assert np.array_equal(expected, actual, equal_nan=True)
+
+                actual = group.read_array(0, 10, 4, 2)
+                expected = np.array([[0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0]])
+                assert np.array_equal(expected, actual, equal_nan=True)
+
+                actual = group.read_array(0, 18, 4, 2)
+                expected = np.array([[0.0, 0.0, 0.0, 0.0], [5.0, 6.0, 7.0, 8.0]])
+                assert np.array_equal(expected, actual, equal_nan=True)

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

@@ -1567,3 +1567,15 @@ def test_raster_and_vector_no_scale_on_vector() -> None:
         calc = raster * vector
         assert calc.sum() > 0.0
         assert calc.sum() < raster.sum()
+
+def test_isnan() -> None:
+    data1 = np.array([[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 5.0, 8.0]])
+    dataset = gdal_dataset_with_data((0.0, 0.0), 0.02, data1)
+    dataset.GetRasterBand(1).SetNoDataValue(5.0)
+    with RasterLayer(dataset) as layer:
+        calc = layer.isnan()
+        with RasterLayer.empty_raster_layer_like(calc) as result:
+            calc.save(result)
+            actual = result.read_array(0, 0, 4, 2)
+            expected = data1 == 5.0
+            assert (expected == actual).all()

{yirgacheffe-1.7.3 → yirgacheffe-1.7.4}/yirgacheffe/_backends/enumeration.py

@@ -38,6 +38,7 @@ class operators(Enum):
     FLOOR = 33
     ROUND = 34
     CEIL = 35
+    ISNAN = 36
 
 class dtype(Enum):
     Float32 = gdal.GDT_Float32

{yirgacheffe-1.7.3 → yirgacheffe-1.7.4}/yirgacheffe/_backends/mlx.py

@@ -40,6 +40,7 @@ maximum = mx.maximum
 minimum = mx.minimum
 zeros = mx.zeros
 pad = mx.pad
+isnan = mx.isnan
 isscalar = np.isscalar
 full = mx.full
 allclose = mx.allclose
@@ -218,4 +219,5 @@ operator_map : Dict[op,Callable] = {
     op.FLOOR: mx.floor,
     op.ROUND: mx.round,
     op.CEIL: mx.ceil,
+    op.ISNAN: mx.isnan,
 }

{yirgacheffe-1.7.3 → yirgacheffe-1.7.4}/yirgacheffe/_backends/numpy.py

@@ -43,6 +43,7 @@ minimum = np.minimum
 zeros = np.zeros
 pad = np.pad
 sum_op = lambda a: np.sum(a.astype(np.float64))
+isnan = np.isnan
 isscalar = np.isscalar
 full = np.full
 allclose = np.allclose
@@ -156,4 +157,5 @@ operator_map : Dict[op,Callable] = {
     op.FLOOR: np.floor,
     op.ROUND: np.round,
     op.CEIL: np.ceil,
+    op.ISNAN: np.isnan,
 }

{yirgacheffe-1.7.3 → yirgacheffe-1.7.4}/yirgacheffe/layers/group.py

@@ -114,8 +114,9 @@ class GroupLayer(YirgacheffeLayer):
         if (xsize <= 0) or (ysize <= 0):
             raise ValueError("Request dimensions must be positive and non-zero")
 
-        scale = self.pixel_scale
-        assert scale is not None
+        map_projection = self.map_projection
+        assert map_projection is not None
+        scale = map_projection.scale
 
         target_window = Window(
             window.xoff + xoffset,
@@ -151,7 +152,7 @@ class GroupLayer(YirgacheffeLayer):
                     intersection.ysize
                 )
                 if layer.nodata is not None:
-                    data[data.isnan()] = 0.0
+                    data = backend.where(backend.isnan(data), 0.0, data)
                 return data
 
         result = np.zeros((ysize, xsize), dtype=float)

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

@@ -139,6 +139,13 @@ class LayerMathMixin:
             test_elements=test_elements,
         )
 
+    def isnan(self):
+        return LayerOperation(
+            self,
+            op.ISNAN,
+            window_op=WindowOperation.NONE,
+        )
+
     def abs(self):
         return LayerOperation(
             self,

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

@@ -1,10 +1,13 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.7.3
+Version: 1.7.4
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC
 Project-URL: Homepage, https://github.com/quantifyearth/yirgacheffe
+Project-URL: Repository, https://github.com/quantifyearth/yirgacheffe.git
+Project-URL: Issues, https://github.com/quantifyearth/yirgacheffe/issues
+Project-URL: Changelog, https://github.com/quantifyearth/yirgacheffe/blob/main/CHANGES.md
 Keywords: gdal,numpy,math
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown