diff --git a/DESCRIPTION b/DESCRIPTION index f6db0e34..ee33b2ab 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.9.0.9003 +Version: 0.9.0.9004 Date: 2019-12-20 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index b60b1d81..7c4b99cb 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.9.0.9003 +# AMR 0.9.0.9004 ## Last updated: 20-Dec-2019 ### Changes diff --git a/_pkgdown.yml b/_pkgdown.yml index 0e1359b0..d3f528b3 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -167,15 +167,15 @@ reference: - "`AMR-deprecated`" authors: - Matthijs S. Berends: + Matthijs S Berends: href: https://www.rug.nl/staff/m.s.berends/ - Christian F. Luz: + Christian F Luz: href: https://www.rug.nl/staff/c.f.luz/ - Alex W. Friedrich: + Alexander W Friedrich: href: https://www.rug.nl/staff/a.w.friedrich/ - Bhanu N. M. Sinha: + Bhanu N M Sinha: href: https://www.rug.nl/staff/b.sinha/ - Casper J. Albers: + Casper J Albers: href: https://www.rug.nl/staff/c.j.albers/ Corinna Glasner: href: https://www.rug.nl/staff/c.glasner/ diff --git a/data-raw/country_analysis.R b/data-raw/country_analysis.R index 52e328b7..452333fe 100644 --- a/data-raw/country_analysis.R +++ b/data-raw/country_analysis.R @@ -44,13 +44,29 @@ countries_plot <- ggplot(world1) + # this makes the border Antarctica turn white (invisible): scale_colour_gradient(low = "white", high = "#81899B") +countries_plot_mini <- countries_plot +countries_plot_mini$data <- countries_plot_mini$data %>% filter(ID != "Antarctica") +countries_plot_mini <- countries_plot_mini + scale_colour_gradient(low = "#81899B", high = "#81899B") +countries_plot_big <- countries_plot + + labs(title = tools::toTitleCase("Countries where the AMR package for R was downloaded from"), + subtitle = paste0("Between March 2018 - ", format(Sys.Date(), "%B %Y"))) + + theme(plot.title = element_text(size = 16, hjust = 0.5), + plot.subtitle = element_text(size = 12, hjust = 0.5)) + + geom_text(aes(x = -170, + y = -70, + label = stringr::str_wrap(paste0("Countries (n = ", + length(countries_name), "): ", + paste(countries_name, collapse = ", ")), + 200)), + hjust = 0, + size = 4) # main website page ggsave("pkgdown/logos/countries.png", width = 6, - height = 3, + height = 2.5, units = "in", dpi = 100, - plot = countries_plot, + plot = countries_plot_mini, scale = 1) # when clicked - a high res enlargement ggsave("pkgdown/logos/countries_large.png", @@ -58,20 +74,7 @@ ggsave("pkgdown/logos/countries_large.png", height = 6, units = "in", dpi = 300, - plot = - countries_plot + - labs(title = tools::toTitleCase("Countries where the AMR package for R was downloaded from"), - subtitle = paste0("Between March 2018 - ", format(Sys.Date(), "%B %Y"))) + - theme(plot.title = element_text(size = 16, hjust = 0.5), - plot.subtitle = element_text(size = 12, hjust = 0.5)) + - geom_text(aes(x = -170, - y = -70, - label = stringr::str_wrap(paste0("Countries (n = ", - length(countries_name), "): ", - paste(countries_name, collapse = ", ")), - 200)), - hjust = 0, - size = 4), + plot = countries_plot_big, scale = 1.5) diff --git a/docs/404.html b/docs/404.html index 062c9b99..6439ba43 100644 --- a/docs/404.html +++ b/docs/404.html @@ -84,7 +84,7 @@ AMR (for R) - 0.9.0.9003 + 0.9.0.9004 @@ -240,7 +240,7 @@ Content not found. Please use links in the navbar.