Skip to content

Commit 24273ff

Browse files
committed
Sync to dev
Merge branch 'dev' of https://github.com/andybeet/NEFSCspatial into bootstrap_5 # Conflicts: # pkgdown/_pkgdown.yml
2 parents dae53d7 + 5fe7c45 commit 24273ff

Some content is hidden

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

46 files changed

+382
-233
lines changed

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Package: NEFSCspatial
22
Title: Spatial data package for regions in the northeast atlantic
33
Version: 0.1.0
44
Authors@R: c(person("Andy", "Beet", email = "andrew.beet@noaa.gov", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-8270-7090")),
5-
person("Kimberly", "Bastille", email = "kimberly.bastille@noaa.gov", role = "aut"),
6-
person("Joshua", "Hatch", email = "joshua.hatch@noaa.gov", role = "aut"))
5+
person("Joshua", "Hatch", email = "joshua.hatch@noaa.gov", role = "aut"),
6+
person("Kimberly", "Bastille", email = "kimberly.bastille@noaa.gov", role = "aut"))
77
URL: https://github.com/NEFSC/NEFSC-Spatial/, https://nefsc.github.io/NEFSC-Spatial/
88
BugReports: https://github.com/NEFSC/NEFSC-Spatial/issues
99
Description: Provides spatial data as sf or raster objects for the Northeast Fisheries Science Center
@@ -29,7 +29,7 @@ Suggests:
2929
hexSticker,
3030
ggimage,
3131
dplyr,
32-
leaflet,
32+
ggplot2,
3333
jsonlite,
3434
httr2,
3535
gt

NEWS.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# NEFSCspatial 0.1.0
22

3+
## Data set additions/removals
4+
5+
- Data sets from [MDEB](Marine Development GIS Data Hub) data hub (Marine Development GIS Data Hub)
6+
- Scallop restricted areas
7+
- Massachusetts inshore survey strata
8+
- Deprecation warnings for data sets due to be replaced by MDEB data
9+
- Added bzip2 data set compression
10+
11+
## Minor fixes
12+
13+
- Removed leaflet documentation
14+
- Standardized data set documentation with added examples
15+
16+
317
# NEFSCspatial 0.0.1
418

519
Initial release of sf objects

