Cast shadow masking

bin/dswx_hls.py

@@ -78,7 +78,9 @@ def main():
         flag_use_otsu_terrain_masking=args.flag_use_otsu_terrain_masking,
         min_slope_angle = args.min_slope_angle,
         max_sun_local_inc_angle=args.max_sun_local_inc_angle,
+        apply_cast_shadow_masking=args.apply_cast_shadow_masking,
         mask_adjacent_to_cloud_mode=args.mask_adjacent_to_cloud_mode,
+        copernicus_forest_classes=args.copernicus_forest_classes,
         flag_debug=args.flag_debug)
 
 

docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:20.04
-FROM python:3.8 
+FROM python:3.9
 
 # Set default UID and GID
 ENV USER_ID 1000

setup.py

@@ -2,7 +2,23 @@
 from setuptools import setup
 from setuptools import Command
 
-__version__ = version = VERSION = '0.1'
+
+def _get_version():
+    """Returns the PROTEUS software version
+
+       Returns
+       -------
+       version : str
+            PROTEUS software version
+    """
+
+    version_file = 'src/proteus/version.py'
+    version = open(version_file).read().split('=')[1]
+    version = version.replace("'", '').replace('"', '').strip()
+
+    return version
+
+__version__ = version = VERSION = _get_version()
 
 
 class CleanCommand(Command):

src/proteus/core.py

@@ -28,7 +28,7 @@ def save_as_cog(filename, scratch_dir = '.', logger = None,
         logger = logging.getLogger('proteus')
 
     logger.info('COG step 1: add overviews')
-    gdal_ds = gdal.Open(filename, 1)
+    gdal_ds = gdal.Open(filename, gdal.GA_Update)
     gdal_dtype = gdal_ds.GetRasterBand(1).DataType
     dtype_name = gdal.GetDataTypeName(gdal_dtype).lower()
 
@@ -62,7 +62,6 @@ def save_as_cog(filename, scratch_dir = '.', logger = None,
     if flag_compress:
         gdal_translate_options += ['COMPRESS=DEFLATE']
 
-    is_integer = 'byte' in dtype_name  or 'int' in dtype_name
     if is_integer:
         gdal_translate_options += ['PREDICTOR=2']
     else:
@@ -90,7 +89,7 @@ def save_as_cog(filename, scratch_dir = '.', logger = None,
                        f' optimized GeoTIFF!')
 
 
-def get_geographic_boundaries_from_mgrs_tile(mgrs_tile_name, verbose=False):
+def get_hls_geographic_boundaries_from_mgrs_tile(mgrs_tile_name, verbose=False):
 
     import mgrs
     mgrs_obj = mgrs.MGRS()
@@ -122,8 +121,10 @@ def get_geographic_boundaries_from_mgrs_tile(mgrs_tile_name, verbose=False):
     for offset_x_multiplier in range(2):
         for offset_y_multiplier in range(2):
 
-            x = x_min + offset_x_multiplier * 109.8 * 1000
-            y = y_min + offset_y_multiplier * 109.8 * 1000
+            # We are using MGRS 100km x 100km tiles
+            # HLS tiles have 4.9 km of margin => width/length = 109.8 km
+            x = x_min - 4.9 * 1000 + offset_x_multiplier * 109.8 * 1000
+            y = y_min - 4.9 * 1000 + offset_y_multiplier * 109.8 * 1000
             lat, lon, z = transformation.TransformPoint(x, y, elevation)
 
             if verbose:

src/proteus/defaults/dswx_hls.yaml

@@ -52,6 +52,10 @@ runconfig:
             product_version:
 
         processing:
+
+            # Check if ancillary inputs cover entirely the output product
+            check_ancillary_inputs_coverage: True
+
             # Use terrain-masking based on the Otsu method
             flag_use_otsu_terrain_masking: False
 
@@ -61,9 +65,15 @@ runconfig:
             # Maximum sun local-incidence angle in degrees for terrain masking
             max_sun_local_inc_angle: 40
 
+            # Apply cast shadow masking
+            apply_cast_shadow_masking: False
+
             # Define how areas adjacent to cloud/cloud-shadow should be handled
             mask_adjacent_to_cloud_mode: 'mask'
 
+            # Copernicus CGLS Land Cover 100m forest classes
+            copernicus_forest_classes: [20, 111, 113, 115, 116, 121, 123, 125, 126]
+
             save_wtr: True    # Layer 1 - WTR
             save_bwtr: True   # Layer 2 - BWTR
             save_conf: True   # Layer 3 - CONF