FIX: Update some code to match sertit==1.29.1

sertit · Sep 26, 2023 · c51dc38 · c51dc38
1 parent b1dbea3
commit c51dc38
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,7 +5,7 @@
 - FIX: Don't collocate a raster on itself
 - FIX: Better management of default pixel size for multi-resolution products (such as PAN band in Landsat)
 - FIX: Fixing the PAN GSD for Landsat-OLI products
-- FIX: Update some code to match `sertit==1.29.0`
+- FIX: Update some code to match `sertit==1.29.1`
 
 ## 0.20.3 (2023-07-31)
 

diff --git a/eoreader/products/optical/dimap_v1_product.py b/eoreader/products/optical/dimap_v1_product.py
@@ -79,8 +79,7 @@ def crs(self) -> riocrs.CRS:
             lat = float(np.mean([float(v.findtext("FRAME_LAT")) for v in vertices]))
 
             # Compute UTM crs from center long/lat
-            utm = vectors.corresponding_utm_projection(lon, lat)
-            utm = riocrs.CRS.from_string(utm)
+            utm = vectors.to_utm_crs(lon, lat)
 
         return utm
 

diff --git a/eoreader/products/optical/dimap_v2_product.py b/eoreader/products/optical/dimap_v2_product.py
@@ -490,8 +490,7 @@ def crs(self) -> riocrs.CRS:
             lat = float(np.mean([float(v.findtext("LAT")) for v in vertices]))
 
             # Compute UTM crs from center long/lat
-            utm = vectors.corresponding_utm_projection(lon, lat)
-            utm = riocrs.CRS.from_string(utm)
+            utm = vectors.to_utm_crs(lon, lat)
 
         return utm
 

diff --git a/eoreader/products/optical/maxar_product.py b/eoreader/products/optical/maxar_product.py
@@ -876,8 +876,7 @@ def crs(self) -> riocrs.CRS:
             lat = float(root.findtext(".//ORIGINY"))
 
             # Compute UTM crs from center long/lat
-            utm = vectors.corresponding_utm_projection(lon, lat)
-            utm = riocrs.CRS.from_string(utm)
+            utm = vectors.to_utm_crs(lon, lat)
         else:
             utm = raw_crs
 

diff --git a/eoreader/products/optical/s3_product.py b/eoreader/products/optical/s3_product.py
@@ -301,9 +301,9 @@ def crs(self) -> riocrs.CRS:
         mid_lon = lon[0, mid_y, mid_x].data
 
         # Deduce UTM proj from the central lon/lat
-        utm = vectors.corresponding_utm_projection(mid_lon, mid_lat)
+        utm = vectors.to_utm_crs(mid_lon, mid_lat)
 
-        return riocrs.CRS.from_string(utm)
+        return utm
 
     def _replace(
         self,

diff --git a/eoreader/products/optical/sv1_product.py b/eoreader/products/optical/sv1_product.py
@@ -276,8 +276,7 @@ def crs(self) -> riocrs.CRS:
             lat = float(root.findtext(".//CenterLatitude"))
 
             # Compute UTM crs from center long/lat
-            utm = vectors.corresponding_utm_projection(lon, lat)
-            utm = riocrs.CRS.from_string(utm)
+            utm = vectors.to_utm_crs(lon, lat)
 
         return utm
 

diff --git a/requirements.txt b/requirements.txt
@@ -40,7 +40,7 @@ spyndex>=0.3.0
 pystac[validation]
 
 # SERTIT libs
-sertit[full]>=1.29.0
+sertit[full]>=1.29.1
 
 # Optimizations
 dask[complete]>=2021.10.0

diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
         "xarray>=0.18.0",
         "rioxarray>=0.10.0",
         "geopandas>=0.11.0",
-        "sertit[full]>=1.27.3",
+        "sertit[full]>=1.29.1",
         "spyndex>=0.3.0",
         "pyresample",
         "zarr",