@deck.gl/carto 8.8.10 → 8.8.11

package/dist/dist.dev.js

@@ -7,7 +7,7 @@
 		exports["deck"] = factory(require("deck"), require("h3"));
 	else
 		root["deck"] = factory(root["deck"], root["h3"]);
-})(window, function(__WEBPACK_EXTERNAL_MODULE__deck_gl_extensions__, __WEBPACK_EXTERNAL_MODULE_h3_js__) {
+})(window, function(__WEBPACK_EXTERNAL_MODULE__deck_gl_core__, __WEBPACK_EXTERNAL_MODULE_h3_js__) {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -13033,7 +13033,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-const VERSION =  true ? "8.8.10" : undefined;
+const VERSION =  true ? "8.8.11" : undefined;
 const isBrowser = Object(_lib_is_browser__WEBPACK_IMPORTED_MODULE_0__["default"])();
 //# sourceMappingURL=globals.js.map
 
@@ -54157,7 +54157,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-const VERSION =  true ? "8.8.10" : undefined;
+const VERSION =  true ? "8.8.11" : undefined;
 const isBrowser = Object(_env_is_browser__WEBPACK_IMPORTED_MODULE_0__["default"])();
 //# sourceMappingURL=globals.js.map
 
@@ -54644,7 +54644,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!******************************!*\
   !*** ./src/api/layer-map.ts ***!
   \******************************/
-/*! exports provided: AGGREGATION, OPACITY_MAP, getLayer, layerFromTileDataset, opacityToAlpha, getColorValueAccessor, getColorAccessor, getSizeAccessor, getTextAccessor, getTextPixelOffsetAccessor, _domainFromValues */
+/*! exports provided: AGGREGATION, OPACITY_MAP, getLayer, layerFromTileDataset, opacityToAlpha, getColorValueAccessor, getColorAccessor, getIconUrlAccessor, getMaxMarkerSize, negateAccessor, getSizeAccessor, getTextAccessor, getTextPixelOffsetAccessor, _domainFromValues */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54656,6 +54656,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "opacityToAlpha", function() { return opacityToAlpha; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getColorValueAccessor", function() { return getColorValueAccessor; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getColorAccessor", function() { return getColorAccessor; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getIconUrlAccessor", function() { return getIconUrlAccessor; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getMaxMarkerSize", function() { return getMaxMarkerSize; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "negateAccessor", function() { return negateAccessor; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSizeAccessor", function() { return getSizeAccessor; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getTextAccessor", function() { return getTextAccessor; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getTextPixelOffsetAccessor", function() { return getTextPixelOffsetAccessor; });
@@ -54666,7 +54669,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var d3_format__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! d3-format */ "../../node_modules/d3-format/src/index.js");
 /* harmony import */ var moment_timezone__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! moment-timezone */ "../../node_modules/moment-timezone/index.js");
 /* harmony import */ var moment_timezone__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(moment_timezone__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @deck.gl/aggregation-layers */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @deck.gl/aggregation-layers */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../layers/carto-tile-layer */ "./src/layers/carto-tile-layer.ts");
 /* harmony import */ var _layers_h3_tile_layer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../layers/h3-tile-layer */ "./src/layers/h3-tile-layer.ts");
@@ -54696,6 +54699,11 @@ const SCALE_FUNCS = {
   sqrt: d3_scale__WEBPACK_IMPORTED_MODULE_2__["scaleSqrt"],
   custom: d3_scale__WEBPACK_IMPORTED_MODULE_2__["scaleThreshold"]
 };
+
+function identity(v) {
+  return v;
+}
+
 const UNKNOWN_COLOR = '#868d91';
 const AGGREGATION = {
   average: 'MEAN',
@@ -54749,6 +54757,12 @@ const sharedPropMap = {
     wireframe: 'wireframe'
   }
 };
+const customMarkersPropsMap = {
+  color: 'getIconColor',
+  visConfig: {
+    radius: 'getIconSize'
+  }
+};
 const aggregationVisConfig = {
   colorAggregation: x => ({
     colorAggregation: AGGREGATION[x] || AGGREGATION.sum
@@ -54778,8 +54792,14 @@ function mergePropMaps(a = {}, b = {}) {
 }
 
 function getLayer(type, config, dataset) {
+  let basePropMap = sharedPropMap;
+
+  if (config.visConfig?.customMarkers && !config.textLabel) {
+    basePropMap = mergePropMaps(sharedPropMap, customMarkersPropsMap);
+  }
+
   if (type === 'mvt' || type === 'tileset' || type === 'h3' || type === 'quadbin') {
-    return getTileLayer(dataset);
+    return getTileLayer(dataset, basePropMap);
   }
 
   const geoColumn = dataset?.geoColumn;
@@ -54852,7 +54872,7 @@ function getLayer(type, config, dataset) {
   const layer = layerTypeDefs[type];
   Object(_utils__WEBPACK_IMPORTED_MODULE_10__["assert"])(layer, `Unsupported layer type: ${type}`);
   return { ...layer,
-    propMap: mergePropMaps(sharedPropMap, layer.propMap),
+    propMap: mergePropMaps(basePropMap, layer.propMap),
     defaultProps: { ...defaultProps,
       ...layer.defaultProps
     }
@@ -54875,7 +54895,7 @@ function layerFromTileDataset(formatTiles = _maps_api_common__WEBPACK_IMPORTED_M
   return _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_6__["default"];
 }
 
-function getTileLayer(dataset) {
+function getTileLayer(dataset, basePropMap) {
   const {
     aggregationExp,
     aggregationResLevel,
@@ -54889,7 +54909,7 @@ function getTileLayer(dataset) {
   const formatTiles = new URL(tileUrl).searchParams.get('formatTiles');
   return {
     Layer: layerFromTileDataset(formatTiles, scheme),
-    propMap: sharedPropMap,
+    propMap: basePropMap,
     defaultProps: { ...defaultProps,
       ...(aggregationExp && {
         aggregationExp
@@ -54924,7 +54944,7 @@ function domainFromAttribute(attribute, scaleType, scaleLength) {
 }
 
 function domainFromValues(values, scaleType) {
-  if (scaleType === 'ordinal') {
+  if (scaleType === 'ordinal' || scaleType === 'point') {
     return Object(d3_array__WEBPACK_IMPORTED_MODULE_0__["groupSort"])(values, g => -g.length, d => d);
   } else if (scaleType === 'quantile') {
     return values.sort((a, b) => a - b);
@@ -55054,12 +55074,71 @@ function getColorAccessor({
 
   return normalizeAccessor(accessor, data);
 }
+const FALLBACK_ICON = 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTAwIDEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCiAgPGNpcmNsZSBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiLz4NCjwvc3ZnPg==';
+function getIconUrlAccessor(field, fallbackUrl, range, maxIconSize, data) {
+  const urlToUnpackedIcon = url => ({
+    id: `${url}@@${maxIconSize}`,
+    url,
+    width: maxIconSize,
+    height: maxIconSize,
+    mask: true
+  });
+
+  let unknownValue = fallbackUrl || FALLBACK_ICON;
+
+  if (range?.othersMarker) {
+    unknownValue = range.othersMarker;
+  }
+
+  const unknownIcon = urlToUnpackedIcon(unknownValue);
+
+  if (!range || !field) {
+    return () => unknownIcon;
+  }
+
+  const mapping = {};
+
+  for (const {
+    value,
+    markerUrl
+  } of range.markerMap) {
+    if (markerUrl) {
+      mapping[value] = urlToUnpackedIcon(markerUrl);
+    }
+  }
+
+  const accessor = properties => {
+    const propertyValue = properties[field.name];
+    return mapping[propertyValue] || unknownIcon;
+  };
+
+  return normalizeAccessor(accessor, data);
+}
+function getMaxMarkerSize(visConfig, visualChannels) {
+  const {
+    radiusRange,
+    radius
+  } = visConfig;
+  const {
+    radiusField,
+    sizeField
+  } = visualChannels;
+  const field = radiusField || sizeField;
+  return Math.ceil(radiusRange && field ? radiusRange[1] : radius);
+}
+function negateAccessor(accessor) {
+  return typeof accessor === 'function' ? (d, i) => -accessor(d, i) : -accessor;
+}
 function getSizeAccessor({
   name
 }, scaleType, aggregation, range, data) {
-  const scale = SCALE_FUNCS[scaleType]();
-  scale.domain(calculateDomain(data, name, scaleType));
-  scale.range(range);
+  const scale = scaleType ? SCALE_FUNCS[scaleType]() : identity;
+
+  if (scaleType) {
+    scale.domain(calculateDomain(data, name, scaleType));
+    scale.range(range);
+  }
+
   let accessorKeys = getAccessorKeys(name, aggregation);
 
   const accessor = properties => {
@@ -55394,7 +55473,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../config */ "./src/config.ts");
 /* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.ts");
 /* harmony import */ var _parseMap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./parseMap */ "./src/api/parseMap.ts");
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
 /**
@@ -56020,7 +56099,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseMap", function() { return parseMap; });
 /* harmony import */ var _luma_gl_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @luma.gl/constants */ "../../node_modules/@luma.gl/constants/dist/esm/index.js");
 /* harmony import */ var _layer_map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./layer-map */ "./src/api/layer-map.ts");
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
 
@@ -56201,6 +56280,8 @@ function createChannelProps(visualChannels, type, config, data) {
   const {
     colorField,
     colorScale,
+    radiusField,
+    radiusScale,
     sizeField,
     sizeScale,
     strokeColorField,
@@ -56242,12 +56323,19 @@ function createChannelProps(visualChannels, type, config, data) {
       colorAggregation: aggregation,
       colorRange: range
     } = visConfig;
-    result.getFillColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(colorField, colorScale, {
+    result.getFillColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(colorField, // @ts-ignore
+    colorScale, {
       aggregation,
       range
     }, visConfig.opacity, data);
   }
 
+  if (radiusField || sizeField) {
+    result.getPointRadius = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])( // @ts-ignore
+    radiusField || sizeField, // @ts-ignore
+    radiusScale || sizeScale, visConfig.sizeAggregation, visConfig.radiusRange || visConfig.sizeRange, data);
+  }
+
   if (strokeColorField) {
     const fallbackOpacity = type === 'point' ? visConfig.opacity : 1;
     const opacity = visConfig.strokeOpacity !== undefined ? visConfig.strokeOpacity : fallbackOpacity;
@@ -56255,18 +56343,17 @@ function createChannelProps(visualChannels, type, config, data) {
       strokeColorAggregation: aggregation,
       strokeColorRange: range
     } = visConfig;
-    result.getLineColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(strokeColorField, strokeColorScale, {
+    result.getLineColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(strokeColorField, // @ts-ignore
+    strokeColorScale, // @ts-ignore
+    {
       aggregation,
       range
     }, opacity, data);
   }
 
   if (heightField) {
-    result.getElevation = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(heightField, heightScale, visConfig.heightAggregation, visConfig.heightRange || visConfig.sizeRange, data);
-  }
-
-  if (sizeField) {
-    result.getPointRadius = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(sizeField, sizeScale, visConfig.sizeAggregation, visConfig.radiusRange || visConfig.sizeRange, data);
+    result.getElevation = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(heightField, // @ts-ignore
+    heightScale, visConfig.heightAggregation, visConfig.heightRange || visConfig.sizeRange, data);
   }
 
   if (textLabelField) {
@@ -56274,6 +56361,40 @@ function createChannelProps(visualChannels, type, config, data) {
     result.pointType = 'text';
     const radius = result.getPointRadius || visConfig.radius;
     result.getTextPixelOffset = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getTextPixelOffsetAccessor"])(textLabel, radius);
+  } else if (visConfig.customMarkers) {
+    const maxIconSize = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getMaxMarkerSize"])(visConfig, visualChannels);
+    const {
+      getPointRadius,
+      getFillColor
+    } = result;
+    result.pointType = 'icon';
+    result.getIcon = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getIconUrlAccessor"])(visualChannels.customMarkersField, visConfig.customMarkersUrl, visConfig.customMarkersRange, maxIconSize, data);
+    result._subLayerProps = {
+      'points-icon': {
+        loadOptions: {
+          image: {
+            type: 'imagebitmap'
+          },
+          imagebitmap: {
+            resizeWidth: maxIconSize,
+            resizeHeight: maxIconSize,
+            resizeQuality: 'high'
+          }
+        }
+      }
+    };
+
+    if (getFillColor) {
+      result.getIconColor = getFillColor;
+    }
+
+    if (getPointRadius) {
+      result.getIconSize = getPointRadius;
+    }
+
+    if (visualChannels.rotationField) {
+      result.getIconAngle = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["negateAccessor"])(Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(visualChannels.rotationField, undefined, null, undefined, data));
+    }
   }
 
   return result;
@@ -56466,7 +56587,7 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CartoLayer; });
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../api */ "./src/api/index.ts");
 /* harmony import */ var _api_layer_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../api/layer-map */ "./src/api/layer-map.ts");
@@ -56731,7 +56852,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CartoTileLayer; });
 /* harmony import */ var _loaders_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @loaders.gl/core */ "../../node_modules/@loaders.gl/core/dist/esm/index.js");
 /* harmony import */ var _schema_carto_vector_tile_loader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./schema/carto-vector-tile-loader */ "./src/layers/schema/carto-vector-tile-loader.ts");
-/* harmony import */ var _deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/extensions */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/extensions */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _loaders_gl_gis__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @loaders.gl/gis */ "../../node_modules/@loaders.gl/gis/dist/esm/index.js");
 /* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../api/maps-api-common */ "./src/api/maps-api-common.ts");
@@ -56845,7 +56966,7 @@ _defineProperty(CartoTileLayer, "defaultProps", defaultProps);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return H3TileLayer; });
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _h3_tileset_2d__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./h3-tileset-2d */ "./src/layers/h3-tileset-2d.ts");
 /* harmony import */ var _spatial_index_tile_layer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./spatial-index-tile-layer */ "./src/layers/spatial-index-tile-layer.ts");
@@ -56964,7 +57085,7 @@ _defineProperty(H3TileLayer, "defaultProps", defaultProps);
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getHexagonResolution", function() { return getHexagonResolution; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return H3Tileset2D; });
-/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var h3_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! h3-js */ "h3-js");
 /* harmony import */ var h3_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(h3_js__WEBPACK_IMPORTED_MODULE_1__);
@@ -57120,7 +57241,7 @@ class H3Tileset2D extends _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__["_Til
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return QuadbinLayer; });
-/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _quadbin_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./quadbin-utils */ "./src/layers/quadbin-utils.ts");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -57167,7 +57288,7 @@ _defineProperty(QuadbinLayer, "defaultProps", defaultProps);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return QuadbinTileLayer; });
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _quadbin_layer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./quadbin-layer */ "./src/layers/quadbin-layer.ts");
 /* harmony import */ var _quadbin_tileset_2d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./quadbin-tileset-2d */ "./src/layers/quadbin-tileset-2d.ts");
@@ -57258,7 +57379,7 @@ _defineProperty(QuadbinTileLayer, "defaultProps", defaultProps);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return QuadbinTileset2D; });
-/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _quadbin_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./quadbin-utils */ "./src/layers/quadbin-utils.ts");
 
