@@ -258,14 +258,15 @@ def main():
258
258
if resp [0 ] != b"" :
259
259
s_list = resp [0 ].decode ("utf-8" ).strip ().splitlines ()
260
260
else :
261
+ # Experimental version warning needs to be removed from i.eodag
261
262
if set (resp ) == {b"" }:
262
263
grass .fatal (_ ("No products found" ))
263
264
else :
264
265
error_msg = ""
265
266
for i in range (0 , len (resp )):
266
267
error_msg += resp [i ].decode ("utf-8" )
267
268
grass .fatal (_ ("Error using i.sentinel.download: {}" ).format (error_msg ))
268
- name_list_tmp = [x .split (" " )[1 ] for x in s_list ]
269
+ name_list_tmp = [x .split (" " )[0 ] for x in s_list ]
269
270
else :
270
271
name_list_tmp = options ["names" ].split ("," )
271
272
name_list = []
@@ -279,13 +280,10 @@ def main():
279
280
grass .run_command (
280
281
"i.sentinel.download" ,
281
282
settings = settings ,
282
- map = area ,
283
- start = start_day ,
284
- end = end_day ,
285
283
footprints = fpi ,
286
284
producttype = producttype ,
287
- query = "identifier=%s" % name ,
288
- flags = "lb " ,
285
+ id = name ,
286
+ flags = "l " ,
289
287
quiet = True ,
290
288
)
291
289
name_list .append (name )
@@ -310,30 +308,31 @@ def main():
310
308
grass .run_command (
311
309
"v.db.update" ,
312
310
map = temp_overlay ,
313
- column = "a_identifier " ,
314
- query_column = 'a_identifier || "+" ' + "|| b_identifier " ,
315
- where = "a_identifier NOT NULL AND " + "b_identifier NOT NULL" ,
311
+ column = "a_title " ,
312
+ query_column = 'a_title || "+" ' + "|| b_title " ,
313
+ where = "a_title NOT NULL AND " + "b_title NOT NULL" ,
316
314
quiet = True ,
317
315
)
318
316
grass .run_command (
319
317
"v.db.update" ,
320
318
map = temp_overlay ,
321
- column = "a_identifier " ,
322
- query_column = "b_identifier " ,
323
- where = "a_identifier IS NULL" ,
319
+ column = "a_title " ,
320
+ query_column = "b_title " ,
321
+ where = "a_title IS NULL" ,
324
322
quiet = True ,
325
323
)
326
324
grass .run_command (
327
325
"v.db.renamecolumn" ,
328
326
map = temp_overlay ,
329
- column = "a_identifier,identifier " ,
327
+ column = "a_title,title " ,
330
328
quiet = True ,
331
329
)
332
330
columns_dict = grass .parse_command ("v.info" , map = temp_overlay , flags = "c" )
333
331
drop_columns = [
334
332
col .split ("|" )[1 ]
335
333
for col in columns_dict
336
- if col .split ("|" )[1 ] not in ["cat" , "identifier" ]
334
+ if col .split ("|" )[1 ]
335
+ not in ["cat" , "title" ] # What does cat refer to here?
337
336
]
338
337
grass .run_command (
339
338
"v.db.dropcolumn" , map = temp_overlay , columns = drop_columns , quiet = True
@@ -366,7 +365,7 @@ def main():
366
365
# list of scenes that actually intersect with bbox
367
366
name_list_updated_tmp = list (
368
367
grass .parse_command (
369
- "v.db.select" , map = fps_in_area , column = "a_identifier " , flags = "c"
368
+ "v.db.select" , map = fps_in_area , column = "a_title " , flags = "c"
370
369
).keys ()
371
370
)
372
371
0 commit comments