-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #96 from poissonconsulting/checks-jan
Update salinity units from ng/L to ppt and corresponding internal data
- Loading branch information
Showing
4 changed files
with
99 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| Package: shinywqg | ||
| Title: Water Quality Guideline Shiny App | ||
| Version: 0.1.0.9000 | ||
| Version: 0.1.1 | ||
| Authors@R: c( | ||
| person("Sebastian", "Dalgarno", , "[email protected]", "aut", comment = c(ORCID = "0000-0002-3658-4517")), | ||
| person("Pearson", "Ayla", , "[email protected]", c("aut", "cre"), comment = c(ORCID = "0000-0001-7388-1222")), | ||
|
|
@@ -31,12 +31,14 @@ Imports: | |
| rlang, | ||
| stringr, | ||
| webshot2, | ||
| chromote, | ||
| chromote (>= 0.3.1.9000), | ||
| pagedown | ||
| Suggests: | ||
| testthat (>= 2.1.0), | ||
| knitr, | ||
| covr | ||
| Remotes: | ||
| rstudio/chromote | ||
| URL: https://github.com/bcgov/shinywqg | ||
| BugReports: https://github.com/bcgov/shinywqg/issues | ||
| Encoding: UTF-8 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,11 @@ | ||
| <!-- NEWS.md is maintained by https://fledge.cynkra.com, contributors should not edit this file --> | ||
|
|
||
| # shinywqg 0.1.1 (2025-01-20) | ||
|
|
||
| - Updated internal data. | ||
| - Changed Salinity unites from ng/L to ppt (parts per thousand) in the user selection box. This was a labeling change for the variable and has no effect on the guideline generated. | ||
| - Added minimum version requirement for the `chromote` package due to issue with random port connection. | ||
|
|
||
| # shinywqg 0.1.0.9000 (2024-11-26) | ||
|
|
||
| - Package maintenance. |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,89 @@ | ||
| Variable,EMS_Code,Units | ||
| Colour Apparent,EMS_0001,Col.unit | ||
| Colour True,EMS_0002,Col.unit | ||
| pH,EMS_0004,pH | ||
| Dissolved Solids (Filterable Residue),EMS_0007,mg/L | ||
| Conductivity Specific,EMS_0011,uS/cm | ||
| Temperature,EMS_0013,degC | ||
| Temperature - Field,EMS_TEMF,degC | ||
| Oxygen Dissolved,EMS_0014,mg/L | ||
| Turbidity,EMS_0015,NTU | ||
| Extinction Depth,EMS_0019,m | ||
| Alkalinity Total 4.5,EMS_0102,mg/L | ||
| Organic Carbon Total,EMS_0103,mg/L | ||
| Chloride Total,EMS_0104,mg/L | ||
| Fluoride Total,EMS_0106,mg/L | ||
| Hardness Total,EMS_0107,mg/L | ||
| Nitrate Nitrite,EMS_0109,mg/L | ||
| Nitrite Dissolved Total,EMS_0111,mg/L | ||
| Nitrogen Total,EMS_0114,mg/L | ||
| Biochemical Oxygen Demand,EMS_0115,mg/L | ||
| Salinity,EMS_0130,ng/L | ||
| Chlorophyll A,EMS_0143,mg/L | ||
| Escherichia coli,EMS_0147,CFU/100mL | ||
| Enterococci,EMS_0148,CFU/100mL | ||
| Coliforms Fecal,EMS_0450,CFU/100mL | ||
| Cyanide Dissolved,EMS_1105,ug/L | ||
| Fluoride Dissolved,EMS_1106,mg/L | ||
| Hardness Dissolved,EMS_1107,mg/L | ||
| Ammonia Dissolved,EMS_1108,mg/L | ||
| Nitrate Nitrite Dissolved,EMS_1109,mg/L | ||
| Nitrogen Dissolved,EMS_1114,mg/L | ||
| Phosphorus Ortho,EMS_1118,mg/L | ||
| Sulphate Dissolved,EMS_1121,mg/L | ||
| Dissolved Organic Carbon,EMS_1103,mg/L | ||
| Atrazine,EMS_A016,mg/L | ||
| Silver Dissolved,EMS_AG_D,ug/L | ||
| Alkalinity Total,EMS_AK_T,mg/L | ||
| Aluminum Total,EMS_AL_T,mg/L | ||
| Arsenic Dissolved,EMS_AS_D,ug/L | ||
| Boron Dissolved,EMS_B__D,mg/L | ||
| Dichlorobromomethane (Bromodichloromethane),EMS_B002,ug/L | ||
| Tribromomethane (Bromoform),EMS_B013,ug/L | ||
| "1,2-Dichlorobenzene",EMS_B022,ug/L | ||
| Barium Dissolved,EMS_BA_D,ug/L | ||
| Vinyl Chloride,EMS_C004,mg/L | ||
| "1,2-Dichloroethane",EMS_C022,ug/L | ||
| "1,1-Dichloroethylene",EMS_C024,mg/L | ||
| Carbon Tetrachloride,EMS_C034,mg/L | ||
| Calcium Dissolved,EMS_CA_D,mg/L | ||
| Cadmium Total,EMS_CD_T,ug/L | ||
| Chlorate Dissolved,EMS_CL03,mg/L | ||
| Chlorite Dissolved,EMS_CLO_,mg/L | ||
| Cyanide Total,EMS_CN_T,ug/L | ||
| Cobalt Dissolved,EMS_CO_D,ug/L | ||
| Chromium Dissolved,EMS_CR_D,ug/L | ||
| Chromium Total,EMS_CR_T,ug/L | ||
| Copper Dissolved,EMS_CU_D,ug/L | ||
| Copper Total,EMS_CU_T,ug/L | ||
| "Chlorophenol, DCP",EMS_D060,mg/L | ||
| Alkalinity pH 4.5/4.2,EMS_D102,mg/L | ||
| Oxygen Dissolved Field,EMS_DO_F,mg/L | ||
| Hexachlorobenzene,EMS_H003,ug/L | ||
| Mercury Dissolved,EMS_HG_D,ug/L | ||
| Mercury Methyl,EMS_HGME,ug/L | ||
| Lithium Total,EMS_LI_T,mg/L | ||
| Manganese Dissolved,EMS_MN_D,mg/L | ||
| Molybdenum Dissolved,EMS_MO_D,mg/L | ||
| Naphthalene D8,EMS_NAPH,ug/L | ||
| Nickel Dissolved,EMS_NI_D,ug/L | ||
| Nitrate Soluble,EMS_NO3_,mg/L | ||
| Phosphorus Dissolved,EMS_P__D,mg/L | ||
| Phosphorus Total,EMS_P__T,mg/L | ||
| Chrysene,EMS_PA09,ug/L | ||
| Polycyclic Aromatic Hydrocarbons (Carcinogenic) Total,EMS_PAH_,mg/L | ||
| Lead Dissolved,EMS_PB_D,ug/L | ||
| Pseudomonas Aeruginosa,EMS_PSEU,CFU/100mL | ||
| Conductivity Specific - Field,EMS_SC_F,uS/cm | ||
| Selenium Dissolved,EMS_SE_D,ug/L | ||
| Strontium Total,EMS_SR_T,mg/L | ||
| "Chlorophenol, TTCP",EMS_T020,mg/L | ||
| "Chlorophenol, TCP",EMS_T021,mg/L | ||
| Trichloroethylene,EMS_T029,mg/L | ||
| Tetrachloroethylene,EMS_T030,mg/L | ||
| Thallium Dissolved,EMS_TL_D,ug/L | ||
| "Tin, Tributyltin",EMS_TRSN,mg/L | ||
| Turbidity - Field,EMS_TURF,NTU | ||
| Uranium Dissolved,EMS_U__D,ug/L | ||
| Vanadium Total,EMS_V__T,mg/L | ||
| Zinc Dissolved,EMS_ZN_D,ug/L | ||
| Variable,EMS_Code,Units | ||
| Colour Apparent,EMS_0001,Col.unit | ||
| Colour True,EMS_0002,Col.unit | ||
| pH,EMS_0004,pH | ||
| Dissolved Solids (Filterable Residue),EMS_0007,mg/L | ||
| Conductivity Specific,EMS_0011,uS/cm | ||
| Temperature,EMS_0013,degC | ||
| Temperature - Field,EMS_TEMF,degC | ||
| Oxygen Dissolved,EMS_0014,mg/L | ||
| Turbidity,EMS_0015,NTU | ||
| Extinction Depth,EMS_0019,m | ||
| Alkalinity Total 4.5,EMS_0102,mg/L | ||
| Organic Carbon Total,EMS_0103,mg/L | ||
| Chloride Total,EMS_0104,mg/L | ||
| Fluoride Total,EMS_0106,mg/L | ||
| Hardness Total,EMS_0107,mg/L | ||
| Nitrate Nitrite,EMS_0109,mg/L | ||
| Nitrite Dissolved Total,EMS_0111,mg/L | ||
| Nitrogen Total,EMS_0114,mg/L | ||
| Biochemical Oxygen Demand,EMS_0115,mg/L | ||
| Salinity,EMS_0130,ppt | ||
| Chlorophyll A,EMS_0143,mg/L | ||
| Escherichia coli,EMS_0147,CFU/100mL | ||
| Enterococci,EMS_0148,CFU/100mL | ||
| Coliforms Fecal,EMS_0450,CFU/100mL | ||
| Cyanide Dissolved,EMS_1105,ug/L | ||
| Fluoride Dissolved,EMS_1106,mg/L | ||
| Hardness Dissolved,EMS_1107,mg/L | ||
| Ammonia Dissolved,EMS_1108,mg/L | ||
| Nitrate Nitrite Dissolved,EMS_1109,mg/L | ||
| Nitrogen Dissolved,EMS_1114,mg/L | ||
| Phosphorus Ortho,EMS_1118,mg/L | ||
| Sulphate Dissolved,EMS_1121,mg/L | ||
| Dissolved Organic Carbon,EMS_1103,mg/L | ||
| Atrazine,EMS_A016,mg/L | ||
| Silver Dissolved,EMS_AG_D,ug/L | ||
| Alkalinity Total,EMS_AK_T,mg/L | ||
| Aluminum Total,EMS_AL_T,mg/L | ||
| Arsenic Dissolved,EMS_AS_D,ug/L | ||
| Boron Dissolved,EMS_B__D,mg/L | ||
| Dichlorobromomethane (Bromodichloromethane),EMS_B002,ug/L | ||
| Tribromomethane (Bromoform),EMS_B013,ug/L | ||
| "1,2-Dichlorobenzene",EMS_B022,ug/L | ||
| Barium Dissolved,EMS_BA_D,ug/L | ||
| Vinyl Chloride,EMS_C004,mg/L | ||
| "1,2-Dichloroethane",EMS_C022,ug/L | ||
| "1,1-Dichloroethylene",EMS_C024,mg/L | ||
| Carbon Tetrachloride,EMS_C034,mg/L | ||
| Calcium Dissolved,EMS_CA_D,mg/L | ||
| Cadmium Total,EMS_CD_T,ug/L | ||
| Chlorate Dissolved,EMS_CL03,mg/L | ||
| Chlorite Dissolved,EMS_CLO_,mg/L | ||
| Cyanide Total,EMS_CN_T,ug/L | ||
| Cobalt Dissolved,EMS_CO_D,ug/L | ||
| Chromium Dissolved,EMS_CR_D,ug/L | ||
| Chromium Total,EMS_CR_T,ug/L | ||
| Copper Dissolved,EMS_CU_D,ug/L | ||
| Copper Total,EMS_CU_T,ug/L | ||
| "Chlorophenol, DCP",EMS_D060,mg/L | ||
| Alkalinity pH 4.5/4.2,EMS_D102,mg/L | ||
| Oxygen Dissolved Field,EMS_DO_F,mg/L | ||
| Hexachlorobenzene,EMS_H003,ug/L | ||
| Mercury Dissolved,EMS_HG_D,ug/L | ||
| Mercury Methyl,EMS_HGME,ug/L | ||
| Lithium Total,EMS_LI_T,mg/L | ||
| Manganese Dissolved,EMS_MN_D,mg/L | ||
| Molybdenum Dissolved,EMS_MO_D,mg/L | ||
| Naphthalene D8,EMS_NAPH,ug/L | ||
| Nickel Dissolved,EMS_NI_D,ug/L | ||
| Nitrate Soluble,EMS_NO3_,mg/L | ||
| Phosphorus Dissolved,EMS_P__D,mg/L | ||
| Phosphorus Total,EMS_P__T,mg/L | ||
| Chrysene,EMS_PA09,ug/L | ||
| Polycyclic Aromatic Hydrocarbons (Carcinogenic) Total,EMS_PAH_,mg/L | ||
| Lead Dissolved,EMS_PB_D,ug/L | ||
| Pseudomonas Aeruginosa,EMS_PSEU,CFU/100mL | ||
| Conductivity Specific - Field,EMS_SC_F,uS/cm | ||
| Selenium Dissolved,EMS_SE_D,ug/L | ||
| Strontium Total,EMS_SR_T,mg/L | ||
| "Chlorophenol, TTCP",EMS_T020,mg/L | ||
| "Chlorophenol, TCP",EMS_T021,mg/L | ||
| Trichloroethylene,EMS_T029,mg/L | ||
| Tetrachloroethylene,EMS_T030,mg/L | ||
| Thallium Dissolved,EMS_TL_D,ug/L | ||
| "Tin, Tributyltin",EMS_TRSN,mg/L | ||
| Turbidity - Field,EMS_TURF,NTU | ||
| Uranium Dissolved,EMS_U__D,ug/L | ||
| Vanadium Total,EMS_V__T,mg/L | ||
| Zinc Dissolved,EMS_ZN_D,ug/L |