Let Layer$compute_geom_2() handle legend defaults
#5903
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
teunbrand
commented
May 23, 2024
Comment on lines
-77
to
-83
|
|
||
| # If `geometry` is not a symbol, `LayerSf$setup_layer()` gives up guessing | ||
| # the legend type, and falls back to "polygon" | ||
| p <- ggplot_build( | ||
| ggplot(d_sf) + geom_sf(aes(geometry = identity(g_point), colour = "a")) | ||
| ) | ||
| expect_identical(p$plot$layers[[1]]$computed_geom_params$legend, "polygon") |
There was a problem hiding this comment.
The legend type is now correctly determined to be a point type, so this test became vestigial
teunbrand
commented
May 23, 2024
| data$.draw <- keep_key_data(params$key, df, matched_aes, layer$show.legend) | ||
| } else { | ||
| reps <- rep(1, nrow(params$key)) | ||
| data <- layer$geom$use_defaults(NULL, layer$aes_params)[reps, ] |
There was a problem hiding this comment.
The visual test for the non-sf legend is to cover this case, which gets solved by Layer$compute_geom_2() now, but was never triggered in the test suite.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is an amendment to #5834, as it didn't handle the non-standard defaults for
geom_sf()legends.Briefly, this PR let's
Layer$compute_geom_2()instead ofGeom$use_defaults()handle populating legend keys with defaults.The legend code was mirroring
Layer$compute_geom_2()in many ways anyway, so this shouldn't be much of a stretch.This ensures that the layer could impose some of its non-aesthetic parameters on the legend keys.
That is needed to resolve the defaults for the correct legend type in
geom_sf(), which we'd need for #5833.In addition the following changes are made:
Layer$compute_geom_2()now accepts a customparamsobject, as legends only pass static aesthetics when they are of length 1.LayerSf$setup_layer()toLayerSf$compute_geom_1(). This allows for more readable code and abolishes the statefulcomputed_legend_key_typefield inLayerSf.geom_sf()'s legend types, because we had detected problems in revdepchecks that weren't covered in our own tests.