From c7382aa4c5d885245bc73348804e929f671f08a2 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Fri, 14 Feb 2025 10:34:49 -0700 Subject: [PATCH 1/3] Fix README typo --- README.md | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7683f02..0f25255 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Data comes from the following sources. We are continuously adding new sources as - [Bureau of Reclamation (BoR)](https://data.usbr.gov/) - Available data: `water quality` - [City of Albuquerque (CABQ)](https://st2.newmexicowaterdata.org/FROST-Server/v1.1/Locations?$filter=properties/agency%20eq%20%27CABQ%27) - - Availabled data: `water levels` + - Available data: `water levels` - Note: the elevation data is the top of casing, not ground surface elevation - [Elephant Butte Irrigation District (EBID)](https://st2.newmexicowaterdata.org/FROST-Server/v1.1/Locations?$filter=properties/agency%20eq%20%27EBID%27) - Available data: `water levels` diff --git a/setup.py b/setup.py index 5ff3dad..29c4e32 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ setup( name="nmuwd", - version="0.5.0", + version="0.5.1", author="Jake Ross", description="New Mexico Water Data Integration Engine", long_description=long_description, From 0ad51adbff2271d73a8ea8e07b21e6625b8206e1 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Fri, 14 Feb 2025 10:41:20 -0700 Subject: [PATCH 2/3] Round mg/l as n to mg/l conversion factor to 4.427 --- UNIT_CONVERSIONS.md | 6 +++--- backend/transformer.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UNIT_CONVERSIONS.md b/UNIT_CONVERSIONS.md index b8dfedd..d5171e0 100644 --- a/UNIT_CONVERSIONS.md +++ b/UNIT_CONVERSIONS.md @@ -11,9 +11,9 @@ The conversion factor is applied to the reported value from the source to obtain | bicarbonate | mg/L as CaCO3 | bicarbonate | mg/L | 1.22 | equivalent mass HCO3 - = 61 | | calcium | mg/L as CaCO3 | calcium | mg/L | 0.4 | equivalent mass Ca 2+ = 20 | | carbonate | mg/L as CaCO3 | carbonate | mg/L | 0.6 | equivalent mass CO3 2- = 30 | -| nitrate as n | mg/L as N | nitrate | mg/L | 4.4268 | - | -| nitrate | mg/L as N | nitrate | mg/L | 4.4268 | - | -| nitrate | ug/L as N | nitrate | mg/L | 0.0044268 | - | +| nitrate as n | mg/L as N | nitrate | mg/L | 4.427 | - | +| nitrate | mg/L as N | nitrate | mg/L | 4.427 | - | +| nitrate | ug/L as N | nitrate | mg/L | 0.004427 | - | | nitrate | mg/L as NO3 | nitrate | mg/L | 1 | - | | sulfate as SO4 | mg/L | sulfate | mg/L | 1 | - | | sulfur sulfate | mg/L | sulfate | mg/L | 1 | - | diff --git a/backend/transformer.py b/backend/transformer.py index bede940..73a4e28 100644 --- a/backend/transformer.py +++ b/backend/transformer.py @@ -203,11 +203,11 @@ def convert_units( elif die_parameter_name == "carbonate": conversion_factor = 0.6 elif input_units == "mg/l as n": - conversion_factor = 4.4268 + conversion_factor = 4.427 elif input_units in ["mg/l asno3", "mg/l as no3"]: conversion_factor = 1 elif input_units == "ug/l as n": - conversion_factor = 0.0044268 + conversion_factor = 0.004427 elif input_units == "pci/l": conversion_factor = 0.00149 elif input_units == ugl: @@ -218,7 +218,7 @@ def convert_units( conversion_factor = 1 elif input_units == output_units: if source_parameter_name in ["nitrate as n", "nitrate (as n)"]: - conversion_factor = 4.4268 + conversion_factor = 4.427 else: conversion_factor = 1 elif output_units == ft: From 13dbee206b264d5aa6fcac41fb0e9b51d0b3ff0e Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Fri, 14 Feb 2025 10:42:40 -0700 Subject: [PATCH 3/3] Bump to v 0.5.2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 29c4e32..d212929 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ setup( name="nmuwd", - version="0.5.1", + version="0.5.2", author="Jake Ross", description="New Mexico Water Data Integration Engine", long_description=long_description,