@cdc/map 4.26.2 → 4.26.3

package/examples/private/annotation-bug.json

@@ -0,0 +1,642 @@
+{
+  "annotations": [
+    {
+      "text": "Gulf of Mexico",
+      "anchorMode": "fixed",
+      "fontSize": 16,
+      "show": {
+        "desktop": true,
+        "tablet": true,
+        "mobile": true
+      },
+      "markerType": "arrow",
+      "connectorType": "line",
+      "colors": {
+        "label": "black",
+        "connector": "black",
+        "marker": "black"
+      },
+      "selected": true,
+      "anchor": {
+        "vertical": false,
+        "horizontal": false
+      },
+      "connectionType": "elbow",
+      "marker": "arrow",
+      "edit": {
+        "subject": false,
+        "label": true
+      },
+      "seriesKey": "",
+      "x": 595.1254272460938,
+      "y": 416.04144287109375,
+      "dx": 124.95358276367188,
+      "dy": -49.2210693359375,
+      "opacity": "52",
+      "savedDimensions": [
+        1565.9749755859375,
+        889.7625122070312
+      ]
+    },
+    {
+      "text": "test",
+      "anchorMode": "fixed",
+      "fontSize": 16,
+      "show": {
+        "desktop": true,
+        "tablet": true,
+        "mobile": true
+      },
+      "markerType": "arrow",
+      "connectorType": "line",
+      "colors": {
+        "label": "black",
+        "connector": "black",
+        "marker": "black"
+      },
+      "selected": true,
+      "anchor": {
+        "vertical": false,
+        "horizontal": false
+      },
+      "connectionType": "line",
+      "marker": "arrow",
+      "edit": {
+        "subject": true,
+        "label": true
+      },
+      "seriesKey": "",
+      "x": 1124.3250732421875,
+      "y": 638.8250122070312,
+      "dx": 0,
+      "dy": 0,
+      "opacity": "100",
+      "savedDimensions": [
+        2248.650146484375,
+        1277.6500244140625
+      ]
+    }
+  ],
+  "general": {
+    "navigationTarget": "_self",
+    "noDataMessage": "No State Selected",
+    "annotationDropdownText": "Annotations",
+    "geoBorderColor": "darkGray",
+    "headerColor": "theme-blue",
+    "title": "Title",
+    "showTitle": true,
+    "titleStyle": "small",
+    "showSidebar": "hidden",
+    "showDownloadMediaButton": false,
+    "displayAsHex": false,
+    "displayStateLabels": true,
+    "territoriesAlwaysShow": false,
+    "language": "en",
+    "geoType": "us",
+    "geoLabelOverride": "",
+    "hasRegions": false,
+    "fullBorder": false,
+    "type": "data",
+    "convertFipsCodes": true,
+    "palette": {
+      "isReversed": false,
+      "name": "sequential_blue",
+      "version": "1.0",
+      "backups": [
+        {
+          "version": "1.0"
+        },
+        {
+          "name": "sequential_blue",
+          "version": "1.0",
+          "isReversed": false
+        }
+      ]
+    },
+    "allowMapZoom": true,
+    "hideGeoColumnInTooltip": false,
+    "hidePrimaryColumnInTooltip": false,
+    "hideUnselectedStates": true,
+    "statesPicked": [],
+    "expandDataTable": false
+  },
+  "type": "map",
+  "columns": {
+    "geo": {
+      "name": "STATE",
+      "label": "Location",
+      "tooltip": false,
+      "dataTable": true,
+      "displayColumn": ""
+    },
+    "primary": {
+      "dataTable": true,
+      "tooltip": true,
+      "prefix": "",
+      "suffix": "",
+      "name": "Rate",
+      "label": "Rate",
+      "roundToPlace": 0
+    },
+    "navigate": {
+      "name": ""
+    },
+    "latitude": {
+      "name": ""
+    },
+    "longitude": {
+      "name": ""
+    }
+  },
+  "legend": {
+    "descriptions": {},
+    "specialClasses": [],
+    "unified": false,
+    "singleColumn": false,
+    "singleRow": false,
+    "verticalSorted": false,
+    "showSpecialClassesLast": false,
+    "dynamicDescription": false,
+    "type": "equalnumber",
+    "numberOfItems": 5,
+    "position": "top",
+    "title": "",
+    "style": "gradient",
+    "subStyle": "linear blocks",
+    "tickRotation": "",
+    "singleColumnLegend": false,
+    "hideBorder": true,
+    "groupBy": ""
+  },
+  "filters": [],
+  "table": {
+    "wrapColumns": false,
+    "label": "Data Table",
+    "expanded": false,
+    "limitHeight": false,
+    "height": "",
+    "caption": "",
+    "showDownloadUrl": false,
+    "showDataTableLink": true,
+    "showDownloadLinkBelow": true,
+    "showFullGeoNameInCSV": false,
+    "forceDisplay": true,
+    "download": true,
+    "indexLabel": "",
+    "cellMinWidth": "0",
+    "collapsible": true
+  },
+  "tooltips": {
+    "appearanceType": "hover",
+    "linkLabel": "Learn More",
+    "opacity": 90
+  },
+  "runtime": {
+    "editorErrorMessage": []
+  },
+  "visual": {
+    "border": false,
+    "borderColorTheme": false,
+    "accent": false,
+    "background": false,
+    "hideBackgroundColor": false,
+    "tp5Treatment": false,
+    "tp5Background": false,
+    "minBubbleSize": 1,
+    "maxBubbleSize": 20,
+    "extraBubbleBorder": false,
+    "cityStyle": "circle",
+    "cityStyleLabel": "",
+    "showBubbleZeros": false,
+    "additionalCityStyles": [],
+    "geoCodeCircleSize": 8
+  },
+  "mapPosition": {
+    "coordinates": [
+      0,
+      30
+    ],
+    "zoom": 1
+  },
+  "map": {
+    "layers": [],
+    "patterns": []
+  },
+  "hexMap": {
+    "type": "",
+    "shapeGroups": [
+      {
+        "legendTitle": "",
+        "legendDescription": "",
+        "items": [
+          {
+            "key": "",
+            "shape": "Arrow Up",
+            "column": "",
+            "operator": "=",
+            "value": ""
+          }
+        ]
+      }
+    ]
+  },
+  "filterBehavior": "Filter Change",
+  "filterIntro": "",
+  "smallMultiples": {
+    "mode": "",
+    "tileColumn": "",
+    "tilesPerRowDesktop": 2,
+    "tilesPerRowMobile": 1,
+    "tileOrderType": "asc",
+    "tileOrder": [],
+    "tileTitles": {},
+    "synchronizedTooltips": true
+  },
+  "markupVariables": [],
+  "enableMarkupVariables": false,
+  "errors": [],
+  "currentViewport": "lg",
+  "id": 19,
+  "category": "Maps",
+  "label": "United States (State- or County-Level)",
+  "subType": "us",
+  "icon": {
+    "type": {},
+    "key": null,
+    "ref": null,
+    "props": {},
+    "_owner": null
+  },
+  "content": "Present a U.S. choropleth map at state or county level.",
+  "position": "right",
+  "activeVizButtonID": 19,
+  "dataMetadata": {},
+  "dataFileName": "valid-data-map.csv",
+  "dataFileSourceType": "file",
+  "dataDescription": {
+    "horizontal": false,
+    "series": false
+  },
+  "version": "4.26.4",
+  "migrations": {
+    "addColorMigration": true
+  },
+  "locale": "en-US",
+  "data": [
+    {
+      "STATE": "Overall",
+      "Rate": "55",
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov"
+    },
+    {
+      "STATE": "Alabama",
+      "Rate": 130,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Alaska",
+      "Rate": 40,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "American Samoa",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Arizona",
+      "Rate": 57,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Arkansas",
+      "Rate": 60,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "California",
+      "Rate": 30,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Colorado",
+      "Rate": 40,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Connecticut",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Delaware",
+      "Rate": 57,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "DC",
+      "Rate": 60,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Florida",
+      "Rate": 30,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Georgia",
+      "Rate": 40,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Guam",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Hawaii",
+      "Rate": 57,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Idaho",
+      "Rate": 60,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Illinois",
+      "Rate": 30,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Indiana",
+      "Rate": 40,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Iowa",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Kansas",
+      "Rate": 57,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Kentucky",
+      "Rate": 60,
+      "Location": "NA",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Louisiana",
+      "Rate": 30,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Maine",
+      "Rate": 40,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Marshall Islands",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Maryland",
+      "Rate": 57,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Massachusetts",
+      "Rate": 60,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Michigan",
+      "Rate": 12,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Micronesia",
+      "Rate": 65,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Minnesota",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Mississippi",
+      "Rate": 57,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Montana",
+      "Rate": 60,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Montana",
+      "Rate": 30,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Nebraska",
+      "Rate": 40,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Nevada",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "New Hampshire",
+      "Rate": 57,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "New Jersey",
+      "Rate": 60,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "New Mexico",
+      "Rate": 12,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "New York",
+      "Rate": 40,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "North Carolina",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "North Dakota",
+      "Rate": 57,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Northern Mariana Islands",
+      "Rate": 60,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Ohio",
+      "Rate": 88,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Oklahoma",
+      "Rate": 40,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Oregon",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Palau",
+      "Rate": 15,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Pennsylvania",
+      "Rate": 60,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Puerto Rico",
+      "Rate": 30,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Rhode Island",
+      "Rate": 40,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "South Carolina",
+      "Rate": 55,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "South Dakota",
+      "Rate": 86,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Tennessee",
+      "Rate": 60,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Texas",
+      "Rate": 30,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Utah",
+      "Rate": 54,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Vermont",
+      "Rate": 40,
+      "Location": "Home",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Virgin Islands",
+      "Rate": 55,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Virginia",
+      "Rate": 57,
+      "Location": "School",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Washington",
+      "Rate": 62,
+      "Location": "Work",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "West Virginia",
+      "Rate": 25,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    },
+    {
+      "STATE": "Wyoming",
+      "Rate": 43,
+      "Location": "Vehicle",
+      "URL": "https://www.cdc.gov/"
+    }
+  ],
+  "datasets": {}
+}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@cdc/map",
-  "version": "4.26.2",
+  "version": "4.26.3",
   "description": "React component for visualizing tabular data on a map of the United States or the world.",
   "license": "Apache-2.0",
   "bugs": "https://github.com/CDCgov/cdc-open-viz/issues",
   "dependencies": {
-    "@cdc/core": "^4.26.2",
+    "@cdc/core": "^4.26.3",
     "@googlemaps/markerclusterer": "^2.5.3",
     "@hello-pangea/dnd": "^16.2.0",
     "@react-google-maps/api": "^2.20.8",
@@ -42,7 +42,7 @@
     "vite-plugin-svgr": "^4.2.0",
     "whatwg-fetch": "^3.6.20"
   },
