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

Fix annotations overlap #221

Merged
merged 7 commits into from
Jun 7, 2021
Merged

Fix annotations overlap #221

merged 7 commits into from
Jun 7, 2021

Conversation

MonikaFu
Copy link
Collaborator

@MonikaFu MonikaFu commented Jun 7, 2021

Closes #203

By drawing all annotations in one ggrepel call the issue of overlapping annotations is solved. See reprex for example.

Additional change introduced here: selection is added to prep_trajectory() as a quick fix for too many columns being returned otherwise when normalise = TRUE.

devtools::load_all()
#> ℹ Loading r2dii.plot
library(tibble, quietly = TRUE)
library(dplyr, quietly = TRUE)
#> 
#> Attaching package: 'dplyr'
#> The following object is masked from 'package:testthat':
#> 
#>     matches
#> The following objects are masked from 'package:stats':
#> 
#>     filter, lag
#> The following objects are masked from 'package:base':
#> 
#>     intersect, setdiff, setequal, union

data <- prep_trajectory(
  market_share,
  sector_filter = "power", technology_filter = "oilcap",
  region_filter = "global", scenario_source_filter = "demo_2020",
  value = "production", end_year_filter = 2025,
  normalize = TRUE
)

scenario_specs <- tibble(
  scenario = c("sds", "sps", "cps"),
  label = c("SDS", "STEPS", "CPS")
)

main_line_metric <- tibble(metric = "projected", label = "Portfolio")
additional_line_metrics <- tibble(metric = "corporate_economy", label = "Corporate Economy")

# create overlapping data - replace portfolio with cps scenario
data_scen <- data %>%
  filter(.data$metric == "cps") %>%
  mutate(metric = "projected",
         metric_type = "portfolio")

data_overlap <- data %>%
  filter(.data$metric != "projected") %>%
  rbind(data_scen)

plot <- plot_trajectory(data_overlap,
  scenario_specs_good_to_bad = scenario_specs,
  main_line_metric = main_line_metric,
  additional_line_metrics = additional_line_metrics
)
plot

Created on 2021-06-07 by the reprex package (v2.0.0)

@MonikaFu MonikaFu requested a review from maurolepore June 7, 2021 15:56
Copy link
Contributor

@maurolepore maurolepore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except that the main line seems to be hidden behind a scenario line. I think the fix is to plot first the scenario lines, then the benchmark, finally the portflolio -- as ggplot is a layered framework, the most visible line will be the one plotted last.

@maurolepore maurolepore merged commit 56aeb53 into master Jun 7, 2021
@maurolepore maurolepore deleted the 203-fix-annotations-overlap branch June 7, 2021 17:00
@MonikaFu
Copy link
Collaborator Author

MonikaFu commented Jun 7, 2021

LGTM except that the main line seems to be hidden behind a scenario line. I think the fix is to plot first the scenario lines, then the benchmark, finally the portflolio -- as ggplot is a layered framework, the most visible line will be the one plotted last.

That is a good remark. I'll make an issue out of it as right now it's the opposite.

jdhoffa added a commit that referenced this pull request Sep 21, 2022
* Export example_data (#127)

* In plot_timeline() remove labels (#128)

* Remove dependency on ggpubr (#152)

* Clarify and simplify messages and tests (#154)

* In plot_timeline(), order legend to match lines (#158)

* New versions of plot_timeline() (#156)

* Enforce atomic sector and warn selection (#148)

* Show how to change colours (#162)

* Update readme (#164)

* In prepare_for_timeline() sector_filter is now obligatory  (#163)

* New versions of prepare_for_timeline*() (#165)

* update readme (#167)

* Add workflow to render all rmarkdown documents (#174)

* Update readme and move error  (#171)

* theme_2dii() now includes common arguments (#168)

* Fix gh action to render readme (#181)

* Update wordslist (#182)

* Rename package (#184)

* Move process_input_data() into prepare_*() functions (#176)

* Revert "Move process_input_data() into prepare_*() functions (#176)"

* Rename datasets (#186)

* prepare_for_ -> prep_ (#188)

* Fix names of data (#191)

* Polish file names and prune unused files (#192)

* Move process_input_data() inside prep_*() (#194)

* Use colours as data, and name them consistently (#189)

* Annotate lines instead of a legend (#183)

* Remove '.static' from package name (#195)

* Show theme set (#190)

* Style (#196)

* Structure website's reference section (#197)

* Colour datasets are now internal (#199)

* Add trajectory version B  (#201)

* Fix timeline (#204)

* Remove filtering ability from prep functions (#206)

* Refactor for consistency and polish documentation (#207)

* Add main_line argument trajectory (#210)

* Fix error message (#214)

* Remove needless exapmle-chunk (#217)

* Prune thick API (#222)

* Fix annotations overlap (#221)

* Rename thick API with suffix "Y" (#224)

* prep_timeline() again gains 'sector_filter' (#225)

* prep_timelineY() again starts at common start year (#227)

* plot_techmix*() now enforce a single scenario (#229)

* plot_trajectoryX() looses arg 'value' for consistency with X API (#231)

* New articles for X and Y API (#232)

* Filter year to make plots of X and Y API identical (#236)

* Add example Y techmix (#238)

* Align timeline examples (#239)

* show similarities pros and cons (#240)

* Align X and Y articles for techmix and trajectory (#241)

* dry high level docs (#246)

* DRY again and polish text (#247)

* Dry-run of CRAN release (#251)

* Polish DESCRIPTION Title and Description (#252)

* Redocument (#253)

* New abort_if_multiple() hints users how to filter (#254)

* GH workflows now work with branch 'develop' (#257)

* Trigger CI on PR too (#258)

* Make the X API the main API (#256)

* Fix website reference (#272)

* Rename to plot_emission_intensity() (#273)

* 268 In examples use base r (#274)

* Add authors and roles (#248)

* Rename plot timeline and add missing test (#279)

* Remove main_line (#280)

* plot_trajectory() loses the argumet 'normalize' (#281)

* Don't beatifull lengend labels (#284)

* Style (#286)

* All plots again beautify legend labels by default (#293)

* Update DESCRIPTION's Title and Description (#296)

* Rename timeline to emission intensity, eveverywhere (#295)

* Filter data to startyear (#290)

* Remove dead code and increase test coverage (#297)

* Handle messages so they don't pollute test output (#298)

* Rename to emission intensity (#299)

* Refactor (#300)

* 294 Remove extrapolate (#301)

* In internal code use dplyr::filter() not subset() (#302)

* 271 New article of entire r2dii workflow (#303)

* New integration test for sda (#304)

* Polish documentation (#308)

* Rebuild readme (#309)

* Improve messages by showing the start year (#306)

* Refactor (#310)

* Simplify get_area_borders code (#311)

* Fix maintainer's email (#312)

* Prepare for initial release 0.0.1 (#314)

* Spellcheck (#316)

* Update readme (#317)

* Increment version number (#318)

Co-authored-by: Mauro Lepore <[email protected]>
Co-authored-by: Monika Furdyna <[email protected]>
Co-authored-by: Mauro Lepore <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: Alex Axthelm <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prevent scenario and trajectory annotations overlap
3 participants