Skip to content

Don't modify legend key settings in geom_sf() during plot build. #3942

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Don't modify legend key settings in geom_sf() during plot build. #3942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c5e57f
fix #3941.
clauswilke Apr 11, 2020
89a5044
fix typo
clauswilke Apr 11, 2020
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
19 changes: 14 additions & 5 deletions R/layer-sf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,21 @@ layer_sf <- function(geom = NULL, stat = NULL,
position = NULL, params = list(),
inherit.aes = TRUE, check.aes = TRUE, check.param = TRUE,
show.legend = NA) {
if (is.character(show.legend)) {
legend_key_type <- show.legend
show.legend <- TRUE
} else {
legend_key_type <- NULL
}

# inherit from LayerSf class to add `legend_key_type` slot
layer_class <- ggproto(NULL, LayerSf, legend_key_type = legend_key_type)

layer(
geom = geom, stat = stat, data = data, mapping = mapping,
position = position, params = params, inherit.aes = inherit.aes,
check.aes = check.aes, check.param = check.param,
show.legend = show.legend, layer_class = LayerSf
show.legend = show.legend, layer_class = layer_class
)
}

Expand All @@ -37,7 +47,7 @@ LayerSf <- ggproto("LayerSf", Layer,
}

# automatically determine the legend type
if (is.na(self$show.legend) || isTRUE(self$show.legend)) {
if (is.null(self$legend_key_type)) {
if (is_sf(data)) {
sf_type <- detect_sf_type(data)
if (sf_type == "point") {
Expand All @@ -48,9 +58,8 @@ LayerSf <- ggproto("LayerSf", Layer,
self$geom_params$legend <- "polygon"
}
}
} else if (is.character(self$show.legend)) {
self$geom_params$legend <- self$show.legend
self$show.legend <- TRUE
} else {
self$geom_params$legend <- self$legend_key_type
}
data
}
Expand Down