Update webpage

MikkoVihtakari · Jul 4, 2023 · bc12433 · bc12433
1 parent d88ca86
commit bc12433
Show file tree

Hide file tree

Showing 60 changed files with 388 additions and 179 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: ggOceanMaps
 Type: Package
 Title: Plot Data on Oceanographic Maps using 'ggplot2'
-Version: 2.0.0
+Version: 2.0.1
 Date: 2023-07-04
 Authors@R: c(person("Mikko", "Vihtakari", email = "mikko.vihtakari@hi.no",
                   role = c("aut", "cre"), 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# ggOceanMaps 2.1 (development version on GitHub)
+
+* Fix a bug in bathy.style wording.
+
 # ggOceanMaps 2.0 
 
 * Full [sf](https://r-spatial.github.io/sf/) integration. Old GIS packages for R and ggspatial dependencies removed. Since this change required rewriting of most functions, new bugs have almost certainly been introduced.

diff --git a/R/geonorge_bathymetry.R b/R/geonorge_bathymetry.R
@@ -4,7 +4,7 @@
 #' @param layer Character string defining the layer containing depth information. If \code{NULL} assumed to be "dybdeareal".
 #' @param verbose Logical indicating whether information the reading process should be returned.
 #' @details You can download the bathymetry polygon shapefiles from \href{https://kartkatalog.geonorge.no/metadata/kartverket/dybdedata/2751aacf-5472-4850-a208-3532a51c529a}{Geonorge}. Download the file in \code{GLM} format. 
-#' @return An \link[sf:st_polygon]{sf} or \code{sp} object containing the depth polygons. Uses same projection than \code{bathy} (see \code{\link[sf:st_crs]{CRS}}).
+#' @return An \link[sf:st_polygon]{sf} object containing the depth polygons. Uses same projection than \code{bathy} (see \code{\link[sf:st_crs]{CRS}}).
 #' @author Mikko Vihtakari
 #' @family create shapefiles
 #' @export

diff --git a/R/internal_functions.R b/R/internal_functions.R
@@ -233,7 +233,7 @@ define_bathy_style <- function(x) {
     out <- "poly_blues"
   } else if(tolower(x) %in% c("pg", "poly_greys")) {
     out <- "poly_grays"
-  } else if(tolower(x) == "cb") {
+  } else if(tolower(x) %in% c("cb", "cbb")) {
     out <- "contour_blues"
   } else if(tolower(x) %in% c("cg", "contour_grey", "contour_greys", "contour_grays")) {
     out <- "contour_gray"

diff --git a/README.Rmd b/README.Rmd
@@ -12,14 +12,6 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r echo=FALSE, message=FALSE, warning=FALSE}
-#library(knitr)
-#knitr::opts_chunk$set(message = FALSE, warning = FALSE, comment = "#>")
-#knit_hooks$set(optipng = hook_optipng)
-#knit_hooks$set(pngquant = hook_pngquant)
-```
-
-
 # ggOceanMaps
 **Plot data on oceanographic maps using ggplot2. R package version `r packageVersion("ggOceanMaps")`**
 

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -43,8 +43,8 @@ reference:
   desc: >
     Custom bathymetry shapes can be added using the `raster_bathymetry` and 
     `vector_bathymetry` functions in this order. The underlying data can be 
-    retrieved from the [ETOPO1](https://doi.org/10.7289/V5C8276M) or
-    [GEBCO](https://www.gebco.net/data_and_products/gridded_bathymetry_data/gebco_2019/gebco_2019_info.html)
+    retrieved from the [ETOPO](https://www.ncei.noaa.gov/products/etopo-global-relief-model) or
+    [GEBCO](https://www.gebco.net/data_and_products/gridded_bathymetry_data/)
     repositories. Already existing 
     [Geonorge](https://kartkatalog.geonorge.no/metadata/kartverket/dybdedata/2751aacf-5472-4850-a208-3532a51c529a)
     bathymetries can be opened and added to the `shapefiles` argument as 

diff --git a/docs/articles/ggOceanMaps.html b/docs/articles/ggOceanMaps.html
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-10-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-10-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-11-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-11-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-12-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-12-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-13-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-13-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-14-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-14-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-15-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-15-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-16-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-16-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-17-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-17-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-18-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-18-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-19-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-19-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-20-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-20-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-21-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-21-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-22-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-22-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-23-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-23-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-24-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-24-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-25-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-25-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-26-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-26-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-28-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-28-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-29-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-29-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-29-2.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-29-2.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-30-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-30-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-31-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-31-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-32-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-32-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-33-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-33-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-34-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-34-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-35-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-35-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-36-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-36-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-38-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-38-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-39-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-39-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-40-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-40-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-41-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-41-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-42-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-42-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-43-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-43-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-44-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-44-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-45-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-45-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-46-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-46-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-48-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-48-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-49-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-49-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-50-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-50-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-60-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-60-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-61-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-61-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-62-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-62-1.png
diff --git a/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-63-1.png b/docs/articles/ggOceanMaps_files/figure-html/unnamed-chunk-63-1.png
diff --git a/docs/articles/new-features.html b/docs/articles/new-features.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -7,5 +7,5 @@ articles:
   poster: poster.html
   premade-maps: premade-maps.html
   premade-shapefiles: premade-shapefiles.html
-last_built: 2023-07-04T12:20Z
+last_built: 2023-07-04T14:06Z
 
diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png
diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png
diff --git a/docs/reference/index.html b/docs/reference/index.html