Combine with HMS UnitsUtil

Author: nghiemv

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

@@ -1,29 +1,49 @@
 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;
+import javax.measure.format.UnitFormat;
 import java.util.Optional;
 
 import static javax.measure.MetricPrefix.*;
-import static systems.uom.common.USCustomary.FAHRENHEIT;
-import static systems.uom.common.USCustomary.INCH;
+import static systems.uom.common.USCustomary.*;
 import static tech.units.indriya.AbstractUnit.ONE;
+import static tech.units.indriya.unit.Units.HOUR;
+import static tech.units.indriya.unit.Units.MINUTE;
 import static tech.units.indriya.unit.Units.*;
 
 public class UnitUtil {
+    static {
+        USCustomary.getInstance();
+    }
+
+    private UnitUtil() {
+        // Utility Class
+    }
+
     public static Unit<?> getUnits(String units) {
+        if (units == null) {
+            return ONE;
+        }
+
         return switch (units.toLowerCase()) {
             case "kg.m-2.s-1", "kg m-2 s-1", "kg/m2s", "mm/s", "mm s-1" -> MILLI(METRE).divide(SECOND);
             case "mm hr^-1", "mm/hr" -> MILLI(METRE).divide(HOUR);
             case "mm/day", "mm/d" -> MILLI(METRE).divide(DAY);
-            case "kg.m-2", "kg/m^2", "kg m^-2", "kg m-2", "mm", "millimeters h20", "millimeters snow thickness" ->
-                    MILLI(METRE);
+            case "kg.m-2", "kg/m^2", "kg m^-2", "kg m-2", "mm", "millimeter", "millimeters", "millimeters h20",
+                 "millimeters snow thickness" -> MILLI(METRE);
             case "in", "inch", "inches" -> INCH;
-            case "1/1000 in" -> ONE.divide(INCH.multiply(1000));
+            case "ft", "foot", "feet" -> FOOT;
+            case "1/1000 in" -> TransformedUnit.parse("in/1000");
+            case "in/hr" -> INCH.divide(HOUR);
             case "celsius", "degrees c", "deg c", "deg_c", "degc", "c" -> CELSIUS;
             case "degc-d" -> CELSIUS.multiply(DAY);
-	        case "degf-d" -> FAHRENHEIT.multiply(DAY);
+            case "degf-d" -> FAHRENHEIT.multiply(DAY);
             case "fahrenheit", "deg f", "deg_f", "degf", "f" -> FAHRENHEIT;
             case "kelvin", "k" -> KELVIN;
             case "watt/m2", "w m-2" -> WATT.divide(SQUARE_METRE);
@@ -34,11 +54,12 @@ public static Unit<?> getUnits(String units) {
             case "hpa" -> HECTO(PASCAL);
             case "kpa" -> KILO(PASCAL);
             case "pa" -> PASCAL;
-            case "m", "meter", "metre" -> METRE;
+            case "m", "meter", "metre", "meters" -> METRE;
             case "min" -> MINUTE;
             case "km" -> KILO(METRE);
             case "degrees", "degrees_east", "degrees_north" -> USCustomary.DEGREE_ANGLE;
-            default -> ONE;
+            case "hr" -> HOUR;
+            default -> parseSimpleUnitFormat(units);
         };
     }
 
@@ -47,4 +68,29 @@ public static boolean equals(String units1, String units2) {
                 .map(u -> u.equalsIgnoreCase(units2))
                 .orElse(units2 == null);
     }
+
+    private static Unit<?> parseSimpleUnitFormat(String units) {
+        if (units == null || units.isBlank()) {
+            return null;
+        }
+
+        try {
+            UnitFormat format = SimpleUnitFormat.getInstance();
+            return format.parse(units);
+        } catch (MeasurementParseException mpe) {
+            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;
+    }
 }