yirgacheffe 1.9.0__tar.gz → 1.9.1__tar.gz

{yirgacheffe-1.9.0/yirgacheffe.egg-info → yirgacheffe-1.9.1}/PKG-INFO

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

{yirgacheffe-1.9.0 → yirgacheffe-1.9.1}/pyproject.toml

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

yirgacheffe-1.9.0/tests/test_base.py → yirgacheffe-1.9.1/tests/test_pixel_coord.py

@@ -83,6 +83,21 @@ def test_latlng_for_pixel(
     assert math.isclose(result[0], expected[0])
     assert math.isclose(result[1], expected[1])
 
+def test_latlng_for_pixel_on_operator() -> None:
+    layer1 = YirgacheffeLayer(
+        Area(-10, 10, 10, -10),
+        MapProjection("epsg:4326", 0.2, -0.2),
+    )
+    layer2 = YirgacheffeLayer(
+        Area(-10, 10, 10, -10),
+        MapProjection("epsg:4326", 0.2, -0.2),
+    )
+    calc = layer1 + layer2
+    result = calc.latlng_for_pixel(0, 0)
+    expected = (10.0, -10.0)
+    assert math.isclose(result[0], expected[0])
+    assert math.isclose(result[1], expected[1])
+
 @pytest.mark.parametrize(
     "area,projection,coord,expected",
     [
@@ -119,6 +134,21 @@ def test_pixel_for_latlng(
     result = layer.pixel_for_latlng(*coord)
     assert result == expected
 
+def test_pixel_for_latlng_on_operator() -> None:
+    layer1 = YirgacheffeLayer(
+        Area(-10, 10, 10, -10),
+        MapProjection("epsg:4326", 0.2, -0.2),
+    )
+    layer2 = YirgacheffeLayer(
+        Area(-10, 10, 10, -10),
+        MapProjection("epsg:4326", 0.2, -0.2),
+    )
+    calc = layer1 + layer2
+    result = calc.pixel_for_latlng(10, -10)
+    expected = (0, 0)
+    assert math.isclose(result[0], expected[0])
+    assert math.isclose(result[1], expected[1])
+
 @pytest.mark.parametrize(
     "area,window,projection,pixel,expected",
     [

{yirgacheffe-1.9.0 → yirgacheffe-1.9.1}/yirgacheffe/_operators.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import builtins
 import logging
 import math
 import multiprocessing
@@ -21,6 +22,7 @@ import numpy as np
 import numpy.typing as npt
 from osgeo import gdal
 from dill import dumps, loads # type: ignore
+from pyproj import Transformer
 
 from . import constants, __version__
 from .rounding import round_up_pixels, round_down_pixels
@@ -290,6 +292,53 @@ class LayerMathMixin:
             datatype=datatype
         )
 
+    def latlng_for_pixel(self, x: int, y: int) -> tuple[float, float]:
+        """Get geo coords for pixel. This is relative to the set view window.
+
+        Args:
+            x: X axis position within raster
+            y: Y axis position within raster
+
+        Returns:
+            A tuple containing the (latitude, longitude).
+        """
+        projection = self.map_projection # type: ignore[attr-defined]
+        area = self.area # type: ignore[attr-defined]
+        if projection is None:
+            raise ValueError("Map has not projection space")
+        pixel_scale = projection.scale
+        coord_in_raster_space = (
+            (y * pixel_scale.ystep) + area.top,
+            (x * pixel_scale.xstep) + area.left,
+        )
+        transformer = Transformer.from_crs(projection.name, "EPSG:4326")
+        return transformer.transform(*coord_in_raster_space)
+
+    def pixel_for_latlng(self, lat: float, lng: float) -> tuple[int, int]:
+        """Get pixel for geo coords. This is relative to the set view window.
+        Result is rounded down to nearest pixel.
+
+        Args:
+            lat: Geospatial latitude in WGS84
+            lng: Geospatial longitude in WGS84
+
+        Returns:
+            A tuple containing the x, y coordinates in pixel space.
+        """
+        projection = self.map_projection # type: ignore[attr-defined]
+        area = self.area # type: ignore[attr-defined]
+        if projection is None:
+            raise ValueError("Map has not projection space")
+
+        transformer = Transformer.from_crs("EPSG:4326", projection.name)
+        x, y = transformer.transform(lng,lat)
+
+        pixel_scale = projection.scale
+        return (
+            round_down_pixels((x - area.left) / pixel_scale.xstep, builtins.abs(pixel_scale.xstep)),
+            round_down_pixels((y - area.top) / pixel_scale.ystep, builtins.abs(pixel_scale.ystep)),
+        )
+
 
 class LayerOperation(LayerMathMixin):
 

{yirgacheffe-1.9.0 → yirgacheffe-1.9.1}/yirgacheffe/layers/base.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 from typing import Any, Sequence
 
 import deprecation
-from pyproj import Transformer
 
 from .. import __version__
 from .._operators import LayerMathMixin
@@ -332,48 +331,3 @@ class YirgacheffeLayer(LayerMathMixin):
         """
         res = self._read_array(x, y, width, height)
         return backend.demote_array(res)
-
-    def latlng_for_pixel(self, x: int, y: int) -> tuple[float, float]:
-        """Get geo coords for pixel. This is relative to the set view window.
-
-        Args:
-            x: X axis position within raster
-            y: Y axis position within raster
-
-        Returns:
-            A tuple containing the (latitude, longitude).
-        """
-        projection = self.map_projection
-        if projection is None:
-            raise ValueError("Map has not projection space")
-        pixel_scale = projection.scale
-        coord_in_raster_space = (
-            (y * pixel_scale.ystep) + self.area.top,
-            (x * pixel_scale.xstep) + self.area.left,
-        )
-        transformer = Transformer.from_crs(projection.name, "EPSG:4326")
-        return transformer.transform(*coord_in_raster_space)
-
-    def pixel_for_latlng(self, lat: float, lng: float) -> tuple[int, int]:
-        """Get pixel for geo coords. This is relative to the set view window.
-        Result is rounded down to nearest pixel.
-
-        Args:
-            lat: Geospatial latitude in WGS84
-            lng: Geospatial longitude in WGS84
-
-        Returns:
-            A tuple containing the x, y coordinates in pixel space.
-        """
-        projection = self.map_projection
-        if projection is None:
-            raise ValueError("Map has not projection space")
-
-        transformer = Transformer.from_crs("EPSG:4326", projection.name)
-        x, y = transformer.transform(lng,lat)
-
-        pixel_scale = projection.scale
-        return (
-            round_down_pixels((x - self.area.left) / pixel_scale.xstep, abs(pixel_scale.xstep)),
-            round_down_pixels((y - self.area.top) / pixel_scale.ystep, abs(pixel_scale.ystep)),
-        )

{yirgacheffe-1.9.0 → yirgacheffe-1.9.1/yirgacheffe.egg-info}/PKG-INFO

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

{yirgacheffe-1.9.0 → yirgacheffe-1.9.1}/yirgacheffe.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ README.md
 pyproject.toml
 tests/test_area.py
 tests/test_auto_windowing.py
-tests/test_base.py
 tests/test_constants.py
 tests/test_datatypes.py
 tests/test_group.py
@@ -17,6 +16,7 @@ tests/test_operators.py
 tests/test_optimisation.py
 tests/test_parallel_operators.py
 tests/test_pickle.py
+tests/test_pixel_coord.py
 tests/test_projection.py
 tests/test_raster.py
 tests/test_rescaling.py