Skip to content

Commit

Permalink
Merge pull request #256 from dblodgett-usgs/master
Browse files Browse the repository at this point in the history
v1.1.9
  • Loading branch information
dblodgett-usgs authored Jan 8, 2020
2 parents cf40678 + a371524 commit 6f366eb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 42 deletions.
8 changes: 5 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
Package: sbtools
Title: USGS ScienceBase Tools
Maintainer: Tim Kern <[email protected]>
Version: 1.1.8
Authors@R: c(person("Tim", "Kern", role=c("cre"),
Maintainer: David Blodgett <[email protected]>
Version: 1.1.9
Authors@R: c(person("David", "Blodgett", role=c("cre"),
email = "[email protected]"),
person("Tim", "Kern", role=c("aut"),
email = "[email protected]"),
person("Luke", "Winslow", role = c("aut"),
email = "[email protected]"),
Expand Down
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Version 1.1.9 (2020-01-07)

* Fixed travis build and addressed CRAN test failures.
* Deprecated item_get_wfs -- will be removed in a future version.
* Changed maintainer to [email protected]
* See repository for other updates.

# Version 1.1.3 (2016-08-18)

* Fix items_create to properly handle cases creating one item
Expand Down
14 changes: 4 additions & 10 deletions R/item_get_wfs.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#' @title Download and load from SB WFS service
#' @title Download and load from SB WFS service (Deprecated)
#'
#' @template manipulate_item
#' @param as_sf boolean, return data in sf format
Expand All @@ -15,18 +15,12 @@
#' installed with sbtools: \code{sf}, \code{httr}, and \code{xml2}.
#' You can install them simply by running \code{install.packages(c("xml2", "httr", "sf"))}
#'
#' @examples
#' \donttest{
#'
#' layer = item_get_wfs('5b4e25a6e4b06a6dd17e4879', as_sf = TRUE)
#'
#' plot(sf::st_geometry(layer), pch = ".")
#'
#' }
#'
#' @export
#'
item_get_wfs = function(sb_id, as_sf = FALSE, ..., session){

warning("item_get_wfs is going to be removed in a future version of sbtools")

if(!requireNamespace("httr") || !requireNamespace("sf") || !requireNamespace("xml2")){
stop('
httr, xml2, and sf packages not installed.
Expand Down
10 changes: 1 addition & 9 deletions R/query_sb_spatial.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,8 @@
#' query_sb_spatial(bb_wkt="POLYGON((-104.4 41.0,-95.1 41.0,-95.1 37.5,-104.4 37.5,-104.4 41.0))",
#' limit=3)
#'
#' \donttest{
#' ###Use the bounding box of an sp object
#' #grab an sp object from a pre-determined ScienceBase Item
#' layer = item_get_wfs('5b4e25a6e4b06a6dd17e4879')
#'
#' #get items in that BB
#' query_sb_spatial(layer)
#' }
#'
#' @export
#'
query_sb_spatial = function(bbox, long, lat, bb_wkt, ..., limit=20, session=current_session()){

if(!missing(bbox)){
Expand Down
12 changes: 1 addition & 11 deletions man/item_get_wfs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions man/query_sb_spatial.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6f366eb

Please sign in to comment.