remove WATER_MAP_TEST job spec

.github/workflows/deploy-enterprise-test.yml

@@ -28,7 +28,6 @@ jobs:
               job_spec/INSAR_ISCE_TEST.yml
               job_spec/INSAR_ISCE_BURST.yml
               job_spec/WATER_MAP.yml
-              job_spec/WATER_MAP_TEST.yml
               job_spec/WATER_MAP_EQ.yml
               job_spec/S1_CORRECTION_ITS_LIVE.yml
             instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.4.0]
+### Changed
+- The `WATER_MAP` job spec has been updated to the new interface described in the `WATER_MAP_TEST` job spec  
+### Removed
+- The `WATER_MAP_TEST` job spec
+
 ## [4.3.0]
 ### Added
 - An `iterative_min_size` parameter has been added to the `WATER_MAP_TEST` job spec.

apps/step-function.json.j2

@@ -103,10 +103,6 @@
                 {
                   "Variable": "$.job_type",
                   "StringEquals": "WATER_MAP_EQ"
-                },
-                {
-                  "Variable": "$.job_type",
-                  "StringEquals": "WATER_MAP_TEST"
                 }
               ]
             },

job_spec/WATER_MAP.yml

@@ -83,9 +83,10 @@ WATER_MAP:
         type: number
     known_water_threshold:
       api_schema:
-        description: Threshold for extracting known water area in percent. Ignored when flood_depth_estimator is None.
-        default: 30.0
+        description: Threshold for extracting known water area in percent. A water threshold is computed when value is null. Ignored when flood_depth_estimator is None.
+        default: null
         type: number
+        nullable: true
     iterative_min:
       api_schema:
         description: Minimum bound used for iterative method. Ignored when flood_depth_estimator is None.
@@ -96,6 +97,20 @@ WATER_MAP:
         description: Maximum bound used for iterative method. Ignored when flood_depth_estimator is None.
         default: 15
         type: integer
+    iterative_min_size:
+      api_schema:
+        description: Minimum size of a connected waterbody in pixels for calculating flood depths with the iterative estimator
+        default: 0
+        type: integer
+        minimum: 0
+    minimization_metric:
+      api_schema:
+        description: Evaluation method to minimize during the iterative flood depth calculation. Options include a Fowlkes-Mallows index (fmi) or a threat score (ts). Only used when flood_depth_estimator is iterative.
+        default: ts
+        type: string
+        enum:
+          - fmi
+          - ts
   validators:
     - check_dem_coverage
   tasks:
@@ -178,6 +193,10 @@ WATER_MAP:
         - Ref::iterative_min
         - --iterative-max
         - Ref::iterative_max
+        - --iterative-min-size
+        - Ref::iterative_min_size
+        - --minimization-metric
+        - Ref::minimization_metric
       timeout: 86400
       vcpu: 1
       memory: 126000