Skip to content

Commit f5fc4ca

Browse files
Merge pull request #1575 from M3nin0/cdse/sentinel-1-grd
remove cdse-os and include sentinel-1-grd in cdse
2 parents 374ba57 + c48a12f commit f5fc4ca

15 files changed

Lines changed: 300 additions & 745 deletions

DESCRIPTION

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ Imports:
8383
utils,
8484
vctrs
8585
Suggests:
86-
aws.s3,
8786
caret,
8887
cli,
8988
cols4all (>= 0.8.0),
@@ -167,7 +166,6 @@ Collate:
167166
'api_ml_model.R'
168167
'api_message.R'
169168
'api_mosaic.R'
170-
'api_odata.R'
171169
'api_parallel.R'
172170
'api_patterns.R'
173171
'api_period.R'
@@ -198,7 +196,6 @@ Collate:
198196
'api_source_aws.R'
199197
'api_source_bdc.R'
200198
'api_source_cdse.R'
201-
'api_source_cdse_os.R'
202199
'api_source_deafrica.R'
203200
'api_source_deaustralia.R'
204201
'api_source_hls.R'

NAMESPACE

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ S3method(.ml_normalize,default)
116116
S3method(.ml_normalize,torch_model)
117117
S3method(.mosaic_split_band_date,derived_cube)
118118
S3method(.mosaic_split_band_date,raster_cube)
119-
S3method(.odata_cdse_extract_tile,RTC)
120-
S3method(.odata_cdse_search,GRD)
121119
S3method(.predictors,sits)
122120
S3method(.predictors,sits_base)
123121
S3method(.reg_tile_convert,"bdc_cube_landsat-2m")
@@ -148,10 +146,10 @@ S3method(.samples_select_bands,sits_base)
148146
S3method(.samples_select_dates,sits)
149147
S3method(.samples_select_labels,sits)
150148
S3method(.slice_dfr,numeric)
149+
S3method(.source_collection_access_test,"cdse_cube_sentinel-1-grd")
151150
S3method(.source_collection_access_test,"mpc_cube_sentinel-1-grd")
152151
S3method(.source_collection_access_test,alphaearth_cube)
153152
S3method(.source_collection_access_test,cdse_cube)
154-
S3method(.source_collection_access_test,cdse_os_cube)
155153
S3method(.source_collection_access_test,hls_cube)
156154
S3method(.source_collection_access_test,mpc_cube)
157155
S3method(.source_collection_access_test,ogh_cube)
@@ -161,7 +159,7 @@ S3method(.source_cube,alphaearth_cube)
161159
S3method(.source_cube,stac_cube)
162160
S3method(.source_filter_tiles,"bdc_cube_landsat-1y")
163161
S3method(.source_filter_tiles,"bdc_cube_landsat-2m")
164-
S3method(.source_filter_tiles,"cdse_os_cube_sentinel-1-rtc")
162+
S3method(.source_filter_tiles,"cdse_cube_sentinel-1-grd")
165163
S3method(.source_filter_tiles,"deafrica_cube_sentinel-1-rtc")
166164
S3method(.source_filter_tiles,"mpc_cube_cop-dem-glo-30")
167165
S3method(.source_filter_tiles,"mpc_cube_sentinel-1-grd")
@@ -172,19 +170,18 @@ S3method(.source_item_get_cloud_cover,stac_cube)
172170
S3method(.source_item_get_date,"mpc_cube_mod09a1-6.1")
173171
S3method(.source_item_get_date,"mpc_cube_mod10a1-6.1")
174172
S3method(.source_item_get_date,"mpc_cube_mod13q1-6.1")
175-
S3method(.source_item_get_date,cdse_os_cube)
176173
S3method(.source_item_get_date,deafrica_cube)
177174
S3method(.source_item_get_date,stac_cube)
178175
S3method(.source_item_get_hrefs,bdc_cube)
179176
S3method(.source_item_get_hrefs,stac_cube)
180177
S3method(.source_item_get_hrefs,usgs_cube)
181-
S3method(.source_items_bands_select,cdse_os_cube)
182178
S3method(.source_items_bands_select,stac_cube)
183179
S3method(.source_items_cube,stac_cube)
184180
S3method(.source_items_fid,stac_cube)
185181
S3method(.source_items_new,"aws_cube_landsat-c2-l2")
186182
S3method(.source_items_new,"bdc_cube_landsat-1y")
187183
S3method(.source_items_new,"bdc_cube_landsat-2m")
184+
S3method(.source_items_new,"cdse_cube_sentinel-1-grd")
188185
S3method(.source_items_new,"deafrica_cube_sentinel-1-rtc")
189186
S3method(.source_items_new,"deafrica_cube_sentinel-2-l2a")
190187
S3method(.source_items_new,"mpc_cube_cop-dem-glo-30")
@@ -197,7 +194,6 @@ S3method(.source_items_new,"terrascope_cube_world-cover-2021")
197194
S3method(.source_items_new,aws_cube)
198195
S3method(.source_items_new,bdc_cube)
199196
S3method(.source_items_new,cdse_cube)
200-
S3method(.source_items_new,cdse_os_cube)
201197
S3method(.source_items_new,deafrica_cube)
202198
S3method(.source_items_new,deaustralia_cube)
203199
S3method(.source_items_new,deaustralia_cube_ga_s2am_ard_3)
@@ -213,7 +209,7 @@ S3method(.source_items_tile,"aws_cube_landsat-c2-l2")
213209
S3method(.source_items_tile,"bdc_cube_amazonia-1")
214210
S3method(.source_items_tile,"bdc_cube_landsat-1y")
215211
S3method(.source_items_tile,"bdc_cube_landsat-2m")
216-
S3method(.source_items_tile,"cdse_os_cube_sentinel-1-rtc")
212+
S3method(.source_items_tile,"cdse_cube_sentinel-1-grd")
217213
S3method(.source_items_tile,"deafrica_cube_rainfall-chirps-daily")
218214
S3method(.source_items_tile,"deafrica_cube_rainfall-chirps-monthly")
219215
S3method(.source_items_tile,"mpc_cube_cop-dem-glo-30")
@@ -230,7 +226,6 @@ S3method(.source_items_tile,"terrascope_cube_world-cover-2021")
230226
S3method(.source_items_tile,aws_cube)
231227
S3method(.source_items_tile,bdc_cube)
232228
S3method(.source_items_tile,cdse_cube)
233-
S3method(.source_items_tile,cdse_os_cube)
234229
S3method(.source_items_tile,deafrica_cube)
235230
S3method(.source_items_tile,deaustralia_cube)
236231
S3method(.source_items_tile,hls_cube)
@@ -241,7 +236,6 @@ S3method(.source_items_tile,usgs_cube)
241236
S3method(.source_roi_tiles,"mpc_cube_landsat-c2-l2")
242237
S3method(.source_roi_tiles,sdc_cube)
243238
S3method(.source_roi_tiles,stac_cube)
244-
S3method(.source_tile_get_bbox,"cdse_os_cube_sentinel-1-rtc")
245239
S3method(.source_tile_get_bbox,"mpc_cube_cop-dem-glo-30")
246240
S3method(.source_tile_get_bbox,"mpc_cube_sentinel-1-grd")
247241
S3method(.source_tile_get_bbox,"mpc_cube_sentinel-1-rtc")

NEWS.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ remove deprecated functions. The highlights below are grouped by theme.
6262
* Add AlphaEarth (AEF) as a data source
6363
* Add support for the Amazonia-1 and GLAD image collections in the Brazil Data
6464
Cube (BDC)
65-
* Migrate the CDSE source to the OData API
65+
* Add support for the `SENTINEL-1-GRD` collection in CDSE
6666
* Add support for a specific regularization strategy for the BDC
6767
`LANDSAT-2M` cube
6868

@@ -86,6 +86,10 @@ remove deprecated functions. The highlights below are grouped by theme.
8686
and `sits_roi_to_mgrs()` functions
8787
* Add deprecation messages for vector-cube-specific `sits_classify()`,
8888
labeling, and reclassify S3 methods
89+
* Remove the `CDSE-OS` source, its `SENTINEL-1-RTC` collection, and the OData
90+
API used to access it. Sentinel-1 is now available from `CDSE` through the
91+
`SENTINEL-1-GRD` collection. `SENTINEL-1-RTC` remains available in `MPC`
92+
and `DEAFRICA`
8993

9094
### Bug fixes and other improvements
9195
* Internal DTW implementation was reworked using a C++

0 commit comments

Comments
 (0)