From 5cc913d523e81e0f1863dcedd2ab298ec4ffa2e3 Mon Sep 17 00:00:00 2001
From: Nat DeFries <42820733+nmdefries@users.noreply.github.com>
Date: Thu, 14 Oct 2021 16:54:55 -0400
Subject: [PATCH 1/3] drop unused locations upfront

---
 app/server.R | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/server.R b/app/server.R
index 194cf62..842001d 100644
--- a/app/server.R
+++ b/app/server.R
@@ -112,6 +112,10 @@ server <- function(input, output, session) {
   ##################
   summaryPlot <- function(colorSeed = 100, reRenderTruth = FALSE, asOfData = NULL) {
     filteredScoreDf <- filterScoreDf()
+    if (!SUMMARIZING_OVER_ALL_LOCATIONS()) {
+      filteredScoreDf <- filter(filteredScoreDf, geo_value == tolower(input$location))
+    }
+
     dfWithForecasts <- NULL
     if (input$showForecasts) {
       dfWithForecasts <- filteredScoreDf

From 7c470ab23ccd2bad7aa04b68b8fb68cc82a5f0ed Mon Sep 17 00:00:00 2001
From: Nat DeFries <42820733+nmdefries@users.noreply.github.com>
Date: Thu, 14 Oct 2021 17:09:04 -0400
Subject: [PATCH 2/3] ditto for us

---
 app/server.R | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/server.R b/app/server.R
index 842001d..33fc615 100644
--- a/app/server.R
+++ b/app/server.R
@@ -114,6 +114,8 @@ server <- function(input, output, session) {
     filteredScoreDf <- filterScoreDf()
     if (!SUMMARIZING_OVER_ALL_LOCATIONS()) {
       filteredScoreDf <- filter(filteredScoreDf, geo_value == tolower(input$location))
+    } else if (SUMMARIZING_OVER_ALL_LOCATIONS()) {
+      filteredScoreDf <- filteredScoreDf %>% filter(geo_value != "us")
     }
 
     dfWithForecasts <- NULL

From d8f64b531efaa2b2127da0c2c05f167247547d47 Mon Sep 17 00:00:00 2001
From: Nat DeFries <42820733+nmdefries@users.noreply.github.com>
Date: Thu, 14 Oct 2021 17:32:36 -0400
Subject: [PATCH 3/3] move to scores filter func

---
 app/server.R | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/server.R b/app/server.R
index 33fc615..87adb3d 100644
--- a/app/server.R
+++ b/app/server.R
@@ -111,13 +111,7 @@ server <- function(input, output, session) {
   # CREATE MAIN PLOT
   ##################
   summaryPlot <- function(colorSeed = 100, reRenderTruth = FALSE, asOfData = NULL) {
-    filteredScoreDf <- filterScoreDf()
-    if (!SUMMARIZING_OVER_ALL_LOCATIONS()) {
-      filteredScoreDf <- filter(filteredScoreDf, geo_value == tolower(input$location))
-    } else if (SUMMARIZING_OVER_ALL_LOCATIONS()) {
-      filteredScoreDf <- filteredScoreDf %>% filter(geo_value != "us")
-    }
-
+    filteredScoreDf <- filterScoreDf(isolate(SUMMARIZING_OVER_ALL_LOCATIONS()))
     dfWithForecasts <- NULL
     if (input$showForecasts) {
       dfWithForecasts <- filteredScoreDf
@@ -411,8 +405,8 @@ server <- function(input, output, session) {
     summaryPlot()
   })
 
-  # Filter scoring df by inputs chosen (targetVariable, forecasters, aheads)
-  filterScoreDf <- function() {
+  # Filter scoring df by inputs chosen (targetVariable, forecasters, aheads, location)
+  filterScoreDf <- function(summarize_over_all_locations) {
     signalFilter <- CASE_FILTER
     if (input$targetVariable == "Deaths") {
       signalFilter <- DEATH_FILTER
@@ -446,6 +440,13 @@ server <- function(input, output, session) {
       }
     }
     filteredScoreDf <- renameScoreCol(filteredScoreDf, input$scoreType, input$coverageInterval)
+
+    if (!summarize_over_all_locations) {
+      filteredScoreDf <- filter(filteredScoreDf, geo_value == tolower(input$location))
+    } else if (summarize_over_all_locations) {
+      filteredScoreDf <- filteredScoreDf %>% filter(geo_value != "us")
+    }
+
     return(filteredScoreDf)
   }