R/data-mass_inshore_strata.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#' @usage data('mass_inshore_strata')
1818
#' @keywords {datasets}
1919
#' @source {https://www.mass.gov/info-details/review-trawl-survey-updates. Division of Marine Fisheries - New Bedford Office. For more info contact the
20-
#' [Resource Assessment Project Leader](https://www.mass.gov/info-details/dmf-staff-directory#fisheries-biology-recreational-fishing-survey-and-assessment) }
20+
#' [Resource Assessment Project Leader](https://www.mass.gov/info-details/dmf-staff-directory#fisheries-biology-recreational-fishing-survey-and-assessment). }
2121
#' @examples
2222
#' \dontrun{
2323
#' # Load the dataset
Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,30 @@
11
#' Gillnet Closure Areas
22
#'
3-
#' An sf object containing the Closure areas for Gillnets
4-
#' Specifically Closed Area 1 and Nantucket Lightship Closure Area
3+
#' @description An \code{sf} object containing the closure areas for gillnets.
4+
#' Specifically Closed Area 1 and Nantucket Lightship Closure Area.
55
#'
6-
#' @format A data frame/ sf object (2 x 25)
6+
#' @format An \code{sf} object
77
#' \describe{
88
#' \item{Geometry type}{POLYGON}
99
#' \item{Dimension}{XY}
1010
#' \item{Bounding box}{xmin: -70.33333 ymin: 40.33333 xmax: -68.5 ymax: 41.5}
1111
#' \item{Geodetic CRS}{NAD83}
1212
#' \item{Features}{2 x 26}
1313
#' \item{Metadata}{See source}
14-
#'
15-
#'
16-
#' \item{GARFO_ID}{A unique identifier used to identify and track this feature;
17-
#' a new GARFO_ID is generated for each version of a Regulated Area, including
18-
#' proposed or final versions (i.e. whenever boundaries or attributes are
19-
#' changed, edited or updated)}
20-
#' \item{AREANAME}{Official name of the Proposed Area, usually the area name as it will be printed in the CFR.}
21-
#' \item{COMMNAME}{Most commonly used name. May be identical to AREANAME, an abbreviation of AREANAME, or a different name altogether.}
22-
#' \item{AREAGROUP}{Specifies if the Proposed Area is part of a group of related areas.}
23-
#' \item{DESCRIBE}{A brief description of the purpose of the Proposed Area.}
24-
#' \item{CFRTITLE}{CFR Title citation where the Proposed Area will be legally defined}
25-
#' \item{CFRPT}{ACFR Part citation where the Proposed Area will be legally defined}
26-
#' \item{CFRPTTXT}{CFR Part citation header text}
27-
#' \item{CFRSUB}{CFR Subpart citation where the Proposed Area will be legally defined}
28-
#' \item{CFRSUBTXT}{CFR Subpart citation header text}
29-
#' \item{CFRSXN}{CFR Section citation where the Proposed Area will be legally defined}
30-
#' \item{CFRSXNTXT}{CFR Section citation header text}
31-
#' \item{CFRPARA}{CFR Paragraph citation where the Proposed Area will be legally defined}
32-
#' \item{CFRPARATXT}{CFR Paragraph citation header text}
33-
#' \item{FRCITE}{Federal Register citation of proposed rule containing the Proposed Area spatial definition.}
34-
#' \item{FRDATE}{Federal Register citation date of proposed rule containing the Proposed Area spatial definition.}
35-
#' \item{EFFECTDATE}{Date Regulated Area officially became law, or most recent modification. For Proposed Areas, this field will be blank because the area is not yet law.}
36-
#' \item{SOURCE}{If Proposed Area will be defined in the CFR, this is the citation for the Amendment/Framework/etc. that will establish the area. If the Proposed Area will not be defined in the CFR, this is the alternative source citation that will establish the area.}
37-
#' \item{RECURST}{Annually recurring date Proposed Area would become active}
38-
#' \item{RECUREND}{Annually recurring date Proposed Area would become inactive}
39-
#' \item{GISAUTHOR}{Name of the NOAA staff person who created the GIS feature}
40-
#' \item{CREATED}{Creation date of the GIS feature}
41-
#' \item{AREANOTES}{Miscellaneous notes regarding the Proposed Area or feature}
42-
#' \item{X}{x coordinate of polygon center}
43-
#' \item{Y}{y coordinate of polygon center}
44-
#' }
45-
#'
46-
#'@section Contact:
47-
#'andrew.beet at noaa.gov
14+
#' }
4815
#'
4916
#'
5017
#' @docType data
5118
#' @name GillnetClosureAreas_20211021
5219
#' @usage data("GillnetClosureAreas_20211021")
5320
#' @keywords datasets
5421
#' @source \url{https://www.fisheries.noaa.gov/resource/map/gillnet-closure-areas}
22+
#' @examples
23+
#' \dontrun{
24+
#' # Load the dataset
25+
#' data(GillnetClosureAreas_20211021)
26+
#'
27+
#' # Plot the geometry
28+
#' plot(sf::st_geometry(GillnetClosureAreas_20211021))
29+
#' }
5530
NULL

R/data_Great_South_Channel_Restricted_Trap_Pot_Area.R

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,12 @@
1717
#' @usage data("Great_South_Channel_Restricted_Trap_Pot_Area")
1818
#' @keywords datasets
1919
#' @source \url{https://www.fisheries.noaa.gov/resource/map/great-south-channel-restricted-area}
20+
#' @examples
21+
#' \dontrun{
22+
#' # Load the dataset
23+
#' data(Great_South_Channel_Restricted_Trap_Pot_Area)
24+
#'
25+
#' # Plot the geometry
26+
#' plot(sf::st_geometry(Great_South_Channel_Restricted_Trap_Pot_Area))
27+
#' }
2028
NULL

