#1: Threshold implementation for Flood

IN-CORE · Oct 3, 2021 · cd2ab45 · cd2ab45
1 parent 1ae5802
commit cd2ab45
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/...rc/main/java/edu/illinois/ncsa/incore/service/hazard/models/flood/FloodHazardDataset.java b/...rc/main/java/edu/illinois/ncsa/incore/service/hazard/models/flood/FloodHazardDataset.java
@@ -8,6 +8,7 @@
  *******************************************************************************/
 package edu.illinois.ncsa.incore.service.hazard.models.flood;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import dev.morphia.annotations.Embedded;
@@ -20,6 +21,7 @@ public abstract class FloodHazardDataset {
     private String datasetId;
     private String demandType;
     private String demandUnits;
+    private Double threshold = null;
 
     public String getDatasetId() {
         return datasetId;
@@ -44,4 +46,18 @@ public String getDemandUnits() {
     public void setDemandUnits(String demandUnits) {
         this.demandUnits = demandUnits;
     }
+
+    public Double getThreshold() {
+        return threshold;
+    }
+
+    public void setThreshold(Double threshold) {
+        this.threshold = threshold;
+    }
+
+    @JsonIgnore
+    public String getThresholdJsonString(){
+        return String.format("{'%s': {'value': %s, 'unit': '%s'}}",
+            this.demandType, this.threshold, this.demandUnits);
+    }
 }
diff --git a/...e/src/main/java/edu/illinois/ncsa/incore/service/hazard/models/flood/utils/FloodCalc.java b/...e/src/main/java/edu/illinois/ncsa/incore/service/hazard/models/flood/utils/FloodCalc.java
@@ -51,9 +51,12 @@ public static FloodHazardResult getFloodHazardValue(Flood flood, String demandTy
                 try {
                     if (hazardValue != null) {
                         hazardValue = FloodUtil.convertHazard(hazardValue, demandType, hazardDataset.getDemandUnits(), demandUnits);
-
-                        // convert demand type in keys to lower case
-                        JSONObject floodThresholds = HazardUtil.toLowerKey(HazardUtil.FLOOD_THRESHOLDS);
+                        JSONObject floodThresholds;
+                        if (hazardDataset.getThreshold() != null){
+                            floodThresholds = HazardUtil.toLowerKey(new JSONObject(hazardDataset.getThresholdJsonString()));
+                        } else {
+                            floodThresholds = HazardUtil.toLowerKey(HazardUtil.FLOOD_THRESHOLDS);
+                        }
 
                         if (floodThresholds.has(demandType.toLowerCase())) {
                             JSONObject demandThreshold = ((JSONObject) floodThresholds.get(demandType.toLowerCase()));