Merge branch 'master' of https://github.com/noaa-nwfsc/FishSET into 1…

…96-merge-expected-catch-subtab-crash
noaa-nwfsc · Jan 15, 2025 · b64b720 · b64b720
2 parents df11052 + 2e7a4cb
commit b64b720
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -75,7 +75,6 @@ Imports:
     shiny (>= 1.7.4),
     shinycssloaders,
     shinyjs,
-    shinyWidgets,
     spdep,
     stats,
     stringi,

diff --git a/R/data.R b/R/data.R
@@ -3,7 +3,7 @@
 #' A subset of anonymized scallop data
 #' 
 #' @format `scallop`
-#' A data.frame with 10,000 rows and 31 columns:
+#' A data.frame with 10,000 rows and 19 columns:
 #' \describe{
 #'   \item{TRIPID}{Randomly assigned trip ID number.}
 #'   \item{DATE_TRIP}{Date of landing.}
@@ -29,10 +29,7 @@
 #'   99th percentile value, respectively.}
 #'   \item{DDLAT}{The latitude reported on a VTR (Vessel Trip Reports).}
 #'   \item{DDLON}{The longitude reported on a VTR (Vessel Trip Reports).}
-#'   \item{NAME}{Name of wind lease which is found within a given ten minute square.}
 #'   \item{ZoneID}{FishSET's version of a ten minute square.}
-#'   \item{POUNDS}{Live pounds.}
-#'   \item{LANDED}{Landed pounds from the dealer report.}
 #'   \item{LANDED_OBSCURED}{Landed pounds from the dealer report (jittered/obscured).}
 #'   \item{DOLLAR_OBSCURED}{The value of catch paid by the dealer, from the 
 #'   dealer report (jittered/obscured).}

diff --git a/data/scallop.rda b/data/scallop.rda
diff --git a/vignettes/making_a_spatial_grid.Rmd b/vignettes/making_a_spatial_grid.Rmd
@@ -7,7 +7,7 @@ output:
     fig_width: 6
     fig_height: 4
 vignette: >
-  %\VignetteIndexEntry{Making a spatial grid}
+  %\VignetteIndexEntry{Making a spatial grid file}
   %\VignetteEngine{knitr::rmarkdown}
   %\VignetteEncoding{UTF-8}
 editor_options: