Changes in grass-addons/grass7/imagery/i.sentinel.mask/i.sentinel.mask.py [72816:72992]

File:

• grass-addons/grass7/imagery/i.sentinel.mask/i.sentinel.mask.py (modified) (7 diffs)

grass-addons/grass7/imagery/i.sentinel.mask/i.sentinel.mask.py

@@ -110 +110 @@
 #% description: name of output vector shadow mask
 #% required : no
+#% guisection: Output
+#%end
+#%option
+#% key: cloud_threshold
+#% type: integer
+#% description: threshold for cleaning small areas from cloud mask
+#% required : yes
+#% answer: 50000
+#% guisection: Output
+#%end
+#%option
+#% key: shadow_threshold
+#% type: integer
+#% description: threshold for cleaning small areas from shadow mask
+#% required : yes
+#% answer: 10000
 #% guisection: Output
 #%end
@@ -219 +235 @@
     f_bands = {}
     scale_fac = options['scale_fac']
-    cloud_clean_T = 50000
-    shadow_clean_T = 10000
+    cloud_threshold = options['cloud_threshold']
+    shadow_threshold = options['shadow_threshold']
     raster_max = {}
     cloud_mask = options['cloud_mask']
@@ -264 +280 @@
         gscript.warning(_('Any rescale factor has been applied'))
         for key, b in bands.items():
-            if gscript.raster_info(b)['datatype'] != "DCELL":
-                gscript.fatal("Raster maps must be double")
+            if gscript.raster_info(b)['datatype'] != "DCELL" and gscript.raster_info(b)['datatype'] != "FCELL":
+                gscript.fatal("Raster maps must be DCELL o FCELL")
             else:
                 f_bands = bands
@@ -310 +326 @@
         fourth_rule,
         fifth_rule)
-    expr_c = '{} = if({}, 0, null( ))'.format(
+    expr_c = '{} = if({}, 0, null())'.format(
         tmp["cloud_def"],
         cloud_rules)
@@ -325 +341 @@
         output=cloud_mask,
         tool='rmarea',
-        threshold=cloud_clean_T)
+        threshold=cloud_threshold)
     gscript.message(_('--- Finish cloud detection procedure ---'))
     ### end of Clouds detection ####
@@ -354 +370 @@
             sixth_rule, 
             seventh_rule)
-        expr_s = '{} = if({}, 0, null( ))'.format(
+        expr_s = '{} = if({}, 0, null())'.format(
             tmp["shadow_temp"],
             shadow_rules)
@@ -370 +386 @@
             output=tmp["shadow_temp_mask"],
             tool='rmarea',
-            threshold=shadow_clean_T)
+            threshold=shadow_threshold)
         gscript.message(_('--- Finish Shadows detection procedure ---'))
         ### end of shadows detection ###