updates (see details in comment)

- Include Fig 2 text for the US - Correct Fig 4 title for TL3 countries - Change Fig 4 font type to "sans/Arial" (mono, serif are other possible options) - Change Fig 4 title position - Change Fig 2 font for CHL - Manually adjust KOR and JPN (exclude Fig 3 and 4) - Manually adjust SVK (no overview and final tables)
oecd-cfe-eds · Oct 24, 2023 · 6eb90d7 · 6eb90d7
1 parent 6bd2fd5
commit 6eb90d7
Show file tree

Hide file tree

Showing 66 changed files with 715 additions and 703 deletions.
diff --git a/00_country_template_tl3.qmd b/00_country_template_tl3.qmd
@@ -900,9 +900,22 @@ text_all <- dp2 %>%
 
 ```{r fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/search.json b/docs/search.json
diff --git a/docs/tl0-irl.html b/docs/tl0-irl.html
diff --git a/docs/tl0-usa.html b/docs/tl0-usa.html
diff --git a/docs/tl2-can.html b/docs/tl2-can.html
diff --git a/docs/tl2-chl.html b/docs/tl2-chl.html
diff --git a/docs/tl2-mex.html b/docs/tl2-mex.html
diff --git a/docs/tl3-aut.html b/docs/tl3-aut.html
diff --git a/docs/tl3-bel.html b/docs/tl3-bel.html
diff --git a/docs/tl3-che.html b/docs/tl3-che.html
diff --git a/docs/tl3-cze.html b/docs/tl3-cze.html
diff --git a/docs/tl3-deu.html b/docs/tl3-deu.html
diff --git a/docs/tl3-dnk.html b/docs/tl3-dnk.html
diff --git a/docs/tl3-esp.html b/docs/tl3-esp.html
diff --git a/docs/tl3-est.html b/docs/tl3-est.html
diff --git a/docs/tl3-fin.html b/docs/tl3-fin.html
diff --git a/docs/tl3-fra.html b/docs/tl3-fra.html
diff --git a/docs/tl3-gbr.html b/docs/tl3-gbr.html
diff --git a/docs/tl3-grc.html b/docs/tl3-grc.html
diff --git a/docs/tl3-hun.html b/docs/tl3-hun.html
diff --git a/docs/tl3-ita.html b/docs/tl3-ita.html
diff --git a/docs/tl3-jpn.html b/docs/tl3-jpn.html
diff --git a/docs/tl3-ltu.html b/docs/tl3-ltu.html
diff --git a/docs/tl3-lva.html b/docs/tl3-lva.html
diff --git a/docs/tl3-nld.html b/docs/tl3-nld.html
diff --git a/docs/tl3-nor.html b/docs/tl3-nor.html
diff --git a/docs/tl3-nzl.html b/docs/tl3-nzl.html
diff --git a/docs/tl3-pol.html b/docs/tl3-pol.html
diff --git a/docs/tl3-prt.html b/docs/tl3-prt.html
diff --git a/docs/tl3-svk.html b/docs/tl3-svk.html
diff --git a/docs/tl3-svn.html b/docs/tl3-svn.html
diff --git a/docs/tl3-swe.html b/docs/tl3-swe.html
diff --git a/docs/tl3-tur.html b/docs/tl3-tur.html
diff --git a/index.qmd b/index.qmd
@@ -702,7 +702,10 @@ text_all <- dp2 %>%
 # put fig3 title in black
 fig3 <- fig3 %>%
     layout(
-        title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0, font = list(color = "black"))
+        title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
     )
 
 # remove legend background

diff --git a/tl0-irl.qmd b/tl0-irl.qmd
@@ -362,7 +362,11 @@ fig2 <- subplot(p1, p2, nrows = 1, margin = 0.05, shareX = TRUE, shareY = TRUE)
 
 fig2 <- fig2 %>%
   layout(
-    title = list(text = "Figure 2: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0),
+    title = list(text = "Figure 2: Share of workers in most productive (tradable) sectors,\nTL2 regions", 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial")),
     margin = list(
       l = 50, r = 50,
       b = 50, t = 120,

diff --git a/tl0-usa.qmd b/tl0-usa.qmd
@@ -515,6 +515,26 @@ gdp_3_gap_txt <- ifelse(gdp_5_gap - gdp_5_gap_lag > 0, "increase", "decrease")
 gdp_3_gap_pct <- abs(round(gdp_5_gap - gdp_5_gap_lag, 3))
 ```
 
