yirgacheffe 1.7.1__py3-none-any.whl → 1.7.3__py3-none-any.whl

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/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.dist-info → yirgacheffe-1.7.3.dist-info}/METADATA

@@ -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.dist-info → yirgacheffe-1.7.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 yirgacheffe/__init__.py,sha256=flTXNQQs6k8nboEv9O4eJnlv8kZ11z5zrfWcmUovCLg,537
 yirgacheffe/_core.py,sha256=2CtRkVOpXBhFnj4fnpwSQBL3lJIvAmQJ4AgsMmKJOSs,4193
 yirgacheffe/constants.py,sha256=uCWJwec3-ND-zVxYbsk1sdHKANl3ToNCTPg7MZb0j2g,434
-yirgacheffe/operators.py,sha256=fqk61NW_BjNuuBVPx_nvxPbgBs839cx6WztGOxrtiuE,35653
+yirgacheffe/operators.py,sha256=FhW6A6AQ-ElzxPT23L9UtX5hv0gcBXBwyri66rMTS-U,36081
 yirgacheffe/rounding.py,sha256=ggBG4lMyLMtHLW3dBxr3gBCcF2qhRrY5etZiFGlIoqA,2258
 yirgacheffe/window.py,sha256=0Wy3BT4SZLyviDwzLcX8LYOo2MeZ2zXCWAiJNpMbQpc,9505
 yirgacheffe/_backends/__init__.py,sha256=jN-2iRrHStnPI6cNL7XhwhsROtI0EaGfIrbF5c-ECV0,334
@@ -10,16 +10,16 @@ yirgacheffe/_backends/mlx.py,sha256=2vOTMqHbQbeqt81Eq_8hxWDXZHaPsDpbXkALRVGEnnw,
 yirgacheffe/_backends/numpy.py,sha256=cYO628s4-5K_-Bp3CrnHegzYSZfkt2QC8iE9oOOMtvA,4069
 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/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.1.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
-yirgacheffe-1.7.1.dist-info/METADATA,sha256=KJuxRRohoo57E8Vcaft3WsItttbVaFK5eAHsf0GRMos,22351
-yirgacheffe-1.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yirgacheffe-1.7.1.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
-yirgacheffe-1.7.1.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
-yirgacheffe-1.7.1.dist-info/RECORD,,
+yirgacheffe-1.7.3.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
+yirgacheffe-1.7.3.dist-info/METADATA,sha256=VA_iyH9HrhwwNwHPSCmQc9K54nHPBSCSb6L3Bbvm1Zw,22351
+yirgacheffe-1.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yirgacheffe-1.7.3.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
+yirgacheffe-1.7.3.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
+yirgacheffe-1.7.3.dist-info/RECORD,,