From c79b04bb7c85c206cc8a49d4f383ce990c34b168 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Wed, 31 Dec 2014 09:57:33 -0600
Subject: [PATCH] Fixed merge of variable info when there's a mix of NWIS and
STORET.
---
R/readWQPdata.R | 2 +-
R/readWQPqw.r | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/R/readWQPdata.R b/R/readWQPdata.R
index f0f8ee88..750a5903 100644
--- a/R/readWQPdata.R
+++ b/R/readWQPdata.R
@@ -143,7 +143,7 @@ readWQPdata <- function(...){
pCodeToName <- pCodeToName
varExtras <- pCodeToName[pCodeToName$parm_cd %in% unique(variableInfo$parameterCd[!is.na(variableInfo$parameterCd)]),]
names(varExtras)[names(varExtras) == "parm_cd"] <- "parameterCd"
- variableInfo <- merge(variableInfo, varExtras, by="parameterCd")
+ variableInfo <- merge(variableInfo, varExtras, by="parameterCd", all = TRUE)
variableInfo <- unique(variableInfo)
}
diff --git a/R/readWQPqw.r b/R/readWQPqw.r
index ac1d2e29..195fcbe8 100644
--- a/R/readWQPqw.r
+++ b/R/readWQPqw.r
@@ -152,7 +152,7 @@ readWQPqw <- function(siteNumbers,parameterCd,startDate="",endDate=""){
varExtras <- pCodeToName[pCodeToName$parm_cd %in%
unique(variableInfo$parameterCd[!is.na(variableInfo$parameterCd)]),]
names(varExtras)[names(varExtras) == "parm_cd"] <- "parameterCd"
- variableInfo <- merge(variableInfo, varExtras, by="parameterCd")
+ variableInfo <- merge(variableInfo, varExtras, by="parameterCd", all=TRUE)
}
attr(retval, "siteInfo") <- siteInfo
--
GitLab