Merge pull request #65 from OPERA-Cal-Val/dev

v0.0.15

Author: cmarshak

.github/workflows/distribute.yml

@@ -11,9 +11,9 @@ jobs:
     outputs:
       SDIST_VERSION: ${{ steps.build.outputs.version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.11
 

.github/workflows/static-analysis.yml

@@ -3,11 +3,6 @@ name: Static Analysis (Flake8/Ruff)
 on: push
 
 jobs:
-  call-flake8-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.20.0
-    with:
-      local_package_names: tile_mate
-
   call-secrets-analysis-workflow:
     uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.20.0
 

CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.15] - 2025-07-06
+
+### Added
+- Antimeridian/dateline crossing using `dem-stitcher`.
+
+### Changed
+- Enforces `xmin <= xmax` and `ymin <= xmax` where `extent = (xmin, ymin, xmax, ymax)` is the input for `get_raster_from_tiles`.
+
 ## [0.0.14] - 2025-07-06
 
 ### Removed

README.md

@@ -97,9 +97,12 @@ More information about these datasets can be found below
 
 See these [notebooks](notebooks/tile_creation) to see how these tiles are generated and organized. Feel free to open a issue ticket or PR if there are modifications or new tilesets you would like to see.
 
-# Dateline support
+# Dateline/antimeridian support
 
-None curently.
+We support a single dateline crossing (crossing +/- 180 longitude) within `get_raster_from_tiles` using in-memory translation of tiles (same as [dem-stitcher](https://github.com/ACCESS-Cloud-Based-InSAR/dem-stitcher)'s functionality). 
+We "wrap" tiles across this dateline crossing. 
+We assume that the supplied bounds/extent overlap the standard lat/lon CRS grid i.e. longitudes between -/+ 180 longitude and are within -/+ 90 latitude, where a buffer around the dateline (longitude axis or $x$-axis). 
+Wrapping tiles around the North and South poles (i.e. at -/+ 90 latitude) is *not* supported (a different CRS is what's required) and an exception will be raised.
 
 # Contributing
 
@@ -110,7 +113,7 @@ We welcome contributions to this open-source package. To do so:
 3. Make your modifications in your own fork
 4. Make a pull-request (PR) in this repo with the code in your fork and tag the repo owner or a relevant contributor.
 
-We use `flake8` and associated linting packages to ensure some basic code quality (see the `environment.yml`). These will be checked for each commit in a PR. Try to write tests wherever possible.
+We use `ruff` and associated linting packages to ensure some basic code quality (see the `environment.yml`). These will be checked for each commit in a PR. Try to write tests wherever possible.
 
 # Support
 

notebooks/Basic_Demo.ipynb

@@ -1,14 +1,18 @@
 from functools import lru_cache
 from pathlib import Path
 from typing import Optional
+import warnings
 
 import geopandas as gpd
 import rasterio
 from dem_stitcher.geojson_io import read_geojson_gzip
 from dem_stitcher.merge import merge_tile_datasets_within_extent
+from dem_stitcher.dateline import get_dateline_crossing
+from dem_stitcher.stitcher import _translate_one_tile_across_dateline
 from rasterio.errors import RasterioIOError
 from rasterio.env import Env
 from shapely.geometry import box
+import pandas as pd
 
 from .exceptions import NoTileCoverage, TilesetNotSupported
 from .tile_model import TILE_SCHEMA
@@ -128,6 +132,7 @@ def update_glad_landcover_url(url: str, year: int = year) -> str:
 
     if df_tiles.empty:
         raise NoTileCoverage(f'{tile_key} has no global tiles with the parameters provided')
+
     return df_tiles
 
 
@@ -152,9 +157,22 @@ def update_hansen_landsat_mosaic_url(url: str, year: int):
 
 
 def get_urls_from_tile_df(extent: list[float], df_tiles: gpd.GeoDataFrame) -> list[str]:
+    df_tiles_all = df_tiles.copy()
+    crossing = get_dateline_crossing(extent)
+    if crossing:
+        warnings.warn(
+            'Getting tiles across dateline on the opposite hemisphere; '
+            f'The source tiles will be {-2 * crossing} deg along the '
+            'longitudinal axis from the extent requested',
+            category=UserWarning,
+        )
+        df_tiles_all_translated = df_tiles_all.copy()
+        x_translation = 2 * crossing
+        df_tiles_all_translated.geometry = df_tiles_all.geometry.translate(xoff=x_translation)
+        df_tiles_all = pd.concat([df_tiles_all, df_tiles_all_translated], axis=0).reset_index(drop=True)
     bbox = box(*extent)
-    ind_inter = df_tiles.geometry.intersects(bbox)
-    df_subset = df_tiles[ind_inter].reset_index(drop=True)
+    ind_inter = df_tiles_all.geometry.intersects(bbox)
+    df_subset = df_tiles_all[ind_inter].reset_index(drop=True)
     urls = df_subset.url.tolist()
     if not urls:
         raise NoTileCoverage('There are no tiles over the requested area')
@@ -218,13 +236,21 @@ def get_raster_from_tiles(
 
     urls_subset = get_urls_from_tile_df(extent, df_tiles)
 
+    datasets = [rasterio.open(url) for url in urls_subset]
+    crossing = get_dateline_crossing(extent)
+    if crossing:
+        zipped_data = list(map(lambda ds: _translate_one_tile_across_dateline(ds, crossing), datasets))
+        memory_files, datasets = zip(*zipped_data)
+
     if tile_shortname == 'umd_ocean_mask':
         env = Env(GS_NO_SIGN_REQUEST='YES')
     else:
         env = Env()  # default environment
 
     with env:
-        X_merged, p_merged = merge_tile_datasets_within_extent(urls_subset, extent)
+        X_merged, p_merged = merge_tile_datasets_within_extent(datasets, extent)
+    if crossing:
+        list(map(lambda mf: mf.close(), memory_files))
 
     # Are stored in the profile for provenance
     p_merged.update(**tile_metadata)

src/tile_mate/stitcher.py

@@ -28,16 +28,17 @@ def test_glad_change():
     assert len(X.shape) == 3
 
 
-def test_umd_ocean_mask():
-    bounds = [-120.45, 34.85, -120.15, 35.15]
+# Antimeridian bounds too!
+@pytest.mark.parametrize('bounds', [[-181, 51.25, -179, 51.75], [-120.45, 34.85, -120.15, 35.15]])
+def test_umd_ocean_mask(bounds: list[float]):
     X, _ = get_raster_from_tiles(bounds, tile_shortname='umd_ocean_mask')
     assert len(X.shape) == 3
 
 
 @pytest.mark.parametrize('year', GLAD_LANDCOVER_YEARS)
 def test_glad_landcover_datasets(year):
     # Note only getting 1 tile - these are large datasets!
-    bounds = [-120.45, 34.85, -121.15, 34.95]
+    bounds = [-121.15, 34.85, -120.45, 34.95]
     X, _ = get_raster_from_tiles(bounds, tile_shortname='glad_landcover', year=year)
     assert len(X.shape) == 3