yirgacheffe 1.7.2__py3-none-any.whl → 1.7.4__py3-none-any.whl

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/_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/_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/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/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/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,
@@ -659,7 +666,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
 

{yirgacheffe-1.7.2.dist-info → yirgacheffe-1.7.4.dist-info}/METADATA

@@ -1,10 +1,13 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.7.2
+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.2.dist-info → yirgacheffe-1.7.4.dist-info}/RECORD

@@ -1,25 +1,25 @@
 yirgacheffe/__init__.py,sha256=flTXNQQs6k8nboEv9O4eJnlv8kZ11z5zrfWcmUovCLg,537
 yirgacheffe/_core.py,sha256=2CtRkVOpXBhFnj4fnpwSQBL3lJIvAmQJ4AgsMmKJOSs,4193
 yirgacheffe/constants.py,sha256=uCWJwec3-ND-zVxYbsk1sdHKANl3ToNCTPg7MZb0j2g,434
-yirgacheffe/operators.py,sha256=yFO43w05YNczxpWvRu7y223Lenu1sqLUHly0R4EWUbw,35925
+yirgacheffe/operators.py,sha256=DNZFBHRqwlZq8HHNv72vU5jDBwikDCyuwyo8RmE59bg,36228
 yirgacheffe/rounding.py,sha256=ggBG4lMyLMtHLW3dBxr3gBCcF2qhRrY5etZiFGlIoqA,2258
 yirgacheffe/window.py,sha256=0Wy3BT4SZLyviDwzLcX8LYOo2MeZ2zXCWAiJNpMbQpc,9505
 yirgacheffe/_backends/__init__.py,sha256=jN-2iRrHStnPI6cNL7XhwhsROtI0EaGfIrbF5c-ECV0,334
-yirgacheffe/_backends/enumeration.py,sha256=pADawllxpW_hW-IVVvZpHWIKzvEMs9aaqfkZRD1zjnY,1003
-yirgacheffe/_backends/mlx.py,sha256=2vOTMqHbQbeqt81Eq_8hxWDXZHaPsDpbXkALRVGEnnw,6130
-yirgacheffe/_backends/numpy.py,sha256=cYO628s4-5K_-Bp3CrnHegzYSZfkt2QC8iE9oOOMtvA,4069
+yirgacheffe/_backends/enumeration.py,sha256=Jrce2p2n4Wlk5tHBkiWntDnpLSD_0H-bnwgsKXHjkwQ,1018
+yirgacheffe/_backends/mlx.py,sha256=kEWcJOhhUQSHkRPljv6s0MYlxcuu-LzLL55Fdd8tIqc,6171
+yirgacheffe/_backends/numpy.py,sha256=IdAgK8oFZxjzK1I_-_yXYu_G935920GxpB6oZoJvWvQ,4110
 yirgacheffe/layers/__init__.py,sha256=mYKjw5YTcMNv_hMy7a6K4yRzIuNUbR8WuBTw4WIAmSk,435
 yirgacheffe/layers/area.py,sha256=OFOM1_dMblzXLW29TwEqfdgSecl6aNs04bKJwUydLH0,3914
-yirgacheffe/layers/base.py,sha256=4BjtEBzAHBWu06k-9Q7J1bm11xNILKDgA2cxuARxVyI,14344
+yirgacheffe/layers/base.py,sha256=MPVGEsFRPuRDYtL1OBu7XP26kBDWfpS3RS3twYKBOQc,14381
 yirgacheffe/layers/constant.py,sha256=XQ1ibeSckAcUOow-dMUlZiW5S2MKeFquOz_m8Y027GI,1437
-yirgacheffe/layers/group.py,sha256=QyrECH5IthmBVV1debqttNvZGVocE-azdayJsvd6qqI,16096
+yirgacheffe/layers/group.py,sha256=YgA0Bl0lAO2KwTT57126rXfyPq6MCssaaFrTQLe377s,16182
 yirgacheffe/layers/h3layer.py,sha256=Ys6F-e4Jre7lbFBYErF_4oidQx22WkWMKpHpQ7pPDTs,9875
 yirgacheffe/layers/rasters.py,sha256=-yECyz3Odhy1er0ilJ9bfLUseI2cTHfwqhP-H3ImUKo,13365
 yirgacheffe/layers/rescaled.py,sha256=hkvsd7paDCyUViABxrAXdXPOZegdwiphibkdrBuRclk,3366
 yirgacheffe/layers/vectors.py,sha256=OpZaV2MgM0v4-CbrCNy_AHv3T2bvV9PFytolIzPPXFc,19900
-yirgacheffe-1.7.2.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
-yirgacheffe-1.7.2.dist-info/METADATA,sha256=5_xSRySwK7HSzhOKEPMcUzX1RpmVXH1E-CEmo5dhtsE,22351
-yirgacheffe-1.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yirgacheffe-1.7.2.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
-yirgacheffe-1.7.2.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
-yirgacheffe-1.7.2.dist-info/RECORD,,
+yirgacheffe-1.7.4.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
+yirgacheffe-1.7.4.dist-info/METADATA,sha256=-HBVApZog3E94bukfIQJD6SLrg9feJiLm8tLr2Kt7cU,22588
+yirgacheffe-1.7.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yirgacheffe-1.7.4.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
+yirgacheffe-1.7.4.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
+yirgacheffe-1.7.4.dist-info/RECORD,,