diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2cf51257028026c2fd9dd06d3da54d35242e7bcf Binary files /dev/null and b/.DS_Store differ diff --git a/irdmalaria_painel.Rproj b/irdmalaria_painel.Rproj index 8e3c2ebc99e2e337f7d69948b93529a437590b27..0208d77f0599075d49eb456ed0aab09f7d1fea36 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 d75d4411529ad8ac4a039743e0dceeb31e6e62fb..8b5b8d4eaddbe53f06f7487f36ddd4b6a8ae7f9d 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 0c7eeabe68df2642b254d1895896f95ca33db7a6..c63b9b2456845105df741544c0fc4f36e59bb23f 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)