Default config updates

uchicago-dsi · Mar 22, 2024 · 937d244 · 937d244
1 parent 6567735
commit 937d244
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/components/Map/Map.tsx b/components/Map/Map.tsx
@@ -96,9 +96,9 @@ export default function MapOuter() {
 
 // Viewport settings
 const INITIAL_VIEW_STATE = {
-  longitude: -122.41669,
-  latitude: 37.7853,
-  zoom: 13,
+  longitude: -98.6,
+  latitude: 39.8283,
+  zoom: 4,
   pitch: 0,
   bearing: 0,
 }
@@ -152,7 +152,7 @@ export const Map = () => {
   const handleSetColumn = (col: string | number) => dispatch(setCurrentColumn(col))
   const handleChangeData = (data: string) => dispatch(setCurrentData(data))
   const handleSetFilter = (filter: string) => dispatch(setCurrentFilter(filter))
-
+  console.log('currentColumnSpec', currentColumnSpec)
   return (
     <div style={{ width: "100vw", height: "100vh", position: "relative", top: 0, left: 0 }}>
       <div style={{ position: "absolute", bottom: "2rem", right: "1rem", zIndex: 1000 }}>
@@ -161,7 +161,7 @@ export const Map = () => {
           {!!(colors.length && breaks.length) &&
             colors.map((_, i) => <BreakText key={i} colors={colors} breaks={breaks} index={i} />)}
           <p style={{ maxWidth: "35ch", fontSize: "0.75rem" }}>
-            <i>Data source: InfoGroup Reference USA. Concentration index (HHI) includes grocery and superstores only.</i>
+            <i>{currentDataSpec?.attribution}</i>
           </p>
         </div>
       </div>
@@ -208,10 +208,11 @@ export const Map = () => {
       </div>
       <Tooltip dataService={ds} />
       <GlMap
-        hash={true}
+        // hash={true}
         mapboxAccessToken={process.env.NEXT_PUBLIC_MAPBOX_TOKEN}
         mapStyle="mapbox://styles/dhalpern/clsb432ya02pi01pf1o813uwa"
         initialViewState={INITIAL_VIEW_STATE}
+        projection={"mercator"}
         // @ts-ignore
         ref={mapRef}
         reuseMaps={true}

diff --git a/utils/data/config.ts b/utils/data/config.ts
@@ -6,7 +6,7 @@ import {
 const years = [2000,2010,2020]
 
 const hhiColumns: Array<ColumnConfig> = years.map(year => ({
-  name: `Concentration Index ${year}`,
+  name: `Concentration Index ${year} (No Dollar Stores)`,
   column: year,
   description: `Herfindahl-Hirschman Index for ${year}`
 }))
@@ -23,7 +23,7 @@ const DollarStoreHhiConfig: DataConfig = {
   id: 'GEOID',
   columns: hhiColumns,
   eager: true,
-  attribution: '',
+  attribution: 'Data source: InfoGroup Reference USA. ACS 2000-2020. Census Centers of Population 2020.',
   colorScheme: 'schemeYlOrRd',
   nBins: 6,
 }
@@ -34,7 +34,7 @@ const GravityNoDollar: DataConfig = {
   id: 'GEOID',
   columns: gravityColumns,
   eager: true,
-  attribution: '',
+  attribution: 'Data source: InfoGroup Reference USA. ACS 2000-2020. Census Centers of Population 2020.',
   colorScheme: 'schemeRdYlGn',
   nBins: 9,
 }
@@ -45,7 +45,7 @@ const GravityDollar: DataConfig = {
   id: 'GEOID',
   columns: gravityColumns,
   eager: true,
-  attribution: '',
+  attribution: 'Data source: InfoGroup Reference USA. ACS 2000-2020. Census Centers of Population 2020.',
   colorScheme: 'schemeRdYlGn',
   nBins: 9,
   // manualBreaks: [
@@ -61,7 +61,7 @@ const GravityDollar: DataConfig = {
 }
 
 export const defaultData = GravityDollar.filename
-
+export const defaultYear = 2020
 export default [
   GravityDollar,
   GravityNoDollar,

diff --git a/utils/hooks/useDataService.ts b/utils/hooks/useDataService.ts
@@ -24,6 +24,7 @@ export const useDataService = () => {
   }
   const currentColumn = useAppSelector((state) => state.map.currentColumn)
   const currentDataSpec = config.find(f => f.filename == currentData)
+
   const currentColumnSpec = currentDataSpec?.columns?.find((f) => f.column === currentColumn)
   const data = ds.data[currentData]
   const isReady = completeData.includes(currentData)

diff --git a/utils/state/map.ts b/utils/state/map.ts
@@ -1,7 +1,7 @@
 "use client"
 import { createSlice } from '@reduxjs/toolkit'
 import type { PayloadAction } from '@reduxjs/toolkit'
-import config, { defaultData } from 'utils/data/config'
+import config, { defaultData, defaultYear } from 'utils/data/config'
 import { DataService } from 'utils/data/service'
 
 export interface MapState {
@@ -20,14 +20,14 @@ export interface MapState {
 }
 
 const initialState: MapState = {
-  year: 2021,
+  year: defaultYear,
   breaks: [0, 1, 2, 3, 4, 5],
   colors: [[
     255, 255, 255, 0
   ]],
   completeData: [],
   currentData: defaultData,
-  currentColumn: 2021,
+  currentColumn: defaultYear,
   tooltip: null,
   idFilter: undefined
 }