updated designs

.pre-commit-config.yaml

@@ -43,7 +43,7 @@ repos:
     rev: v3.4.0
     hooks: 
     -   id: check-added-large-files
-        args: ['--maxkb=200']
+        args: ['--maxkb=800']
     -   id: end-of-file-fixer
         exclude: '\.Rd'
 -   repo: local

README.Rmd

@@ -12,7 +12,18 @@ knitr::opts_chunk$set(
 ```
 
 
-# Subnational data for the COVID-19 outbreak <img src="man/figures/logo.png" align="right" alt="" width="120"/>
+# Hexsticker designs
+
+### Design 1
+![Design 1](man/figures/logo.png)
+
+### Design 2
+![design 2](man/figures/logo2.png)
+
+### Design 3
+![design 3](man/figures/logo3.png)
+
+# Subnational data for the COVID-19 outbreak
 
 [![Lifecycle: maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![R-CMD-check](https://github.com/epiforecasts/covidregionaldata/workflows/R-CMD-check/badge.svg)](https://github.com/epiforecasts/covidregionaldata/actions) [![Codecov test coverage](https://codecov.io/gh/epiforecasts/covidregionaldata/branch/master/graph/badge.svg)](https://codecov.io/gh/epiforecasts/covidregionaldata?branch=master) [![Data status](https://img.shields.io/badge/Data-status-lightblue.svg?style=flat)](https://epiforecasts.io/covidregionaldata/articles/supported-countries.html) [![metacran downloads](http://cranlogs.r-pkg.org/badges/grand-total/covidregionaldata?color=ff69b4)](https://cran.r-project.org/package=covidregionaldata)
 

README.md

@@ -1,5 +1,19 @@
 
-# Subnational data for the COVID-19 outbreak <img src="man/figures/logo.png" align="right" alt="" width="120"/>
+# Hexsticker designs
+
+### Design 1
+
+![Design 1](man/figures/logo.png)
+
+### Design 2
+
+![design 2](man/figures/logo2.png)
+
+### Design 3
+
+![design 3](man/figures/logo3.png)
+
+# Subnational data for the COVID-19 outbreak
 
 [![Lifecycle:
 maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://lifecycle.r-lib.org/articles/stages.html)
@@ -78,7 +92,7 @@ the temporary directory by default),
 
 ``` r
 start_using_memoise()
-#> Using a cache at: /tmp/RtmpdtqshY
+#> Using a cache at: /tmp/RtmpcnFAXK
 ```
 
 To stop using `memoise` use,
@@ -103,7 +117,7 @@ the Google COVID-19 open data project), use:
 ``` r
 nots <- get_national_data()
 #> Downloading data from https://covid19.who.int/WHO-COVID-19-global-data.csv
-#> Rows: 125,724
+#> Rows: 125,961
 #> Columns: 8
 #> Delimiter: ","
 #> chr  [3]: Country_code, Country, WHO_region
@@ -115,7 +129,7 @@ nots <- get_national_data()
 #> Cleaning data
 #> Processing data
 nots
-#> # A tibble: 125,846 x 15
+#> # A tibble: 126,083 x 15
 #>    date       un_region who_region country        iso_code cases_new cases_total
 #>    <date>     <chr>     <chr>      <chr>          <chr>        <dbl>       <dbl>
 #>  1 2020-01-03 Asia      EMRO       Afghanistan    AF               0           0
@@ -128,7 +142,7 @@ nots
 #>  8 2020-01-03 Americas  AMRO       Antigua & Bar… AG               0           0
 #>  9 2020-01-03 Americas  AMRO       Argentina      AR               0           0
 #> 10 2020-01-03 Asia      EURO       Armenia        AM               0           0
-#> # … with 125,836 more rows, and 8 more variables: deaths_new <dbl>,
+#> # … with 126,073 more rows, and 8 more variables: deaths_new <dbl>,
 #> #   deaths_total <dbl>, recovered_new <dbl>, recovered_total <dbl>,
 #> #   hosp_new <dbl>, hosp_total <dbl>, tested_new <dbl>, tested_total <dbl>
 ```
@@ -169,7 +183,7 @@ for example by level 1 region in the UK, use:
 ``` r
 uk_nots <- get_regional_data(country = "UK", verbose = FALSE)
 uk_nots
-#> # A tibble: 6,539 x 26
+#> # A tibble: 6,552 x 26
 #>    date       region   region_code cases_new cases_total deaths_new deaths_total
 #>    <date>     <chr>    <chr>           <dbl>       <dbl>      <dbl>        <dbl>
 #>  1 2020-01-30 East Mi… E12000004          NA          NA         NA           NA
@@ -182,7 +196,7 @@ uk_nots
 #>  8 2020-01-30 Scotland S92000003          NA          NA         NA           NA
 #>  9 2020-01-30 South E… E12000008          NA          NA         NA           NA
 #> 10 2020-01-30 South W… E12000009          NA          NA         NA           NA
-#> # … with 6,529 more rows, and 19 more variables: recovered_new <dbl>,
+#> # … with 6,542 more rows, and 19 more variables: recovered_new <dbl>,
 #> #   recovered_total <dbl>, hosp_new <dbl>, hosp_total <dbl>, tested_new <dbl>,
 #> #   tested_total <dbl>, areaType <chr>, cumCasesByPublishDate <dbl>,
 #> #   cumCasesBySpecimenDate <dbl>, newCasesByPublishDate <dbl>,

inst/WORDLIST

@@ -190,6 +190,7 @@ HDTRA
 Healy
 hellewell
 Hellewell
+Hexsticker
 Hiroaki
 hl
 Hongru

inst/make_hexsticker.R

@@ -1,8 +1,14 @@
 library(hexSticker)
+library(showtext)
 library(ggplot2)
 library(dplyr)
 library(maps)
+library(sf)
 
+# font setup
+font_add_google("Zilla Slab Highlight", "useme")
+
+# des
 regional_countries <- get_available_datasets() %>%
   filter(type == "regional")
 
@@ -38,9 +44,86 @@ logo <- sticker(
   p_size = 48, s_x = 0.93, s_y = 0.8, s_width = 1.7, s_height = 2,
   p_y = 1.45,
   p_color = "white",
+  p_family = "useme",
   h_color = "#646770",
   h_fill = "#24A7DF",
   filename = "man/figures/logo.png",
   u_size = 3.5,
   dpi = 1000
 )
+
+
+world <- spData::world %>%
+  st_as_sf()
+
+supported_countries <- world %>%
+  mutate(
+    fill = case_when(
+      name_long %in% countryname(regional_countries_l2[["class"]], , destination = "country.name.en") ~ "Level 2",
+      name_long %in% countryname(regional_countries[["class"]], , destination = "country.name.en") ~ "Level 1",
+      TRUE ~ "Unsupported"
+    )
+  ) # %>%
+# filter(name_long != "Antarctica")
+
+
+covid_map_2 <- ggplot() +
+  ggspatial::layer_spatial(data = supported_countries, aes(fill = fill), color = "black", size = 0.05) +
+  coord_sf(crs = "ESRI:54010") +
+  scale_fill_manual(
+    name = "",
+    values = c("#0072b2", "#cc79a7", "grey80")
+  ) +
+  cowplot::theme_minimal_grid(color = "white", line_size = 0.05) +
+  theme(legend.position = "none", axis.text.x = element_blank())
+
+logo2 <- sticker(
+  covid_map_2,
+  package = "covidregionaldata",
+  p_size = 48, s_x = 1, s_y = 0.8, s_width = 1.98, s_height = 1.98,
+  p_y = 1.45,
+  p_color = "white",
+  p_family = "useme",
+  h_color = "#646770",
+  h_fill = "#24A7DF",
+  filename = "man/figures/logo2.png",
+  u_size = 3.5,
+  dpi = 1000
+)
+
+
+# logo 3
+
+supported_countries <- world %>%
+  mutate(
+    fill = case_when(
+      name_long %in% countryname(regional_countries_l2[["class"]], , destination = "country.name.en") ~ "Level 2",
+      name_long %in% countryname(regional_countries[["class"]], , destination = "country.name.en") ~ "Level 1",
+      TRUE ~ "Unsupported"
+    )
+  ) %>%
+  filter(name_long != "Antarctica")
+
+covid_map_3 <- ggplot() +
+  ggspatial::layer_spatial(data = supported_countries, aes(fill = fill), color = "black", size = 0.05) +
+  coord_sf(crs = "ESRI:54016") +
+  scale_fill_manual(
+    name = "",
+    values = c("#0072b2", "#cc79a7", "grey80")
+  ) +
+  theme_void() +
+  theme(legend.position = "none", axis.text.x = element_blank())
+
+logo3 <- sticker(
+  covid_map_3,
+  package = "covidregionaldata",
+  p_size = 48, s_x = 0.96, s_y = 0.8, s_width = 1.7, s_height = 1.7,
+  p_y = 1.45,
+  p_color = "white",
+  p_family = "useme",
+  h_color = "#646770",
+  h_fill = "#24A7DF",
+  filename = "man/figures/logo3.png",
+  u_size = 3.5,
+  dpi = 1000
+)