@cdc/map 2.6.3 → 4.22.10

package/src/components/BubbleList.js

@@ -0,0 +1,244 @@
+import React, {memo, useState, useEffect} from 'react'
+import { scaleLinear } from 'd3-scale';
+import { countryCoordinates } from '../data/country-coordinates';
+import stateCoordinates from '../data/state-coordinates';
+import ReactTooltip from 'react-tooltip'
+
+export const BubbleList = (
+	{
+		data: dataImport,
+		state,
+		projection,
+		applyLegendToRow,
+		applyTooltipsToGeo,
+		handleCircleClick,
+		runtimeData,
+		displayGeoName
+	}) => {
+
+	useEffect(() => {
+		ReactTooltip.hide()
+	}, [runtimeData]);
+
+	const maxDataValue = Math.max(...dataImport.map(d => d[state.columns.primary.name]))
+	const hasBubblesWithZeroOnMap = state.visual.showBubbleZeros ? 0 : 1;
+	// sort runtime data. Smaller bubbles should appear on top.
+	const sortedRuntimeData = Object.values(runtimeData).sort((a, b) => a[state.columns.primary.name] < b[state.columns.primary.name] ? 1 : -1 )
+	if(!sortedRuntimeData) return;
+
+	const clickTolerance = 10;
+
+	// Set bubble sizes
+	var size = scaleLinear()
+		.domain([hasBubblesWithZeroOnMap, maxDataValue])
+		.range([state.visual.minBubbleSize, state.visual.maxBubbleSize])
+
+	// Start looping through the countries to create the bubbles.
+	if(state.general.geoType === 'world') {
+		const countries = sortedRuntimeData && sortedRuntimeData.map( (country, index) => {
+
+			let coordinates = countryCoordinates[country.uid]
+
+			if(!coordinates) return true;
+
+			const countryName = displayGeoName(country[state.columns.geo.name]);
+			const toolTip = applyTooltipsToGeo(countryName, country);
+			const legendColors = applyLegendToRow(country);
+			
+			let primaryKey = state.columns.primary.name
+			if ((Math.floor(Number(size(country[primaryKey]))) === 0 || country[primaryKey] === "") && !state.visual.showBubbleZeros) return;
+
+			let transform = `translate(${projection([coordinates[1], coordinates[0]])})`
+
+			let pointerX, pointerY;
+
+			if( !projection(coordinates) ) return true;
+
+			const circle = (
+				<>
+					<circle
+						key={`circle-${countryName.replace(' ', '')}`}
+						data-tip={toolTip}
+						data-for="tooltip"
+						className={`bubble country--${countryName}`}
+						cx={ Number(projection(coordinates[1], coordinates[0])[0]) || 0  } // || 0 handles error on loads where the data isn't ready
+						cy={ Number(projection(coordinates[1], coordinates[0])[1]) || 0 }
+						r={ Number(size(country[primaryKey])) }
+						fill={legendColors[0] }
+						stroke={legendColors[0]}
+						strokeWidth={1.25}
+						fillOpacity={.4}
+						onPointerDown={(e) => {
+							pointerX = e.clientX; 
+							pointerY = e.clientY;
+						}}
+						onPointerUp={(e) => {
+							if(pointerX && pointerY &&
+								e.clientX > (pointerX - clickTolerance) &&
+								e.clientX < (pointerX + clickTolerance) &&
+								e.clientY > (pointerY - clickTolerance) &&
+								e.clientY < (pointerY + clickTolerance)
+							){ 
+								handleCircleClick(country)
+								pointerX = undefined;
+								pointerY = undefined;
+							}
+						}}
+						transform={transform}
+						style={{ transition: 'all .25s ease-in-out', cursor: "pointer" }}
+					/>
+
+					{state.visual.extraBubbleBorder &&
+						<circle
+							key={`circle-${countryName.replace(' ', '')}`}
+							data-tip={toolTip}
+							data-for="tooltip"
+							className="bubble"
+							cx={ Number(projection(coordinates[1], coordinates[0])[0]) || 0  } // || 0 handles error on loads where the data isn't ready
+							cy={ Number(projection(coordinates[1], coordinates[0])[1]) || 0 }
+							r={ Number(size(country[primaryKey])) + 1 }
+							fill={ "transparent" }
+							stroke={ "white" }
+							strokeWidth={.5}
+							onPointerDown={(e) => {
+								pointerX = e.clientX; 
+								pointerY = e.clientY;
+							}}
+							onPointerUp={(e) => {
+								if(pointerX && pointerY &&
+									e.clientX > (pointerX - clickTolerance) &&
+									e.clientX < (pointerX + clickTolerance) &&
+									e.clientY > (pointerY - clickTolerance) &&
+									e.clientY < (pointerY + clickTolerance)
+								){ 
+									handleCircleClick(country)
+									pointerX = undefined;
+									pointerY = undefined;
+								}
+							}}
+							transform={transform}
+							style={{ transition: 'all .25s ease-in-out', cursor: "pointer" }}
+						/>
+					}
+				</>
+			);
+		
+
+			return (
+				<g key={`group-${countryName.replace(' ', '')}`}>
+					{circle}
+				</g>
+			)
+		})
+		return countries;
+	}
+
+	if(state.general.geoType === 'us') {
+		const bubbles = sortedRuntimeData && sortedRuntimeData.map( (item, index) => {
+			let stateData = stateCoordinates[item.uid]
+			let primaryKey = state?.columns?.primary?.name
+			if ( Number(size(item[primaryKey])) === 0) return;
+
+			if (item[primaryKey] === null) item[primaryKey] = ""
+
+			// Return if hiding zeros on the map
+			if( (Math.floor(Number(size(item[primaryKey]))) === 0 || item[primaryKey] === "" )&& !state.visual.showBubbleZeros ) return;
+
+			if(!stateData) return true;
+			let longitude = Number( stateData.Longitude);
+			let latitude = Number( stateData.Latitude);
+			let coordinates = [longitude, latitude]
+			//console.log('projection', projection([longitude, latitude]))
+			let stateName = stateData.Name;
+			if (!coordinates) return true;
+
+			stateName = displayGeoName(stateName);
+			const toolTip = applyTooltipsToGeo(stateName, item);
+			const legendColors = applyLegendToRow(item);
+
+
+			let transform = `translate(${projection([coordinates[1], coordinates[0]])})`
+
+			if ( !projection(coordinates) ) return true;
+
+			let pointerX, pointerY;
+			const circle = (
+				<>
+					<circle
+						key={`circle-${stateName.replace(' ', '')}`}
+						data-tip={toolTip}
+						data-for="tooltip"
+						className="bubble"
+						cx={projection(coordinates)[0] || 0} // || 0 handles error on loads where the data isn't ready
+						cy={projection(coordinates)[1] || 0}
+						r={Number(size(item[primaryKey]))}
+						fill={legendColors[0]}
+						stroke={legendColors[0]}
+						strokeWidth={1.25}
+						fillOpacity={.4}
+						onPointerDown={(e) => {
+							pointerX = e.clientX;
+							pointerY = e.clientY;
+						}}
+						onPointerUp={(e) => {
+							if (pointerX && pointerY &&
+								e.clientX > (pointerX - clickTolerance) &&
+								e.clientX < (pointerX + clickTolerance) &&
+								e.clientY > (pointerY - clickTolerance) &&
+								e.clientY < (pointerY + clickTolerance)
+							) {
+								handleCircleClick(state)
+								pointerX = undefined;
+								pointerY = undefined;
+							}
+						}}
+						transform={transform}
+						style={{ transition: 'all .25s ease-in-out', cursor: "pointer" }}
+					/>
+					{ state.visual.extraBubbleBorder &&
+						<circle
+						key={`circle-${stateName.replace(' ', '')}`}
+						data-tip={toolTip}
+						data-for="tooltip"
+						className="bubble"
+						cx={ projection(coordinates)[0] || 0 } // || 0 handles error on loads where the data isn't ready
+						cy={ projection(coordinates)[1] || 0 }
+						r={ Number(size(item[primaryKey])) + 1 }
+						fill={"transparent"}
+						stroke={"white"}
+						strokeWidth={.5}
+						fillOpacity={.4}
+						onPointerDown={(e) => {
+							pointerX = e.clientX;
+							pointerY = e.clientY;
+						}}
+						onPointerUp={(e) => {
+							if (pointerX && pointerY &&
+								e.clientX > (pointerX - clickTolerance) &&
+								e.clientX < (pointerX + clickTolerance) &&
+								e.clientY > (pointerY - clickTolerance) &&
+								e.clientY < (pointerY + clickTolerance)
+							) {
+								handleCircleClick(state)
+								pointerX = undefined;
+								pointerY = undefined;
+							}
+						}}
+						transform={transform}
+						style={{ transition: 'all .25s ease-in-out', cursor: "pointer" }}
+						/>
+					}
+				</>
+			);
+
+
+			return (
+				<g key={`group-${stateName.replace(' ', '')}`}>
+					{circle}
+				</g>
+			)
+		})
+		return bubbles;
+	}
+}
+export default BubbleList

