Merge pull request #11 from subugoe/sep_23

Add two new DE views (Thieme and Elsevier)
subugoe · Oct 12, 2023 · 23040f4 · 23040f4
2 parents 2ed126f + 220d21c
commit 23040f4
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 55 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,7 +10,7 @@ name: build
 
 jobs:
   CICD:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -24,14 +24,18 @@ jobs:
         run: |
           wget -O Atkinson_Hyperlegible.zip https://fonts.google.com/download?family=Atkinson%20Hyperlegible
           unzip -d Atkinson_Hyperlegible/ Atkinson_Hyperlegible.zip
-          mv Atkinson_Hyperlegible ~/Library/Fonts/
+          mv Atkinson_Hyperlegible /usr/share/fonts/
           fc-cache -fv
 
       - uses: quarto-dev/quarto-actions/setup@v2
+      - run: |
+          quarto --version
 
       - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
 
-      - uses: r-lib/actions/setup-renv@v2
+      - uses: r-lib/actions/setup-r-dependencies@v2
 
       - name: Create dashboard documents
         run: |

diff --git a/R/oam_publisher_market_share.R b/R/oam_publisher_market_share.R
@@ -3,17 +3,17 @@
 pub_shares <- my_df |>
   mutate(
     type = case_when(
+      esac_publisher == "Elsevier (DEAL)" ~ "Elsevier (DEAL)",
       esac_publisher == "Springer Hybrid (DEAL)" ~ "Springer Hybrid (DEAL)",
       esac_publisher == "Wiley Hybrid (DEAL)" ~ "Wiley Hybrid (DEAL)",
-      esac_publisher == "Wiley" ~ "Wiley",
-      esac_publisher %in% top_13[3:13] ~ "Top 3-13",
+      esac_publisher %in% top_13[3:13] ~ "Top 4-13",
       is.character(esac_publisher) ~ "Other"
     )
   ) |>
   mutate(type =
            forcats::fct_relevel(
              type,
-             c("Springer Hybrid (DEAL)", "Wiley Hybrid (DEAL)", "Top 3-13", "Other")
+             c("Elsevier (DEAL)", "Springer Hybrid (DEAL)", "Wiley Hybrid (DEAL)", "Top 4-13", "Other")
            )) |>
   mutate(cat = forcats::fct_rev(as.factor(collection))) |>
   group_by(cat, type, esac_publisher) |>
@@ -75,9 +75,10 @@ plot_pub_shares <-
       scale_fill_manual(
         "",
         values = c(
+          "Elsevier (DEAL)" = "#e9711c",
           "Springer Hybrid (DEAL)" = "#486a7e",
           "Wiley Hybrid (DEAL)" = "#068853",
-          "Top 3-13" = "grey60",
+          "Top 4-13" = "grey60",
           "Other" = "grey90"
         ),
         guide = guide_legend(reverse = FALSE,  nrow = 1)
@@ -86,6 +87,7 @@ plot_pub_shares <-
       scale_y_continuous(breaks = seq(0, 1, by = 0.1),
                          labels = scales::percent_format(accuracy = 5L)) +
       labs(x = NULL, y = NULL) +
+      guides(fill = guide_legend(nrow = 2)) +
       theme_minimal(base_family = "Atkinson Hyperlegible", base_size = 14) +
       theme(panel.grid.minor = element_blank()) +
       theme(axis.ticks = element_blank()) +

diff --git a/_quarto.yml b/_quarto.yml
@@ -89,6 +89,8 @@ website:
                 contents:
                   - section: "DEAL"
                     contents:
+                      - text: "Elsevier"
+                        href: "oam/elsevierdeal/index.qmd"
                       - text: "Springer"
                         href: oam/springerhybriddeal/index.qmd
                       - text: "Wiley"
@@ -123,10 +125,14 @@ website:
                           href: oam/portlandpresstib/index.qmd
                         - text: "RSC"
                           href: oam/rsctib/index.qmd
+                  - section: "ZB MED"
+                    contents:
+                       - text: "Thieme"
+                         href: oam/thiemezbmed/index.qmd
                   - section: "ZBW"
                     contents:
                        - text: "Taylor and Francis"
-                         href: oam/taylorfranciszbw
+                         href: oam/taylorfranciszbw/index.qmd
           - text: "About"
             href: "about.qmd"
     footer: funding_note.md

diff --git a/config.csv b/config.csv
@@ -18,6 +18,7 @@ publisher,collection
 "BMJ Publishing","jct"
 "EDP Sciences","jct"
 "The Royal Society","jct"
+"Elsevier (DEAL)","oam"
 "Springer Hybrid (DEAL)","oam"
 "Wiley Hybrid (DEAL)","oam"
 "Sage (BSB)","oam"
@@ -34,3 +35,4 @@ publisher,collection
 "Karger (BSB)","oam"
 "Hogrefe (SUB Göttingen)","oam"
 "TaylorFrancis (ZBW)","oam"
+"Thieme (ZB MED)","oam"
diff --git a/create_qmd.R b/create_qmd.R
@@ -7,7 +7,7 @@ library(readr)
 library(fs)
 
 # Load agreements
-my_ta <- readr::read_csv("config.csv")
+my_ta <- readr::read_csv("config.csv") 
 # Get ISSNs
 get_ta_jns <- function(publisher = NULL, collection = c("jct", "oam")) {
   match.arg(collection)