Skip to content

Commit 1d6a4b7

Browse files
authored
Prepare release 1.1.0 (#33)
* fgeo.x is no longer imported but suggested * Update installation instructions * Update news * Update revdepcheck * Update cran comments and tidy description * Update news * update words list * Update site
1 parent 61f6804 commit 1d6a4b7

54 files changed

Lines changed: 174 additions & 96 deletions

Some content is hidden

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

DESCRIPTION

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: fgeo.plot
2-
Title: Plot 'ForestGEO' Data
3-
Version: 1.0.4.9000
2+
Title: Plot ForestGEO Data
3+
Version: 1.1.0
44
Authors@R:
55
c(person(given = "Mauro",
66
family = "Lepore",
@@ -9,7 +9,7 @@ Authors@R:
99
person(given = "CTFS-ForestGEO",
1010
role = c("cph", "fnd"),
1111
email = "ForestGEO@si.edu"))
12-
Description: Plot 'ForestGEO' data
12+
Description: Plot ForestGEO data
1313
(<http://www.forestgeo.si.edu/>).
1414
License: GPL-3
1515
URL: https://github.com/forestgeo/fgeo.plot,
@@ -18,28 +18,25 @@ BugReports: https://github.com/forestgeo/fgeo.plot/issues
1818
Depends:
1919
R (>= 3.3)
2020
Imports:
21-
fgeo.x,
22-
fgeo.tool,
2321
dplyr,
22+
fgeo.tool,
2423
ggplot2,
2524
ggrepel,
2625
glue,
27-
grDevices,
2826
magrittr,
27+
purrr,
2928
rlang,
3029
stats,
31-
stringr,
32-
purrr
30+
stringr
3331
Suggests:
3432
covr,
33+
fgeo.x,
3534
gridExtra,
3635
knitr,
3736
rmarkdown,
3837
spelling,
3938
testthat
40-
Remotes:
41-
forestgeo/fgeo.x,
42-
forestgeo/fgeo.tool
39+
Additional_repositories: https://forestgeo.github.io/drat/
4340
Encoding: UTF-8
4441
Language: en-US
4542
LazyData: true

NAMESPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ S3method(autoplot_by_species,sp)
88
S3method(autoplot_by_species,sp_elev)
99
S3method(print,sp_elev)
1010
export("%>%")
11+
export(assert_is_installed)
1112
export(autoplot)
1213
export(autoplot_by_species)
1314
export(elev)
@@ -26,6 +27,7 @@ importFrom(dplyr,group_by)
2627
importFrom(dplyr,mutate)
2728
importFrom(dplyr,select)
2829
importFrom(dplyr,ungroup)
30+
importFrom(fgeo.tool,assert_is_installed)
2931
importFrom(fgeo.tool,check_crucial_names)
3032
importFrom(fgeo.tool,flag_if)
3133
importFrom(fgeo.tool,is_multiple)

NEWS.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@
22

33
* Work in progress.
44

5-
# fgeo.plot 1.0.4 (GitHub release)
5+
# fgeo.plot 1.1.0 (GitHub release)
66

7-
* Use release version recrsively via @*release.
7+
* fgeo.x no longer is imported but instead is suggested.
8+
9+
* Import fgeo packages via `Additional_repositories` served at <https://forestgeo.github.io/drat/>.
10+
11+
* First argument of most visible functions now follow tidyverse principles (<http://bit.ly/2TfDcfX>).
12+
13+
# fgeo.plot 1.0.4 (GitHub and drat release)
14+
15+
* Use release version recursively via @*release.
816

917
# fgeo.plot 1.0.3 (GitHub release)
1018

R/autoplot-sp_elev.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
#' @return A "ggplot".
5959
#'
6060
#' @examples
61+
#' assert_is_installed("fgeo.x")
62+
#'
6163
#' # Species ---------------------------------------------------------------
6264
#'
6365
#' # Small dataset with a few species for quick examples

R/autoplot.fgeo_habitat.R

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
#'
99
#' @examples
1010
#' \dontrun{
11-
#' fgeo_analyze_is_installed <- requireNamespace("fgeo_analyze", quietly = TRUE)
12-
#' if (fgeo_analyze_is_installed) {
13-
#' library(fgeo.analyze)
11+
#' assert_is_installed("fgeo.x")
12+
#' assert_is_installed("fgeo.analyze")
13+
#' library(fgeo.analyze)
1414
#'
15-
#' habitats <- fgeo_habitat(fgeo.x::elevation, gridsize = 20, n = 4)
16-
#' autoplot(habitats)
17-
#' }
15+
#' habitats <- fgeo_habitat(fgeo.x::elevation, gridsize = 20, n = 4)
16+
#' autoplot(habitats)
1817
#' }
1918
#' @family plot functions
2019
#' @family autoplots

R/autoplot_by_species.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
#' @template return_a_list_of_ggplots
4343
#'
4444
#' @examples
45+
#' assert_is_installed("fgeo.x")
46+
#'
4547
#' # Species ---------------------------------------------------------------
4648
#' # Small dataset with a few species for quick examples
4749
#' census <- fgeo.x::tree6_3species

R/imports-reexports.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
#' @importFrom utils head tail
1010
NULL
1111

12+
#' @importFrom fgeo.tool assert_is_installed
13+
#' @export
14+
#' @keywords internal
15+
fgeo.tool::assert_is_installed
16+
1217
#' @import ggplot2
1318
#' @export
1419
ggplot2::autoplot

R/plot_dbh_bubles_by_quadrat.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#' @return A list which each element is a plot of class ggplot.
1515
#'
1616
#' @examples
17+
#' assert_is_installed("fgeo.x")
18+
#'
1719
#' # Create a small VieFullTable
1820
#' first_n <- function(x, n) x %in% sort(unique(x))[1:n]
1921
#' small_vft <- fgeo.x::vft_4quad %>%

R/plot_tag_status_by_subquadrat.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
#' @template return_a_list_of_ggplots
5656
#'
5757
#' @examples
58+
#' assert_is_installed("fgeo.x")
59+
#'
5860
#' # Create a small VieFullTable
5961
#' first <- function(x) x %in% sort(unique(x))[1]
6062
#' small_vft <- subset(fgeo.x::vft_4quad, first(CensusID) & first(QuadratID))

R/sp_elev.R

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#' @return An S3 object of class 'sp'.
88
#'
99
#' @examples
10+
#' assert_is_installed("fgeo.x")
11+
#'
1012
#' inherits(sp(fgeo.x::stem5), "sp")
1113
#' @family plot functions
1214
#' @family autoplots
@@ -28,8 +30,9 @@ sp <- function(sp) {
2830
#' @return An S3 object of class 'elev'.
2931
#'
3032
#' @examples
31-
#' inherits(elev(fgeo.x::elevation), "elev")
33+
#' assert_is_installed("fgeo.x")
3234
#'
35+
#' inherits(elev(fgeo.x::elevation), "elev")
3336
#' inherits(elev(fgeo.x::elevation$col), "elev")
3437
#' @family plot functions
3538
#' @family autoplots
@@ -52,6 +55,8 @@ elev <- function(elev) {
5255
#' @return An S3 object of class 'sp_elev'.
5356
#'
5457
#' @examples
58+
#' assert_is_installed("fgeo.x")
59+
#'
5560
#' species_elevation <- sp_elev(fgeo.x::stem5, fgeo.x::elevation)
5661
#' inherits(species_elevation, "sp_elev")
5762
#' @family plot functions

0 commit comments

Comments
 (0)