@carto/api-client 0.5.30-alpha.bdcd62f.119 → 0.5.30-alpha.e460f66.121

package/CHANGELOG.md

@@ -2,7 +2,10 @@
 
 ## Unreleased
 
-- feat(sources): expose `_getPointsAggregationLevel` for maps-api dynamic point-tile aggregation parity (#304)
+- feat(fetchMap): Support line & polygon stroke dash styles (#297)
+
+### 0.5.30
+
 - feat(widgetSources): support `featureIds` / `geometryType` request options to filter widget aggregations by a feature selection without relying on the synthetic `_carto_feature_id` column (#294)
 - feat(widgetSources): support `SpatialIndexFilter` (H3/Quadbin cell selection) on `spatialFilter` (#296)
 

package/build/api-client.cjs

@@ -137,7 +137,6 @@ __export(src_exports, {
   _fillInTileStats: () => fillInTileStats,
   _getHexagonResolution: () => _getHexagonResolution,
   _getLog10ScaleSteps: () => getLog10ScaleSteps,
-  _getPointsAggregationLevel: () => getPointsAggregationLevel,
   _getRasterTileLayerStyleProps: () => getRasterTileLayerStyleProps,
   _validateVecExprSyntax: () => validateVecExprSyntax,
   addFilter: () => addFilter,
@@ -176,6 +175,7 @@ __export(src_exports, {
   getIconUrlAccessor: () => getIconUrlAccessor,
   getLayerDescriptor: () => getLayerDescriptor,
   getLayerProps: () => getLayerProps,
+  getLineStyleAccessor: () => getLineStyleAccessor,
   getMaxMarkerSize: () => getMaxMarkerSize,
   getSizeAccessor: () => getSizeAccessor,
   getSorter: () => getSorter,
@@ -10150,6 +10150,19 @@ function getIconUrlAccessor(field, range, {
   };
   return normalizeAccessor(accessor, data);
 }
+function getLineStyleAccessor(field, range, data) {
+  const fallback = range.othersDashArray ?? [0, 0];
+  const mapping = {};
+  for (const { value, dashArray } of range.dashArrayMap) {
+    mapping[value] = dashArray;
+  }
+  const accessor = (properties) => mapping[properties[field.name]] ?? fallback;
+  return {
+    accessor: normalizeAccessor(accessor, data),
+    domain: range.dashArrayMap.map(({ value }) => value),
+    range: range.dashArrayMap.map(({ dashArray }) => dashArray)
+  };
+}
 function getMaxMarkerSize(visConfig, visualChannels) {
   const { radiusRange, radius, sizeMaxPixels } = visConfig;
   const { radiusField, sizeField } = visualChannels;
@@ -10863,6 +10876,10 @@ function createChannelProps(id, layerType, config2, visualChannels, data, datase
   const result = {};
   const updateTriggers = {};
   const scales = {};
+  const isVectorTile = layerType === "mvt" || layerType === "tileset";
+  const geometry = data.tilestats?.layers?.[0]?.geometry;
+  const isLine = geometry === "Line" || geometry === "LineString" || geometry === "MultiLineString";
+  const isPolygon = geometry === "Polygon" || geometry === "MultiPolygon";
   {
     const { colorField, colorScale } = visualChannels;
     const { colorRange } = visConfig;
@@ -11023,6 +11040,43 @@ function createChannelProps(id, layerType, config2, visualChannels, data, datase
       };
     }
   }
+  {
+    const strokeVisible = isLine || isPolygon && Boolean(visConfig.stroked);
+    if (isVectorTile && strokeVisible) {
+      const { lineStyleField, lineStyleScale } = visualChannels;
+      const { lineStyleRange } = visConfig;
+      if (visConfig.lineStyle && visConfig.lineStyle !== "solid") {
+        if (visConfig.lineStyle === "dotted") {
+          result.lineCapRounded = true;
+        }
+        result.lineStyle = visConfig.lineStyle;
+        if (visConfig.dashArray) {
+          result.dashArray = visConfig.dashArray;
+          result.getDashArray = visConfig.dashArray;
+        }
+      }
+      if (lineStyleField && lineStyleScale && lineStyleRange) {
+        const { accessor, ...scaleProps } = getLineStyleAccessor(
+          lineStyleField,
+          lineStyleRange,
+          data
+        );
+        result.getDashArray = accessor;
+        scales.lineStyle = updateTriggers.getDashArray = {
+          field: lineStyleField,
+          type: lineStyleScale,
+          ...scaleProps
+        };
+        const dashArrays = [
+          ...lineStyleRange.dashArrayMap.map(({ dashArray }) => dashArray),
+          ...lineStyleRange.othersDashArray ? [lineStyleRange.othersDashArray] : []
+        ];
+        if (dashArrays.some(([dash]) => dash === 0)) {
+          result.lineCapRounded = true;
+        }
+      }
+    }
+  }
   {
     const { heightField, heightScale } = visualChannels;
     const { enable3d, heightRange } = visConfig;
@@ -11151,9 +11205,7 @@ function createChannelProps(id, layerType, config2, visualChannels, data, datase
     } = secondaryLabel || {};
     result.getText = mainLabel.field && getTextAccessor(mainLabel.field, data);
     const getSecondaryText = secondaryField && getTextAccessor(secondaryField, data);
-    const geometry = data.tilestats?.layers?.[0]?.geometry;
-    const isLineOrPolygon = geometry === "Polygon" || geometry === "MultiPolygon" || geometry === "Line" || geometry === "LineString" || geometry === "MultiLineString";
-    if (isLineOrPolygon && (layerType === "tileset" || layerType === "mvt")) {
+    if ((isLine || isPolygon) && isVectorTile) {
       const uniqueIdProperty = visConfig.textLabelUniqueIdField;
       result.autoLabels = uniqueIdProperty ? { uniqueIdProperty } : true;
       result.pointType = "text";
@@ -11789,20 +11841,6 @@ function _getHexagonResolution(viewport, tileSize) {
     Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS)
   );
 }
-var DYNAMIC_TILES_POINTS_AGGREGATION_LEVEL = 8;
-var AGG_LEVEL_CORRECTION_BY_TILE_RESOLUTION = {
-  0.25: -1,
-  0.5: 0,
-  1: 1,
-  2: 2,
-  4: 3
-};
-function getPointsAggregationLevel({
-  tileResolution,
-  zoomLevel
-}) {
-  return zoomLevel + DYNAMIC_TILES_POINTS_AGGREGATION_LEVEL + AGG_LEVEL_CORRECTION_BY_TILE_RESOLUTION[tileResolution];
-}
 
 // src/utils/CellSet.ts
 init_cjs_shims();
@@ -11900,7 +11938,6 @@ function hashBuckets(initialCount) {
   _fillInTileStats,
   _getHexagonResolution,
   _getLog10ScaleSteps,
-  _getPointsAggregationLevel,
   _getRasterTileLayerStyleProps,
   _validateVecExprSyntax,
   addFilter,
@@ -11939,6 +11976,7 @@ function hashBuckets(initialCount) {
   getIconUrlAccessor,
   getLayerDescriptor,
   getLayerProps,
+  getLineStyleAccessor,
   getMaxMarkerSize,
   getSizeAccessor,
   getSorter,