Skip to content

Commit

Permalink
Documentation conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
hannahlowens committed Mar 6, 2024
1 parent 741e72a commit f4f5e42
Show file tree
Hide file tree
Showing 9 changed files with 89 additions and 34 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Suggests:
testthat,
taxize,
vcr
RoxygenNote: 7.3.0
RoxygenNote: 7.3.1
X-schema.org-applicationCategory: Biodiversity
X-schema.org-keywords: specimens, API, web-services, occurrences, species, taxonomy, GBIF, INAT, Vertnet, eBird, iDigBio, OBIS, ALA
X-schema.org-isPartOf: ropensci.org
Expand Down
26 changes: 26 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,33 @@ export(occ_options)
export(spocc_capwords)
export(wkt2bbox)
export(wkt_vis)
importFrom(data.table,rbindlist)
importFrom(data.table,setDF)
importFrom(jsonlite,toJSON)
importFrom(lubridate,as_date)
importFrom(lubridate,now)
importFrom(lubridate,ydm_hm)
importFrom(lubridate,ymd)
importFrom(lubridate,ymd_hm)
importFrom(lubridate,ymd_hms)
importFrom(rebird,ebirdgeo)
importFrom(rebird,ebirdregion)
importFrom(rgbif,name_lookup)
importFrom(rgbif,occ_data)
importFrom(rgbif,occ_get)
importFrom(ridigbio,idig_search_records)
importFrom(ridigbio,idig_view_records)
importFrom(rvertnet,vertsearch)
importFrom(s2,s2_centroid)
importFrom(tibble,as_tibble)
importFrom(tibble,tibble)
importFrom(utils,browseURL)
importFrom(utils,data)
importFrom(utils,head)
importFrom(utils,read.csv)
importFrom(utils,setTxtProgressBar)
importFrom(utils,txtProgressBar)
importFrom(whisker,whisker.render)
importFrom(wk,wk_bbox)
importFrom(wk,wk_coords)
importFrom(wk,wkt)
3 changes: 1 addition & 2 deletions R/spocc-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
#' @importFrom ridigbio idig_search_records idig_view_records
#' @importFrom whisker whisker.render
#' @name spocc-package
#' @aliases spocc
#' @docType package
#' @aliases spocc-package
#' @author Scott Chamberlain
#' @keywords package
NULL
2 changes: 1 addition & 1 deletion man/occ.Rd

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

2 changes: 1 addition & 1 deletion man/occ_names.Rd

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

2 changes: 1 addition & 1 deletion man/occ_names_options.Rd

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

4 changes: 2 additions & 2 deletions man/occ_options.Rd

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

76 changes: 53 additions & 23 deletions man/spocc-package.Rd

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

6 changes: 3 additions & 3 deletions man/spocc_objects.Rd

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

0 comments on commit f4f5e42

Please sign in to comment.