Awaiting county map load if already zooming

jacksonjude · Dec 3, 2024 · 9fd8b16 · 9fd8b16
1 parent e764b7a
commit 9fd8b16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/model/map-source.js b/src/model/map-source.js
@@ -120,7 +120,7 @@ class MapSource
     }
     self.mapDates.sort((mapDate1, mapDate2) => (mapDate1-mapDate2))
 
-    let filterMapDataCallback = self.executeFilter(self.rawMapData, self.mapDates, self)
+    let filterMapDataCallback = await self.executeFilter(self.rawMapData, self.mapDates, self)
     self.mapData = filterMapDataCallback.mapData
 
     if (filterMapDataCallback.candidateNameData != null && resetCandidateNames)
@@ -154,9 +154,9 @@ class MapSource
     return true
   }
 
-  executeFilter(rawData, mapDates, self = this, ...args)
+  async executeFilter(rawData, mapDates, self = this, ...args)
   {
-    return self.filterMapDataFunction(rawData, mapDates, self.columnMap, self.cycleYear, self.candidateNameToPartyIDMap, self.regionNameToIDMap, self.heldRegionMap, self.shouldFilterOutDuplicateRows, self.isCustomMap, self.voteshareCutoffMargin, !self.isCustomMap || self.editingMode == EditingMode.voteshare, ...args)
+    return await self.filterMapDataFunction(rawData, mapDates, self.columnMap, self.cycleYear, self.candidateNameToPartyIDMap, self.regionNameToIDMap, self.heldRegionMap, self.shouldFilterOutDuplicateRows, self.isCustomMap, self.voteshareCutoffMargin, !self.isCustomMap || self.editingMode == EditingMode.voteshare, ...args)
   }
 
   async loadMapCache(self, reloadCache, onlyAttemptLocalFetch)

diff --git a/src/model/map-types/usa-president-map-type.js b/src/model/map-types/usa-president-map-type.js
@@ -1255,7 +1255,7 @@ var USAPresidentMapType = new MapType(
 
       removeLoader(LoaderType.standard)
 
-      const { mapData } = CNNResults2024MapSource.executeFilter(countyZoomData, [date], undefined, true)
+      const { mapData } = await CNNResults2024MapSource.executeFilter(countyZoomData, [date], undefined, true)
       let countyDateData = Object.values(mapData)[0]
 
       if (countyToCityMap[zoomRegion])
@@ -1811,8 +1811,13 @@ var USAPresidentMapType = new MapType(
       null, // heldRegionMap
       false, // shouldFilterOutDuplicateRows
       true, // addDecimalPadding
-      (rawMapData, mapDates, columnMap, _, candidateNameToPartyIDMap, regionNameToID, __, ___, isCustomMap, voteshareCutoffMargin, shouldIncludeVoteshare) => {
-        CountyElectionResultMapSource.loadMap()
+      async (rawMapData, mapDates, columnMap, _, candidateNameToPartyIDMap, regionNameToID, __, ___, isCustomMap, voteshareCutoffMargin, shouldIncludeVoteshare) => {
+        if (currentViewingState == ViewingState.zooming) {
+          await CountyElectionResultMapSource.loadMap()
+        } else {
+          CountyElectionResultMapSource.loadMap()
+        }
+
         return doubleLineVoteshareFilterFunction(rawMapData, mapDates, columnMap, _, candidateNameToPartyIDMap, regionNameToID, __, ___, isCustomMap, voteshareCutoffMargin, shouldIncludeVoteshare)
       }, // organizeMapDataFunction
       null, // viewingDataFunction