From c720ba39f529e6c9d3766d54f1ceb9df75decd74 Mon Sep 17 00:00:00 2001
From: Vincent DUPONT <hello@vincentdupont.com>
Date: Fri, 3 Jan 2025 11:57:24 +0100
Subject: [PATCH] Update filters to 2025
---
.DS_Store | Bin 0 -> 8196 bytes
irdmalaria_painel.Rproj | 1 +
modules/server_ui.R | 12 ++++++------
server.R | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 .DS_Store
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2cf51257028026c2fd9dd06d3da54d35242e7bcf
GIT binary patch
literal 8196
zcmeHM%Wl&^6ur}g#!-b7(IT=zvcxuoKnqpHCWLgsf=z>90Vvq9DK3sDit`YPB4rK#
zz%Q`nOZXR7aPG`Ba-38wDxnHys<~%8b6<1(%5{lIw8p`GqAC$N=!}&ehz*U`xv#Y?
zGjjtdU{B9t+4E!R<G8Y>Z6_=PmI2FvWxz6E8Mq1z;GNCQx!}F8SFN-RSO)$}2Kf2l
zqBAxPE;On~2ZSmCfJIEJhOzqT4|I6~*fhA%h#54YO@Z1}m=Z&n%0XyztT&DRLZdb(
zp(4YNi7ZToB23{ST%}H;snJTyfMsBv0j}MP6p%+F@>c8jty8Rh{iT{RT<QgBFZQL3
zdA3aNX-o<A;2<K2QM&4eo<OUfakIg~pQZ!z;o!SJh@*7WX#5ach2pjCl2dYaoVT41
za@rYrqjB2uhOhbP1rqSj$DaQ(3a8!5-cy;3yeJ8W${-3tsJwX<C4ro_<TwdZW!upU
zPT47UE7jTT;NfA--9J2<*WB6BgGS9g*nc#imz|q;?ma%~evJEx{H!P-VV*y9T^}#y
z7mPOS><?5;I>RKE2{X-(cj*)qO30W(x{I@tpvUw{k=vt`>U6e7@Hbdy3BH9BF~m9T
zD_ala2%|0yAR~AT;jvC9I36O_+3M*Mw{zaMp)GNGIgc=>%bU(dE+M8w<T2~!^AtaG
z+Pla_VrS4qc6|BtG4A3hR5|lJ@?4FnuF7o8GInx|i>yu0fpz!@RxQ*8n7xko;GKO(
z$TUO_9GQ35h2#|vUYP4i&JXjP_2ZaKCo12yOcj$^{UUgY)^{YB#jIX|ru?@WU9q=8
z>mRvw%${@i1K$-*u*0~}Xy5;e2P-TCmt~-!9aOpgKfd_;|7F8id&_`j;0iM!itSFj
zg#^!k+vaoSTH8f`ht7@l78;cageu2@svHL{|6z!+3stsh8eC|^44VBAplGndGVoU!
F_zkJNL`MJs
literal 0
HcmV?d00001
diff --git a/irdmalaria_painel.Rproj b/irdmalaria_painel.Rproj
index 8e3c2eb..0208d77 100644
--- a/irdmalaria_painel.Rproj
+++ b/irdmalaria_painel.Rproj
@@ -1,4 +1,5 @@
Version: 1.0
+ProjectId: 58edca30-84e5-40b5-8cf3-868ef2f97eb3
RestoreWorkspace: Default
SaveWorkspace: Default
diff --git a/modules/server_ui.R b/modules/server_ui.R
index d75d441..8b5b8d4 100644
--- a/modules/server_ui.R
+++ b/modules/server_ui.R
@@ -96,7 +96,7 @@ output$tabItems <- renderUI({
box(
title = tr("filter"),
width = 4,
- sliderInput('dates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2024, value = c(2007,2024)),
+ sliderInput('dates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2025, value = c(2007,2025)),
selectInput('new_attack', tr("cases"), ops_new_attack(), selected = TRUE),
selectInput('diagn', tr("plasmodium"), ops_diagn()),
sliderInput('age', tr("age"), min = 0, max = 100, value = c(0,100)),
@@ -142,7 +142,7 @@ output$tabItems <- renderUI({
selectInput('HARLOCtype', tr("type"), ops_location()),
uiOutput('HARLOClocation_fg'),
uiOutput('HARLOClocation_br'),
- sliderInput('HARLOCdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2024, value = c(2010,2024)),
+ sliderInput('HARLOCdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2025, value = c(2010,2025)),
selectInput('HARLOCnew_attack', tr("new_attack"), ops_new_attack(), selected = TRUE),
selectInput('HARLOCdiagn', tr("plasmodium"), ops_diagn()),
sliderInput('HARLOCage', tr("age"), min = 0, max = 100, value = c(0,100)),
@@ -188,7 +188,7 @@ output$tabItems <- renderUI({
top = 100, left = "auto", right = 10, bottom = "auto",
draggable = TRUE,
selectInput('MAPtype', tr("type"), ops_location2(), selected = "residence_area"),
- sliderInput('MAPdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2024, value = c(2007,2024), animate = TRUE),
+ sliderInput('MAPdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2025, value = c(2007,2025), animate = TRUE),
selectInput('MAPdiagn', tr("plasmodium"), ops_diagn()),
checkboxGroupInput('MAPosm', "OSM layers", c("Hospitals", "Clinics"), inline=TRUE),
# checkboxGroupInput('MAPgbif', "GBIF layers", c("Anopheles darlingi", "Anopheles marajoara"), inline=TRUE),
@@ -207,7 +207,7 @@ output$tabItems <- renderUI({
title = tr("filter"),
width = 4,
selectInput('RANKtype', tr("type"), ops_location()),
- sliderInput('RANKdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2024, value = c(2010,2024)),
+ sliderInput('RANKdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2025, value = c(2010,2025)),
selectInput('RANKnew_attack', tr("new_attack"), ops_new_attack(), selected = TRUE),
selectInput('RANKdiagn', tr("plasmodium"), ops_diagn()),
sliderInput('RANKage', tr("age"), min = 0, max = 100, value = c(0,100)),
@@ -227,7 +227,7 @@ output$tabItems <- renderUI({
title = tr("filter"),
width = 4,
selectInput('DOWNtype', tr("type"), ops_location()),
- sliderInput('DOWNdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2024, value = c(2010,2024)),
+ sliderInput('DOWNdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2025, value = c(2010,2025)),
selectInput('DOWNnew_attack', tr("new_attack"), ops_new_attack(), selected = TRUE),
selectInput('DOWNdiagn', tr("plasmodium"), ops_diagn()),
sliderInput('DOWNage', tr("age"), min = 0, max = 100, value = c(0,100)),
@@ -281,7 +281,7 @@ output$tabItems <- renderUI({
selectInput('INFOQtype', tr("type"), ops_location()),
uiOutput('INFOQlocation_fg'),
uiOutput('INFOQlocation_br'),
- sliderInput('INFOQdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2024, value = c(2010,2024)),
+ sliderInput('INFOQdates', tr("dateRange"), sep = "", step = 1, min = 2003, max = 2025, value = c(2010,2025)),
selectInput('INFOQnew_attack', tr("new_attack"), ops_new_attack(), selected = "Any"),
selectInput('INFOQdiagn', tr("plasmodium"), ops_diagn(), selected = "Any"),
selectInput('INFOQsex', tr("sex"), ops_sex())
diff --git a/server.R b/server.R
index 0c7eeab..c63b9b2 100644
--- a/server.R
+++ b/server.R
@@ -14,7 +14,7 @@ library(DT)
library(leaflet)
library(readr)
library(stringr)
-library(rgdal)
+#library(rgdal)
library(sf)
library(osmdata)
--
GitLab