Proposed changes

Need to update HEC-HMS to account for removed methods in Vortex

Author: Tom Brauer

vortex-api/src/main/java/mil/army/usace/hec/vortex/util/UnitUtil.java

@@ -1,9 +1,7 @@
 package mil.army.usace.hec.vortex.util;
 
-import hec.heclib.dss.HecDataConversion;
 import systems.uom.common.USCustomary;
 import tech.units.indriya.format.SimpleUnitFormat;
-import tech.units.indriya.unit.TransformedUnit;
 
 import javax.measure.Unit;
 import javax.measure.format.MeasurementParseException;
@@ -39,7 +37,7 @@ public static Unit<?> getUnits(String units) {
                  "millimeters snow thickness" -> MILLI(METRE);
             case "in", "inch", "inches" -> INCH;
             case "ft", "foot", "feet" -> FOOT;
-            case "1/1000 in" -> TransformedUnit.parse("in/1000");
+            case "1/1000 in" -> INCH.divide(1000);
             case "in/hr" -> INCH.divide(HOUR);
             case "celsius", "degrees c", "deg c", "deg_c", "degc", "c" -> CELSIUS;
             case "degc-d" -> CELSIUS.multiply(DAY);
@@ -59,6 +57,8 @@ public static Unit<?> getUnits(String units) {
             case "km" -> KILO(METRE);
             case "degrees", "degrees_east", "degrees_north" -> USCustomary.DEGREE_ANGLE;
             case "hr" -> HOUR;
+            case "ac", "acre" -> ACRE;
+            case "sqft", "ft2" -> SQUARE_FOOT;
             default -> parseSimpleUnitFormat(units);
         };
     }
@@ -71,7 +71,7 @@ public static boolean equals(String units1, String units2) {
 
     private static Unit<?> parseSimpleUnitFormat(String units) {
         if (units == null || units.isBlank()) {
-            return null;
+            return ONE;
         }
 
         try {
@@ -81,16 +81,4 @@ private static Unit<?> parseSimpleUnitFormat(String units) {
             return ONE;
         }
     }
-
-    public static boolean isSquareFeet(String label) {
-        return label.equalsIgnoreCase("ft2") || label.equalsIgnoreCase("sqft");
-    }
-
-    public static boolean isAcre(String label) {
-        return label.equalsIgnoreCase("ac") || label.equalsIgnoreCase("acre");
-    }
-
-    public static boolean isEnglishUnitSystem(int unitSystem) {
-        return unitSystem == HecDataConversion.ENGLISH_UNITS;
-    }
 }

vortex-api/src/test/java/mil/army/usace/hec/vortex/util/UnitUtilTest.java

@@ -0,0 +1,34 @@
+package mil.army.usace.hec.vortex.util;
+
+import org.junit.jupiter.api.Test;
+import tech.units.indriya.unit.TransformedUnit;
+
+import javax.measure.Unit;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static systems.uom.common.USCustomary.INCH;
+import static systems.uom.common.USCustomary.SQUARE_FOOT;
+
+class UnitUtilTest {
+
+    @Test
+    void unit1divide1000inches() {
+        String str = "1/1000 in";
+
+        Unit<?> units = INCH.divide(1000);
+        Unit<?> parsed = TransformedUnit.parse("in/1000");
+
+        Unit<?> retrieved = UnitUtil.getUnits(str);
+        assertEquals(units, retrieved);
+        assertEquals(units, parsed);
+    }
+
+    @Test
+    void unitSquareFeet() {
+        String ft2 = "ft2";
+        assertEquals(SQUARE_FOOT, UnitUtil.getUnits(ft2));
+
+        String sqft = "sqft";
+        assertEquals(SQUARE_FOOT, UnitUtil.getUnits(sqft));
+    }
+}