Skip to content

Commit 935575b

Browse files
Merge pull request #849 from DOI-USGS/develop
Getting ready for CRAN
2 parents e92a2d5 + 43e569a commit 935575b

File tree

95 files changed

+2256
-1592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2256
-1592
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ README.Rmd
4040
^codecov\.yml$
4141
^\.github$
4242
^\.gitlab$
43+
^\.quarto$
4344
vignettes/tutorial.Rmd
4445
vignettes/phosData.rds
4546
vignettes/waterservices.png

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
http-user-agent: ${{ matrix.config.http-user-agent }}
4141
use-public-rspm: true
4242

43-
- uses: r-lib/actions/setup-r-dependencies@96b1dc658a45175f93ed5f33fda2b2cebbb12ee8
43+
- uses: r-lib/actions/setup-r-dependencies@6f6e5bc62fba3a704f74e7ad7ef7676c5c6a2590
4444
with:
4545
extra-packages: |
4646
any::rcmdcheck

DESCRIPTION

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: dataRetrieval
22
Type: Package
33
Title: Retrieval Functions for USGS and EPA Hydrology and Water Quality Data
4-
Version: 2.7.21
4+
Version: 2.7.22
55
Authors@R: c(
66
person("Laura", "DeCicco", role = c("aut","cre"),
77
email = "ldecicco@usgs.gov",
@@ -25,12 +25,11 @@ Authors@R: c(
2525
email = "akrall@usgs.gov",
2626
comment=c(ORCID = "0000-0003-2521-5043")),
2727
person("Lee", "Stanish", role="ctb",
28-
email = "lstanish@usgs.gov",
2928
comment=c(ORCID = "0000-0002-9775-6861")),
3029
person("Joeseph", "Zemmels", role="ctb",
3130
email = "jzemmels@usgs.gov",
3231
comment=c(ORCID = "0009-0008-1463-6313")),
33-
person("Elise", "Hinman", role="ctb",
32+
person("Elise", "Hinman", role="aut",
3433
email = "ehinman@usgs.gov",
3534
comment=c(ORCID = "0000-0001-5396-1583")),
3635
person("Michael", "Mahoney", role="ctb",
@@ -67,5 +66,5 @@ Encoding: UTF-8
6766
BuildVignettes: true
6867
VignetteBuilder: knitr
6968
BugReports: https://github.com/DOI-USGS/dataRetrieval/issues
70-
RoxygenNote: 7.3.2
69+
RoxygenNote: 7.3.3
7170
Roxygen: list(markdown = TRUE)

NAMESPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export(create_WQP_bib)
1717
export(findNLDI)
1818
export(getWebServiceData)
1919
export(get_nldi_sources)
20+
export(get_ogc_params)
2021
export(importNGWMN)
2122
export(importRDB1)
2223
export(importWQP)
@@ -46,9 +47,11 @@ export(readWQPqw)
4647
export(readWQPsummary)
4748
export(read_USGS_samples)
4849
export(read_waterdata)
50+
export(read_waterdata_continuous)
4951
export(read_waterdata_daily)
5052
export(read_waterdata_field_measurements)
5153
export(read_waterdata_latest_continuous)
54+
export(read_waterdata_latest_daily)
5255
export(read_waterdata_metadata)
5356
export(read_waterdata_monitoring_location)
5457
export(read_waterdata_parameter_codes)

NEWS

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
dataRetrieval 2.7.22
2+
===================
3+
* Added read_waterdata_latest_daily to access latest daily USGS water data.
4+
* Added read_waterdata_continuous to access continuous USGS water data.
5+
* Added state_name and hydrologic_unit_code to read_waterdata_ts_meta
6+
* Removed daily_id from read_waterdata_daily output since it
7+
is not stable over time. Moved other "id" columns to end of returned data frames.
8+
* Changed examples for stateCd, countyCd, and parameterCdFile. Users are
9+
encouraged to migrate to the "read_waterdata_metadata" functions.
10+
* Added no_paging argument. This will make the request more efficient, but is not
11+
recommended because it will silently cut off data after 50,000 rows.
12+
* Removed max_results argument. Was confusing and redundant with the combination
13+
of no_paging and limit.
14+
* Increase the flexibility of read_waterdata_metadata to match other OGC functions.
15+
* NLDI to use agency code prefixes and should no longer be stripping the "USGS-" off the site ides.
16+
* Add deprecate message to readNWISuse function as data services have been retired.
17+
118
dataRetrieval 2.7.21
219
===================
320
* Added read_waterdata_field_measurements to access new USGS water data API.

R/AAA.R

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,20 @@ pkg.env <- new.env()
88

99
services <- c("server", "daily", "time-series-metadata",
1010
"monitoring-locations", "latest-continuous",
11-
"field-measurements")
11+
"field-measurements", "latest-daily",
12+
"continuous")
1213
collections <- c("parameter-codes", "agency-codes", "altitude-datums", "aquifer-codes",
1314
"aquifer-types", "coordinate-accuracy-codes", "coordinate-datum-codes",
14-
"coordinate-method-codes", "medium-codes",
15+
"coordinate-method-codes", "medium-codes", "counties",
16+
"hydrologic-unit-codes", "states",
1517
"national-aquifer-codes", "reliability-codes", "site-types", "statistic-codes",
1618
"topographic-codes", "time-zone-codes")
19+
names(collections) <- c("parameter_code", "agency_code", "altitude_datum", "aquifer_code",
20+
"aquifer_type", "coordinate_accuracy_code", "coordinate_datum_code",
21+
"coordinate_method_code", "medium_code", "county",
22+
"hydrologic_unit_code", "state",
23+
"national_aquifer_code", "reliability_code", "site_types", "statistic_code",
24+
"topographic_code", "time_zone_code")
1725

1826
pkg.env$api_endpoints <- services
1927
pkg.env$metadata <- collections

0 commit comments

Comments
 (0)