Skip to content

Display full names for states and territories #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2021
Merged

Display full names for states and territories #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/global.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ MIN_AVAIL_HOSP_AS_OF_DATE <- as.Date("2020-11-11")
MIN_AVAIL_TERRITORY_AS_OF_DATE <- as.Date("2021-02-10")

TERRITORIES <- c("AS", "GU", "MP", "VI")
STATE_ABB <- c(state.abb, TERRITORIES, "PR", "DC")
STATE_NAME <- c(state.name, "American Samoa", "Guam", "Northern Mariana Islands", "US Virgin Islands", "Puerto Rico", "District of Columbia")

resolveCurrentCasesDeathDay <- function() {
# Get most recent target end date
Expand Down
9 changes: 9 additions & 0 deletions app/server.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,18 @@ updateCoverageChoices <- function(session, df, targetVariable, forecasterChoices
updateLocationChoices <- function(session, df, targetVariable, forecasterChoices, locationInput) {
df <- df %>% filter(forecaster %in% forecasterChoices)
locationChoices <- unique(toupper(df$geo_value))

# Move US to front of list
locationChoices <- locationChoices[c(length(locationChoices), seq_len(length(locationChoices) - 1))]
# Add totaled states option to front of list
locationChoices <- c(TOTAL_LOCATIONS, locationChoices)

# Display full names for subset of locations
longnames <- STATE_NAME[match(locationChoices, STATE_ABB)]
names(locationChoices) <- paste(locationChoices, "-", longnames)
unmatched <- which(is.na(longnames))
names(locationChoices)[unmatched] <- locationChoices[unmatched]

# Ensure previously selected options are still allowed
if (locationInput %in% locationChoices) {
selectedLocation <- locationInput
Expand Down