Commit 85c2f61c authored by numeroteca's avatar numeroteca

update FR IT region charts, and missing commited files

parent df0d2d0e
......@@ -5,6 +5,8 @@
/tmp
/img/spain/regions/2020*
/img/spain/provincias/2020*
img/spain/provincias/daily-deaths/co*
img/spain/regions/small_multiple/co*
/img/spain/regions/small_multiple/*
/img/spain/provincias/daily-deaths/co*
/img/spain/regions/small_multiple/co*
/img/spain/regions/small_multiple
/img/france/202*
/img/italia/202*
......@@ -138,8 +138,6 @@ Italian data: https://github.com/pcm-dpc/COVID-19
Warning: this section needs update.
Working on it. Meanwhile: data/original/france/covid19-france.csv
Official data from national government: https://www.data.gouv.fr/fr/datasets/cas-confirmes-dinfection-au-covid-19-par-region/
The main source for french data is this repo: https://github.com/opencovid19-fr/data
......@@ -166,6 +164,7 @@ This is the structure:
| source_nom | name of the source |
| source_url | URL of the source |
| source_type | type of source |
\* don't know the different with registered cases. this column is empty except for Polynésie et Nouvelle Calédonie
#### Regiones (Régions)
......
......@@ -3363,10 +3363,10 @@ geom_text_repel(data= last_day_available,
segment.size = 0.1,
segment.color="#777777"
) +
coord_cartesian(
ylim = c(0,1000),
xlim = c(0,10000)
) +
# coord_cartesian(
# ylim = c(0,100),
# xlim = c(0,1000)
# ) +
scale_color_manual(values = colors_prov ) +
scale_y_continuous(
# breaks = c(200,400,600,800,1000,1200,1400,1600,1800,2000)
......
......@@ -9,7 +9,7 @@
# Settings -------
# Cambia el pie del gráfico pero conserva la fuente de los datos
caption_f <- "Gráfico: lab.montera34.com/covid19. Datos: OpenCOVID19-fr"
periodo_f <- "2020.03.04 - 05.07"
periodo_f <- "2020.03.04 - 05.08"
# COVID-19 in France-----------
......
......@@ -8,7 +8,7 @@ library(ggrepel) # for geom_text_repel to prevent overlapping
# Settings -------
# Cambia el pie del gráfico pero conserva la fuente de losS datos
caption_i <- "Gráfico: @numeroteca (lab.montera34.com/covid19). Datos: Protezione Civile (Italia)"
periodo_i <- "2020.02.24 - 05.07"
periodo_i <- "2020.02.24 - 05.08"
# COVID-19 in Italy -----------
# Load data
......@@ -52,7 +52,7 @@ data_i_cases$recovered_per_100000 <- round( data_i_cases$recovered / data_i_case
data_i_cases <- data_i_cases %>% group_by(region) %>% arrange(date) %>% mutate(
daily_deaths = deceassed - lag(deceassed),
daily_deaths_inc = round((deceassed - lag(deceassed)) /lag(deceassed) * 100, digits = 1),
daily_deaths_avg6 = round( ( daily_deaths + lag(daily_deaths,1) + lag(daily_deaths,2) + lag(daily_deaths,3) + lag(daily_deaths,4) + lag(daily_deaths,5) ) / 6, digits = 1 ), # average of dayly deaths of 6 last days
daily_deaths_avg6 = round( ( daily_deaths + lag(daily_deaths,1) + lag(daily_deaths,2) + lag(daily_deaths,3) + lag(daily_deaths,4) + lag(daily_deaths,5) + lag(daily_deaths,6)) / 7, digits = 1 ), # average of dayly deaths of 6 last days
daily_deaths_avg2 = round( ( daily_deaths + lag(daily_deaths,1) ) / 2, digits = 1 ),
daily_deaths_avg3 = round( ( daily_deaths + lag(daily_deaths,1)+ lag(daily_deaths,2) ) / 3, digits = 1 ),
daily_deaths_avg4 = round( ( daily_deaths + lag(daily_deaths,1) + lag(daily_deaths,2) + lag(daily_deaths,3) ) / 4, digits = 1 )
......@@ -627,7 +627,7 @@ data_i_cases %>%
) +
# marca la línea
geom_text_repel(data=filter( data_i_cases, date==as.Date("2020-04-06"), region == "Lombardia" ),
aes(date+0.5,326, label=paste("media de 6 días")),
aes(date+0.5,329, label=paste("media de 7 días")),
nudge_y = 5, # adjust the starting y position of the text label
size=5,
hjust=0,
......@@ -658,7 +658,7 @@ data_i_cases %>%
axis.ticks.x = element_line(color = "#000000"),
legend.position = "none"
) +
labs(title = "Media de Número de muertes por COVID-19 registradas por día en Italia",
labs(title = "Media de muertes (ventana de 7 días) por COVID-19 registradas por día en Italia",
subtitle = paste0("Por región (escala logarítmica). ",periodo_i),
y = "fallecidos.",
x = "fecha",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
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