got RNAG code working - differences in column headings for files. Also …

…Fixed #7
ropensci · Feb 12, 2019 · 0ab74bc · 0ab74bc
1 parent 8165903
commit 0ab74bc
Show file tree

Hide file tree

Showing 13 changed files with 325 additions and 25 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+export(get_rnag)
 export(get_status)
 export(plot_status)
 export(search_names)

diff --git a/R/get_rnag.r b/R/get_rnag.r
@@ -1,4 +1,4 @@
-#' Retrieve Reasonf for Not Achieving Good Status 
+#' Retrieve Reasons for Not Achieving Good Status 
 #' @description Retrieves details of Reasons for Not Achieving Good (RNAG)
 #' status from EA Catchment Data Explorer site.
 #' Data can be retrieved by specifying waterbody id
@@ -71,21 +71,18 @@ get_rnag <- function(col_value = NULL, column = NULL, startyr = NULL, endyr = NU
   # do subsetting here - years first
   if (!is.null(startyr) & !is.null(endyr)) {
     # if both years are specified, subset by range
-    rnag_data <- rnag_data[rnag_data$Year >= startyr & rnag_data$Year <= endyr, ]
+    rnag_data <- rnag_data[rnag_data$Classification.Year >= startyr & rnag_data$Classification.Year <= endyr, ]
   }
   else if (!is.null(startyr)) {
-    rnag_data <- rnag_data[rnag_data$Year == startyr, ]
+    rnag_data <- rnag_data[rnag_data$Classification.Year == startyr, ]
   }
   # subset by Water.body.type
   if (!is.null(type)) {
     rnag_data <- rnag_data[rnag_data$Water.body.type == type, ]
   }
   # if year range covers 2013 and 2014, subset to just include cycle 2 data
   # avoids double counting of waterbodies
-  rnag_data <- rnag_data[!(rnag_data$Year == 2013 & rnag_data$Cycle == 1 | rnag_data$Year == 2014 & rnag_data$Cycle == 1), ]
-
-  # remove web link column - not really needed
-  rnag_data <- rnag_data[, !(names(rnag_data) %in% c("classification.ID"))]
+  rnag_data <- rnag_data[!(rnag_data$Classification.Year == 2013 & rnag_data$Cycle == 1 | rnag_data$Classification.Year == 2014 & rnag_data$Cycle == 1), ]
 
   return(rnag_data)
 } # end of function
diff --git a/R/get_status.r b/R/get_status.r
@@ -106,8 +106,5 @@ get_status <- function(col_value = NULL, column = NULL, level = "Overall Water B
   # avoids double counting of waterbodies
   status_data <- status_data[!(status_data$Year == 2013 & status_data$Cycle == 1 | status_data$Year == 2014 & status_data$Cycle == 1), ]
 
-  # remove web link column - not really needed
-  status_data <- status_data[, !(names(status_data) %in% c("classification.ID"))]
-
   return(status_data)
 } # end of function
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/reference/get_rnag.html b/docs/reference/get_rnag.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/plot_status-1.png b/docs/reference/plot_status-1.png
diff --git a/docs/reference/plot_status-2.png b/docs/reference/plot_status-2.png
diff --git a/docs/reference/plot_status-3.png b/docs/reference/plot_status-3.png
diff --git a/man/get_rnag.Rd b/man/get_rnag.Rd