Merge pull request #62 from jacksonjude/cnn-counties

CNN Counties
jacksonjude · Nov 21, 2024 · bac5d59 · bac5d59
2 parents 55713c6 + f11dd05
commit bac5d59
Show file tree

Hide file tree

Showing 7 changed files with 388 additions and 219 deletions.
diff --git a/csv-sources/past-president-county.csv b/csv-sources/past-president-county.csv
diff --git a/src/display/control-events.js b/src/display/control-events.js
@@ -737,6 +737,15 @@ async function leftClickRegion(div)
     var baseRegionID = getBaseRegionID($(div).attr('id')).baseID
     currentViewingState = ViewingState.zooming
     currentMapZoomRegion = regionID.includes(subregionSeparator) ? baseRegionID.split(subregionSeparator)[0] : baseRegionID
+
+    if (currentMapType.getID() == USAPresidentMapType.getID() && currentMapZoomRegion.includes("-"))
+    {
+      let stateID = currentMapZoomRegion.split("-")[0]
+      if (stateID == "NE" || stateID == "ME")
+      {
+        currentMapZoomRegion = stateID
+      }
+    }
 
     displayDataMap(null, null, true)
 

diff --git a/src/display/map-display.js b/src/display/map-display.js
@@ -975,7 +975,8 @@ async function displayDataMap(dateIndex, reloadPartyDropdowns, fadeForNewSVG)
 
   updatePoliticalPartyCandidateNames(dateToDisplay.getTime())
   displayPartyTotals(reloadPartyDropdowns)
-
+
+  // console.log(Object.keys(displayRegionDataArray)[0])
   updateTotalsPieChart()
 
   let iconOverlayText = currentMapSource.getIconOverlayText()
@@ -1412,14 +1413,11 @@ async function zoomOutMap(displayMap = true)
   currentViewingState = ViewingState.viewing
   currentMapZoomRegion = null
 
-  const countyResultMapSourceID = "Presidential-Counties"
-  if (showingCompareMap && currentMapType.getID() == USAPresidentMapType.getID() && compareMapSourceIDArray[0] == countyResultMapSourceID && compareMapSourceIDArray[1] == countyResultMapSourceID)
+  if (showingCompareMap && currentMapType.getID() == USAPresidentMapType.getID())
   {
-    const pastResultMapSourceID = "Past-Presidential-Elections"
-    compareMapSourceIDArray = [pastResultMapSourceID, pastResultMapSourceID]
     compareResultCustomMapSource = null
     getCompareMajorParties = null
-    shouldSetCompareMapSource = currentMapSource.isCustom();
+    shouldSetCompareMapSource = currentMapSource.isCustom()
 
     await updateCompareMapSources([true, true], true, false, [$("#firstCompareDataMapDateSlider").val(), $("#secondCompareDataMapDateSlider").val()])
     shouldSetCompareMapSource = true

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.filterMapDataFunction(self.rawMapData, self.mapDates, self.columnMap, self.cycleYear, self.candidateNameToPartyIDMap, self.regionNameToIDMap, self.heldRegionMap, self.shouldFilterOutDuplicateRows, self.isCustomMap, self.voteshareCutoffMargin, !self.isCustomMap || self.editingMode == EditingMode.voteshare)
+    let filterMapDataCallback = self.executeFilter(self.rawMapData, self.mapDates, self)
     self.mapData = filterMapDataCallback.mapData
 
     if (filterMapDataCallback.candidateNameData != null && resetCandidateNames)
@@ -153,6 +153,11 @@ class MapSource
 
     return true
   }
+
+  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)
+  }
 
   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
diff --git a/svg-sources/source-updated-times.json b/svg-sources/source-updated-times.json
@@ -1,5 +1,5 @@
 {
-  "usa-counties-map.svg": 1666250246355,
+  "usa-counties-map.svg": 1732001746274,
   "usa-governor-map.svg": 1666250246355,
   "usa-house-1976-map.svg": 1666250246355,
   "usa-house-1982-map.svg": 1666250246355,

diff --git a/svg-sources/usa-counties-map.svg b/svg-sources/usa-counties-map.svg