Merge pull request #43 from quantifyearth/mwd-fix-packages

Fix broken package import

Author: mdales

CHANGES.md

@@ -1,3 +1,10 @@
+## v2.0.1 (20/01/2026)
+
+### Fixed
+
+* Fixed broken import on pyproject.toml
+* Habitat processing regression due to change in GDAL default behaviour.
+
 ## v2.0.0 (15/01/2026)
 
 ### Changed

aoh/habitat_process.py

@@ -84,6 +84,13 @@ def make_single_type_map(
             filtered_map = habitat_map == habitat_value
             filtered_map.to_geotiff(filter_map_path, parallelism=max_threads)
 
+            if pixel_scale is not None and target_projection is not None:
+                reprojected_area = filtered_map.area.reproject(
+                    yg.MapProjection(target_projection, pixel_scale, -pixel_scale)
+                )
+            else:
+                reprojected_area = habitat_map.area
+
             with VsimemFile(f"/vsimem/warped_{habitat_value}.tif") as warped_map_path:
                 logger.info("Projecting %s...", habitat_value)
                 gdal.Warp(
@@ -97,6 +104,8 @@ def make_single_type_map(
                         xRes=pixel_scale,
                         yRes=((0.0 - pixel_scale) if pixel_scale is not None else pixel_scale),
                         resampleAlg="average",
+                        outputBounds=(reprojected_area.left, reprojected_area.bottom,
+                            reprojected_area.right, reprojected_area.top),
                         targetAlignedPixels=pixel_scale is not None,
                         warpOptions=[f'NUM_THREADS={max_threads}'],
                         warpMemoryLimit=available_mem,
@@ -107,6 +116,21 @@ def make_single_type_map(
                 logger.info("Saving %s...", habitat_value)
                 filename = f"lcc_{habitat_value}.tif"
                 with yg.read_raster(warped_map_path) as result:
+                    # We had issues whereby original GDAL warp worked okay without needing
+                    # output bounds specified, and then at some point that changed and we were
+                    # losing a lot of the top and bottom of the map. This is a sanity check
+                    # just to ensure that isn't happening.
+                    # The 1% check here is probably overly tolerant, but it's enough to catch the
+                    # errors that caused this check to be added.
+                    reverted = result.area.reproject(habitat_map.map_projection)
+                    original = habitat_map.area
+
+                    if ((abs(original.left - reverted.left) / original.left) > 0.01) or \
+                        ((abs(original.right - reverted.right) / original.right) > 0.01) or \
+                        ((abs(original.top - reverted.top) / original.top) > 0.01) or \
+                        ((abs(original.bottom - reverted.bottom) / original.bottom) > 0.01):
+                        raise ValueError(f"Area of reprojected map significantly different: {original} vs {reverted}")
+
                     result.to_geotiff(output_directory_path / filename)
 
 def habitat_process(
@@ -145,7 +169,7 @@ def main() -> None:
     parser.add_argument(
         "--scale",
         type=float,
-        required=True,
+        required=False,
         dest="pixel_scale",
         help="Optional output pixel scale value, otherwise same as source."
     )
@@ -174,6 +198,11 @@ def main() -> None:
     )
     args = parser.parse_args()
 
+    has_projection = args.target_projection is not None
+    has_scale = args.pixel_scale is not None
+    if has_projection ^ has_scale:
+        parser.error("Specify either both --projection and --scale must be specified or neither")
+
     habitat_process(
         args.habitat_path,
         args.pixel_scale,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aoh"
-version = "2.0.0"
+version = "2.0.1"
 description = "A library for calculating Area of Habitat for species distribution mapping"
 authors = [
     {name = "Michael Dales", email = "mwd24@cam.ac.uk"}
@@ -79,7 +79,7 @@ aoh-validate-occurences = "aoh.validation.validate_occurences:main"
 aoh-fetch-gbif-data = "aoh.validation.fetch_gbif_data:main"
 
 [tool.setuptools]
-packages = ["aoh", "aoh.summaries", "aoh.validation"]
+packages = ["aoh", "aoh._internal", "aoh.summaries", "aoh.validation"]
 
 [tool.setuptools.package-data]
 aoh = ["py.typed"]