diff --git a/src/main/java/org/opendcs/usgs/waterdata/MonitoringLocation.java b/src/main/java/org/opendcs/usgs/waterdata/MonitoringLocation.java index b72a7a7..134facc 100644 --- a/src/main/java/org/opendcs/usgs/waterdata/MonitoringLocation.java +++ b/src/main/java/org/opendcs/usgs/waterdata/MonitoringLocation.java @@ -30,10 +30,15 @@ static MonitoringLocation findByNumber(List locations, Strin public String siteType; public String hydrologicUnitCode; public String basinCode; + /** + * Altitude of the gage or land surface, which is not the gage datum, so stage + * (Parameter.STAGE) cannot be converted to water-surface elevation by adding it. + */ public String altitude; public String altitudeAccuracy; public String altitudeMethodCode; public String altitudeMethodName; + /** The vertical datum that altitude is referenced to, such as NAVD88. */ public String verticalDatum; public String verticalDatumName; public String horizontalPositionalAccuracyCode; diff --git a/src/main/java/org/opendcs/usgs/waterdata/Parameter.java b/src/main/java/org/opendcs/usgs/waterdata/Parameter.java index 3527dab..746a2b8 100644 --- a/src/main/java/org/opendcs/usgs/waterdata/Parameter.java +++ b/src/main/java/org/opendcs/usgs/waterdata/Parameter.java @@ -11,19 +11,27 @@ public final class Parameter { public static final String RELATIVE_HUMIDITY = "00052"; public static final String RESERVOIR_STORAGE_AC_FT = "00054"; public static final String DISCHARGE = "00060"; + /** Reservoir water-surface elevation above the local gage datum, which MonitoringLocation.altitude cannot supply. */ + public static final String ELEVATION_RESERVOIR_ABOVE_DATUM = "00062"; public static final String STAGE = "00065"; public static final String SPECIFIC_CONDUCTANCE = "00095"; public static final String SALINITY = "00096"; public static final String RESERVOIR_STORAGE = "72036"; public static final String SOLAR_RADIATION = "62608"; + /** Lake or reservoir water-surface elevation above NGVD 1929. */ + public static final String ELEVATION_LAKE_NGVD29 = "62614"; + /** Lake or reservoir water-surface elevation above NAVD 1988. */ + public static final String ELEVATION_LAKE_NAVD88 = "62615"; + /** Stream water-surface elevation above NAVD 1988. */ public static final String ELEVATION_NAVD88 = "63160"; public static List all() { return List.of( WATER_TEMPERATURE, AIR_TEMPERATURE, WIND_SPEED, WIND_DIRECTION, PRECIPITATION, RELATIVE_HUMIDITY, RESERVOIR_STORAGE_AC_FT, - DISCHARGE, STAGE, SPECIFIC_CONDUCTANCE, SALINITY, - RESERVOIR_STORAGE, SOLAR_RADIATION, ELEVATION_NAVD88); + DISCHARGE, ELEVATION_RESERVOIR_ABOVE_DATUM, STAGE, + SPECIFIC_CONDUCTANCE, SALINITY, RESERVOIR_STORAGE, SOLAR_RADIATION, + ELEVATION_LAKE_NGVD29, ELEVATION_LAKE_NAVD88, ELEVATION_NAVD88); } private Parameter() {