diff --git a/app/queries.R b/app/queries.R index b548d88..4a78e3a 100644 --- a/app/queries.R +++ b/app/queries.R @@ -360,7 +360,7 @@ get_normalized_metric_growth <- function(storm, full_lf_id) { select(state_fips, county_fips) query <- tbl(con, I("metrics.pop_housing_normalized_growth")) %>% - filter(base_year_population == storm$storm_year) %>% + #filter(base_year_population == storm$storm_year) %>% inner_join(affected_counties, by = c("state_fips", "county_fips")) %>% inner_join( tbl(con, I("public.counties")), diff --git a/app/ui.R b/app/ui.R index 7215902..a71daab 100644 --- a/app/ui.R +++ b/app/ui.R @@ -140,7 +140,6 @@ ui <- page_navbar( ) ), card( - card_header("Meteorology"), dygraphOutput("track_met_chart", height = "250px") ) ) @@ -149,8 +148,8 @@ ui <- page_navbar( ), nav_panel( "Cost Normalization", - layout_columns( - col_widths = 6, + layout_column_wrap( + col_widths = 1, card( "MMH/MMP Normalization", div( @@ -193,8 +192,6 @@ ui <- page_navbar( ) ) ), - card(), - card(), card() ) ), @@ -205,31 +202,6 @@ ui <- page_navbar( layout_columns( col_widths = 12, row_heights = c("auto", "1fr", "auto"), - card( - fill = FALSE, - sliderInput( - "growth_trend_map_slider", - label = NULL, - min = 0, - max = 2024, - step = 1, - animate = list( - interval = 250, - loop = F - ), - value = 0, - sep = "", - width = "100%", - ticks = F - ) - ), - card( - full_screen = TRUE, - card_body( - class = "p-0", - leafletOutput("growth_map", height = "100%") - ) - ), card( fill = FALSE, layout_columns( @@ -247,6 +219,31 @@ ui <- page_navbar( justified = T ) ), + ), + card( + full_screen = TRUE, + card_body( + class = "p-0", + leafletOutput("growth_map", height = "100%") + ) + ), + card( + fill = FALSE, + sliderInput( + "growth_trend_map_slider", + label = NULL, + min = 0, + max = 2024, + step = 1, + animate = list( + interval = 250, + loop = F + ), + value = 0, + sep = "", + width = "100%", + ticks = F + ) ) ) )