Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update develop #137

Merged
merged 4 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ Authors@R: c(
role = c("aut"),
comment = c(ORCID = "0000-0003-0319-4210")),
person("Nate", "Miller", , "nate@globalfishingwatch.org",
role = c("aut")),
person("Andrea", "Sánchez-Tapia", , "andrea.sanchez-tapia@globalfishingwatch.org",
role = c("aut"),
comment = c(ORCID = "YOUR-ORCID-ID"))
comment = c(ORCID = "0000-0002-3521-4338"))
)
Description: This package connects to several Global Fishing Watch APIs to get vessel and events information in an R-friendly format.
License: file LICENSE
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
Imports:
dplyr,
geojsonsf,
Expand Down
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ importFrom(httr2,request)
importFrom(httr2,resp_body_json)
importFrom(httr2,resp_body_raw)
importFrom(magrittr,"%>%")
importFrom(magrittr,`%>%`)
importFrom(purrr,flatten)
importFrom(purrr,map)
importFrom(purrr,map_chr)
Expand Down
2 changes: 1 addition & 1 deletion R/get_raster.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#' EEZ code). See details about geojson formatting.
#' @param region_source source of the region ('eez','mpa', 'rfmo' or 'user_json')
#' @param key Authorization token. Can be obtained with gfw_auth function
#' @importFrom magrittr `%>%`
#' @importFrom magrittr %>%
#' @importFrom readr read_csv
#' @importFrom httr2 resp_body_raw
#' @importFrom httr2 req_body_raw
Expand Down
2 changes: 1 addition & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ get_region_id <- function(region_name, region_source = 'eez', key) {
#' Formats an sf shapefile to a formatted geojson
#'
#' @param sf_shape The sf shapefile to transform
#' @returns A correctly-formatted geojason to be used in `get_raster()`
#' @returns A correctly-formatted geojson to be used in `get_raster()`
#' @importFrom geojsonsf sf_geojson
#' @export

Expand Down
169 changes: 91 additions & 78 deletions README.Rmd

Large diffs are not rendered by default.

342 changes: 237 additions & 105 deletions README.md

Large diffs are not rendered by default.

97 changes: 55 additions & 42 deletions docs/404.html

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

Loading