@@ -57906,7 +58027,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return SpatialIndexTileLayer; });
 /* harmony import */ var _loaders_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @loaders.gl/core */ "../../node_modules/@loaders.gl/core/dist/esm/index.js");
 /* harmony import */ var _schema_carto_spatial_tile_loader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./schema/carto-spatial-tile-loader */ "./src/layers/schema/carto-spatial-tile-loader.ts");
-/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../api/maps-api-common */ "./src/api/maps-api-common.ts");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -58260,7 +58381,7 @@ function assert(condition, message = '') {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "assert", function() { return assert; });
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/extensions");
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__);
 
 function assert(condition, message) {
@@ -58357,14 +58478,14 @@ function assert(condition, message) {
 
 /***/ }),
 
-/***/ "@deck.gl/extensions":
+/***/ "@deck.gl/core":
 /*!***********************!*\
   !*** external "deck" ***!
   \***********************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = __WEBPACK_EXTERNAL_MODULE__deck_gl_extensions__;
+module.exports = __WEBPACK_EXTERNAL_MODULE__deck_gl_core__;
 
 /***/ }),
 

package/dist/es5/api/layer-map.js

@@ -10,6 +10,9 @@ exports.layerFromTileDataset = layerFromTileDataset;
 exports.opacityToAlpha = opacityToAlpha;
 exports.getColorValueAccessor = getColorValueAccessor;
 exports.getColorAccessor = getColorAccessor;
