From 4f7d4192472e0ddb76f18976af5950c78a40c77f Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Tue, 16 Dec 2014 12:13:45 -0600
Subject: [PATCH] Fix for variableInfo attribute that comes back incomplete.
---
R/importWaterML1.r | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/R/importWaterML1.r b/R/importWaterML1.r
index e20f2aec..8188d432 100644
--- a/R/importWaterML1.r
+++ b/R/importWaterML1.r
@@ -358,13 +358,14 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
siteInfo <- cbind(siteInfo, t(propertyValues))
names(extraVariableData) <- make.unique(names(extraVariableData))
- variableInfo <- data.frame(parameterCd=extraVariableData$variableCode$text,
+
+ variableInfo <- c(parameterCd=extraVariableData$variableCode$text,
parameter_nm=extraVariableData$variableName,
parameter_desc=extraVariableData$variableDescription,
valueType=extraVariableData$valueType,
- param_units=extraVariableData$unit$unitCode,
- noDataValue=NA, #as.numeric(extraVariableData$noDataValue), since it's already converted
- stringsAsFactors=FALSE)
+ param_units=extraVariableData$unit$unitCode)
+
+ variableInfo <- data.frame(t(variableInfo), stringsAsFactors=FALSE)
statInfo <- data.frame(statisticName=statName,
statisticCd=statCd,
@@ -387,7 +388,7 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
}
######################
-
+
attList[[uniqueName]] <- list(extraSiteData, extraVariableData)
@@ -425,6 +426,7 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
mergedDF <- data.frame()
}
+ variableInformation$noDataValue <- rep(NA, nrow(variableInformation))
row.names(mergedDF) <- NULL
attr(mergedDF, "url") <- obs_url
--
GitLab