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 figures #83

Merged
merged 5 commits into from
Nov 13, 2022
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
1 change: 0 additions & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion R/esp_get_can_box.R
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion R/esp_get_railway.R
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion R/esp_get_rivers.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions data-raw/logo.R
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
Binary file modified img/README-giscoR-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/README-static-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion inst/examples/esp_nuts_sf.R
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion man/esp_get_can_box.Rd

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

2 changes: 1 addition & 1 deletion man/esp_get_railway.Rd

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

2 changes: 1 addition & 1 deletion man/esp_get_rivers.Rd

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

2 changes: 1 addition & 1 deletion man/esp_nuts.sf.Rd

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

3 changes: 2 additions & 1 deletion vignettes/articles/working_imagery.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ knitr::opts_chunk$set(
message = FALSE,
dpi = 300,
tidy = "styler",
dev = "ragg_png",
out.width = "100%"
)
```
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion vignettes/articles/x01_regioncodes.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
)
```

Expand Down
5 changes: 3 additions & 2 deletions vignettes/articles/x02_mapasesp.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ knitr::opts_chunk$set(
message = FALSE,
dpi = 300,
tidy = "styler",
dev = "ragg_png",
out.width = "100%"
)

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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")
Expand Down
Binary file modified vignettes/basic-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vignettes/basic-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vignettes/basic-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vignettes/choro-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vignettes/giscoR-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions vignettes/mapSpain.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down
7 changes: 4 additions & 3 deletions vignettes/mapSpain.Rmd.orig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ knitr::opts_chunk$set(
warning = FALSE,
message = FALSE,
tidy = "styler",
dev = "ragg_png",
dpi = 90,
fig.path = "./",
out.width = "100%"
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down
Binary file modified vignettes/thematic-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.