+exports.getIconUrlAccessor = getIconUrlAccessor;
+exports.getMaxMarkerSize = getMaxMarkerSize;
+exports.negateAccessor = negateAccessor;
 exports.getSizeAccessor = getSizeAccessor;
 exports.getTextAccessor = getTextAccessor;
 exports.getTextPixelOffsetAccessor = getTextPixelOffsetAccessor;
@@ -66,6 +69,11 @@ var SCALE_FUNCS = {
   sqrt: _d3Scale.scaleSqrt,
   custom: _d3Scale.scaleThreshold
 };
+
+function identity(v) {
+  return v;
+}
+
 var UNKNOWN_COLOR = '#868d91';
 var AGGREGATION = {
   average: 'MEAN',
@@ -127,6 +135,12 @@ var sharedPropMap = {
     wireframe: 'wireframe'
   }
 };
+var customMarkersPropsMap = {
+  color: 'getIconColor',
+  visConfig: {
+    radius: 'getIconSize'
+  }
+};
 var aggregationVisConfig = {
   colorAggregation: function colorAggregation(x) {
     return {
@@ -159,10 +173,16 @@ function mergePropMaps() {
 }
 
 function getLayer(type, config, dataset) {
-  var _config$columns;
+  var _config$visConfig, _config$columns;
+
+  var basePropMap = sharedPropMap;
+
+  if ((_config$visConfig = config.visConfig) !== null && _config$visConfig !== void 0 && _config$visConfig.customMarkers && !config.textLabel) {
+    basePropMap = mergePropMaps(sharedPropMap, customMarkersPropsMap);
+  }
 
   if (type === 'mvt' || type === 'tileset' || type === 'h3' || type === 'quadbin') {
-    return getTileLayer(dataset);
+    return getTileLayer(dataset, basePropMap);
   }
 
   var geoColumn = dataset === null || dataset === void 0 ? void 0 : dataset.geoColumn;
@@ -243,7 +263,7 @@ function getLayer(type, config, dataset) {
   var layer = layerTypeDefs[type];
   (0, _utils.assert)(layer, "Unsupported layer type: ".concat(type));
   return _objectSpread(_objectSpread({}, layer), {}, {
-    propMap: mergePropMaps(sharedPropMap, layer.propMap),
+    propMap: mergePropMaps(basePropMap, layer.propMap),
     defaultProps: _objectSpread(_objectSpread({}, defaultProps), layer.defaultProps)
   });
 }
@@ -267,7 +287,7 @@ function layerFromTileDataset() {
   return _cartoTileLayer.default;
 }
 
-function getTileLayer(dataset) {
+function getTileLayer(dataset, basePropMap) {
   var aggregationExp = dataset.aggregationExp,
       aggregationResLevel = dataset.aggregationResLevel,
       _dataset$data = dataset.data,
@@ -278,7 +298,7 @@ function getTileLayer(dataset) {
   var formatTiles = new URL(tileUrl).searchParams.get('formatTiles');
   return {
     Layer: layerFromTileDataset(formatTiles, scheme),
-    propMap: sharedPropMap,
+    propMap: basePropMap,
     defaultProps: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), aggregationExp && {
       aggregationExp: aggregationExp
     }), aggregationResLevel && {
@@ -313,7 +333,7 @@ function domainFromAttribute(attribute, scaleType, scaleLength) {
 }
 
 function domainFromValues(values, scaleType) {
-  if (scaleType === 'ordinal') {
+  if (scaleType === 'ordinal' || scaleType === 'point') {
     return (0, _d3Array.groupSort)(values, function (g) {
       return -g.length;
     }, function (d) {
@@ -472,11 +492,86 @@ function getColorAccessor(_ref4, scaleType, _ref5, opacity, data) {
   return normalizeAccessor(accessor, data);
 }
 
+var FALLBACK_ICON = 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTAwIDEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCiAgPGNpcmNsZSBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiLz4NCjwvc3ZnPg==';
+
+function getIconUrlAccessor(field, fallbackUrl, range, maxIconSize, data) {
+  var urlToUnpackedIcon = function urlToUnpackedIcon(url) {
+    return {
+      id: "".concat(url, "@@").concat(maxIconSize),
+      url: url,
+      width: maxIconSize,
+      height: maxIconSize,
+      mask: true
+    };
+  };
+
+  var unknownValue = fallbackUrl || FALLBACK_ICON;
+
+  if (range !== null && range !== void 0 && range.othersMarker) {
+    unknownValue = range.othersMarker;
+  }
+
+  var unknownIcon = urlToUnpackedIcon(unknownValue);
+
+  if (!range || !field) {
+    return function () {
+      return unknownIcon;
+    };
+  }
+
+  var mapping = {};
+
+  var _iterator2 = _createForOfIteratorHelper(range.markerMap),
+      _step2;
+
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _step2$value = _step2.value,
+          _value = _step2$value.value,
+          markerUrl = _step2$value.markerUrl;
+
+      if (markerUrl) {
+        mapping[_value] = urlToUnpackedIcon(markerUrl);
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+
+  var accessor = function accessor(properties) {
+    var propertyValue = properties[field.name];
+    return mapping[propertyValue] || unknownIcon;
+  };
+
+  return normalizeAccessor(accessor, data);
+}
+
+function getMaxMarkerSize(visConfig, visualChannels) {
+  var radiusRange = visConfig.radiusRange,
+      radius = visConfig.radius;
+  var radiusField = visualChannels.radiusField,
+      sizeField = visualChannels.sizeField;
+  var field = radiusField || sizeField;
+  return Math.ceil(radiusRange && field ? radiusRange[1] : radius);
+}
+
+function negateAccessor(accessor) {
+  return typeof accessor === 'function' ? function (d, i) {
+    return -accessor(d, i);
+  } : -accessor;
+}
+
 function getSizeAccessor(_ref8, scaleType, aggregation, range, data) {
   var name = _ref8.name;
-  var scale = SCALE_FUNCS[scaleType]();
-  scale.domain(calculateDomain(data, name, scaleType));
-  scale.range(range);
+  var scale = scaleType ? SCALE_FUNCS[scaleType]() : identity;
+
+  if (scaleType) {
+    scale.domain(calculateDomain(data, name, scaleType));
+    scale.range(range);
+  }
+
   var accessorKeys = getAccessorKeys(name, aggregation);
 
   var accessor = function accessor(properties) {