dist-s1-enumerator 1.0.4__tar.gz → 1.0.6__tar.gz

{dist_s1_enumerator-1.0.4 → dist_s1_enumerator-1.0.6}/CHANGELOG.md

@@ -6,6 +6,19 @@ 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).
 
+## [1.0.6] - 2025-10-09
+
+### Added
+* Tests for MGRS tiles and burst geometries ensuring they overlap the antimeridian if and only if they are multipolygons.
+* Updated readme with information about these mgrs/burst geometries and the dateline.
+* Updated burst geometries using geopackage geometry from opera_adt/burst_db. See this issue: https://github.com/opera-adt/burst_db/issues/120 - some dateline geometries were cut off. The new geometries are larger and the table went from 24 MB to 37 MB. See this notebook: https://github.com/OPERA-Cal-Val/dist-s1-research/blob/dev/marshak/Zb_update_burst_table/Update%20Burst%20Geometries%20Using%20Geopackage.ipynb
+
+## [1.0.5] - 2025-09-29
+
+### Fixed
+* CMR metadata does not have correctly migrated urls from ASF datapool to ASF cumulus - see https://github.com/opera-adt/dist-s1/issues/158.
+
+
 ## [1.0.4] - 2025-09-29
 
 ### Added
@@ -14,7 +27,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * We now ensure that single polarization data is excluded from baselines and not used in the creation of the post-image set.
 
 ### Fixed
-* Bug in enumerating 1 product.
+* Bug in enumerating 1 product - we did not ensure spatial bursts were consistent between pre-/post-image sets.
 
 
 ## [1.0.3] - 2025-09-09

