Merge pull request #214 from kvos/development

Development

coastsat/SDS_download.py

@@ -130,7 +130,7 @@ def retrieve_images(inputs):
                 # if passed a value of 1 is stored if failed a value of -1 is stored in the metadata
                 # the name of the property containing the flag changes across the S2 archive
                 # check which flag name is used for the image and store the 1/-1 for acc_georef
-                flag_names = ['GEOMETRIC_QUALITY_FLAG', 'GEOMETRIC_QUALITY', 'quality_check']
+                flag_names = ['GEOMETRIC_QUALITY_FLAG', 'GEOMETRIC_QUALITY', 'quality_check', 'GENERAL_QUALITY_FLAG']
                 for key in flag_names: 
                     if key in im_meta['properties'].keys(): break
                 if im_meta['properties'][key] == 'PASSED': acc_georef = 1
@@ -721,8 +721,8 @@ def duplicates(lst, item):
 
     # first pass on images that have the exact same timestamp
     duplicates = duplicates_dict([_.split('_')[0] for _ in filenames])
+    total_removed_step1 = 0
     if len(duplicates) > 0:
-        total_removed_step1 = 0
         # loop through each pair of duplicates and merge them
         for key in duplicates.keys():
             idx_dup = duplicates[key]