Skip to content

Commit a49d697

Browse files
committed
Add death time series
1 parent 5815b26 commit a49d697

File tree

1 file changed

+32
-23
lines changed

1 file changed

+32
-23
lines changed

load_data.R

+32-23
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,16 @@ library(shinydashboard)
88

99
source(paste0(getwd(), "/model/generate_data.R"))
1010

11-
# Confirmados ----
1211

13-
url_confirmados <- "https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-Confirmed.csv"
12+
## John Hopkins data ----
1413

15-
cvirus_confirmed <- read_csv(url_confirmados)
14+
cvirus_confirmed <- read_csv("https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-Confirmed.csv")
1615

16+
cvirus_recovered <- read_csv("https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-Recovered.csv")
1717

18+
cvirus_death <- read_csv("https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-Deaths.csv")
1819

19-
# Recuperados
20-
21-
url_recovered <- "https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-Recovered.csv"
22-
23-
cvirus_recovered <- read_csv(url_recovered)
24-
25-
# cvirus$`Province/State`<- NULL
26-
27-
28-
# Pasamos a formato largo ----
20+
# Pasamos a formato largo
2921

3022
cvirus_confirmed_longer <- cvirus_confirmed %>%
3123
pivot_longer(
@@ -39,27 +31,38 @@ cvirus_recovered_longer <- cvirus_recovered %>%
3931
values_to = "recuperados"
4032
)
4133

34+
cvirus_death_longer <- cvirus_death %>%
35+
pivot_longer(
36+
cols = 5:ncol(cvirus_death),
37+
values_to = "fallecidos"
38+
)
39+
40+
41+
4242
cvirus_longer <- cvirus_confirmed_longer %>%
4343
left_join(
4444
cvirus_recovered_longer,
4545
by = c("Province/State", "Country/Region", "Lat", "Long", "name")
46+
) %>%
47+
left_join(
48+
cvirus_death_longer,
49+
by = c("Province/State", "Country/Region", "Lat", "Long", "name")
4650
)
4751

4852

4953

50-
colnames(cvirus_longer) <- c("provincia_estado","pais", "Lat", "Long", "fecha", "casos", "recuperados")
54+
colnames(cvirus_longer) <- c("provincia_estado","pais", "Lat", "Long", "fecha", "casos", "recuperados", "fallecidos")
5155

5256
cvirus_longer$fecha <- as.Date(as.character(cvirus_longer$fecha), format = "%m/%d/%y")
5357

5458
cvirus_longer <- cvirus_longer %>%
5559
mutate(provincia_estado = if_else(is.na(provincia_estado), pais, provincia_estado)) %>%
5660
filter(casos>0)
5761

58-
# mapa con el último dato -----
5962

60-
# mapa con el último dato -----
61-
## sub graphs
63+
# mapa con el último dato
6264

65+
## TODO Create interaactive with days since filter(casos >= input$ncasos)
6366
res <- cvirus_longer %>%
6467
# filter(provincia_estado!= "Diamond Princess") %>%
6568
group_by(pais, fecha) %>%
@@ -68,38 +71,44 @@ res <- cvirus_longer %>%
6871
summarise(
6972
casos = sum(casos),
7073
recuperados = sum(recuperados),
74+
fallecidos = sum(fallecidos),
7175
Lat = first(Lat),
7276
Long = first(Long)
7377
) %>%
7478
mutate(
7579
casos_prev_day = lag(casos, n = 1, default = 0),
7680
casos_nuevos = casos - casos_prev_day,
7781
recuperados_prev_day = lag(recuperados, n = 1, default = 0),
78-
recuperados_nuevos = recuperados - recuperados_prev_day
82+
recuperados_nuevos = recuperados - recuperados_prev_day,
83+
fallecidos_prev_day = lag(fallecidos, n = 1, default = 0),
84+
fallecidos_nuevos = fallecidos - fallecidos_prev_day,
85+
7986
) %>%
80-
filter(casos >= 5) %>%
87+
filter(casos >= 100) %>%
8188
mutate(
8289
casos_nuevos = if_else(casos_nuevos == 0,
8390
lag(casos_nuevos, 1),
8491
casos_nuevos),
85-
dia_since_5 = row_number()
92+
dia_since_100 = row_number()
8693
)
8794

8895

89-
9096
cvirus_map_data <- res %>%
9197
group_by(pais) %>%
9298
filter(fecha == max(fecha)) %>%
9399
mutate(casos = sum(casos),
94-
recuperados = sum(recuperados)) %>%
100+
recuperados = sum(recuperados),
101+
fallecidos = sum(fallecidos)) %>%
95102
ungroup()
96103

104+
## TODO try to change to highcharter and conver to interactive shiny
105+
97106

98107
p_subs <- map(cvirus_map_data$pais, function(pais_select) {
99108
df <- res %>%
100109
filter(pais== pais_select)
101110
p <- df %>%
102-
ggplot( aes(x = dia_since_5, y = casos_nuevos, group = 1))
111+
ggplot( aes(x = dia_since_100, y = casos_nuevos, group = 1))
103112
p +
104113
geom_point(size = rel(1.5)) +
105114
geom_line() +

0 commit comments

Comments
 (0)