Merge pull request #83 from dieghernan/main

Update figures
rOpenSpain · Nov 13, 2022 · 335cbc6 · 335cbc6
2 parents e6f038a + 4e3fe8d
commit 335cbc6
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 28 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -301,4 +301,3 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0001-8457-4658
   year: '2022'
-  url: https://CRAN.R-project.org/package=tidyterra
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -35,6 +35,9 @@ Suggests:
     tidyterra
 VignetteBuilder: 
     knitr
+Config/Needs/coverage: covr
+Config/Needs/website: ragg, reactable, rnaturalearth, tidyverse,
+    ropenspain/rostemplate, ropensci/rnaturalearthhires, IamKDO/GADMTools
 Config/testthat/edition: 3
 Config/testthat/parallel: true
 Copyright: © EuroGeographics for the administrative boundaries. Atlas
@@ -43,7 +46,7 @@ Copyright: © EuroGeographics for the administrative boundaries. Atlas
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.2
 X-schema.org-applicationCategory: cartography
 X-schema.org-isPartOf: https://ropenspain.es/
 X-schema.org-keywords: rOpenSpain, tiles, r, maps, spatial, rstats,

diff --git a/R/esp_get_can_box.R b/R/esp_get_can_box.R
@@ -93,7 +93,7 @@
 #'
 #' ggplot(Countries) +
 #'   geom_sf(fill = "#DFDFDF") +
-#'   geom_sf(data = CANbox, fill = "#C7E7FB", lwd = 1) +
+#'   geom_sf(data = CANbox, fill = "#C7E7FB", linewidth = 1) +
 #'   geom_sf(data = CCAA, fill = "#FDFBEA") +
 #'   coord_sf(
 #'     xlim = c(-10, 4.3),

diff --git a/R/esp_get_railway.R b/R/esp_get_railway.R
@@ -44,7 +44,7 @@
 #'   geom_sf(data = ccaa, fill = NA) +
 #'   geom_sf(
 #'     data = rails, aes(color = tipo),
-#'     show.legend = FALSE, lwd = 1.5
+#'     show.legend = FALSE, linewidth = 1.5
 #'   ) +
 #'   geom_sf(
 #'     data = stations,

diff --git a/R/esp_get_rivers.R b/R/esp_get_rivers.R
@@ -50,7 +50,7 @@
 #'
 #' ggplot(shapeEsp) +
 #'   geom_sf() +
-#'   geom_sf(data = MainRivers, color = "skyblue", lwd = 2) +
+#'   geom_sf(data = MainRivers, color = "skyblue", linewidth = 2) +
 #'   coord_sf(
 #'     xlim = c(-7.5, 1),
 #'     ylim = c(36.8, 43)

