Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update s2 #135

Merged
merged 4 commits into from
Nov 15, 2024
Merged

Update s2 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8c686
Update s2
ivanzvonkov Nov 12, 2024
3a66adf
Address numpy and rioxarray
ivanzvonkov Nov 15, 2024
5899eee
Ensure rioxarray is installed
ivanzvonkov Nov 15, 2024
017d1da
Update constants.py
ivanzvonkov Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openmapflow/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion openmapflow/engineer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []

Expand Down
2 changes: 1 addition & 1 deletion openmapflow/eo/sentinel2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -51,6 +51,7 @@
"google-cloud-storage",
"netCDF4",
"rasterio",
"rioxarray",
"xarray==0.19",
],
"all": [
Expand All @@ -61,6 +62,7 @@
"ipython",
"netCDF4",
"rasterio",
"rioxarray",
"xarray==0.19",
"fastcore<1.5.18",
"tsai",
Expand Down
Loading