package/src/components/CityList.js

@@ -2,6 +2,8 @@ import React, { useState, useEffect, useContext } from 'react';
 /** @jsx jsx */
 import { jsx } from '@emotion/react'
 import { supportedCities } from '../data/supported-geos';
+import { scaleLinear } from 'd3-scale';
+import ReactTooltip from 'react-tooltip';
 
 const CityList = (({
   data,
@@ -11,26 +13,56 @@ const CityList = (({
   displayGeoName,
   applyLegendToRow,
   projection,
-  titleCase
+  titleCase,
+  setSharedFilterValue,
+  isFilterValueSupported,
+  isGeoCodeMap
 }) => {
+
   const [citiesData, setCitiesData] = useState({});
 
   useEffect(() => {
-    const citiesList = Object.keys(data).filter((item) => Object.keys(supportedCities).includes(item));
+    ReactTooltip.rebuild()
+  });
 
-    const citiesDictionary = {};
+  useEffect(() => {
+    if(!isGeoCodeMap) {
+      const citiesList = Object.keys(data).filter((item) => Object.keys(supportedCities).includes(item));
+  
+      const citiesDictionary = {};
+  
+      citiesList.map((city) => citiesDictionary[city] = data[city]);
+  
+      setCitiesData(citiesDictionary);
+    } else {
+      const citiesDictionary = {};
+      state.data.map(city => citiesDictionary[city[state.columns.geo.name]] = city)
+      setCitiesData(citiesDictionary);
+    }
+  }, [data, state.data]);
 
-    citiesList.map((city) => citiesDictionary[city] = data[city]);
+  if (state.general.type === 'bubble') {
+    const maxDataValue = Math.max(...state.data.map(d => d[state.columns.primary.name]))
+    const sortedRuntimeData = Object.values(data).sort((a, b) => a[state.columns.primary.name] < b[state.columns.primary.name] ? 1 : -1)
+    if (!sortedRuntimeData) return;
 
-    setCitiesData(citiesDictionary);
-  }, [data]);
+    // Set bubble sizes
+    var size = scaleLinear()
+      .domain([1, maxDataValue])
+      .range([state.visual.minBubbleSize, state.visual.maxBubbleSize])
 
-  const cityList = Object.keys(citiesData).filter((c) => undefined !== data[c]);
+  }
+  let cityList = isGeoCodeMap ? Object.keys(citiesData).filter((c) => undefined !== c) : Object.keys(citiesData).filter((c) => undefined !== data[c]);
+  if(!cityList) return true;
 
+  // Cities output
   const cities = cityList.map((city, i) => {
-    const cityDisplayName = titleCase( displayGeoName(city) );
 
-    const legendColors = applyLegendToRow(data[city]);
+    const geoData = isGeoCodeMap ? state.data.filter(item => city === item[state.columns.geo.name])[0] : data[city];
+
+    const cityDisplayName = isGeoCodeMap ? city : titleCase( displayGeoName(city) );
+
+    const legendColors = (isGeoCodeMap && geoData) ? applyLegendToRow(geoData) : data[city] ? applyLegendToRow(data[city]) : false;
 
     if (legendColors === false) {
       return true;
@@ -38,8 +70,8 @@ const CityList = (({
 
     const styles = {
       fill: legendColors[0],
-      outline: 0,
-      stroke: 'rgba(0, 0, 0, 0.4)',
+      opacity: setSharedFilterValue && isFilterValueSupported && data[city][state.columns.geo.name] !== setSharedFilterValue ? .5 : 1,
+      stroke: setSharedFilterValue && isFilterValueSupported && data[city][state.columns.geo.name] === setSharedFilterValue ? 'rgba(0, 0, 0, 1)' : 'rgba(0, 0, 0, 0.4)',
       '&:hover': {
         fill: legendColors[1],
         outline: 0
@@ -50,16 +82,20 @@ const CityList = (({
       }
     };
 
-    const geoData = data[city];
+
 
     const toolTip = applyTooltipsToGeo(cityDisplayName, data[city]);
 
     // If we need to add a cursor pointer
-    if ((state.columns.navigate && geoData[state.columns.navigate.name]) || state.tooltips.appearanceType === 'click') {
+    if ((state.columns.navigate && (geoData?.[state.columns.navigate.name] && geoData[state.columns.navigate.name]) ) || state.tooltips.appearanceType === 'click') {
       styles.cursor = 'pointer'
     }
 
-    const radius = state.general.geoType === 'us' ? 8 : 4;
+    const radius = state.general.geoType === 'us' && !isGeoCodeMap ? 8 : isGeoCodeMap ? 2 : 4;
+
+    const additionalProps = {
+      fillOpacity: state.general.type === 'bubble' ? .4 : 1
+    }
 
     const circle = (
       <circle
@@ -67,13 +103,38 @@ const CityList = (({
         data-for="tooltip"
         cx={0}
         cy={0}
-        r={radius}
+        r={ state.general.type === 'bubble' ? size(geoData[state.columns.primary.name]) : radius}
         title="Click for more information"
         onClick={() => geoClickHandler(cityDisplayName, geoData)}
+       {...additionalProps}
       />
     );
 
-    let transform = `translate(${projection(supportedCities[city])})`
+    const pin = (
+      <path 
+        className="marker" 
+        d="M0,0l-8.8-17.7C-12.1-24.3-7.4-32,0-32h0c7.4,0,12.1,7.7,8.8,14.3L0,0z" 
+        title="Click for more information"
+        onClick={() => geoClickHandler(cityDisplayName, geoData)}
+        data-tip={toolTip}
+        data-for="tooltip"
+        strokeWidth={2}
+        stroke={'black'}
+        {...additionalProps}
+        >
+      </path>
+    );
+
+    let transform = '';
+
+    if (!isGeoCodeMap)  {
+      transform = `translate(${projection(supportedCities[city])})`
+    }
+
+    if (isGeoCodeMap) {
+      let coords = [Number(geoData?.[state.columns.longitude.name]), Number(geoData?.[state.columns.latitude.name])]
+      transform = `translate(${projection(coords)})`
+    }
 
     return (
       <g
@@ -82,7 +143,8 @@ const CityList = (({
         css={styles}
         className="geo-point"
       >
-        {circle}
+        {state.visual.cityStyle === 'circle' && circle }
+        {state.visual.cityStyle === 'pin' && pin }
       </g>
     );
   });

package/src/components/CountyMap.js

@@ -1,14 +1,16 @@
 import React, { useState, useEffect, memo, useRef } from 'react';
+import Loading from '@cdc/core/components/Loading';
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import ErrorBoundary from '@cdc/core/components/ErrorBoundary';
 import { geoCentroid, geoPath } from 'd3-geo';
 import { feature, mesh } from 'topojson-client';
 import { CustomProjection } from '@visx/geo';
-import colorPalettes from '../data/color-palettes';
+import colorPalettes from '../../../core/data/colorPalettes'
 import { geoAlbersUsaTerritories } from 'd3-composite-projections';
-import testJSON from '../data/dfc-map.json';
+import testJSON from '../data/county-map.json';
 import { abbrs } from '../data/abbreviations';
+import CityList from './CityList';
 
 const offsets = {
 	Vermont: [50, -8],
@@ -43,31 +45,21 @@ const STATE_INACTIVE_FILL = '#F4F7FA';
 const projection = geoAlbersUsaTerritories().translate([WIDTH / 2, HEIGHT / 2]);
 const path = geoPath().projection(projection);
 const stateLines = path(mesh(testJSON, testJSON.objects.states));
+const countyLines = path(mesh(testJSON, testJSON.objects.counties));
 
-const nudges = {
-	'US-FL': [15, 3],
-	'US-AK': [0, -8],
-	'US-CA': [-10, 0],
-	'US-NY': [5, 0],
-	'US-MI': [13, 20],
-	'US-LA': [-10, -3],
-	'US-HI': [-10, 10],
-	'US-ID': [0, 10],
-	'US-WV': [-2, 2],
-};
 
 function CountyMapChecks(prevState, nextState) {
+	const equalNumberOptIn = prevState.state.general.equalNumberOptIn && nextState.state.general.equalNumberOptIn;
 	const equalColumnName = prevState.state.general.type && nextState.state.general.type;
 	const equalNavColumn = prevState.state.columns.navigate && nextState.state.columns.navigate;
 	const equalLegend = prevState.runtimeLegend === nextState.runtimeLegend;
 	const equalBorderColors = prevState.state.general.geoBorderColor === nextState.state.general.geoBorderColor; // update when geoborder color changes
 	const equalMapColors = prevState.state.color === nextState.state.color; // update when map colors change
 	const equalData = prevState.data === nextState.data; // update when data changes
-	return equalMapColors && equalData && equalBorderColors && equalLegend && equalColumnName && equalNavColumn ? true : false;
+	return equalMapColors && equalData && equalBorderColors && equalLegend && equalColumnName && equalNavColumn && equalNumberOptIn ? true : false;
 }
 
 const CountyMap = (props) => {
-
 	let mapData = states.concat(counties);
 
 	const {
@@ -79,6 +71,10 @@ const CountyMap = (props) => {
 		displayGeoName,
 		rebuildTooltips,
 		containerEl,
+		handleMapAriaLabels,
+		titleCase,
+		setSharedFilterValue,
+		isFilterValueSupported
 	} = props;
 
 	useEffect(() => {
@@ -213,27 +209,42 @@ const CountyMap = (props) => {
 	};
 
 	const onReset = (e) => {
-		e.preventDefault();
-		const svg = document.querySelector('.svg-container')
 
-		svg.setAttribute('data-scaleZoom', 0)
+		if (state.general.type !== 'us-geocode') {
+			e.preventDefault();
+			const svg = document.querySelector('.svg-container') 
 
+			svg.setAttribute('data-scaleZoom', 0)
 
-		const allStates = document.querySelectorAll('.state path');
-		const allCounties = document.querySelectorAll('.county path');
 
-		stateLinesPath.current.setAttribute('stroke', geoStrokeColor);
-		stateLinesPath.current.setAttribute('stroke-width', startingLineWidth);
+			const allStates = document.querySelectorAll('.state path');
+			const allCounties = document.querySelectorAll('.county path');
+
+			stateLinesPath.current.setAttribute('stroke', geoStrokeColor);
+			stateLinesPath.current.setAttribute('stroke-width', startingLineWidth);
 
-		let otherStates = document.querySelectorAll(`.state--inactive`);
-		otherStates.forEach((el) => (el.style.display = 'none'));
-		allCounties.forEach((el) => (el.style.strokeWidth = 0.85));
-		allStates.forEach((state) => state.setAttribute('stroke-width', .75 / .85 ));
+			let otherStates = document.querySelectorAll(`.state--inactive`);
+			otherStates.forEach((el) => (el.style.display = 'none'));
+			allCounties.forEach((el) => (el.style.strokeWidth = 0.85));
+			allStates.forEach((state) => state.setAttribute('stroke-width', .75 / .85));
 
-		mapGroup.current.setAttribute('transform', `translate(${[0, 0]}) scale(${0.85})`);
+			mapGroup.current.setAttribute('transform', `translate(${[0, 0]}) scale(${0.85})`);
 
-		// reset button
-		resetButton.current.style.display = 'none';
+			// reset button
+			resetButton.current.style.display = 'none';
+		} else {
+			const svg = document.querySelector('.svg-container')
+			const allStates = document.querySelectorAll('.state');
+			document.querySelector('#focusedBorder path').style.stroke = 'none';
+			allStates.forEach(item => item.classList.remove('state--inactive'))
+			//document.querySelectorAll('.state path').forEach(item => item.style.fill = 'rgb(244, 247, 250)')
+			document.querySelectorAll('.state').forEach(item => item.style.display = 'block')
+			stateLinesPath.current.setAttribute('stroke', geoStrokeColor);
+			stateLinesPath.current.setAttribute('stroke-width', startingLineWidth);
+			svg.setAttribute('data-scaleZoom', 0)
+			mapGroup.current.setAttribute('transform', `translate(${[0, 0]}) scale(${0.85})`);
+			resetButton.current.style.display = 'none';
+		}
 	};
 
 	function setStateLeave() {
@@ -259,11 +270,11 @@ const CountyMap = (props) => {
 		focusedBorderPath.current.setAttribute('d', focusedStateLine);
 		focusedBorderPath.current.setAttribute('stroke', '#000');
 
-		if(scale) {
-			allStates.forEach( state => state.setAttribute('stroke-width', 0.75 / scale))
-			focusedBorderPath.current.setAttribute('stroke-width', 0.75 / scale );
+		if (scale) {
+			allStates.forEach(state => state.setAttribute('stroke-width', 0.75 / scale))
+			focusedBorderPath.current.setAttribute('stroke-width', 0.75 / scale);
 		}
-		
+
 	}
 
 	const StateLines = memo(({ stateLines, lineWidth, geoStrokeColor }) => {
@@ -422,6 +433,12 @@ const CountyMap = (props) => {
 		return output;
 	});
 
+	const GeoCodeCountyLines = memo(() => {
+		return (
+			<path d={countyLines} className="county-borders" style={{ stroke: geoStrokeColor}} />
+		)
+	})
+
 	const StateOutput = memo(({ geographies, states }) => {
 		let output = [];
 		output.push(
@@ -444,13 +461,25 @@ const CountyMap = (props) => {
 
 				const geoDisplayName = displayGeoName(geoKey);
 
-				let stateStyles = {
-					cursor: 'default',
-					stroke: STATE_BORDER,
-					strokeWidth: 0.75 / scale,
-					display: !focusedState ? 'none' : focusedState && focusedState !== geo.id ? 'block' : 'none',
-					fill: focusedState && focusedState !== geo.id ? STATE_INACTIVE_FILL : 'none',
-				};
+				let stateStyles = {}
+
+				if (state.general.type !== 'us-geocode') {
+					stateStyles = {
+						cursor: 'default',
+						stroke: STATE_BORDER,
+						strokeWidth: 0.75 / scale,
+						display: !focusedState ? 'none' : focusedState && focusedState !== geo.id ? 'block' : 'none',
+						fill: focusedState && focusedState !== geo.id ? STATE_INACTIVE_FILL : 'none',
+					};
+				} else {
+					stateStyles = {
+						cursor: 'default',
+						stroke: STATE_BORDER,
+						strokeWidth: 0.75 / scale,
+						display: 'block',
+						fill: '#f4f7fa',
+					};
+				}
 
 				let stateSelectedStyles = {
 					fillOpacity: 1,
@@ -501,7 +530,14 @@ const CountyMap = (props) => {
 		const states = geographies.slice(0, 56);
 		const counties = geographies.slice(56);
 		let geosJsx = [];
-		geosJsx.push(<CountyOutput geographies={geographies} counties={counties} key="county-key" />);
+		{
+			'us-geocode' !== state.general.type &&
+			geosJsx.push(<CountyOutput geographies={geographies} counties={counties} key="county-key" />);
+		}
+		{
+			'us-geocode' === state.general.type &&
+			geosJsx.push(<GeoCodeCountyLines />);
+		}
 		geosJsx.push(<StateOutput geographies={geographies} states={states} key="state-key" />);
 		geosJsx.push(
 			<StateLines
@@ -512,12 +548,34 @@ const CountyMap = (props) => {
 			/>
 		);
 		geosJsx.push(<FocusedStateBorder key="focused-border-key" />);
+		geosJsx.push(<CityList
+			projection={projection}
+			key="cities"
+			data={data}
+			state={state}
+			geoClickHandler={geoClickHandler}
+			applyTooltipsToGeo={applyTooltipsToGeo}
+			displayGeoName={displayGeoName}
+			applyLegendToRow={applyLegendToRow}
+			titleCase={titleCase}
+			setSharedFilterValue={setSharedFilterValue}
+			isFilterValueSupported={isFilterValueSupported}
+			isGeoCodeMap={state.general.type === 'us-geocode'}
+			/>)
 		return geosJsx;
 	};
-
+	if(!data) <Loading />
 	return (
 		<ErrorBoundary component='CountyMap'>
-			<svg viewBox={`0 0 ${WIDTH} ${HEIGHT}`} preserveAspectRatio='xMinYMin' className='svg-container' data-scale={scale ? scale : ''} data-translate={translate ? translate : ''}>
+			<svg
+				viewBox={`0 0 ${WIDTH} ${HEIGHT}`}
+				preserveAspectRatio='xMinYMin'
+				className='svg-container'
+				data-scale={scale ? scale : ''}
+				data-translate={translate ? translate : ''}
+				role="img"
+				aria-label={handleMapAriaLabels(state)}
+			>
 				<rect
 					className='background center-container ocean'
 					width={WIDTH}
@@ -540,12 +598,14 @@ const CountyMap = (props) => {
 								transform={`translate(${translate}) scale(${scale})`}
 								key='countyMapGroup'
 							>
-								{constructGeoJsx(features, geoAlbersUsaTerritories)}
+								{constructGeoJsx(features, projection)}
 							</g>
 						);
 					}}
 				</CustomProjection>
 			</svg>
+
+			{/* TODO: Refactor to COVE button */}
 			<button className={`btn btn--reset`} onClick={onReset} ref={resetButton} style={{ display: 'none' }} tabIndex="0">
 				Reset Zoom
 			</button>