Skip to content

Commit 7ac68eb

Browse files
jaseeverettjaseeverett
committed
Merge branch 'main' into pr/142
2 parents e0f9f48 + 1567a8c commit 7ac68eb

File tree

297 files changed

+18849
-4670
lines changed

Some content is hidden

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

297 files changed

+18849
-4670
lines changed

‎.github/workflows/MacOS.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
any::rcmdcheck
4747
any::remotes
4848
any::lpsymphony
49+
any::slam
4950
needs: check
5051

5152
- uses: r-lib/actions/check-r-package@v2

‎.github/workflows/Ubuntu.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
any::rcmdcheck
5454
any::remotes
5555
any::lpsymphony
56+
any::slam
5657
needs: check
5758

5859
- uses: r-lib/actions/check-r-package@v2

‎.github/workflows/Windows.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
any::rcmdcheck
5151
any::remotes
5252
any::lpsymphony
53+
any::slam
5354
needs: check
5455

5556
- uses: r-lib/actions/check-r-package@v2

‎.github/workflows/test-coverage.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
any::rcmdcheck
4343
any::remotes
4444
any::lpsymphony
45+
any::slam
4546
needs: coverage
4647

4748
- name: Test coverage

‎DESCRIPTION‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: spatialplanr
22
Title: Help files for prioritzr Spatial Planning projects
3-
Version: 0.6.9
3+
Version: 0.7.0
44
Authors@R: c(
55
person(
66
given = "Jason D.",
@@ -23,7 +23,7 @@ BugReports: https://github.com/SpatialPlanning/spatialplanr/issues
2323
Encoding: UTF-8
2424
LazyData: true
2525
Roxygen: list(markdown = TRUE)
26-
RoxygenNote: 7.3.2
26+
RoxygenNote: 7.3.3
2727
Suggests:
2828
gfwr,
2929
ggcorrplot,
@@ -32,16 +32,12 @@ Suggests:
3232
knitr,
3333
oceandatr,
3434
patchwork,
35-
prioritizr,
3635
RColorBrewer,
3736
rmarkdown,
3837
rnaturalearthdata,
3938
rnaturalearthhires,
4039
rredlist,
4140
testthat (>= 3.0.0),
42-
units,
43-
vctrs,
44-
viridis,
4541
wdpar
4642
VignetteBuilder: knitr
4743
Depends:
@@ -54,7 +50,7 @@ Imports:
5450
ggplot2,
5551
lifecycle,
5652
magrittr,
57-
methods,
53+
prioritizr,
5854
purrr,
5955
rappdirs,
6056
rlang,
@@ -66,7 +62,10 @@ Imports:
6662
terra,
6763
tibble,
6864
tidyr,
69-
tidyselect
65+
tidyselect,
66+
units,
67+
vctrs,
68+
viridis
7069
Remotes:
7170
github::emlab-ucsb/oceandatr,
7271
github::emlab-ucsb/spatialgridr,

‎NAMESPACE‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,142 @@ export(splnr_scale_01)
4040
export(splnr_targets_byCategory)
4141
export(splnr_targets_byIUCN)
4242
export(splnr_targets_byInverseArea)
43+
importFrom(assertthat,assert_that)
44+
importFrom(assertthat,is.flag)
45+
importFrom(assertthat,is.string)
46+
importFrom(dplyr,across)
47+
importFrom(dplyr,any_of)
48+
importFrom(dplyr,arrange)
49+
importFrom(dplyr,as_tibble)
50+
importFrom(dplyr,bind_cols)
51+
importFrom(dplyr,bind_rows)
52+
importFrom(dplyr,case_when)
53+
importFrom(dplyr,coalesce)
54+
importFrom(dplyr,everything)
55+
importFrom(dplyr,filter)
56+
importFrom(dplyr,full_join)
57+
importFrom(dplyr,group_by)
58+
importFrom(dplyr,if_else)
59+
importFrom(dplyr,left_join)
60+
importFrom(dplyr,mutate)
61+
importFrom(dplyr,pull)
62+
importFrom(dplyr,rename)
63+
importFrom(dplyr,rename_at)
64+
importFrom(dplyr,rowwise)
65+
importFrom(dplyr,select)
66+
importFrom(dplyr,starts_with)
67+
importFrom(dplyr,summarise)
68+
importFrom(dplyr,summarize)
69+
importFrom(dplyr,tibble)
70+
importFrom(dplyr,ungroup)
71+
importFrom(ggnewscale,new_scale_colour)
72+
importFrom(ggnewscale,new_scale_fill)
73+
importFrom(ggplot2,aes)
74+
importFrom(ggplot2,annotate)
75+
importFrom(ggplot2,coord_polar)
76+
importFrom(ggplot2,coord_sf)
77+
importFrom(ggplot2,element_blank)
78+
importFrom(ggplot2,element_line)
79+
importFrom(ggplot2,element_rect)
80+
importFrom(ggplot2,element_text)
81+
importFrom(ggplot2,geom_abline)
82+
importFrom(ggplot2,geom_bar)
83+
importFrom(ggplot2,geom_segment)
84+
importFrom(ggplot2,geom_sf)
85+
importFrom(ggplot2,geom_text)
86+
importFrom(ggplot2,ggplot)
87+
importFrom(ggplot2,guide_axis)
88+
importFrom(ggplot2,guide_colourbar)
89+
importFrom(ggplot2,guide_legend)
90+
importFrom(ggplot2,guides)
91+
importFrom(ggplot2,labs)
92+
importFrom(ggplot2,scale_fill_brewer)
93+
importFrom(ggplot2,scale_fill_distiller)
94+
importFrom(ggplot2,scale_fill_gradient)
95+
importFrom(ggplot2,scale_fill_gradient2)
96+
importFrom(ggplot2,scale_fill_manual)
97+
importFrom(ggplot2,scale_fill_viridis_c)
98+
importFrom(ggplot2,scale_linetype_manual)
99+
importFrom(ggplot2,scale_x_continuous)
100+
importFrom(ggplot2,scale_x_discrete)
101+
importFrom(ggplot2,scale_y_continuous)
102+
importFrom(ggplot2,scale_y_discrete)
103+
importFrom(ggplot2,theme)
104+
importFrom(ggplot2,theme_bw)
105+
importFrom(ggplot2,theme_minimal)
106+
importFrom(ggplot2,unit)
107+
importFrom(ggplot2,ylim)
108+
importFrom(grid,unit)
109+
importFrom(lifecycle,deprecate_warn)
43110
importFrom(lifecycle,deprecated)
44111
importFrom(magrittr,"%>%")
112+
importFrom(prioritizr,add_binary_decisions)
113+
importFrom(prioritizr,add_cuts_portfolio)
114+
importFrom(prioritizr,add_default_solver)
115+
importFrom(prioritizr,add_min_set_objective)
116+
importFrom(prioritizr,add_relative_targets)
117+
importFrom(prioritizr,eval_feature_representation_summary)
118+
importFrom(prioritizr,eval_ferrier_importance)
119+
importFrom(prioritizr,eval_rare_richness_importance)
120+
importFrom(prioritizr,eval_replacement_importance)
121+
importFrom(prioritizr,problem)
122+
importFrom(prioritizr,solve.ConservationProblem)
123+
importFrom(prioritizr,zones)
124+
importFrom(purrr,map)
125+
importFrom(purrr,map_df)
126+
importFrom(purrr,map_vec)
127+
importFrom(rappdirs,user_data_dir)
45128
importFrom(rlang,":=")
46129
importFrom(rlang,.data)
130+
importFrom(rlang,sym)
131+
importFrom(rnaturalearth,ne_coastline)
132+
importFrom(rnaturalearth,ne_download)
133+
importFrom(scales,squish)
134+
importFrom(sf,st_area)
135+
importFrom(sf,st_as_sf)
136+
importFrom(sf,st_bbox)
137+
importFrom(sf,st_centroid)
138+
importFrom(sf,st_coordinates)
139+
importFrom(sf,st_crs)
140+
importFrom(sf,st_distance)
141+
importFrom(sf,st_drop_geometry)
142+
importFrom(sf,st_geometry)
143+
importFrom(sf,st_join)
144+
importFrom(sf,st_nearest_feature)
145+
importFrom(sf,st_polygon)
146+
importFrom(sf,st_set_crs)
147+
importFrom(sf,st_set_geometry)
148+
importFrom(sf,st_sf)
149+
importFrom(sf,st_sfc)
150+
importFrom(sf,st_transform)
151+
importFrom(sf,st_union)
152+
importFrom(spatialgridr,get_data_in_grid)
153+
importFrom(stats,na.omit)
154+
importFrom(stats,quantile)
155+
importFrom(stats,reorder)
156+
importFrom(stats,setNames)
157+
importFrom(stringr,str_c)
158+
importFrom(stringr,str_ends)
159+
importFrom(stringr,str_pad)
160+
importFrom(stringr,str_remove_all)
161+
importFrom(stringr,str_replace_all)
162+
importFrom(stringr,str_sub)
163+
importFrom(stringr,str_subset)
164+
importFrom(tibble,as_tibble)
165+
importFrom(tibble,deframe)
166+
importFrom(tibble,enframe)
167+
importFrom(tibble,rowid_to_column)
168+
importFrom(tibble,tibble)
169+
importFrom(tibble,tribble)
170+
importFrom(tidyr,pivot_longer)
171+
importFrom(tidyr,pivot_wider)
172+
importFrom(tidyr,replace_na)
173+
importFrom(tidyselect,all_of)
174+
importFrom(tidyselect,any_of)
175+
importFrom(tidyselect,everything)
176+
importFrom(tidyselect,matches)
177+
importFrom(tidyselect,starts_with)
178+
importFrom(tidyselect,where)
179+
importFrom(units,drop_units)
180+
importFrom(units,set_units)
181+
importFrom(vctrs,vec_c)

‎R/data.R‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#' Planning Units
22
#'
3-
#' An sf dataframe of planning units for spatial prioritisation
3+
#' An sf dataframe of Planning Units for spatial prioritization
44
#'
55
#' @format `dat_PUs`
66
#' A data frame with XXXX rows and XXX columns:
@@ -14,9 +14,9 @@
1414

1515
# -------------------------------------------------------------------------
1616

17-
#' Boundary of planning units
17+
#' Boundary of Planning Units
1818
#'
19-
#' An sf dataframe of planning units for spatial prioritisation
19+
#' An sf dataframe of Planning Units for spatial prioritization
2020
#'
2121
#' @format `dat_bndry`
2222
#' A data frame with XXXX rows and XXX columns:
@@ -32,7 +32,7 @@
3232

3333
#' Regionalisation
3434
#'
35-
#' An sf dataframe of planning units for spatial prioritisation
35+
#' An sf dataframe of Planning Units for spatial prioritization
3636
#'
3737
#' @format `dat_region`
3838
#' A data frame with XXXX rows and XXX columns:
@@ -47,7 +47,7 @@
4747

4848
#' Binary Species Data
4949
#'
50-
#' An sf dataframe of planning units for spatial prioritisation
50+
#' An sf dataframe of Planning Units for spatial prioritization
5151
#'
5252
#' @format `dat_species_bin`
5353
#' A data frame with XXXX rows and XXX columns:
@@ -63,7 +63,7 @@
6363

6464
#' Binary Species Data 2
6565
#'
66-
#' An sf dataframe of planning units for spatial prioritisation
66+
#' An sf dataframe of Planning Units for spatial prioritization
6767
#'
6868
#' @format `dat_species_bin2`
6969
#' A data frame with XXXX rows and XXX columns:
@@ -79,7 +79,7 @@
7979

8080
#' Probability Species Data
8181
#'
82-
#' An sf dataframe of planning units for spatial prioritisation
82+
#' An sf dataframe of Planning Units for spatial prioritization
8383
#'
8484
#' @format `dat_species_prob`
8585
#' A data frame with XXXX rows and XXX columns:
@@ -93,9 +93,9 @@
9393

9494
# -------------------------------------------------------------------------
9595

96-
#' MPA Data
96+
#' Marine Protected Areas (MPAs) Data
9797
#'
98-
#' An sf dataframe of planning units for spatial prioritisation
98+
#' An sf dataframe of Planning Units for spatial prioritization
9999
#'
100100
#' @format `dat_mpas`
101101
#' A data frame with XXXX rows and XXX columns:
@@ -117,7 +117,7 @@
117117
#' @format `dat_category`
118118
#' A data frame with XXXX rows and XXX columns:
119119
#' \describe{
120-
#' \item{feature}{all features available for spatial prioritisation}
120+
#' \item{feature}{all features available for spatial prioritization}
121121
#' \item{category}{the categories of all features}
122122
#' ...
123123
#' }
@@ -135,7 +135,7 @@
135135
#' @format `dat_category2`
136136
#' A data frame with XXXX rows and XXX columns:
137137
#' \describe{
138-
#' \item{feature}{all features available for spatial prioritisation}
138+
#' \item{feature}{all features available for spatial prioritization}
139139
#' \item{category}{the categories of all features}
140140
#' ...
141141
#' }
@@ -148,7 +148,7 @@
148148

149149
#' Climate metric data
150150
#'
151-
#' An sf dataframe of planning units for spatial prioritisation
151+
#' An sf dataframe of Planning Units for spatial prioritization
152152
#'
153153
#' @format `dat_clim`
154154
#' A data frame with 780 rows and 3 columns:
@@ -179,14 +179,14 @@
179179
# -------------------------------------------------------------------------
180180

181181

182-
#' Current MPAs of the Coral Sea
182+
#' Current Marine Protected Areas (MPAs) of the Coral Sea
183183
#'
184-
#' sf file containing the current marine protected areas of the coral sea
184+
#' sf file containing the current Marine Protected Areas (MPAs) of the coral sea
185185
#'
186186
#' @format `MPAsCoralSea`
187187
#' A data frame with 397 rows and 17 columns:
188188
#' \describe{
189-
#' \item{wdpa}{binary vector denoting presence or absence of a current marine protected area}
189+
#' \item{wdpa}{binary vector denoting presence or absence of a current MPA}
190190
#' ...
191191
#' }
192192
#' @source https://www.protectedplanet.net/en/thematic-areas/wdpa?tab=WDPA

0 commit comments

Comments
 (0)