Skip to content

Commit 3ade8d2

Browse files
JanssenBrmJanssenBrm
authored
Merge pull request #129 from Open-EO/unavilable_notebooks
Unavilable notebooks
2 parents 8bb8e37 + bca4039 commit 3ade8d2

12 files changed

Lines changed: 273 additions & 2414 deletions

‎notebooks/OpenEO/FuseTS - CropSAR Full Workflow.ipynb‎

Lines changed: 21 additions & 383 deletions
Large diffs are not rendered by default.

‎notebooks/OpenEO/FuseTS - MOGPR Full Workflow.ipynb‎

Lines changed: 46 additions & 396 deletions
Large diffs are not rendered by default.

‎notebooks/OpenEO/FuseTS - MOGPR Multi Source Fusion.ipynb‎

Lines changed: 76 additions & 437 deletions
Large diffs are not rendered by default.

‎notebooks/OpenEO/FuseTS - MOGPR S1 and S2.ipynb‎

Lines changed: 57 additions & 414 deletions
Large diffs are not rendered by default.

‎src/fusets/openeo/__init__.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,18 @@ def load_xarray(collection_id, spatial_extent, temporal_extent, properties=None,
7272
if openeo_connection == None:
7373
openeo_connection = openeo.connect("openeo.cloud").authenticate_oidc()
7474
print(spatial_extent)
75-
scl = openeo_connection.load_collection(
76-
collection_id, temporal_extent=temporal_extent, bands=["SCL"]
77-
).filter_bbox(spatial_extent)
75+
scl = openeo_connection.load_collection(collection_id, temporal_extent=temporal_extent, bands=["SCL"]).filter_bbox(
76+
spatial_extent
77+
)
7878
cloud_mask = scl.process(
7979
"to_scl_dilation_mask",
8080
data=scl,
81-
kernel1_size=17, kernel2_size=77,
81+
kernel1_size=17,
82+
kernel2_size=77,
8283
mask1_values=[2, 4, 5, 6, 7],
8384
mask2_values=[3, 8, 9, 10, 11],
84-
erosion_kernel_size=3)
85+
erosion_kernel_size=3,
86+
)
8587
data = openeo_connection.load_collection(
8688
collection_id, temporal_extent=temporal_extent, bands=["B02", "B03", "B04"]
8789
).filter_bbox(spatial_extent)

‎src/fusets/openeo/services/publish_mogpr.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ def execute_udf():
2929
temp_ext = ["2023-01-01", "2023-03-31"]
3030

3131
# Setup NDVI cube
32-
scl = connection.load_collection(
33-
"SENTINEL2_L2A", spatial_extent=spat_ext, temporal_extent=temp_ext, bands=["SCL"]
34-
)
32+
scl = connection.load_collection("SENTINEL2_L2A", spatial_extent=spat_ext, temporal_extent=temp_ext, bands=["SCL"])
3533
cloud_mask = scl.process(
3634
"to_scl_dilation_mask",
3735
data=scl,
38-
kernel1_size=17, kernel2_size=77,
36+
kernel1_size=17,
37+
kernel2_size=77,
3938
mask1_values=[2, 4, 5, 6, 7],
4039
mask2_values=[3, 8, 9, 10, 11],
41-
erosion_kernel_size=3)
40+
erosion_kernel_size=3,
41+
)
4242
base_s2 = connection.load_collection(
4343
"SENTINEL2_L2A", spatial_extent=spat_ext, temporal_extent=temp_ext, bands=["B04", "B08"]
4444
)

‎src/fusets/openeo/services/publish_mogpr_s1_s2.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,16 @@ def _load_ndvi(connection, polygon, date):
151151
:param date:
152152
:return:
153153
"""
154-
scl = connection.load_collection(
155-
"SENTINEL2_L2A", spatial_extent=polygon, temporal_extent=date, bands=["SCL"]
156-
)
154+
scl = connection.load_collection("SENTINEL2_L2A", spatial_extent=polygon, temporal_extent=date, bands=["SCL"])
157155
cloud_mask = scl.process(
158156
"to_scl_dilation_mask",
159157
data=scl,
160-
kernel1_size=17, kernel2_size=77,
158+
kernel1_size=17,
159+
kernel2_size=77,
161160
mask1_values=[2, 4, 5, 6, 7],
162161
mask2_values=[3, 8, 9, 10, 11],
163-
erosion_kernel_size=3)
162+
erosion_kernel_size=3,
163+
)
164164
base_s2 = connection.load_collection(
165165
"SENTINEL2_L2A", spatial_extent=polygon, temporal_extent=date, bands=["B04", "B08"]
166166
)
@@ -201,10 +201,12 @@ def _load_evi(connection, polygon, date):
201201
cloud_mask = scl.process(
202202
"to_scl_dilation_mask",
203203
data=scl,
204-
kernel1_size=17, kernel2_size=77,
204+
kernel1_size=17,
205+
kernel2_size=77,
205206
mask1_values=[2, 4, 5, 6, 7],
206207
mask2_values=[3, 8, 9, 10, 11],
207-
erosion_kernel_size=3)
208+
erosion_kernel_size=3,
209+
)
208210
base_s2 = connection.load_collection(
209211
collection_id="SENTINEL2_L2A",
210212
spatial_extent=polygon,

‎src/fusets/openeo/services/publish_phenology.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ def test_udf():
5656
cloud_mask = scl.process(
5757
"to_scl_dilation_mask",
5858
data=scl,
59-
kernel1_size=17, kernel2_size=77,
59+
kernel1_size=17,
60+
kernel2_size=77,
6061
mask1_values=[2, 4, 5, 6, 7],
6162
mask2_values=[3, 8, 9, 10, 11],
62-
erosion_kernel_size=3)
63+
erosion_kernel_size=3,
64+
)
6365
base = connection.load_collection(
6466
"SENTINEL2_L2A_SENTINELHUB", spatial_extent=spat_ext, temporal_extent=temp_ext, bands=["B04", "B08"]
6567
)

‎tests/conftest.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@ def wetland_sentinel2_ndvi(areas):
118118
cloud_mask = scl.process(
119119
"to_scl_dilation_mask",
120120
data=scl,
121-
kernel1_size=17, kernel2_size=77,
121+
kernel1_size=17,
122+
kernel2_size=77,
122123
mask1_values=[2, 4, 5, 6, 7],
123124
mask2_values=[3, 8, 9, 10, 11],
124-
erosion_kernel_size=3)
125+
erosion_kernel_size=3,
126+
)
125127
data = openeo_connection.load_collection(
126128
"SENTINEL2_L2A", temporal_extent=("2020-01-01", "2021-01-01"), bands=["B08", "B04"]
127129
).filter_bbox(areas["wetland"])

‎tests/fusets_openeo_tests/test_performance.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ def start_job(data, context: dict, **kwargs) -> openeo.BatchJob:
5050
cloud_mask = scl.process(
5151
"to_scl_dilation_mask",
5252
data=scl,
53-
kernel1_size=17, kernel2_size=77,
53+
kernel1_size=17,
54+
kernel2_size=77,
5455
mask1_values=[2, 4, 5, 6, 7],
5556
mask2_values=[3, 8, 9, 10, 11],
56-
erosion_kernel_size=3)
57+
erosion_kernel_size=3,
58+
)
5759
base = connection.load_collection(
5860
"SENTINEL2_L2A",
5961
spatial_extent=aoi,

0 commit comments

Comments
 (0)