R/data_Herring_Management_Areas.R

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#' @title Herring Management Areas
22
#'
3-
#' @description An \code{sf} object depicting the boundaries of the Herring Management Areas
3+
#' @description An \code{sf} object depicting the boundaries of the Herring Management Areas.
44
#'
55
#' @format An \code{sf} object:
66
#' \describe{
@@ -18,4 +18,12 @@
1818
#' @usage data("Herring_Management_Areas")
1919
#' @keywords datasets
2020
#' @source \url{https://www.fisheries.noaa.gov/resource/map/herring-management-areas}
21+
#' @examples
22+
#' \dontrun{
23+
#' # Load the dataset
24+
#' data(Herring_Management_Areas)
25+
#'
26+
#' # Plot the geometry
27+
#' plot(sf::st_geometry(Herring_Management_Areas))
28+
#' }
2129
NULL

R/data_LMA1_Restricted_Area_FR.R

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,12 @@
1717
#' @usage data("LMA1_Restricted_Area_FR")
1818
#' @keywords datasets
1919
#' @source \url{https://www.fisheries.noaa.gov/resource/map/lma-1-restricted-area}
20+
#' @examples
21+
#' \dontrun{
22+
#' # Load the dataset
23+
#' data(LMA1_Restricted_Area_FR)
24+
#'
25+
#' # Plot the geometry
26+
#' plot(sf::st_geometry(LMA1_Restricted_Area_FR))
27+
#' }
2028
NULL

R/data_NAFO_Divisions_2021_line_enclosed.R

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#' @title NAFO Divisions (Bounded)
22
#'
3-
#' @description An \code{sf} object that depicts the boundaries of the NAFO regions
3+
#' @description An \code{sf} object that depicts the boundaries of the NAFO regions.
44
#'
55
#' @format An \code{sf} object:
66
#' \describe{
@@ -17,4 +17,12 @@
1717
#' @usage data("NAFO_Divisions_2021_line_enclosed")
1818
#' @keywords datasets
1919
#' @source \url{https://www.nafo.int/Data/GIS}
20+
#' @examples
21+
#' \dontrun{
22+
#' # Load the dataset
23+
#' data(NAFO_Divisions_2021_line_enclosed)
24+
#'
25+
#' # Plot the geometry
26+
#' plot(sf::st_geometry(NAFO_Divisions_2021_line_enclosed))
27+
#' }
2028
NULL

R/data_NAFO_Divisions_2021_line_not_enclosed.R

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#' @title NAFO Divisions (Not Bounded)
22
#'
3-
#' @description An \code{sf} object that depicts the boundaries of the NAFO regions
3+
#' @description An \code{sf} object that depicts the boundaries of the NAFO regions.
44
#'
55
#' @format An \code{sf} object:
66
#' \describe{
@@ -17,4 +17,12 @@
1717
#' @usage data("NAFO_Divisions_2021_line_not_enclosed")
1818
#' @keywords datasets
1919
#' @source \url{https://www.nafo.int/Data/GIS}
20+
#' @examples
21+
#' \dontrun{
22+
#' # Load the dataset
23+
#' data(NAFO_Divisions_2021_line_not_enclosed)
24+
#'
25+
#' # Plot the geometry
26+
#' plot(sf::st_geometry(NAFO_Divisions_2021_line_not_enclosed))
27+
#' }
2028
NULL

R/data_NAFO_Divisions_2021_poly_clipped.R

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#' @title NAFO Divisions (Polygon clipped to coastline)
22
#'
3-
#' @description An \code{sf} object that depicts the boundaries of the NAFO regions
3+
#' @description An \code{sf} object that depicts the boundaries of the NAFO regions.
44
#'
55
#' @format An \code{sf} object:
66
#' \describe{
@@ -17,4 +17,12 @@
1717
#' @usage data("NAFO_Divisions_2021_poly_clipped")
1818
#' @keywords datasets
1919
#' @source \url{https://www.nafo.int/Data/GIS}
20+
#' @examples
21+
#' \dontrun{
22+
#' # Load the dataset
23+
#' data(NAFO_Divisions_2021_poly_clipped)
24+
#'
25+
#' # Plot the geometry
26+
#' plot(sf::st_geometry(NAFO_Divisions_2021_poly_clipped))
27+
#' }
2028
NULL

0 commit comments

Comments
 (0)