diff --git a/README.Rmd b/README.Rmd
@@ -122,7 +122,7 @@ library(ggplot2)
 ggplot(CCAA_sf) +
   geom_sf(aes(fill = porc_women),
     color = "grey70",
-    lwd = .3
+    linewidth = .3
   ) +
   geom_sf(data = Can, color = "grey70") +
   geom_sf_label(aes(label = porc_women_lab),
@@ -236,7 +236,7 @@ library(ggplot2)
 ggplot(all_countries) +
   geom_sf(fill = "#DFDFDF", color = "#656565") +
   geom_sf(data = eu_countries, fill = "#FDFBEA", color = "#656565") +
-  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", lwd = .1) +
+  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", linewidth = .1) +
   # Center in Europe: EPSG 3035
   coord_sf(
     xlim = c(2377294, 7453440),

diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ library(ggplot2)
 ggplot(CCAA_sf) +
   geom_sf(aes(fill = porc_women),
     color = "grey70",
-    lwd = .3
+    linewidth = .3
   ) +
   geom_sf(data = Can, color = "grey70") +
   geom_sf_label(aes(label = porc_women_lab),
@@ -216,7 +216,7 @@ library(ggplot2)
 ggplot(all_countries) +
   geom_sf(fill = "#DFDFDF", color = "#656565") +
   geom_sf(data = eu_countries, fill = "#FDFBEA", color = "#656565") +
-  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", lwd = .1) +
+  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", linewidth = .1) +
   # Center in Europe: EPSG 3035
   coord_sf(
     xlim = c(2377294, 7453440),

diff --git a/codemeta.json b/codemeta.json
@@ -233,7 +233,7 @@
   "applicationCategory": "cartography",
   "isPartOf": "https://ropenspain.es/",
   "keywords": ["rOpenSpain", "tiles", "r", "maps", "spatial", "rstats", "r-package", "municipalities", "Spain", "gisco", "provinces", "ign", "administrative-boundaries", "ccaa", "static-tiles", "spain", "cran", "ropenspain", "ggplot2", "gis"],
-  "fileSize": "2576.611KB",
+  "fileSize": "2706.095KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",

diff --git a/data-raw/logo.R b/data-raw/logo.R
@@ -28,10 +28,10 @@ a <- ggplot(map) +
     data = map2,
     color = "#FABD00",
     fill = NA,
-    lwd = 0.1
+    linewidth = 0.1
   ) +
-  geom_sf(data = l, color = "#FABD00", lwd = 0.1) +
-  geom_sf(data = p, color = "#FABD00", lwd = 0.1) +
+  geom_sf(data = l, color = "#FABD00", linewidth = 0.1) +
+  geom_sf(data = p, color = "#FABD00", linewidth = 0.1) +
   theme_void()
 
 

diff --git a/img/README-giscoR-1.png b/img/README-giscoR-1.png
diff --git a/img/README-static-1.png b/img/README-static-1.png
diff --git a/inst/examples/esp_nuts_sf.R b/inst/examples/esp_nuts_sf.R
@@ -20,7 +20,7 @@ levels(nuts3$URBN_TYPE_cat)
 levels(nuts3$URBN_TYPE_cat) <- c("Urban", "Intermediate", "Rural")
 
 ggplot(nuts3) +
-  geom_sf(aes(fill = URBN_TYPE_cat), lwd = .1) +
+  geom_sf(aes(fill = URBN_TYPE_cat), linewidth = .1) +
   scale_fill_manual(values = c("grey80", "#FFC183", "#68AC20")) +
   labs(
     title = "NUTS3 levels of Spain",

diff --git a/man/esp_get_can_box.Rd b/man/esp_get_can_box.Rd
diff --git a/man/esp_get_railway.Rd b/man/esp_get_railway.Rd
diff --git a/man/esp_get_rivers.Rd b/man/esp_get_rivers.Rd
diff --git a/man/esp_nuts.sf.Rd b/man/esp_nuts.sf.Rd
diff --git a/vignettes/articles/working_imagery.Rmd b/vignettes/articles/working_imagery.Rmd
@@ -17,6 +17,7 @@ knitr::opts_chunk$set(
   message = FALSE,
   dpi = 300,
   tidy = "styler",
+  dev = "ragg_png",
   out.width = "100%"
 )
 ```
@@ -60,7 +61,7 @@ tile_LGN <- esp_getTiles(LGN, "IDErioja", bbox_expand = 0.5)
 
 ggplot(LGN) +
   geom_spatraster_rgb(data = tile_LGN) +
-  geom_sf(fill = NA, lwd = 2, color = "blue")
+  geom_sf(fill = NA, linewidth = 2, color = "blue")
 ```
 
 ### Alpha value on tiles

diff --git a/vignettes/articles/x01_regioncodes.Rmd b/vignettes/articles/x01_regioncodes.Rmd
@@ -9,7 +9,11 @@ knitr::opts_chunk$set(
   collapse = TRUE,
   comment = "#>",
   warning = FALSE,
-  message = FALSE
+  message = FALSE,
+  dpi = 300,
+  tidy = "styler",
+  dev = "ragg_png",
+  out.width = "100%"
 )
 ```
 

diff --git a/vignettes/articles/x02_mapasesp.Rmd b/vignettes/articles/x02_mapasesp.Rmd
@@ -17,6 +17,7 @@ knitr::opts_chunk$set(
   message = FALSE,
   dpi = 300,
   tidy = "styler",
+  dev = "ragg_png",
   out.width = "100%"
 )
 
@@ -160,7 +161,7 @@ ggplot(esp_all) +
   geom_spatraster_rgb(data = tile) +
   geom_sf(aes(color = source),
     fill = NA, show.legend = "line",
-    lwd = 1.2
+    linewidth = 1.2
   ) +
   coord_sf(
     crs = 4326,
@@ -483,7 +484,7 @@ ggplot() +
   geom_spatraster_rgb(data = base_pnoa) +
   geom_sf(
     data = madrid_munis, color = "blue", fill = "blue",
-    alpha = 0.25, lwd = 0.5
+    alpha = 0.25, linewidth = 0.5
   ) +
   theme_minimal() +
   labs(title = "Municipios en Madrid")

diff --git a/vignettes/basic-1.png b/vignettes/basic-1.png
diff --git a/vignettes/basic-2.png b/vignettes/basic-2.png
diff --git a/vignettes/basic-3.png b/vignettes/basic-3.png
diff --git a/vignettes/choro-1.png b/vignettes/choro-1.png
diff --git a/vignettes/giscoR-1.png b/vignettes/giscoR-1.png
diff --git a/vignettes/mapSpain.Rmd b/vignettes/mapSpain.Rmd
@@ -157,7 +157,7 @@ Can <- esp_get_can_box()
 ggplot(CCAA_sf) +
   geom_sf(aes(fill = porc_women),
     color = "grey70",
-    lwd = .3
+    linewidth = .3
   ) +
   geom_sf(data = Can, color = "grey70") +
   geom_sf_label(aes(label = porc_women_lab),
@@ -222,7 +222,7 @@ br <-
 munic.pop$cuts <- cut(munic.pop$dens, br)
 
 ggplot(munic.pop) +
-  geom_sf(aes(fill = cuts), color = NA, lwd = 0) +
+  geom_sf(aes(fill = cuts), color = NA, linewidth = 0) +
   scale_fill_manual(
     values = c("grey5", hcl.colors(
       length(br) - 2,
@@ -284,7 +284,7 @@ ccaa <- esp_get_ccaa(
 ggplot(all_countries) +
   geom_sf(fill = "#DFDFDF", color = "#656565") +
   geom_sf(data = eu_countries, fill = "#FDFBEA", color = "#656565") +
-  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", lwd = .1) +
+  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", linewidth = .1) +
   # Center in Europe: EPSG 3035
   coord_sf(
     xlim = c(2377294, 7453440),

diff --git a/vignettes/mapSpain.Rmd.orig b/vignettes/mapSpain.Rmd.orig
@@ -17,6 +17,7 @@ knitr::opts_chunk$set(
   warning = FALSE,
   message = FALSE,
   tidy = "styler",
+  dev = "ragg_png",
   dpi = 90,
   fig.path = "./",
   out.width = "100%"
@@ -153,7 +154,7 @@ Can <- esp_get_can_box()
 ggplot(CCAA_sf) +
   geom_sf(aes(fill = porc_women),
     color = "grey70",
-    lwd = .3
+    linewidth = .3
   ) +
   geom_sf(data = Can, color = "grey70") +
   geom_sf_label(aes(label = porc_women_lab),
@@ -215,7 +216,7 @@ br <-
 munic.pop$cuts <- cut(munic.pop$dens, br)
 
 ggplot(munic.pop) +
-  geom_sf(aes(fill = cuts), color = NA, lwd = 0) +
+  geom_sf(aes(fill = cuts), color = NA, linewidth = 0) +
   scale_fill_manual(
     values = c("grey5", hcl.colors(
       length(br) - 2,
@@ -274,7 +275,7 @@ ccaa <- esp_get_ccaa(
 ggplot(all_countries) +
   geom_sf(fill = "#DFDFDF", color = "#656565") +
   geom_sf(data = eu_countries, fill = "#FDFBEA", color = "#656565") +
-  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", lwd = .1) +
+  geom_sf(data = ccaa, fill = "#C12838", color = "grey80", linewidth = .1) +
   # Center in Europe: EPSG 3035
   coord_sf(
     xlim = c(2377294, 7453440),

diff --git a/vignettes/thematic-1.png b/vignettes/thematic-1.png