Skip to content

Commit

Permalink
Update data fetching after 2018 BBS data release. Fix #129
Browse files Browse the repository at this point in the history
  • Loading branch information
BrandonEdwards committed Aug 12, 2019
1 parent 9e133e0 commit aa659bb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: bbsBayes
Type: Package
Title: Hierarchical Bayesian Analysis of North American Breeding Bird Survey Data
Version: 1.1.2
Date: 2019-07-18
Version: 2.0.0
Date: 2019-08-12
Authors@R: c(person("Brandon P.M.", "Edwards", role = c("aut", "cre"),
email = "edwardsb@uoguelph.ca"),
person("Adam C.", "Smith", role = "aut",
Expand All @@ -19,7 +19,7 @@ Imports:
latticeExtra,
rappdirs
Depends: R (>= 2.10)
SystemRequirements: JAGS 4.2.0 (https://sourceforge.net/projects/mcmc-jags/)
SystemRequirements: JAGS 4.3.0 (https://sourceforge.net/projects/mcmc-jags/)
URL: https://github.com/BrandonEdwards/bbsBayes
NeedsCompilation: no
Description: A package to perform hierarchical Bayesian analysis of North
Expand Down
2 changes: 1 addition & 1 deletion R/fetch-bbs-data.R
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ fetch_bbs_data <- function(level = "state", quiet = FALSE, force = FALSE)
temp <- tempfile()
utils::download.file(paste0(base_url(), "SpeciesList.txt"), temp, quiet = TRUE)
tick(pb, quiet)
species <- utils::read.fwf(temp, skip = 9, strip.white = TRUE, header = FALSE,
species <- utils::read.fwf(temp, skip = 10, strip.white = TRUE, header = FALSE,
colClasses = c("integer",
"character",
"character",
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ bbsBayes is a package to perform hierarchical Bayesian analysis of North America

We expect a CRAN release shortly, but for now you can install from Github using the following options:

Option 1: Most recent stable release (currently v1.1.2)
Option 1: Most recent stable release (currently v2.0.0)
``` r
# To install v1.1.2 from Github:
# To install v2.0.0 from Github:
install.packages("devtools")
library(devtools)
devtools::install_github("BrandonEdwards/bbsBayes", ref = "v1.1.2")
devtools::install_github("BrandonEdwards/bbsBayes", ref = "v2.0.0")
```

Option 2: Less-stable development version
Expand Down
6 changes: 3 additions & 3 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ citHeader("To cite the Breeding Bird Survey data in publication, please use:")

citEntry(
entry = "misc",
title = "North American Breeding Bird Survey Dataset 1966 - 2017",
title = "North American Breeding Bird Survey Dataset 1966 - 2018",
version = "2017.0",
publisher = "U.S. Geological Survey, Patuxent Wildlife Research Center.",
author = "Pardieck, Keith L. and Ziolkowski Jr., Dave J. and Lutmerding M. and Hudson, Marie-Anne R.",
textVersion = "Pardieck, K.L., D.J. Ziolkowski Jr., M. Lutmerding and M.-A.R. Hudson. 2018. North American Breeding Bird Survey Dataset 1966 - 2017, version 2017.0. U.S. Geological Survey, Patuxent Wildlife Research Center. https://doi.org/10.5066/F76972V8."
author = "Pardieck, Keith L. and Ziolkowski Jr., Dave J. and Lutmerding, M. and Aponte, Veronica and Hudson, Marie-Anne R.",
textVersion = "Pardieck, K.L., D.J. Ziolkowski Jr., M. Lutmerding, V. Aponte and M-A.R. Hudson. 2019. North American Breeding Bird Survey Dataset 1966 - 2018, version 2018.0. U.S. Geological Survey, Patuxent Wildlife Research Center. https://doi.org/10.5066/P9HE8XYJ."
)
12 changes: 6 additions & 6 deletions inst/data-terms
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
**********************
* Data Citation *
**********************
Pardieck, K.L., D.J. Ziolkowski Jr., M. Lutmerding and M.-A.R. Hudson. 2018. North American Breeding Bird Survey Dataset 1966 - 2017, version 2017.0. U.S. Geological Survey, Patuxent Wildlife Research Center. https://doi.org/10.5066/F76972V8.
Pardieck, K.L., D.J. Ziolkowski Jr., M. Lutmerding, V. Aponte and M-A.R. Hudson. 2019. North American Breeding Bird Survey Dataset 1966 - 2018, version 2018.0. U.S. Geological Survey, Patuxent Wildlife Research Center. https://doi.org/10.5066/P9HE8XYJ.

**********************
* Terms of Use *
**********************
Users of these BBS data are obligated to formally recognize their use of the program's data in publications, presentations and other outlets. Additionally, all work using these data should acknowledge the thousands of U.S. and Canadian participants who annually perform and coordinate the survey.
Users of these BBS data are obligated to formally recognize their use of the program's data in publications, presentations and other outlets. Additionally, all work using these data should acknowledge the thousands of U.S. and Canadian participants who annually perform and coordinate the survey.

It is in the best interest for the continued success of the BBS that authors submit a reprint or pdf of their work featuring BBS data to the National BBS staff for inclusion in the program's bibliography. If a publication is based solely on the analysis of BBS data, we recommend that you involve National BBS staff (see https://www.pwrc.usgs.gov/BBS/ContactUs/) with the writing and/or review of the manuscript.
It is in the best interest for the continued success of the BBS that authors submit a reprint or pdf of their work featuring BBS data to the National BBS staff for inclusion in the program's bibliography. If a publication is based solely on the analysis of BBS data, we recommend that you involve National BBS staff with the writing and/or review of the manuscript.

Thank you for supporting the BBS program and we look forward to learning of your work.
Thank you for supporting the BBS program and we look forward to learning of your work.

*****************************
* Data Liability Disclaimer *
*****************************
This database, identified as the North American Breeding Bird Survey Dataset, has been approved for release and publication by the U.S. Geological Survey (USGS) and the Canadian Wildlife Service of Environment Canada (EC). Although this database has been subjected to rigorous review and is substantially complete, the USGS and EC reserve the right to revise the data pursuant to further analysis and review. Furthermore, it is released on the condition that the USGS, the U.S. Government, the EC, and the Canadian Government may not be held liable for any damages resulting from its authorized or unauthorized use.
This database, identified as the North American Breeding Bird Survey Dataset, has been approved for release and publication by the U.S. Geological Survey (USGS) and the Canadian Wildlife Service of Environment Canada (EC). Although this database has been subjected to rigorous review and is substantially complete, the USGS and EC reserve the right to revise the data pursuant to further analysis and review. Furthermore, it is released on the condition that the USGS, the U.S. Government, the EC, and the Canadian Government may not be held liable for any damages resulting from its authorized or unauthorized use.

It is also strongly recommended that careful attention be paid to the contents of the metadata files associated with the dataset. Information concerning the accuracy and appropriate uses of these data may be obtained from the metadata files, or from the National Program Managers.
It is also strongly recommended that careful attention be paid to the contents of the metadata files associated with the dataset. Information concerning the accuracy and appropriate uses of these data may be obtained from the metadata files, or from the National Program Managers.

By typing "yes", you signify that you have thoroughly reviewed the liability statement above and agree to the terms of use.

0 comments on commit aa659bb

Please sign in to comment.