Skip to content

Commit 0637b14

Browse files
committed
Since we've had a deprecation message for 2 versions, we should just take these functions out.
1 parent 450b9f0 commit 0637b14

File tree

6 files changed

+1
-156
lines changed

6 files changed

+1
-156
lines changed

NAMESPACE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ export(readNGWMNlevels)
3232
export(readNGWMNsites)
3333
export(readNWISdata)
3434
export(readNWISdv)
35-
export(readNWISgwl)
36-
export(readNWISmeas)
3735
export(readNWISpCode)
3836
export(readNWISpeak)
3937
export(readNWISrating)

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ the request attribute
1515
* Improved error handling in WQP functions
1616
* Added read_waterdata_field_meta, read_waterdata_combine_meta,
1717
and read_waterdata_channel
18+
* Removed readNWISgwl and readNWISmeas as services have been turned off
1819

1920

2021
dataRetrieval 2.7.22

R/readNWISunit.R

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -295,78 +295,6 @@ readNWISrating <- function(siteNumber, type = "base", convertType = TRUE) {
295295
return(data)
296296
}
297297

298-
#' Surface-water measurement data retrieval from USGS (NWIS)
299-
#'
300-
#' Deprecated: please see `read_waterdata_field_measurements`
301-
#'
302-
#' @param siteNumbers character USGS site number (or multiple sites). This is usually an 8 digit number
303-
#' @param startDate character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
304-
#' retrieval for the earliest possible record.
305-
#' @param endDate character ending date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
306-
#' retrieval for the latest possible record.
307-
#' @param tz character to set timezone attribute of dateTime. Default is "UTC", and converts the
308-
#' date times to UTC, properly accounting for daylight savings times based on the data's provided tz_cd column.
309-
#' Possible values to provide are "America/New_York", "America/Chicago", "America/Denver", "America/Los_Angeles",
310-
#' "America/Anchorage", as well as the following which do not use daylight savings time: "America/Honolulu",
311-
#' "America/Jamaica", "America/Managua", "America/Phoenix", and "America/Metlakatla". See also `OlsonNames()`
312-
#' for more information on time zones.
313-
#' @param expanded logical. Whether or not (TRUE or FALSE) to call the expanded data.
314-
#' @param convertType logical, defaults to `TRUE`. If `TRUE`, the function will
315-
#' convert the data to dates, datetimes,
316-
#' numerics based on a standard algorithm. If false, everything is returned as a character
317-
#' @return NULL
318-
#'
319-
#' @export
320-
readNWISmeas <- function(siteNumbers,
321-
startDate = "",
322-
endDate = "",
323-
tz = "UTC",
324-
expanded = FALSE,
325-
convertType = TRUE) {
326-
327-
.Deprecated(new = "read_waterdata_field_measurements",
328-
package = "dataRetrieval",
329-
msg = "NWIS servers are slated for decommission. Please migrate to read_waterdata_field_measurements.")
330-
331-
332-
return(NULL)
333-
}
334-
335-
#' Groundwater level measurements retrieval from USGS (NWIS)
336-
#'
337-
#' Deprecated. Please see: `read_waterdata_field_measurements`.
338-
#'
339-
#'
340-
#'
341-
#' @param siteNumbers character USGS site number (or multiple sites). This is usually an 8 digit number
342-
#' @param startDate character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
343-
#' retrieval for the earliest possible record.
344-
#' @param endDate character ending date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
345-
#' retrieval for the latest possible record.
346-
#' @param parameterCd character USGS parameter code. This is usually an 5 digit number. Default is "".
347-
#' @param convertType logical, defaults to `TRUE`. If `TRUE`, the
348-
#' function will convert the data to dates, datetimes,
349-
#' numerics based on a standard algorithm. If false, everything is returned as a character
350-
#' @param tz character to set timezone attribute of dateTime. Default is "UTC", and converts the
351-
#' date times to UTC, properly accounting for daylight savings times based on the data's provided tz_cd column.
352-
#' Possible values to provide are "America/New_York", "America/Chicago", "America/Denver", "America/Los_Angeles",
353-
#' "America/Anchorage", as well as the following which do not use daylight savings time: "America/Honolulu",
354-
#' "America/Jamaica", "America/Managua", "America/Phoenix", and "America/Metlakatla". See also `OlsonNames()`
355-
#' for more information on time zones.
356-
#' @return NULL
357-
#'
358-
#' @export
359-
readNWISgwl <- function(siteNumbers,
360-
startDate = "",
361-
endDate = "",
362-
parameterCd = NA,
363-
convertType = TRUE, tz = "UTC") {
364-
365-
.Deprecated(new = "read_waterdata_field_measurements.",
366-
package = "dataRetrieval",
367-
msg = "NWIS servers are slated for decommission. Please migrate to read_waterdata_field_measurements.")
368-
return(NULL)
369-
}
370298

371299
#' Site statistics retrieval from USGS (NWIS)
372300
#'

_pkgdown.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@ reference:
9696
- readNWISuv
9797
- readNWISsite
9898
- readNWISstat
99-
- readNWISmeas
10099
- readNWISpCode
101100
- readNWISrating
102101
- readNWISpeak
103-
- readNWISgwl
104102
- readNWISuse
105103
- readNWISdata
106104
- whatNWISsites

man/readNWISgwl.Rd

Lines changed: 0 additions & 40 deletions
This file was deleted.

man/readNWISmeas.Rd

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)