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

yirgacheffe/__init__.py

@@ -12,7 +12,7 @@ except ModuleNotFoundError:
         pyproject_data = tomllib.load(f)
     __version__ = pyproject_data["project"]["version"]
 
-from ._core import read_raster, read_rasters, read_shape, read_shape_like
+from ._core import read_raster, read_rasters, read_shape, read_shape_like, constant, read_narrow_raster
 from .constants import WGS_84_PROJECTION
 
 gdal.UseExceptions()

yirgacheffe/_core.py

@@ -1,7 +1,9 @@
 from pathlib import Path
 from typing import Optional, Sequence, Tuple, Union
 
+from .layers.area import UniformAreaLayer
 from .layers.base import YirgacheffeLayer
+from .layers.constant import ConstantLayer
 from .layers.group import GroupLayer, TiledGroupLayer
 from .layers.rasters import RasterLayer
 from .layers.vectors import VectorLayer
@@ -31,6 +33,33 @@ def read_raster(
     """
     return RasterLayer.layer_from_file(filename, band, ignore_nodata)
 
+def read_narrow_raster(
+    filename: Union[Path,str],
+    band: int = 1,
+    ignore_nodata: bool = False,
+) -> RasterLayer:
+    """Open a 1 pixel wide raster file as a global raster.
+
+    This exists for the special use case where an area per pixel raster would have the same value per horizontal row
+    (e.g., a WGS84 map projection). For that case you can use this to load a raster that is 1 pixel wide and have
+    it automatically expanded to act like a global raster in calculations.
+
+    Parameters
+    ----------
+    filename : Path
+        Path of raster file to open.
+    band : int, default=1
+        For multi-band rasters, which band to use (defaults to first if not specified)
+    ignore_nodata : bool, default=False
+        If the GeoTIFF has a NODATA value, don't subsitute that value for NaN
+
+    Returns
+    -------
+    RasterLayer
+        Returns an layer representing the raster data.
+    """
+    return UniformAreaLayer.layer_from_file(filename, band, ignore_nodata)
+
 def read_rasters(
     filenames : Sequence[Union[Path,str]],
     tiled: bool=False
@@ -132,3 +161,23 @@ def read_shape_like(
         datatype,
         burn_value,
     )
+
+def constant(value: Union[int,float]) -> ConstantLayer:
+    """Generate a layer that has the same value in all pixels regardless of scale, projection, and area.
+
+    Generally this should not be necessary unless you must have the constant as the first term in an
+    expression, as Yirgacheffe will automatically convert numbers into constant layers. However if the
+    constant is the first term in the expression it must be wrapped by this call otherwise Python will
+    not know that it should be part of the Yirgacheffe expression.
+
+    Parameters
+    ----------
+    value : int or float
+        The value to be in each pixel of the expression term.
+
+    Returns
+    -------
+    ConstantLayer
+        Returns a constant layer of the provided value.
+    """
+    return ConstantLayer(value)

yirgacheffe/layers/rasters.py

@@ -97,8 +97,6 @@ class RasterLayer(YirgacheffeLayer):
         threads: Optional[int]=None,
         bands: int=1
     ) -> RasterLayer:
-        width = layer.window.xsize
-        height = layer.window.ysize
         if area is None:
             area = layer.area
         assert area is not None
@@ -117,6 +115,12 @@ class RasterLayer(YirgacheffeLayer):
             area.left, projection.xstep, 0.0, area.top, 0.0, projection.ystep
         )
 
+        if area is None:
+            og_width = layer.window.xsize
+            og_height = layer.window.ysize
+            assert (og_width == width) and (og_height == height), \
+                f"original size ({og_width}, {og_height}) != estimated ({width}, {height})"
+
         if datatype is None:
             datatype_arg = layer.datatype
         elif isinstance(datatype, int):

yirgacheffe/layers/vectors.py

@@ -4,8 +4,10 @@ from pathlib import Path
 from typing import Any, Optional, Tuple, Union
 from typing_extensions import NotRequired
 
+import deprecation
 from osgeo import gdal, ogr
 
+from .. import __version__
 from ..operators import DataType
 from ..window import Area, MapProjection, PixelScale
 from .base import YirgacheffeLayer
@@ -60,6 +62,12 @@ class RasteredVectorLayer(RasterLayer):
     VectorLayer."""
 
     @classmethod
+    @deprecation.deprecated(
+        deprecated_in="1.7",
+        removed_in="2.0",
+        current_version=__version__,
+        details="Use `VectorLayer` instead."
+    )
     def layer_from_file( # type: ignore[override] # pylint: disable=W0221
         cls,
         filename: Union[Path,str],

yirgacheffe/operators.py

@@ -387,50 +387,9 @@ class LayerOperation(LayerMathMixin):
 
     @property
     def area(self) -> Area:
-        # The type().__name__ here is to avoid a circular import dependancy
-        lhs_area = self.lhs.area
-        try:
-            rhs_area = self.rhs.area
-        except AttributeError:
-            rhs_area = None
-        try:
-            other_area = self.other.area
-        except AttributeError:
-            other_area = None
-
-        all_areas = [x for x in [lhs_area, rhs_area, other_area] if (x is not None) and (not x.is_world)]
-
-        match self.window_op:
-            case WindowOperation.NONE:
-                return all_areas[0]
-            case WindowOperation.LEFT:
-                return lhs_area
-            case WindowOperation.RIGHT:
-                assert rhs_area is not None
-                return rhs_area
-            case WindowOperation.INTERSECTION:
-                intersection = Area(
-                    left=max(x.left for x in all_areas),
-                    top=min(x.top for x in all_areas),
-                    right=min(x.right for x in all_areas),
-                    bottom=max(x.bottom for x in all_areas)
-                )
-                if (intersection.left >= intersection.right) or (intersection.bottom >= intersection.top):
-                    raise ValueError('No intersection possible')
-                return intersection
-            case WindowOperation.UNION:
-                return Area(
-                    left=min(x.left for x in all_areas),
-                    top=max(x.top for x in all_areas),
-                    right=max(x.right for x in all_areas),
-                    bottom=min(x.bottom for x in all_areas)
-                )
-            case _:
-                assert False, "Should not be reached"
+        return self._get_operation_area(self.map_projection)
 
     def _get_operation_area(self, projection: Optional[MapProjection]) -> Area:
-
-        # The type().__name__ here is to avoid a circular import dependancy
         lhs_area = self.lhs._get_operation_area(projection)
         try:
             rhs_area = self.rhs._get_operation_area(projection)
@@ -462,12 +421,13 @@ class LayerOperation(LayerMathMixin):
                     raise ValueError('No intersection possible')
                 return intersection
             case WindowOperation.UNION:
-                return Area(
+                union = Area(
                     left=min(x.left for x in all_areas),
                     top=max(x.top for x in all_areas),
                     right=max(x.right for x in all_areas),
                     bottom=min(x.bottom for x in all_areas)
                 )
+                return union
             case _:
                 assert False, "Should not be reached"
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.7.4
+Version: 1.7.6
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC
@@ -262,17 +262,33 @@ Notes:
 * You can have missing tiles, and these will be filled in with zeros.
 * You can have tiles that overlap, so long as they still conform to the rule that all tiles are the same size and on a grid.
 
-### ConstantLayer
+### Constants
 
-This is there to simplify code when you have some optional layers. Rather than littering your code with checks, you can just use a constant layer, which can be included in calculations and will just return an fixed value as if it wasn't there. Useful with 0.0 or 1.0 for sum or multiplication null layers.
+At times it is useful to have a fixed constant in an expression. Typically, similar to numpy, if an expression involving layers has a constant in, Yirgacheffe will apply that to all pixels in the equation without need for further elaboration:
+
+```python
+with yg.read_raster("some_data.tif") as layer:
+    doubled_layer = layer * 2.0
+    ...
+```
+
+This can be useful in tasks where you have an optional layer in your code. For example, here the code optionally loads an area-per-pixel layer, which if not present can just be substituted with a 1.0:
 
 ```python
 try:
-    area_layer = RasterLayer.layer_from_file('myarea.tiff')
+    area_layer = yg.read_raster('myarea.tiff')
 except FileDoesNotExist:
-    area_layer = ConstantLayer(0.0)
+    area_layer = 1.0
 ```
 
+However, as with numpy, Python can not make the correct inference if the constant value is the first term in the equation. In that case you need to explicitly wrap the value with `constant` to help Python understand what is happening:
+
+```python
+with yg.read_raster("some_data.tif") as layer:
+    result = yg.constant(1.0) / layer
+```
+
+
 ### H3CellLayer
 
 If you have H3 installed, you can generate a mask layer based on an H3 cell identifier, where pixels inside the cell will have a value of 1, and those outside will have a value of 0.

{yirgacheffe-1.7.4.dist-info → yirgacheffe-1.7.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
-yirgacheffe/__init__.py,sha256=flTXNQQs6k8nboEv9O4eJnlv8kZ11z5zrfWcmUovCLg,537
-yirgacheffe/_core.py,sha256=2CtRkVOpXBhFnj4fnpwSQBL3lJIvAmQJ4AgsMmKJOSs,4193
+yirgacheffe/__init__.py,sha256=pY9dqmHHARfY44T-7-7y6Ah97qQHj9_0pgYTItI5TR8,567
+yirgacheffe/_core.py,sha256=C3TefRffw8n57AQGTNXgyEtXXZb9exZcRFg0yxNtqlo,6062
 yirgacheffe/constants.py,sha256=uCWJwec3-ND-zVxYbsk1sdHKANl3ToNCTPg7MZb0j2g,434
-yirgacheffe/operators.py,sha256=DNZFBHRqwlZq8HHNv72vU5jDBwikDCyuwyo8RmE59bg,36228
+yirgacheffe/operators.py,sha256=PIF3ec2ogGf2-8D7m56usNNer1bOe0HA9kL5JOqpbnQ,34576
 yirgacheffe/rounding.py,sha256=ggBG4lMyLMtHLW3dBxr3gBCcF2qhRrY5etZiFGlIoqA,2258
 yirgacheffe/window.py,sha256=0Wy3BT4SZLyviDwzLcX8LYOo2MeZ2zXCWAiJNpMbQpc,9505
 yirgacheffe/_backends/__init__.py,sha256=jN-2iRrHStnPI6cNL7XhwhsROtI0EaGfIrbF5c-ECV0,334
@@ -14,12 +14,12 @@ yirgacheffe/layers/base.py,sha256=MPVGEsFRPuRDYtL1OBu7XP26kBDWfpS3RS3twYKBOQc,14
 yirgacheffe/layers/constant.py,sha256=XQ1ibeSckAcUOow-dMUlZiW5S2MKeFquOz_m8Y027GI,1437
 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/rasters.py,sha256=w1lmZmvwU7tKUy84y8uqWNnVn-0T268VrsQTUKfQkP0,13565
 yirgacheffe/layers/rescaled.py,sha256=hkvsd7paDCyUViABxrAXdXPOZegdwiphibkdrBuRclk,3366
-yirgacheffe/layers/vectors.py,sha256=OpZaV2MgM0v4-CbrCNy_AHv3T2bvV9PFytolIzPPXFc,19900
-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,,
+yirgacheffe/layers/vectors.py,sha256=8tt0rCkhrT-HZi90rEvv8qL6cVSYLG5HZTqqTz6BuTU,20118
+yirgacheffe-1.7.6.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
+yirgacheffe-1.7.6.dist-info/METADATA,sha256=kUhrFtnD5Me9SSD0VBCk48z6YLJ9U7vU94Fto5VSDZY,23134
+yirgacheffe-1.7.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yirgacheffe-1.7.6.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
+yirgacheffe-1.7.6.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
+yirgacheffe-1.7.6.dist-info/RECORD,,