transformez 0.5.0__tar.gz → 0.5.2__tar.gz

{transformez-0.5.0 → transformez-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: transformez
-Version: 0.5.0
+Version: 0.5.2
 Summary: A standalone utility for vertical elevation datum transformations.
 Project-URL: Homepage, https://github.com/continuous-dems/transformez
 Project-URL: Issues, https://github.com/continuous-dems/transformez/issues
@@ -36,11 +36,12 @@ Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.12
 Requires-Dist: click
 Requires-Dist: fetchez>=0.6.0
-Requires-Dist: fiona
 Requires-Dist: numpy>1.24
+Requires-Dist: pyogrio>=0.7.0
 Requires-Dist: pyproj>3.6.1
 Requires-Dist: rasterio>1.4.0
 Requires-Dist: scipy
+Requires-Dist: shapely>=2.0.0
 Provides-Extra: full
 Requires-Dist: matplotlib; extra == 'full'
 Provides-Extra: preview
@@ -56,10 +57,11 @@ Description-Content-Type: text/markdown
 <p align="center"><strong>Global vertical datum transformations, simplified.</strong></p>
 
 <p align="center">
-  <a href="https://github.com/continuous-dems/transformez"><img src="https://img.shields.io/badge/version-0.5.0-blue.svg" alt="Version"></a>
+  <a href="https://github.com/continuous-dems/transformez"><img src="https://img.shields.io/badge/version-0.5.1-blue.svg" alt="Version"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-green.svg" alt="License"></a>
   <a href="https://www.python.org/"><img src="https://img.shields.io/badge/python-3.12+-yellow.svg" alt="Python"></a>
   <a href="https://badge.fury.io/py/transformez"><img src="https://badge.fury.io/py/transformez.svg" alt="PyPI version"></a>
+  <a href="https://anaconda.org/conda-forge/transformez"><img src="https://img.shields.io/conda/vn/conda-forge/transformez.svg" alt="Conda Version"></a>
   <a href="https://cudem.zulip.org"><img src="https://img.shields.io/badge/zulip-join_chat-brightgreen.svg" alt="Project Chat"></a>
 </p>
 

{transformez-0.5.0 → transformez-0.5.2}/README.md

@@ -7,10 +7,11 @@
 <p align="center"><strong>Global vertical datum transformations, simplified.</strong></p>
 
 <p align="center">
-  <a href="https://github.com/continuous-dems/transformez"><img src="https://img.shields.io/badge/version-0.5.0-blue.svg" alt="Version"></a>
+  <a href="https://github.com/continuous-dems/transformez"><img src="https://img.shields.io/badge/version-0.5.1-blue.svg" alt="Version"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-green.svg" alt="License"></a>
   <a href="https://www.python.org/"><img src="https://img.shields.io/badge/python-3.12+-yellow.svg" alt="Python"></a>
   <a href="https://badge.fury.io/py/transformez"><img src="https://badge.fury.io/py/transformez.svg" alt="PyPI version"></a>
+  <a href="https://anaconda.org/conda-forge/transformez"><img src="https://img.shields.io/conda/vn/conda-forge/transformez.svg" alt="Conda Version"></a>
   <a href="https://cudem.zulip.org"><img src="https://img.shields.io/badge/zulip-join_chat-brightgreen.svg" alt="Project Chat"></a>
 </p>
 

{transformez-0.5.0 → transformez-0.5.2}/pyproject.toml

@@ -28,7 +28,8 @@ dependencies = [
     'numpy>1.24',
     'pyproj>3.6.1',
     'rasterio>1.4.0',
-    'fiona',
+    'pyogrio>=0.7.0',
+    'shapely>=2.0.0',
     'fetchez>=0.6.0',
     'scipy',
     'click',

{transformez-0.5.0 → transformez-0.5.2}/src/transformez/_version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '0.5.0'
+__version__ = VERSION = '0.5.2'

{transformez-0.5.0 → transformez-0.5.2}/src/transformez/cli.py

@@ -29,17 +29,18 @@ TRANSFORMEZ_COMMANDS = {
 class TransformezMainGroup(FetchezMainGroup):
     """A custom Click Group that handles deprecated aliases."""
 
-    def get_command(self, ctx, cmd_name):
-        if cmd_name == "run":
-            click.secho(
-                " DEPRECATION WARNING: 'transformez run' is deprecated and will be removed in a future release.\n"
-                "Please use 'transformez grid' to generate shift grids or 'transformez raster' to shift a raster.",
-                fg="yellow",
-                err=True,
-            )
-            return click.Group.get_command(self, ctx, "run")
-
-        return click.Group.get_command(self, ctx, cmd_name)
+    pass
+    # def get_command(self, ctx, cmd_name):
+    #     if cmd_name == "run":
+    #         click.secho(
+    #             " DEPRECATION WARNING: 'transformez run' is deprecated and will be removed in a future release.\n"
+    #             "Please use 'transformez grid' to generate shift grids or 'transformez raster' to shift a raster.",
+    #             fg="yellow",
+    #             err=True,
+    #         )
+    #         return click.Group.get_command(self, ctx, "run")
+
+    #     return click.Group.get_command(self, ctx, cmd_name)
 
     # def format_commands(self, ctx, formatter):
     #     commands = []

{transformez-0.5.0 → transformez-0.5.2}/src/transformez/grid_engine.py

@@ -79,18 +79,19 @@ def plot_grid(grid_array, region, title="Vertical Shift Preview"):
 
 class GridEngine:
     @staticmethod
-    def create_land_mask(region, nx, ny, shapefiles):
-        """Reads a list of vector shapefiles and rasterizes them into a boolean land mask.
+    def create_land_mask(region, nx, ny, vector_files):
+        """Reads a list of vector files and rasterizes them into a boolean land mask.
         Returns a numpy boolean array where True = Land, False = Ocean.
         """
 
         try:
-            import fiona
+            from pyogrio.raw import read
+            import shapely
             from rasterio.features import rasterize
 
         except ImportError:
             logger.warning(
-                "fiona and rasterio are required for vector coastline masking."
+                "pyogrio and shapely are required for vector coastline masking."
             )
             return None
 
@@ -99,16 +100,24 @@ class GridEngine:
         )
 
         geoms = []
-        for shp in shapefiles:
+        for vec_path in vector_files:
             try:
-                # Use bbox filtering in Fiona to dramatically speed up reading massive global shapefiles
+                # Use bbox filtering in pyogrio to speed up reading vectors
                 bbox = (region.xmin, region.ymin, region.xmax, region.ymax)
-                with fiona.open(shp, bbox=bbox) as src:
-                    for feature in src:
-                        if feature.get("geometry") is not None:
-                            geoms.append(feature["geometry"])
+
+                # pyogrio raw read returns a tuple: (meta, geometry_wkb, field_data)
+                meta, fids, geometry_wkb, fields = read(vec_path, bbox=bbox)
+
+                if len(geometry_wkb) > 0:
+                    # Convert WKB directly to shapely geometries
+                    # We also filter out any None/Null geometries
+                    valid_geoms = [
+                        g for g in shapely.from_wkb(geometry_wkb) if g is not None
+                    ]
+                    geoms.extend(valid_geoms)
+
             except Exception as e:
-                logger.warning(f"Failed reading coastline shapefile {shp}: {e}")
+                logger.warning(f"Failed reading coastline vector {vec_path}: {e}")
 
         if not geoms:
             return None

{transformez-0.5.0 → transformez-0.5.2}/src/transformez/srs.py

@@ -16,6 +16,10 @@ import os
 import logging
 from pyproj import CRS, Transformer
 
+import numpy as np
+from rasterio.warp import transform_bounds, reproject, Resampling
+from rasterio.transform import from_bounds
+
 from fetchez.spatial import Region
 from .definitions import Datums
 from .transform import VerticalTransform
@@ -145,7 +149,7 @@ class SRSParser:
         self.tc["want_vertical"] = has_src_vert or has_dst_vert
 
     def set_vertical_transform(self):
-        """Generates the vertical shift grid using VerticalTransform."""
+        """Generates the vertical shift grid using VerticalTransform, aligned to src_crs."""
 
         if not self.region or not self.tc["want_vertical"]:
             return
@@ -162,7 +166,6 @@ class SRSParser:
 
         if not s_ident and self.tc["src_geoid"]:
             s_ident = 6319
-
         if not d_ident and self.tc["dst_geoid"]:
             d_ident = 6319
 
@@ -178,10 +181,32 @@ class SRSParser:
             logger.info(
                 f"Generating vertical grid: {s_ident} -> {d_ident} : {self.tc['trans_fn']} :"
             )
+
+            # Determine Native WGS84 Region for Transformez
+            src_is_projected = self.tc["src_crs"].is_projected
+            if src_is_projected:
+                # Transform the native bounding box to WGS84 to query the shift models
+                w, s, e, n = transform_bounds(
+                    self.tc["src_crs"],
+                    "EPSG:4326",
+                    proc_region.xmin,
+                    proc_region.ymin,
+                    proc_region.xmax,
+                    proc_region.ymax,
+                )
+                vt_region = Region(w, e, s, n)
+            else:
+                vt_region = proc_region
+
+            # Generate grid resolution based on WGS84 bounds (approx 3 arc-seconds)
+            inc_deg = 3.0 / 3600.0
+            vt_nx = max(10, int(vt_region.width / inc_deg))
+            vt_ny = max(10, int(vt_region.height / inc_deg))
+
             vt = VerticalTransform(
-                proc_region,
-                nx=max(10, int(proc_region.width / 0.0008333)),
-                ny=max(10, int(proc_region.height / 0.0008333)),
+                vt_region,
+                nx=vt_nx,
+                ny=vt_ny,
                 epsg_in=s_ident,
                 epsg_out=d_ident,
                 geoid_in=self.tc["src_geoid"],
@@ -189,27 +214,65 @@ class SRSParser:
                 cache_dir=self.cache_dir,
             )
             shift_arr, _ = vt._vertical_transform(vt.epsg_in, vt.epsg_out)
+
+            # Warp the Grid Back to the Source CRS
+            if src_is_projected:
+                logger.info(
+                    f"Warping shift grid to native input CRS ({self.tc['src_crs'].name})..."
+                )
+                wgs_transform = from_bounds(
+                    vt_region.xmin,
+                    vt_region.ymin,
+                    vt_region.xmax,
+                    vt_region.ymax,
+                    vt_nx,
+                    vt_ny,
+                )
+
+                # Output grid dimensions for the native projection
+                out_nx = max(10, int(proc_region.width / (proc_region.width / vt_nx)))
+                out_ny = max(10, int(proc_region.height / (proc_region.height / vt_ny)))
+                native_transform = from_bounds(
+                    proc_region.xmin,
+                    proc_region.ymin,
+                    proc_region.xmax,
+                    proc_region.ymax,
+                    out_nx,
+                    out_ny,
+                )
+
+                native_shift_array = np.zeros((out_ny, out_nx), dtype=np.float32)
+
+                reproject(
+                    source=shift_arr,
+                    destination=native_shift_array,
+                    src_transform=wgs_transform,
+                    src_crs="EPSG:4326",
+                    dst_transform=native_transform,
+                    dst_crs=self.tc["src_crs"],
+                    resampling=Resampling.bilinear,
+                )
+                shift_arr = native_shift_array
+
+                # We artificially inject the native transform into proc_region to satisfy GridWriter
+                proc_region.transform = native_transform
+
+            # Write the natively-aligned grid to disk!
             GridWriter.write(self.tc["trans_fn"], shift_arr, proc_region)
 
         self.manual_vert_grid = self.tc["trans_fn"]
 
     def get_components(self):
         """Returns the components:
-
-        - Transformer: Source -> Hub (NAD83 2D)
-        - Transformer: Hub -> Dest (2D)
-        - Grid Path (str) or None
+        - Transformer: Source -> Dest (Single Pass Horizontal)
+        - Grid Path (str) or None (Aligned to Source)
         """
 
         if self.tc["want_vertical"] and not self.manual_vert_grid:
             self.set_vertical_transform()
 
-        # Define Hub: NAD83(2011) 2D - maybe this should be wgs(transit)
-        hub_crs = CRS.from_epsg(4269)
-
-        # only build 2D transformer (for proj). We'll apply the vertical grid ourselves,
-        # as pyproj seems finicky when it comes to this.
-        t_to_hub = Transformer.from_crs(self.tc["src_crs"], hub_crs, always_xy=True)
-        t_from_hub = Transformer.from_crs(hub_crs, self.tc["dst_crs"], always_xy=True)
+        horz_transformer = Transformer.from_crs(
+            self.tc["src_crs"], self.tc["dst_crs"], always_xy=True
+        )
 
-        return t_to_hub, t_from_hub, self.manual_vert_grid
+        return horz_transformer, self.manual_vert_grid