diff --git a/openmapflow/constants.py b/openmapflow/constants.py index c6b2148..51ae2ca 100644 --- a/openmapflow/constants.py +++ b/openmapflow/constants.py @@ -13,7 +13,7 @@ TEMPLATE_README = TEMPLATES_DIR / "README.md" TEMPLATE_DEPLOY_YML = TEMPLATES_DIR / "github-deploy.yaml" TEMPLATE_TEST_YML = TEMPLATES_DIR / "github-test.yaml" -VERSION = "0.2.4" +VERSION = "0.2.5rc1" # -------------- Dataframe column names -------------------------------------- SOURCE = "source" diff --git a/openmapflow/engineer.py b/openmapflow/engineer.py index 6d14ef4..96b219f 100644 --- a/openmapflow/engineer.py +++ b/openmapflow/engineer.py @@ -60,8 +60,9 @@ def load_tif( Returns: The loaded xr.DataArray """ xr = import_optional_dependency("xarray") + rio = import_optional_dependency("rioxarray") - da = xr.open_rasterio(filepath).rename("FEATURES") + da = rio.open_rasterio(filepath).rename("FEATURES") da_split_by_time = [] diff --git a/openmapflow/eo/sentinel2.py b/openmapflow/eo/sentinel2.py index 8842d13..4cd68bd 100644 --- a/openmapflow/eo/sentinel2.py +++ b/openmapflow/eo/sentinel2.py @@ -8,7 +8,7 @@ from openmapflow.utils import date_to_string # These are algorithm settings for the cloud filtering algorithm -image_collection = "COPERNICUS/S2" +image_collection = "COPERNICUS/S2_HARMONIZED" # Ranges from 0-1.Lower value will mask more pixels out. # Generally 0.1-0.3 works well with 0.2 being used most commonly diff --git a/setup.py b/setup.py index 30c5b2e..ab11555 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ }, scripts=["openmapflow/scripts/openmapflow", "openmapflow/scripts/deploy.sh"], install_requires=[ - "numpy", + "numpy==1.26.4", "pandas>=1.3.5,<2", "pyyaml>=6.0", "requests", @@ -51,6 +51,7 @@ "google-cloud-storage", "netCDF4", "rasterio", + "rioxarray", "xarray==0.19", ], "all": [ @@ -61,6 +62,7 @@ "ipython", "netCDF4", "rasterio", + "rioxarray", "xarray==0.19", "fastcore<1.5.18", "tsai",