-  "gitHead": "be3413e8e1149abf94225108f86a7910f56e0616",
+  "gitHead": "d50e45a074fbefa56cac904917e707d57f237737",
   "main": "dist/cdcmap",
   "moduleName": "CdcMap",
   "peerDependencies": {

package/src/CdcMap.tsx

@@ -58,7 +58,8 @@ const CdcMap: React.FC<CdcMapProps> = ({
       ...configToLoad
     }
     if (newState.dataUrl) {
-      let newData = await fetchRemoteData(newState.dataUrl, 'map')
+      let { data: newData, dataMetadata } = await fetchRemoteData(newState.dataUrl)
+      newState.dataMetadata = dataMetadata
 
       if (newState.vegaConfig) {
         newData = extractCoveData(updateVegaData(newState.vegaConfig, newData))
@@ -79,18 +80,6 @@ const CdcMap: React.FC<CdcMapProps> = ({
       newState.data = transform.developerStandardize(newState.data, newState.dataDescription)
     }
 
-    Object.keys(newState).forEach(key => {
-      if ('object' === typeof newState[key] && false === Array.isArray(newState[key])) {
-        if (initialState[key]) {
-          Object.keys(initialState[key]).forEach(property => {
-            if (undefined === newState[key][property]) {
-              newState[key][property] = initialState[key][property]
-            }
-          })
-        }
-      }
-    })
-
     if (newState.columns.geo.name || newState.columns.geo.fips) {
       addUIDs(newState, newState.columns.geo.name || newState.columns.geo.fips)
     }
@@ -113,7 +102,7 @@ const CdcMap: React.FC<CdcMapProps> = ({
     let _newConfig = cloneConfig(config ?? initialState)
 
     if (configUrl) {
-      _newConfig = await fetchRemoteData(configUrl)
+      _newConfig = await fetch(configUrl).then(r => r.json())
     }
     if ('object' === typeof _newConfig) {
       loadConfig(_newConfig)