From 4f3630202c516974cdf8d50c114ee0d76d8141fd Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Mon, 23 Nov 2015 09:41:17 -0600
Subject: [PATCH] Moving specific rating curve bit to rating curve function.
---
R/importRDB1.r | 4 ----
R/readNWISunit.r | 5 +++++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/R/importRDB1.r b/R/importRDB1.r
index 916b5da4..674fc50b 100644
--- a/R/importRDB1.r
+++ b/R/importRDB1.r
@@ -151,10 +151,6 @@ importRDB1 <- function(obs_url, asDateTime=FALSE, qw=FALSE, convertType = TRUE,
intColumns <- grep("_nu",names(data))
- if("current_rating_nu" %in% names(data)){
- intColumns <- intColumns[!("current_rating_nu" %in% names(data)[intColumns])]
- data$current_rating_nu <- gsub(" ", "", data$current_rating_nu)
- }
data[,intColumns] <- sapply(data[,intColumns],as.integer)
if(length(grep('d$', dataType)) > 0){
diff --git a/R/readNWISunit.r b/R/readNWISunit.r
index c9376d17..d8dabb75 100644
--- a/R/readNWISunit.r
+++ b/R/readNWISunit.r
@@ -204,6 +204,11 @@ readNWISrating <- function (siteNumber,type="base"){
data <- importRDB1(url, asDateTime=FALSE)
+ if("current_rating_nu" %in% names(data)){
+ intColumns <- intColumns[!("current_rating_nu" %in% names(data)[intColumns])]
+ data$current_rating_nu <- gsub(" ", "", data$current_rating_nu)
+ }
+
if(nrow(data) > 0){
if(type == "base") {
Rat <- grep("//RATING ", comment(data), value=TRUE, fixed=TRUE)
--
GitLab