@deck.gl/carto 8.7.0-beta.1 → 8.7.0-beta.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.7.0-beta.1",
+  "version": "8.7.0-beta.2",
   "publishConfig": {
     "access": "public"
   },
@@ -35,7 +35,7 @@
     "@loaders.gl/loader-utils": "^3.1.5",
     "@loaders.gl/mvt": "^3.1.5",
     "@loaders.gl/tiles": "^3.1.5",
-    "@math.gl/web-mercator": "^3.5.6",
+    "@math.gl/web-mercator": "^3.5.7",
     "cartocolor": "^4.0.2",
     "d3-array": "^2.8.0",
     "d3-color": "^2.0.0",
@@ -49,5 +49,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.1.5"
   },
-  "gitHead": "0297ca9d2c85d980b075e2af4cfbeb75e31db55a"
+  "gitHead": "a507df6d9a5d9d9bba3a97ac93246b6ed0e5dd43"
 }

package/src/api/layer-map.js

@@ -11,6 +11,7 @@ import {
 } from 'd3-scale';
 import {format as d3Format} from 'd3-format';
 import moment from 'moment-timezone';
+import {log} from '@deck.gl/core';
 import {H3HexagonLayer, MVTLayer} from '@deck.gl/geo-layers';
 import {GeoJsonLayer} from '@deck.gl/layers';
 
@@ -62,37 +63,45 @@ function mergePropMaps(a, b) {
   return {...a, ...b, visConfig: {...a.visConfig, ...b.visConfig}};
 }
 
-export const LAYER_MAP = {
-  point: {
-    Layer: GeoJsonLayer,
-    propMap: mergePropMaps(sharedPropMap, {
-      visConfig: {outline: 'stroked'}
-    }),
-    defaultProps
-  },
-  geojson: {
-    Layer: GeoJsonLayer,
-    propMap: sharedPropMap,
-    defaultProps: {...defaultProps, lineWidthScale: 2}
-  },
-  hexagonId: {
-    Layer: H3HexagonLayer,
-    propMap: mergePropMaps(sharedPropMap, {
-      visConfig: {coverage: 'coverage', elevationScale: 'elevationScale'}
-    }),
-    defaultProps: {...defaultProps, getHexagon: d => d.h3}
-  },
-  mvt: {
-    Layer: MVTLayer,
-    propMap: sharedPropMap,
-    defaultProps: {
-      ...defaultProps,
-      pointRadiusScale: 0.3,
-      lineWidthScale: 2,
-      uniqueIdProperty: 'geoid'
+export function getLayer(type, config) {
+  const hexagonId = config.columns?.hex_id;
+
+  const layer = {
+    point: {
+      Layer: GeoJsonLayer,
+      propMap: mergePropMaps(sharedPropMap, {
+        visConfig: {outline: 'stroked'}
+      }),
+      defaultProps
+    },
+    geojson: {
+      Layer: GeoJsonLayer,
+      propMap: sharedPropMap,
+      defaultProps: {...defaultProps, lineWidthScale: 2}
+    },
+    hexagonId: {
+      Layer: H3HexagonLayer,
+      propMap: mergePropMaps(sharedPropMap, {
+        visConfig: {coverage: 'coverage', elevationScale: 'elevationScale'}
+      }),
+      defaultProps: {...defaultProps, getHexagon: d => d[hexagonId]}
+    },
+    mvt: {
+      Layer: MVTLayer,
+      propMap: sharedPropMap,
+      defaultProps: {
+        ...defaultProps,
+        pointRadiusScale: 0.3,
+        lineWidthScale: 2,
+        uniqueIdProperty: 'geoid'
+      }
     }
-  }
-};
+  }[type];
+
+  log.assert(layer, `Unsupported layer type: ${type}`);
+
+  return layer;
+}
 
 function domainFromAttribute(attribute, scaleType) {
   if (scaleType === 'ordinal' || scaleType === 'point') {

package/src/api/parseMap.js

@@ -1,6 +1,6 @@
 import GL from '@luma.gl/constants';
 import {
-  LAYER_MAP,
+  getLayer,
   getColorAccessor,
   getSizeAccessor,
   getTextAccessor,
@@ -24,9 +24,7 @@ export function parseMap(json) {
     mapStyle,
     layers: extractTextLayers(layers.reverse()).map(({id, type, config, visualChannels}) => {
       try {
-        log.assert(type in LAYER_MAP, `Unsupported layer type: ${type}`);
-        const {Layer, propMap, defaultProps} = LAYER_MAP[type];
-
+        const {Layer, propMap, defaultProps} = getLayer(type, config);
         const {dataId} = config;
         const dataset = datasets.find(d => d.id === dataId);
         log.assert(dataset, `No dataset matching dataId: ${dataId}`);