+```{r next paragraph}
+next_paragraph <- if (any(ctry %in% c("LTU", "EST", "FIN", "LVA", "NZL", "NOR", "SVK", "SVN", "CHE"))) {
+  glue("There is no data for the gap in GDP per capita between large metropolitan and non-large metropolitan regions for 2000 and 2020.")
+} else {
+  glue("In 2020, the gap in GDP per capita between large metropolitan and non-large metropolitan regions was { gdp_gap }. For reference, the same value for OECD was { gdp_2_gap }. This gap { gdp_gap_txt }  by { gdp_gap_pct } percentage points between 2000 and 2020.")
+}
+
+last_paragraph <- if (any(ctry %in% c("KOR", "NLD"))) {
+  glue("There is no data for the gap in GDP per capita between regions near and far a Functional Urban Area (FUA) of more than 250 thousand inhabitants for 2000 and 2020.")
+} else {
+  glue("In turn, the gap in GDP per capita between regions near and far a Functional Urban Area (FUA) of more than 250 thousand inhabitants was { gdp_5_gap } in 2020 and { gdp_3_gap_txt } by { gdp_3_gap_pct}  percentage points since 2000.")
+}
+```
+
+`r next_paragraph`
+
+Meanwhile, in 2020, the gap in GDP per capita between metropolitan and non-metropolitan regions was `r gdp_3_gap`. For reference, the same value for OECD was `r gdp_4_gap`. This gap `r paste(gdp_2_gap_txt, "by", gdp_2_gap_pct)` percentage points since 2000.
+
+`r last_paragraph`
+
 ```{r usa_fig2_3}
 # no interactivity
 # fig2
@@ -904,7 +924,11 @@ text_all <- dp2 %>%
 # put fig4 title in black
 fig4 <- fig4 %>%
     layout(
-        title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0, font = list(color = "black"))
+        title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors,\nTL2 regions", 
+                     x = 0,
+                     xanchor = "left",
+                     xref = "paper",
+                     font = list(color = "black", family = "Arial"))
     )
 
 # remove legend background

diff --git a/tl2-can.qmd b/tl2-can.qmd
@@ -696,7 +696,11 @@ text_all <- dp2 %>%
 # put fig3 title in black
 fig3 <- fig3 %>%
   layout(
-    title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl2-chl.qmd b/tl2-chl.qmd
@@ -391,6 +391,30 @@ hpdiff <- hpgrew - lpgrew
 
 hpmore <- ifelse(hpdiff > 0, "more", "less")
 
+# fig2 <- dp11 %>%
+#   rename(
+#     value = value_country,
+#     series = name
+#   ) %>%
+#   ggplot() +
+#   geom_line(aes(x = time, y = value, color = series), linewidth = 1.2) +
+#   # theme_oecd(base_size = 10) +
+#   theme_minimal() +
+#   scale_colour_manual(values = c("#177dc7","#508551")) +
+#   labs(
+#     x = "", y = "Labour productivity (2015 USD PPP)", colour = "",
+#     title = "Figure 2: Evolution of labour productivity, TL2 regions"
+#   ) +
+#   scale_x_continuous(labels = as.character(yrs), breaks = yrs) +
+#   scale_y_continuous(labels = scales::number_format())+
+#   theme(title = element_text(family = "serif"))    # windowsFonts()
+
+fig3_title <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "CHL"))) {
+  "Figure 2: Evolution of labour productivity,\nTL2 regions"
+} else {
+  "Figure 2: Evolution of labour productivity,\nTL2 regions"
+}
+
 fig2 <- dp11 %>%
   rename(
     value = value_country,
@@ -399,15 +423,19 @@ fig2 <- dp11 %>%
   ggplot() +
   geom_line(aes(x = time, y = value, color = series), linewidth = 1.2) +
   # theme_oecd(base_size = 10) +
+  # theme(plot.title = element_text(size = 13, hjust = 0, margin = margin(0, 0, 10, 0))) +
   theme_minimal() +
-  scale_colour_manual(values = c("#177dc7","#508551")) +
+  # scale_colour_manual(values = clrs3[1:2]) +
+  scale_colour_manual(values = c("#508551", "#177dc7")) +
   labs(
     x = "", y = "Labour productivity (2015 USD PPP)", colour = "",
-    title = "Figure 2: Evolution of labour productivity, TL2 regions"
+    title = fig3_title
   ) +
   scale_x_continuous(labels = as.character(yrs), breaks = yrs) +
   scale_y_continuous(labels = scales::number_format())
 
+
+
 ctry3 <- if (any(ctry %in% c("USA", "GBR", "CZE", "SVK", "NLD"))) {
   paste("The", ctry2)
 } else {
@@ -700,7 +728,11 @@ text_all <- dp2 %>%
 # put fig3 title in black
 fig3 <- fig3 %>%
   layout(
-    title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl2-mex.qmd b/tl2-mex.qmd
@@ -689,7 +689,10 @@ text_all <- dp2 %>%
 # put fig3 title in black
 fig3 <- fig3 %>%
   layout(
-    title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = "Figure 3: Share of workers in most productive (tradable) sectors,\nTL2 regions", x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-aut.qmd b/tl3-aut.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r aut_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-bel.qmd b/tl3-bel.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r bel_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-che.qmd b/tl3-che.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r che_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-cze.qmd b/tl3-cze.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r cze_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-deu.qmd b/tl3-deu.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r deu_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-dnk.qmd b/tl3-dnk.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r dnk_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-esp.qmd b/tl3-esp.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r esp_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-est.qmd b/tl3-est.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r est_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background

diff --git a/tl3-fin.qmd b/tl3-fin.qmd
@@ -907,9 +907,22 @@ text_all <- dp2 %>%
 
 ```{r fin_fig4_2}
 # put fig4 title in black
+
+title_fig4 <- if (any(ctry %in% c("USA", "TUR", "NOR", "CHE", "IRL"))) {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL2 regions"
+} else {
+  "Figure 4: Share of workers in most productive (tradable) sectors, \nTL3 regions"
+}
+
+# https://stackoverflow.com/questions/34610165/what-is-the-default-font-for-ggplot2
+# https://plotly.com/r/reference/layout/
 fig4 <- fig4 %>%
   layout(
-    title = list(text = "Figure 4: Share of workers in most productive (tradable) sectors, TL2 regions", x = 0, font = list(color = "black"))
+    title = list(text = title_fig4, 
+                 x = 0,
+                 xanchor = "left",
+                 xref = "paper",
+                 font = list(color = "black", family = "Arial"))
   )
 
 # remove legend background