{dist_s1_enumerator-1.0.4/src/dist_s1_enumerator.egg-info → dist_s1_enumerator-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dist-s1-enumerator
-Version: 1.0.4
+Version: 1.0.6
 Summary: Enumeration and ops library for the OPERA DIST-S1 project
 Author-email: "Richard West, Charlie Marshak, Talib Oliver-Cabrera, and Jungkyo Jung" <charlie.z.marshak@jpl.nasa.gov>
 License: Apache-2.0
@@ -125,6 +125,15 @@ There are two category of tests: unit tests and integration tests. The former ca
 The integration tests that are the most time consuming are represented by the notebooks and are run only upon a release PR.
 These notebook tests are tagged with `notebooks` and can be excluded from the other tests with `pytest tests -m 'not notebooks'`.
 
+# Remarks about the Dateline/Dateline and Geometry
+
+The antimeridian (or dateline) is the line at the -180 longitude mark that global CRS tiles are wrapped by standard global reference systems.
+The geometries of the bursts and the MGRS tiles in this package are all in `epsg:4326` (standard lon/lat). 
+The geometries are all between -180 and 180 so those geometries that cross the antimeridian/dateline are generally wrapped.
+For MGRS tiles, the statement that a geometry overlaps the antimeridian occurs if and only if the geometry is a Polygon.
+The same is true for burst geometries.
+See `test_antimeridian_crossing` in [`tests/test_mgrs_burst_data.py`](tests/test_mgrs_burst_data.py).
+
 # Contributing
 
 We welcome contributions to this open-source package. To do so:

{dist_s1_enumerator-1.0.4 → dist_s1_enumerator-1.0.6}/README.md

@@ -102,6 +102,15 @@ There are two category of tests: unit tests and integration tests. The former ca
 The integration tests that are the most time consuming are represented by the notebooks and are run only upon a release PR.
 These notebook tests are tagged with `notebooks` and can be excluded from the other tests with `pytest tests -m 'not notebooks'`.
 
+# Remarks about the Dateline/Dateline and Geometry
+
+The antimeridian (or dateline) is the line at the -180 longitude mark that global CRS tiles are wrapped by standard global reference systems.
+The geometries of the bursts and the MGRS tiles in this package are all in `epsg:4326` (standard lon/lat). 
+The geometries are all between -180 and 180 so those geometries that cross the antimeridian/dateline are generally wrapped.
+For MGRS tiles, the statement that a geometry overlaps the antimeridian occurs if and only if the geometry is a Polygon.
+The same is true for burst geometries.
+See `test_antimeridian_crossing` in [`tests/test_mgrs_burst_data.py`](tests/test_mgrs_burst_data.py).
+
 # Contributing
 
 We welcome contributions to this open-source package. To do so:

{dist_s1_enumerator-1.0.4 → dist_s1_enumerator-1.0.6}/src/dist_s1_enumerator/asf.py

@@ -12,6 +12,27 @@ from dist_s1_enumerator.mgrs_burst_data import get_burst_ids_in_mgrs_tiles, get_
 from dist_s1_enumerator.tabular_models import reorder_columns, rtc_s1_resp_schema, rtc_s1_schema
 
 
+def convert_asf_url_to_cumulus(url: str) -> str:
+    asf_base = 'https://datapool.asf.alaska.edu/RTC/OPERA-S1/'
+    cumulus_base = 'https://cumulus.asf.earthdatacloud.nasa.gov/OPERA/OPERA_L2_RTC-S1/'
+
+    if not (url.startswith(cumulus_base) or url.startswith(asf_base)):
+        warn(f'URL {url} is not a valid ASF datapool or cumulus earthdatacloud URL.')
+        return url
+
+    if not url.startswith(asf_base):
+        return url
+
+    filename = url.split('/')[-1]
+    granule_pol_parts = filename.rsplit('_', 1)
+    if len(granule_pol_parts) != 2:
+        raise ValueError(f'Could not extract granule name from filename: {filename}')
+
+    granule_name = granule_pol_parts[0]
+    new_url = f'{cumulus_base}{granule_name}/{filename}'
+    return new_url
+
+
 def format_polarization(pol: list | str) -> str:
     if isinstance(pol, list):
         if ('VV' in pol) and len(pol) == 2:
@@ -167,6 +188,8 @@ def get_rtc_s1_ts_metadata_by_burst_ids(
 
     df_rtc['url_copol'] = url_copol
     df_rtc['url_crosspol'] = url_crosspol
+    df_rtc['url_copol'] = df_rtc['url_copol'].map(convert_asf_url_to_cumulus)
+    df_rtc['url_crosspol'] = df_rtc['url_crosspol'].map(convert_asf_url_to_cumulus)
     df_rtc = df_rtc.drop(columns=['all_urls'])
 
     # Ensure the data is sorted by jpl_burst_id and acq_dt

{dist_s1_enumerator-1.0.4 → dist_s1_enumerator-1.0.6/src/dist_s1_enumerator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dist-s1-enumerator
-Version: 1.0.4
+Version: 1.0.6
 Summary: Enumeration and ops library for the OPERA DIST-S1 project
 Author-email: "Richard West, Charlie Marshak, Talib Oliver-Cabrera, and Jungkyo Jung" <charlie.z.marshak@jpl.nasa.gov>
 License: Apache-2.0
@@ -125,6 +125,15 @@ There are two category of tests: unit tests and integration tests. The former ca
 The integration tests that are the most time consuming are represented by the notebooks and are run only upon a release PR.
 These notebook tests are tagged with `notebooks` and can be excluded from the other tests with `pytest tests -m 'not notebooks'`.
 
+# Remarks about the Dateline/Dateline and Geometry
+
+The antimeridian (or dateline) is the line at the -180 longitude mark that global CRS tiles are wrapped by standard global reference systems.
+The geometries of the bursts and the MGRS tiles in this package are all in `epsg:4326` (standard lon/lat). 
+The geometries are all between -180 and 180 so those geometries that cross the antimeridian/dateline are generally wrapped.
+For MGRS tiles, the statement that a geometry overlaps the antimeridian occurs if and only if the geometry is a Polygon.
+The same is true for burst geometries.
+See `test_antimeridian_crossing` in [`tests/test_mgrs_burst_data.py`](tests/test_mgrs_burst_data.py).
+
 # Contributing
 
 We welcome contributions to this open-source package. To do so:

{dist_s1_enumerator-1.0.4 → dist_s1_enumerator-1.0.6}/tests/test_asf.py

@@ -1,6 +1,6 @@
 import pytest
 
-from dist_s1_enumerator.asf import append_pass_data, get_rtc_s1_ts_metadata_by_burst_ids
+from dist_s1_enumerator.asf import append_pass_data, convert_asf_url_to_cumulus, get_rtc_s1_ts_metadata_by_burst_ids
 
 
 @pytest.mark.integration
@@ -35,3 +35,24 @@ def test_appending_mgrs_tiles() -> None:
 
     df_rtc_formatted_no_rows = append_pass_data(df_rtc_resp, ['22NFF'])
     assert df_rtc_formatted_no_rows.empty
+
+
+@pytest.mark.parametrize('pol_token', ['VV', 'VH', 'HH', 'HV'])
+def test_convert_asf_url_to_cumulus_from_datapool(pol_token: str) -> None:
+    """Test converting ASF datapool URL to cumulus earthdatacloud URL."""
+    asf_url = f'https://datapool.asf.alaska.edu/RTC/OPERA-S1/OPERA_L2_RTC-S1_T001-000189-IW2_20211028T180924Z_20250703T015334Z_S1A_30_v1.0_{pol_token}.tif'
+    expected_cumulus_url = f'https://cumulus.asf.earthdatacloud.nasa.gov/OPERA/OPERA_L2_RTC-S1/OPERA_L2_RTC-S1_T001-000189-IW2_20211028T180924Z_20250703T015334Z_S1A_30_v1.0/OPERA_L2_RTC-S1_T001-000189-IW2_20211028T180924Z_20250703T015334Z_S1A_30_v1.0_{pol_token}.tif'
+
+    result = convert_asf_url_to_cumulus(asf_url)
+
+    assert result == expected_cumulus_url
+
+
+@pytest.mark.parametrize('pol_token', ['VV', 'VH', 'HH', 'HV'])
+def test_convert_asf_url_to_cumulus_already_cumulus(pol_token: str) -> None:
+    """Test that cumulus URLs are returned unchanged."""
+    cumulus_url = f'https://cumulus.asf.earthdatacloud.nasa.gov/OPERA/OPERA_L2_RTC-S1/OPERA_L2_RTC-S1_T001-000189-IW2_20211028T180924Z_20250703T015334Z_S1A_30_v1.0/OPERA_L2_RTC-S1_T001-000189-IW2_20211028T180924Z_20250703T015334Z_S1A_30_v1.0_{pol_token}.tif'
+
+    result = convert_asf_url_to_cumulus(cumulus_url)
+
+    assert result == cumulus_url

{dist_s1_enumerator-1.0.4 → dist_s1_enumerator-1.0.6}/tests/test_mgrs_burst_data.py

@@ -1,5 +1,5 @@
 import pytest
-from shapely.geometry import Point
+from shapely.geometry import LineString, MultiPolygon, Point, Polygon
 
 from dist_s1_enumerator.exceptions import NoMGRSCoverage
 from dist_s1_enumerator.mgrs_burst_data import (
@@ -161,3 +161,20 @@ def test_all_bursts_in_lut() -> None:
     df_merged = df_bursts.merge(df_mgrs_lut, on='jpl_burst_id', indicator=True, how='left')
     burst_ids_not_in_lut = df_merged[df_merged['_merge'] == 'left_only'].jpl_burst_id.unique().tolist()
     assert len(burst_ids_not_in_lut) == 0
+
+
+def test_antimeridian_crossing() -> None:
+    df_mgrs = get_mgrs_table()
+    df_burst = get_burst_table()
+    antimeridian_0 = LineString(coordinates=((-180, 90), (-180, -90))).buffer(0.00000001)
+    antimeridian_1 = LineString(coordinates=((180, 90), (180, -90))).buffer(0.00000001)
+
+    for df in [df_mgrs, df_burst]:
+        for antimeridian in [antimeridian_0, antimeridian_1]:
+            ind_anti = df.geometry.intersects(antimeridian)
+            df_antimerid = df[ind_anti].reset_index(drop=True)
+            any_polygons = (df_antimerid.geometry.map(lambda geo: isinstance(geo, Polygon))).sum()
+            assert any_polygons == 0
+            df_antimerid_not = df[~ind_anti].reset_index(drop=True)
+            any_multis = (df_antimerid_not.geometry.map(lambda geo: isinstance(geo, MultiPolygon))).sum()
+            assert any_multis == 0