Skip to content

Commit 381bdb8

Browse files
committed
fix <<
1 parent ce6f0ff commit 381bdb8

File tree

2 files changed

+32
-19
lines changed

2 files changed

+32
-19
lines changed

source/R/Vertalingen.R

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
trend_translate <- data.frame(trendeng = c("unknown", "uncertain", "decreasing",
22
"increasing", "stable",
33
"deteriorating", "improving"),
4-
trendnl = c("onbekend", "onzeker", "\U2198", "\U2197", "=",
4+
trendnl = c("onbekend", "onzeker", "$\\searrow$", "$\\nearrow$", "=",
55
"verslechterend", "verbeterend"),
66
trendlegende = c("onbekend", "onzeker", "afname",
77
"toename", "stabiel",
@@ -13,7 +13,7 @@ expected_trend_translate <- data.frame(trendeng = c("very positive", "positive",
1313
"stabiel", "negatief",
1414
"heel negatief", "onbekend"))
1515
kleurenpallet <- data.frame(
16-
waarde = c("onbekend", "onzeker", "\U2198", "afname", "\U2197", "toename",
16+
waarde = c("onbekend", "onzeker", "$\\searrow$", "afname", "$\\nearrow$", "toename",
1717
"=", "stabiel", "U2 zeer ongunstig", "U1 matig ongunstig",
1818
"FV gunstig", "goed", "slecht", "matig", "verslechterend",
1919
"verbeterend"),
@@ -36,17 +36,18 @@ toekomst_translate <- data.frame(
3636
INBOtheme::traffic_palette(9)[8]))
3737

3838
frr_translate <- data.frame(
39-
symbool = c("", "<", "<<", "<<<"),
39+
symbool = c("", "$<$", "$<<$", "$<<<$"),
4040
frr_eng = c("Approximately equal to the favourable reference range (less than 2% smaller)",
4141
"Between 2% and 10% smaller than the FRR",
4242
"Between 11% and 50% smaller than the FRR",
4343
"Between 51% and 100% smaller than the FRR"),
4444
frr_areaal = c("actueel areaal ongeveer gelijk aan FRR (minder dan 2\\% kleiner)",
4545
"actueel areaal tussen 2\\% en 10\\% kleiner dan FRR",#dubbele \ om latex problemen te voorkomen
4646
"actueel areaal tussen 11\\% en 50\\% kleiner dan FRR",
47-
"actueel areaal tussen 51\\% en 100\\% kleiner dan FRR"))
47+
"actueel areaal tussen 51\\% en 100\\% kleiner dan FRR"),
48+
order = 1:4)
4849
fra_translate <- data.frame(
49-
symbool = c("", "<", "<<", "<<<", "<<<<"),
50+
symbool = c("", "$<$", "$<<$", "$<<<$", "$<<<<$"),
5051
fra_eng = c("Approximately equal to the favourable reference area (less than 2% smaller)",
5152
"Between 2% and 10% smaller than the FRA",
5253
"Between 11% and 25% smaller than the FRA",
@@ -56,7 +57,8 @@ fra_translate <- data.frame(
5657
"actuele oppervl. tussen 2\\% en 10\\% kleiner dan FRA",#dubbele \ om latex problemen te voorkomen
5758
"actuele oppervl. tussen 11\\% en 25\\% kleiner dan FRA",
5859
"actuele oppervl. tussen 26\\% en 50\\% kleiner dan FRA",
59-
"actuele oppervl. tussen 51\\% en 100\\% kleiner dan FRA"))
60+
"actuele oppervl. tussen 51\\% en 100\\% kleiner dan FRA"),
61+
order = 1:5)
6062

6163
#pressures & threats categories uit https://docs.google.com/spreadsheets/d/1InQHG_ZJUqSVjSA1VyyJd9qlQGtF5Kui/edit#gid=1546634614
6264

@@ -82,22 +84,29 @@ legende_caption <- function(trend = NA, FRR_areaal = NA, FRA_area = NA){
8284
trendlegende <- NA
8385
frrlegende <- NA
8486
fralegende <- NA
85-
if (!is.null(trend)) {
86-
d <- data.frame(trendeng = trend) %>% distinct() %>%#input = wat er in de fiches staat
87-
filter(!(trendeng %in% c("unknown", "uncertain"))) %>%
87+
if (any(!is.na(trend))) {
88+
d <- data.frame(trendeng = trend) %>%
89+
distinct() %>%#input = wat er in de fiches staat
90+
filter(!is.na(trendeng) &
91+
!(trendeng %in% c("unknown", "uncertain"))) %>%
8892
left_join(trend_translate)
8993
trendlegende <- str_c(d$trendnl, d$trendlegende, sep = " ", collapse = ", ")
9094
trendlegende <- str_c("trend: ", trendlegende)
9195
}
92-
if (!is.null(FRR_areaal)) {
93-
d <- data.frame(frr_eng = FRR_areaal) %>% distinct() %>%#input = wat er in de fiches staat
96+
if (any(!is.na(FRR_areaal))) {
97+
d <- data.frame(frr_eng = FRR_areaal) %>%
98+
filter(!is.na(frr_eng)) %>%
99+
distinct() %>%#input = wat er in de fiches staat
94100
left_join(frr_translate)
95101
frrlegende <- str_c(d$symbool, d$frr_areaal, sep = " ", collapse = ", ")
96102
frrlegende <- str_c("FRR: ", frrlegende)
97103
}
98-
if (!is.null(FRA_area)) {
99-
d <- data.frame(fra_eng = FRA_area) %>% distinct() %>%#input = wat er in de fiches staat
100-
left_join(fra_translate)
104+
if (any(!is.na(FRA_area))) {
105+
d <- data.frame(fra_eng = FRA_area) %>%
106+
filter(!is.na(fra_eng)) %>%
107+
distinct() %>%#input = wat er in de fiches staat
108+
left_join(fra_translate) %>%
109+
arrange(order)
101110
fralegende <- str_c(d$symbool, d$fra_area, sep = " ", collapse = ", ")
102111
fralegende <- str_c("FRA: ", fralegende)
103112
}

source/bookdown/_template_habitats.Rmd

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ data_areaal %>%
7171
dplyr::select(code, area, trendnl, symbool, statusnl) %>%
7272
arrange(code) %>%
7373
kable(booktabs = TRUE,
74-
#format = "latex",
74+
format = "latex",
75+
exape = FALSE,
7576
col.names = c("", "Areaal (km²)", "Trend t.o.v. vorige rapportage",
7677
"FRR",
7778
"Eindconclusie"),
@@ -118,11 +119,13 @@ data_area %>% filter(hab == this_hab) %>%
118119
left_join(trend_translate, by = c("trend" = "trendeng")) %>%
119120
left_join(status_translate, by = c("conclusie" = "statuseng")) %>%
120121
left_join(fra_translate, by = c("fra" = "fra_eng")) %>%
121-
mutate(area = as.numeric(str_replace(area,',','.')) * 100) %>%#km² -> ha
122+
mutate(area = as.numeric(str_replace(area,',','.')) * 100,
123+
stt = str_replace(stt, pattern = "\\%", replacement = "\\\\%")) %>%#km² -> ha
122124
dplyr::select(code, area, trendnl, stt, symbool, statusnl) %>%
123125
arrange(code) %>%
124126
kable(booktabs = TRUE,
125-
#format = "latex",
127+
format = "latex",
128+
escape = FALSE,
126129
col.names = c("","Oppervlakte Vlaanderen (ha)",
127130
"Trend t.o.v. vorige rapportage",
128131
"Korte termijn trend", "FRA", "Eindconclusie"),
@@ -143,10 +146,11 @@ data_area %>% filter(hab == this_hab) %>%
143146
dplyr::select(code, sbz_opp, trendnl) %>%
144147
arrange(code) %>%
145148
kable(booktabs = TRUE,
146-
#format = "latex",
149+
format = "latex",
150+
escape = FALSE,
147151
col.names = c("","Oppervlakte in SBZ-H",
148152
"Trend van de oppervlakte in SBZ-H"),
149-
caption = "Oppervlakte en trend van de oppervlakte in SBZ-H") %>%
153+
caption = paste0("Oppervlakte en trend van de oppervlakte in SBZ-H(", legende_caption(trend = b$sbz_trend),").")) %>%
150154
kable_styling() %>%
151155
column_spec(2, width = "2.5cm") %>%
152156
column_spec(3, width = "2.5cm")

0 commit comments

Comments
 (0)