Skip to content
Snippets Groups Projects
Commit b2e5e4c9 authored by Laura A DeCicco's avatar Laura A DeCicco
Browse files

Pull in parameterCdFile via sysdata.rda instead of lazy loading.

parent f54cc3da
No related branches found
No related tags found
1 merge request!55Change from lazy loading to data.
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 141 deletions
DESCRIPTION
+ 0
− 2
View file @ b2e5e4c9
......@@ -35,8 +35,6 @@ Suggests:
xtable,
knitr,
testthat
LazyLoad: yes
LazyData: yes
VignetteBuilder: knitr
BuildVignettes: true
URL: https://github.com/USGS-R/dataRetrieval, http://pubs.usgs.gov/tm/04/a10/
R/constructNWISURL.r
+ 0
− 2
View file @ b2e5e4c9
......@@ -48,8 +48,6 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
service <- match.arg(service, c("dv","uv","iv","qw","gwlevels","rating","peak","meas"))
data("parameterCdFile")
if(any(!is.na(parameterCd))){
pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
......
R/readNWISpCode.r
+ 0
− 2
View file @ b2e5e4c9
......@@ -24,8 +24,6 @@ readNWISpCode <- function(parameterCd){
pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
data("parameterCdFile")
if(!pcodeCheck){
goodIndex <- which(parameterCd %in% parameterCdFile$parameter_cd)
if(length(goodIndex) > 0){
......
data/pCodeToName.RData → R/sysdata.rda
+ 0
− 0
View file @ b2e5e4c9
No preview for this file type
R/tabbedDataRetrievals.R
+ 2
− 58
View file @ b2e5e4c9
......@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab dataRetrieval\cr
#' Type: \tab Package\cr
#' Version: \tab 2.0.1\cr
#' Date: \tab 2014-12-02\cr
#' Version: \tab 2.0.2\cr
#' Date: \tab 2014-12-15\cr
#' License: \tab Unlimited for this package, dependencies have more restrictive licensing.\cr
#' Copyright: \tab This software is in the public domain because it contains materials
#' that originally came from the United States Geological Survey, an agency of
......@@ -24,59 +24,3 @@
#' @keywords USGS, web services
NULL
#' List of USGS parameter codes
#'
#' Complete list of USGS parameter codes as of November 7, 2014. The data was pulled from
#' \url{http://nwis.waterdata.usgs.gov/nwis/pmcodes/pmcodes?radio_pm_search=param_group&pm_group=All+--+include+all+parameter+groups&
#' format=rdb&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units}
#'
#' @name parameterCdFile
#' @return parameterData data frame with information about USGS parameters.
#'
#' \tabular{lll}{
#' Name \tab Type \tab Description\cr
#' parameter_cd \tab character \tab 5-digit USGS parameter code \cr
#' parameter_group_nm \tab character \tab USGS parameter group name\cr
#' parameter_nm \tab character \tab USGS parameter name\cr
#' casrn \tab character \tab Chemical Abstracts Service (CAS) Registry Number\cr
#' srsname \tab character \tab Substance Registry Services Name\cr
#' parameter_units \tab character \tab Parameter units\cr
#' }
#'
#' @docType data
#' @keywords USGS parameterCd
#' @examples
#' data(parameterCdFile)
#' dischargeInfo <- parameterCdFile[parameterCdFile$parameter_cd=="00060",]
NULL
#' Data to convert USGS parameter code to characteristic names
#'
#' Data pulled from Water Quality Portal on November 25, 2014. The data was pulled from
#' \url{http://www.waterqualitydata.us/public_srsnames?mimeType=json}.
#'
#' @name pCodeToName
#' @return pCodeToName data frame with information about USGS parameters and how they
#' relate to characteristic names (useful for WQP requests).
#'
#' \tabular{lll}{
#' Name \tab Type \tab Description\cr
#' parm_cd \tab character \tab 5-digit USGS parameter code \cr
#' description \tab character \tab Parameter description\cr
#' characteristicname \tab character \tab Characteristic Name \cr
#' measureunitcode \tab character \tab Parameter units\cr
#' resultsamplefraction \tab character \tab Result sample fraction text\cr
#' resulttemperaturebasis \tab character \tab Temperature basis information\cr
#' resultstatisticalbasis \tab character \tab Statistical basis\cr
#' resulttimebasis \tab character \tab Time basis\cr
#' resultweightbasis \tab character \tab Weight basis\cr
#' resultparticlesizebasis \tab character \tab Particle size basis\cr
#' last_rev_dt \tab character \tab Latest revision of information\cr
#' }
#' @docType data
#' @keywords USGS parameterCd
#' @examples
#' pCodeToName <- pCodeToName
#' dischargeInfo <- pCodeToName[pCodeToName$parm_cd=="00060",]
NULL
R/whatNWISData.r
+ 0
− 3
View file @ b2e5e4c9
......@@ -71,9 +71,6 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all
if(!("all" %in% service)){
service <- match.arg(service, c("dv","uv","qw","ad","id","pk","sv","gw","aw","all","ad","iv","rt"), several.ok = TRUE)
}
data("parameterCdFile", envir = )
if(!("all" %in% parameterCd)){
parameterCdCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
......
data/parameterCdFile.RData deleted 100644 → 0
+ 0
− 0
View file @ f54cc3da
File deleted
man/dataRetrieval-package.Rd
+ 2
− 2
View file @ b2e5e4c9
......@@ -7,8 +7,8 @@
\tabular{ll}{
Package: \tab dataRetrieval\cr
Type: \tab Package\cr
Version: \tab 2.0.1\cr
Date: \tab 2014-12-02\cr
Version: \tab 2.0.2\cr
Date: \tab 2014-12-15\cr
License: \tab Unlimited for this package, dependencies have more restrictive licensing.\cr
Copyright: \tab This software is in the public domain because it contains materials
that originally came from the United States Geological Survey, an agency of
......
man/pCodeToName.Rd deleted 100644 → 0
+ 0
− 35
View file @ f54cc3da
% Generated by roxygen2 (4.0.2): do not edit by hand
\docType{data}
\name{pCodeToName}
\alias{pCodeToName}
\title{Data to convert USGS parameter code to characteristic names}
\value{
pCodeToName data frame with information about USGS parameters and how they
relate to characteristic names (useful for WQP requests).
\tabular{lll}{
Name \tab Type \tab Description\cr
parm_cd \tab character \tab 5-digit USGS parameter code \cr
description \tab character \tab Parameter description\cr
characteristicname \tab character \tab Characteristic Name \cr
measureunitcode \tab character \tab Parameter units\cr
resultsamplefraction \tab character \tab Result sample fraction text\cr
resulttemperaturebasis \tab character \tab Temperature basis information\cr
resultstatisticalbasis \tab character \tab Statistical basis\cr
resulttimebasis \tab character \tab Time basis\cr
resultweightbasis \tab character \tab Weight basis\cr
resultparticlesizebasis \tab character \tab Particle size basis\cr
last_rev_dt \tab character \tab Latest revision of information\cr
}
}
\description{
Data pulled from Water Quality Portal on November 25, 2014. The data was pulled from
\url{http://www.waterqualitydata.us/public_srsnames?mimeType=json}.
}
\examples{
pCodeToName <- pCodeToName
dischargeInfo <- pCodeToName[pCodeToName$parm_cd=="00060",]
}
\keyword{USGS}
\keyword{parameterCd}
man/parameterCdFile.Rd deleted 100644 → 0
+ 0
− 30
View file @ f54cc3da
% Generated by roxygen2 (4.0.2): do not edit by hand
\docType{data}
\name{parameterCdFile}
\alias{parameterCdFile}
\title{List of USGS parameter codes}
\value{
parameterData data frame with information about USGS parameters.
\tabular{lll}{
Name \tab Type \tab Description\cr
parameter_cd \tab character \tab 5-digit USGS parameter code \cr
parameter_group_nm \tab character \tab USGS parameter group name\cr
parameter_nm \tab character \tab USGS parameter name\cr
casrn \tab character \tab Chemical Abstracts Service (CAS) Registry Number\cr
srsname \tab character \tab Substance Registry Services Name\cr
parameter_units \tab character \tab Parameter units\cr
}
}
\description{
Complete list of USGS parameter codes as of November 7, 2014. The data was pulled from
\url{http://nwis.waterdata.usgs.gov/nwis/pmcodes/pmcodes?radio_pm_search=param_group&pm_group=All+--+include+all+parameter+groups&
format=rdb&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units}
}
\examples{
data(parameterCdFile)
dischargeInfo <- parameterCdFile[parameterCdFile$parameter_cd=="00060",]
}
\keyword{USGS}
\keyword{parameterCd}
vignettes/dataRetrieval.Rnw
+ 8
− 7
View file @ b2e5e4c9
......@@ -160,6 +160,7 @@ bold.colHeaders <- function(x) {
returnX <- paste("\\multicolumn{1}{c}{\\textbf{\\textsf{", x, "}}}", sep = "")
}
addSpace <- function(x) ifelse(x != "1", "[5pt]","")
library(dataRetrieval)
@
\noindent{\huge\textsf{\textbf{The dataRetrieval R package}}}
......@@ -306,13 +307,13 @@ print(xtable(data.df,
@
A complete list (as of November 7, 2014) is available as data attached to the package. It is accessed by the following:
<<tableParameterCodesDataRetrieval, echo=TRUE, eval=TRUE>>=
library(dataRetrieval)
parameterCdFile <- parameterCdFile
names(parameterCdFile)
@
% A complete list (as of November 7, 2014) is available as data attached to the package. It is accessed by the following:
%
% <<tableParameterCodesDataRetrieval, echo=TRUE, eval=TRUE>>=
% library(dataRetrieval)
% parameterCdFile <- parameterCdFile
% names(parameterCdFile)
% @
Two output columns that may not be obvious are \enquote{srsname} and \enquote{casrn}. Srsname stands for \enquote{Substance Registry Services}. More information on the srs name can be found here:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment