Commit 51f048ba authored by Renaud Lancelot's avatar Renaud Lancelot 🌍
Browse files

Resolved conflicts with Facundo's updates.

parent f7edc186
Pipeline #14111 failed with stage
in 2 minutes and 36 seconds
......@@ -54,7 +54,8 @@ plan <- drake_plan(
## GIS vector layer for the region of interest covering European
## countries described above
roi_europe_light = readOGR(dsn = "data/roi_europe_light.gpkg",
layer = "roi_europe_light"),
layer = "roi_europe_light"),
geo_europe = readOGR(dsn = file_in("data/geo_europe.gpkg"),
layer = "geo_europe"),
......@@ -72,13 +73,17 @@ plan <- drake_plan(
"Malta", "Netherlands", "Poland", "Portugal",
"Romania", "Slovakia", "Slovenia", "Spain", "Sweden",
"United Kingdom"),
## European free trade association
efta = c("Iceland", "Liechtenstein", "Norway", "Switzerland"),
## Candidate countries
candi = c("Albania", "Montenegro", "North Macedonia",
"Serbia", "Turkey"),
## Other countries
noneu = c("Bosnia and Herzegovina", "Kosovo"),
## neighbour countries
enp = c("Algeria", "Armenia", "Azerbaijan", "Belarus", "Egypt",
"Georgia", "Israel", "Jordan", "Lebanon", "Libya",
......@@ -99,11 +104,14 @@ plan <- drake_plan(
## today (ANSI)
tod = format(Sys.Date(), "%Y%m%d"),
## Coordinate Reference Systems
wgs84 = CRS("+proj=longlat +ellps=WGS84",
doCheckCRSArgs = FALSE),
merc = CRS("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs",
doCheckCRSArgs = FALSE),
eust = "MOOD has received funding from the EU Horizon 2020 Research and Innovation programme under grant agreement No 874850.",
report_euro_html =
......@@ -134,12 +142,12 @@ plan <- drake_plan(
dev = "pdf",
includes = list(
in_header = "preamble.tex",
before_body = "before_body.tex"),
toc = T,
toc_depth = 3,
number_sections = T,
latex_engine = "xelatex"
),
before_body = "before_body.tex"),
toc = T,
toc_depth = 3,
number_sections = T,
latex_engine = "xelatex"
),
output_file = file_out("public/covid19MortalityEurope.pdf"),
quiet = FALSE
),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment