@cdc/map 2.6.4 → 9.22.9

package/src/components/SingleStateMap.js

@@ -7,7 +7,7 @@ import { feature, mesh } from "topojson-client";
 import { CustomProjection } from '@visx/geo';
 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';
 
 const abbrs = {
   Alabama: 'AL',
@@ -99,7 +99,8 @@ const SingleStateMap = (props) => {
     supportedTerritories,
     rebuildTooltips,
     runtimeLegend,
-    generateColorsArray
+    generateColorsArray,
+    handleMapAriaLabels
   } = props;
 
 
@@ -290,11 +291,16 @@ const SingleStateMap = (props) => {
     return geosJsx;
   };
 
-
   return (
     <ErrorBoundary component="SingleStateMap">
 		{stateToShow &&
-			<svg viewBox={`0 0 ${WIDTH} ${HEIGHT}`} preserveAspectRatio="xMinYMin" className="svg-container">
+			<svg 
+        viewBox={`0 0 ${WIDTH} ${HEIGHT}`} 
+        preserveAspectRatio="xMinYMin" 
+        className="svg-container" 
+        role="img"
+        aria-label={handleMapAriaLabels(state)}
+      >
 				<rect className="background center-container ocean" width={WIDTH} height={HEIGHT} fillOpacity={1} fill="white"></rect>
 				<CustomProjection 
 					data={ [{states: stateToShow, counties: countiesToShow }] } 

package/src/components/UsaMap.js

@@ -10,6 +10,7 @@ import { AlbersUsa, Mercator } from '@visx/geo';
 import chroma from 'chroma-js';
 import CityList from './CityList';
 import BubbleList from './BubbleList';
+import { supportedCities, supportedStates } from '../data/supported-geos';
 
 const { features: unitedStates } = feature(topoJSON, topoJSON.objects.states)
 const { features: unitedStatesHex } = feature(hexTopoJSON, hexTopoJSON.objects.states)
@@ -70,9 +71,31 @@ const UsaMap = (props) => {
     supportedTerritories,
     rebuildTooltips,
     titleCase,
-    handleCircleClick
+    handleCircleClick,
+    setSharedFilterValue,
+    handleMapAriaLabels
   } = props;
 
+  let isFilterValueSupported = false;
+
+  if(setSharedFilterValue){
+    Object.keys(supportedStates).forEach(supportedState => {
+      if(supportedStates[supportedState].indexOf(setSharedFilterValue.toUpperCase()) !== -1){
+        isFilterValueSupported = true;
+      }
+    });
+    Object.keys(supportedTerritories).forEach(supportedTerritory => {
+      if(supportedTerritories[supportedTerritory].indexOf(setSharedFilterValue.toUpperCase()) !== -1){
+        isFilterValueSupported = true;
+      }
+    });
+    Object.keys(supportedCities).forEach(supportedCity => {
+      if(supportedCity === setSharedFilterValue.toUpperCase()){
+        isFilterValueSupported = true;
+      }
+    });
+  }
+
   // "Choose State" options
   const [extent, setExtent] = useState(null)
   const [focusedStates, setFocusedStates] = useState(unitedStates)
@@ -125,7 +148,7 @@ const UsaMap = (props) => {
 
     if (legendColors) {
       // Use white text if the background is dark, and dark grey if it's light
-      if (chroma.contrast(textColor, legendColors[0]) < 4.5) {
+      if (chroma.contrast(textColor, legendColors[0]) < 3.5) {
         textColor = '#202020';
       }
 
@@ -139,6 +162,8 @@ const UsaMap = (props) => {
       styles = {
         color: textColor,
         fill: legendColors[0],
+        opacity: setSharedFilterValue && isFilterValueSupported && setSharedFilterValue !== territoryData[state.columns.geo.name] ? .5 : 1,
+        stroke: setSharedFilterValue && isFilterValueSupported && setSharedFilterValue === territoryData[state.columns.geo.name] ? 'rgba(0, 0, 0, 1)' : geoStrokeColor,
         cursor: needsPointer ? 'pointer' : 'default',
         '&:hover': {
           fill: legendColors[1],
@@ -155,7 +180,6 @@ const UsaMap = (props) => {
         text={styles.color}
         data-tip={toolTip}
         data-for="tooltip"
-        stroke={geoStrokeColor}
         strokeWidth={1.5}
         onClick={() => geoClickHandler(territory, territoryData)}
       />)
@@ -171,7 +195,7 @@ const UsaMap = (props) => {
       let textColor = "#FFF"
 
       // Dynamic text color
-      if (chroma.contrast(textColor, bgColor) < 4.5 ) {
+      if (chroma.contrast(textColor, bgColor) < 3.5 ) {
         textColor = '#202020';
       }
 
@@ -208,6 +232,25 @@ const UsaMap = (props) => {
   const constructGeoJsx = (geographies, projection) => {
     let showLabel = state.general.displayStateLabels
 
+    // Order alphabetically. Important for accessibility if ever read out loud.
+    geographies.map ( state => {
+      if(!state.feature.properties.iso) return;
+      state.feature.properties.name = titleCase(supportedStates[state.feature.properties.iso][0])
+    })
+
+    geographies.sort( (a,b) => {
+      const first = a.feature.properties.name.toUpperCase(); // ignore upper and lowercase
+      const second = b.feature.properties.name.toUpperCase(); // ignore upper and lowercase
+      if (first < second) {
+        return -1;
+      }
+      if (first > second) {
+        return 1;
+      }
+
+      // names must be equal
+      return 0;
+    })
     const geosJsx = geographies.map(( {feature: geo, path = ''}) => {
       const key = isHex ? geo.properties.iso + '-hex-group' : geo.properties.iso + '-group'
 
@@ -218,6 +261,7 @@ const UsaMap = (props) => {
 
       // Map the name from the geo data with the appropriate key for the processed data
       let geoKey = geo.properties.iso;
+      let geoName = geo.properties.name;
 
       // Manually add Washington D.C. in for Hex maps
 
@@ -240,6 +284,8 @@ const UsaMap = (props) => {
 
         styles = {
           fill: state.general.type !== 'bubble' ? legendColors[0] : '#E6E6E6',
+          opacity: setSharedFilterValue && isFilterValueSupported && setSharedFilterValue !== geoData[state.columns.geo.name] ? .5 : 1,
+          stroke: setSharedFilterValue && isFilterValueSupported && setSharedFilterValue === geoData[state.columns.geo.name] ? 'rgba(0, 0, 0, 1)' : geoStrokeColor,
           cursor: 'default',
           '&:hover': {
             fill: state.general.type !== 'bubble' ? legendColors[1] : '#e6e6e6',
@@ -253,43 +299,43 @@ const UsaMap = (props) => {
         if ((state.columns.navigate && geoData[state.columns.navigate.name]) || state.tooltips.appearanceType === 'click') {
           styles.cursor = 'pointer'
         }
-
         return (
+          <g data-name={geoName} key={key}>
+            <g
+              data-for="tooltip"
+              data-tip={tooltip}
+              className="geo-group"
+              css={styles}
+              onClick={() => geoClickHandler(geoDisplayName, geoData)}
+            >
+              <path
+                tabIndex={-1}
+                className='single-geo'
+                strokeWidth={1.3}   
+                d={path}
+              />
+              {(isHex || showLabel) && geoLabel(geo, legendColors[0], projection)}
+            </g>
+          </g>
+        )
+      }
+
+      // Default return state, just geo with no additional information
+      return (
+        <g data-name={geoName} key={key}>
           <g
-            data-for="tooltip"
-            data-tip={tooltip}
-            key={key}         
             className="geo-group"
             css={styles}
-            onClick={() => geoClickHandler(geoDisplayName, geoData)}
           >
             <path
               tabIndex={-1}
               className='single-geo'
               stroke={geoStrokeColor}
-              strokeWidth={1.3}   
+              strokeWidth={1.3}
               d={path}
             />
-            {(isHex || showLabel) && geoLabel(geo, legendColors[0], projection)}
+            {(isHex || showLabel) && geoLabel(geo, styles.fill, projection)}
           </g>
-        )
-      }
-
-      // Default return state, just geo with no additional information
-      return (
-        <g
-        key={key}
-          className="geo-group"
-          css={styles}
-        >
-          <path
-            tabIndex={-1}
-            className='single-geo'
-            stroke={geoStrokeColor}
-            strokeWidth={1.3}
-            d={path}
-          />
-          {(isHex || showLabel) && geoLabel(geo, styles.fill, projection)}
         </g>
       )
     });
@@ -307,6 +353,8 @@ const UsaMap = (props) => {
       displayGeoName={displayGeoName}
       applyLegendToRow={applyLegendToRow}
       titleCase={titleCase}
+      setSharedFilterValue={setSharedFilterValue}
+      isFilterValueSupported={isFilterValueSupported}
     />)
 
     // Bubbles
@@ -330,7 +378,11 @@ const UsaMap = (props) => {
   
   return (
     <ErrorBoundary component="UsaMap">
-      <svg viewBox="0 0 880 500">
+      <svg 
+        viewBox="0 0 880 500" 
+        role="img" 
+        aria-label={handleMapAriaLabels(state)}
+      >
         {state.general.displayAsHex ?
             (<Mercator data={unitedStatesHex} scale={650} translate={[1600, 775]}>
               {({ features, projection }) => constructGeoJsx(features, projection)}

package/src/components/UsaRegionMap.js

@@ -32,7 +32,8 @@ const UsaRegionMap = (props) => {
     supportedTerritories,
     rebuildTooltips,
     titleCase,
-    handleCircleClick
+    handleCircleClick,
+    handleMapAriaLabels
   } = props;
 
   // "Choose State" options
@@ -299,7 +300,7 @@ const UsaRegionMap = (props) => {
   
   return (
     <ErrorBoundary component="UsaRegionMap">
-      <svg viewBox="0 0 880 500">
+      <svg viewBox="0 0 880 500" role="img" aria-label={handleMapAriaLabels(state)}>
 
         <Mercator data={focusedStates} scale={620} translate={[1500, 735]}>
           {({ features, projection }) => constructGeoJsx(features, projection)}

package/src/components/WorldMap.js

@@ -31,7 +31,8 @@ const WorldMap = (props) => {
     setFilteredCountryCode,
     position,
     setPosition,
-    hasZoom
+    hasZoom,
+    handleMapAriaLabels
   } = props;
 
 // TODO Refactor - state should be set together here to avoid rerenders
@@ -198,7 +199,11 @@ const ZoomControls = ({position, setPosition, state, setState, setRuntimeData, g
   return (
     <ErrorBoundary component="WorldMap">
       {hasZoom ? (
-        <svg viewBox="0 0 880 500">
+        <svg 
+          viewBox="0 0 880 500"
+          role="img"
+          aria-label={handleMapAriaLabels(state)}
+        >
           <rect height={500} width={880} onClick={() => handleReset(state, setState, setRuntimeData, generateRuntimeData)} fill="white"/>
           <ZoomableGroup
             zoom={position.zoom}

package/src/data/initial-state.js

@@ -70,7 +70,8 @@ export default {
   visual: {
     minBubbleSize: 1,
     maxBubbleSize: 20,
-    extraBubbleBorder: false
+    extraBubbleBorder: false,
+    cityStyle: 'circle'
   },
   mapPosition: 
     { coordinates: [0, 30], zoom: 1 }

package/src/data/supported-geos.js

@@ -497,7 +497,12 @@ export const supportedTerritories = {
 };
 
 export const supportedCities = {
+  'GAINESVILLE': [-82.3248, 29.6516],
   'DISTRICT OF COLUMBIA': [-77.036873, 38.907192],
+  'US-DC': [-77.036873, 38.907192],
+  'WASHINGTON D.C.': [-77.036873, 38.907192],
+  'WASHINGTON DC.': [-77.036873, 38.907192],
+  'WASHINGTON DC': [-77.036873, 38.907192],
   'LOS ANGELES COUNTY': [-118.229362, 34.058762],
   MESA: [-111.831474, 33.415184],
   PHOENIX: [-112.074036, 33.448376],

package/src/index.html

@@ -14,24 +14,19 @@
 	</head>
 	<body>
 		<!-- DEFAULT EXAMPLES -->
-		<!-- <div class="react-container react-container--maps" data-config="/examples/default-county.json"></div> -->
-		 <div class="react-container react-container--maps" data-config="/examples/default-usa-regions.json"></div>
-<!--		 <div class="react-container react-container&#45;&#45;maps" data-config="/examples/default-usa.json"></div>-->
+		<div class="react-container react-container--maps" data-config="/examples/default-county.json"></div>
+		 <!-- <div class="react-container react-container--maps" data-config="/examples/default-usa-regions.json"></div> -->
 		<!-- <div class="react-container react-container--maps" data-config="/examples/default-world.json"></div> -->
-		<!-- <div class="react-container react-container--maps" data-config="/examples/private/world.json"></div> -->
 		<!-- <div class="react-container react-container--maps" data-config="/examples/bubble-us.json"></div/> -->
 <!--		<div class="react-container react-container&#45;&#45;maps" data-config="/examples/bubble-world.json"></div>-->
-		<!-- <div class="react-container react-container--maps" data-config="/examples/private/nav-only.json"></div> -->
-		<!-- <div class="react-container react-container--maps" data-config="/examples/private/example-hex-map-with-filter.json"></div> -->
 		<!-- <div class="react-container react-container--maps" data-config="/examples/default-single-state.json"></div> -->
 		
 		<!-- TP4 EXAMPLES -->
 		<!-- <div class="react-container react-container--maps" data-config="/examples/example-city-state.json"></div>  -->
 		<!-- <div class="react-container react-container--maps" data-config="/examples/example-world-map.json"></div>  -->
 		<!-- <div class="react-container react-container--maps" data-config="/examples/default-hex.json"></div>  -->
-		<!-- <div class="react-container react-container--maps" data-config="/examples/private/atsdr.json"></div>  -->
-		
 		
+
 		<noscript>You need to enable JavaScript to run this app.</noscript>
 	</body>
 </html>

package/src/scss/editor-panel.scss

@@ -30,7 +30,8 @@
         fill: currentColor
       }
     }
-    li {
+    button {
+      background: transparent;
       padding: .3em .75em;
       display: flex;
       border: $lightGray 1px solid;
@@ -239,7 +240,6 @@
         display: block;
         text-align: left;
         cursor: pointer;
-        color: rgba(0,0,0,.5);
         text-decoration: underline;
         span {
           text-decoration: none;

package/src/scss/main.scss

@@ -221,4 +221,4 @@
     outline-color: rgb(0, 95, 204)
   }
   
-}
+}

package/src/scss/map.scss

@@ -155,6 +155,9 @@ header + .map-container.full-border {
 			height: 1.75em;
 			width: 1.75em;
 		}
+		&:focus {
+			background: #005eaa;
+		}
 	}
 	> button:first-child {
 		margin-right: 0.25em;
@@ -170,6 +173,7 @@ header + .map-container.full-border {
 			width: 2.5em;
 		}
 	}
+	
 }
 
 @include breakpointClass(md) {

package/src/scss/sidebar.scss

@@ -68,6 +68,7 @@ aside {
       padding: 0;
       display: flex;
       flex-wrap: wrap;
+      button { font-size: unset; background: transparent; }
       li {
         flex-shrink: 0;
         display: inline-block;
@@ -76,7 +77,7 @@ aside {
         vertical-align: middle;
         transition: .1s opacity;
         display: flex;
-        align-items: center;
+        // align-items: center;
         &.single-legend {
           cursor: pointer;
         }