@deck.gl/carto 9.0.37 → 9.0.40

package/dist/layers/post-process-utils.d.ts

@@ -1,4 +1,4 @@
-import { CompositeLayer, Layer, LayersList } from '@deck.gl/core';
+import { _ConstructorOf, CompositeLayer, Layer, LayersList } from '@deck.gl/core';
 type Constructor<T> = (new (...args: any[]) => T) & {
     layerName: string;
 };
@@ -10,18 +10,23 @@ type DrawableCompositeLayer = CompositeLayer & {
  * Resulting layer must be used as a sublayer of a layer created
  * with `PostProcessModifier`
  */
-export declare function RTTModifier(BaseLayer: any): {
-    new (): {
-        [x: string]: any;
-        draw(this: any, opts: any): void;
-    };
-    [x: string]: any;
-    layerName: string;
-};
+export declare function RTTModifier<T extends _ConstructorOf<Layer>>(BaseLayer: T): T;
 /**
  * Modifier that returns the a modified Layer, which applies a
  * postprocess effect to all subLayers created using `RTTModifier`
  */
 export declare function PostProcessModifier<T extends Constructor<DrawableCompositeLayer>>(BaseLayer: T, effect: any): T;
+/**
+ * Copy
+ * Simple module that just copies input color to output
+ */
+export declare const copy: {
+    readonly name: "copy";
+    readonly fs: "vec4 copy_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {\n  return color;\n}\n";
+    readonly getUniforms: () => {};
+    readonly passes: [{
+        readonly filter: true;
+    }];
+};
 export {};
 //# sourceMappingURL=post-process-utils.d.ts.map

package/dist/layers/post-process-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post-process-utils.d.ts","sourceRoot":"","sources":["../../src/layers/post-process-utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,KAAK,EAGL,UAAU,EAGX,MAAM,eAAe,CAAC;AAoBvB,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAAC;AACxE,KAAK,sBAAsB,GAAG,cAAc,GAAG;IAC7C,YAAY,IAAI,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC;CAC/C,CAAC;AAwBF;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,SAAS,KAAA;;;8BAIN,GAAG;;;;EAiBjC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,WAAW,CAAC,sBAAsB,CAAC,EAC/E,SAAS,EAAE,CAAC,EACZ,MAAM,EAAE,GAAG,GACV,CAAC,CAwFH"}
+{"version":3,"file":"post-process-utils.d.ts","sourceRoot":"","sources":["../../src/layers/post-process-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,cAAc,EACd,KAAK,EAGL,UAAU,EAGX,MAAM,eAAe,CAAC;AAoBvB,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAAC;AACxE,KAAK,sBAAsB,GAAG,cAAc,GAAG;IAC7C,YAAY,IAAI,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC;CAC/C,CAAC;AAwBF;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,cAAc,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,CAuB5E;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,WAAW,CAAC,sBAAsB,CAAC,EAC/E,SAAS,EAAE,CAAC,EACZ,MAAM,EAAE,GAAG,GACV,CAAC,CAgGH;AAQD;;;GAGG;AACH,eAAO,MAAM,IAAI;;;;;;;CAKkB,CAAC"}

package/dist/layers/post-process-utils.js

@@ -34,6 +34,7 @@ DrawCallbackLayer.layerName = 'DrawCallbackLayer';
  */
 export function RTTModifier(BaseLayer) {
     var _a;
+    // @ts-expect-error initializeState is abstract
     return _a = class RTTLayer extends BaseLayer {
             draw(opts) {
                 const { moduleParameters } = opts;
@@ -49,6 +50,7 @@ export function RTTModifier(BaseLayer) {
                 }
             }
         },
+        // @ts-expect-error typescript doesn't see static property
         _a.layerName = `RTT-${BaseLayer.layerName}`,
         _a;
 }
@@ -128,7 +130,29 @@ export function PostProcessModifier(BaseLayer, effect) {
                 });
                 this.internalState.renderInProgress = false;
             }
+            _finalize() {
+                this.internalState.renderBuffers.forEach((fbo) => {
+                    fbo.destroy();
+                });
+                this.internalState.renderBuffers = null;
+                this.internalState.postProcess.cleanup();
+            }
         },
         _a.layerName = `PostProcess${BaseLayer.layerName}`,
         _a;
 }
+const fs = /* glsl */ `\
+vec4 copy_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+  return color;
+}
+`;
+/**
+ * Copy
+ * Simple module that just copies input color to output
+ */
+export const copy = {
+    name: 'copy',
+    fs,
+    getUniforms: () => ({}),
+    passes: [{ filter: true }]
+};

package/dist/layers/raster-layer-vertex.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin float instanceElevations;\nin vec4 instanceFillColors;\nin vec4 instanceLineColors;\n\nin vec3 instancePickingColors;\n\n// Custom uniforms\nuniform float opacity;\nuniform bool extruded;\nuniform bool stroked;\nuniform bool isStroke;\nuniform float coverage;\nuniform float elevationScale;\nuniform float widthScale;\nuniform vec3 offset;\n\n// Result\nout vec4 vColor;\n#ifdef FLAT_SHADING\nout vec4 position_commonspace;\n#endif\n\nvoid main(void) {\n  // Rather than positioning using attribute, layout pixel grid using gl_InstanceID\n  vec2 common_position = offset.xy;\n  float scale = offset.z;\n\n  int yIndex = - (gl_InstanceID / BLOCK_WIDTH);\n  int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);\n  common_position += scale * vec2(float(xIndex), float(yIndex - 1));\n\n  vec4 color = isStroke ? instanceLineColors : instanceFillColors;\n\n  // if alpha == 0.0 or z < 0.0, do not render element\n  float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);\n  float cellWidth = coverage * scale;\n\n  // Get position directly from quadbin, rather than projecting\n  // Important to set geometry.position before using project_ methods below\n  // as geometry.worldPosition is not set (we don't know our lat/long)\n  geometry.position = vec4(common_position, 0.0, 1.0);\n  if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {\n    geometry.position.xyz -= project_uCommonOrigin;\n  }\n\n  // calculate elevation, if 3d not enabled set to 0\n  // cylindar geometry height are between -1.0 to 1.0, transform it to between 0, 1\n  float elevation = 0.0;\n  // calculate stroke offset\n  float strokeOffsetRatio = 1.0;\n\n  if (extruded) {\n    elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;\n  } else if (stroked) {\n    float halfOffset = project_pixel_size(widthScale) / cellWidth;\n    if (isStroke) {\n      strokeOffsetRatio -= sign(positions.z) * halfOffset;\n    } else {\n      strokeOffsetRatio -= halfOffset;\n    }\n  }\n\n  geometry.pickingColor = instancePickingColors;\n\n  // project center of column\n  vec2 offset = (vec2(0.5) + positions.xy * strokeOffsetRatio) * cellWidth * shouldRender;\n  vec3 pos = vec3(offset, project_size(elevation));\n  DECKGL_FILTER_SIZE(pos, geometry);\n\n  geometry.position.xyz += pos;\n  gl_Position = project_common_position_to_clipspace(geometry.position);\n\n  geometry.normal = project_normal(normals);\n  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n  // Light calculations\n  if (extruded && !isStroke) {\n#ifdef FLAT_SHADING\n    position_commonspace = geometry.position;\n    vColor = vec4(color.rgb, color.a * opacity);\n#else\n    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);\n    vColor = vec4(lightColor, color.a * opacity);\n#endif\n  } else {\n    vColor = vec4(color.rgb, color.a * opacity);\n  }\n\n  DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin float instanceElevations;\nin vec4 instanceFillColors;\nin vec4 instanceLineColors;\n\nin vec3 instancePickingColors;\n\n// Custom uniforms\nuniform float opacity;\nuniform bool extruded;\nuniform bool stroked;\nuniform bool isStroke;\nuniform float coverage;\nuniform float elevationScale;\nuniform float widthScale;\nuniform vec3 offset;\n\n// Result\nout vec4 vColor;\n#ifdef FLAT_SHADING\nout vec4 position_commonspace;\n#endif\n\nvoid main(void) {\n  // Rather than positioning using attribute, layout pixel grid using gl_InstanceID\n  vec2 tileOrigin = offset.xy;\n  float scale = offset.z;\n\n  int yIndex = - (gl_InstanceID / BLOCK_WIDTH);\n  int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);\n\n  // Avoid precision issues by applying 0.5 offset here, rather than when laying out vertices\n  vec2 cellCenter = scale * vec2(float(xIndex) + 0.5, float(yIndex) - 0.5);\n\n  vec4 color = isStroke ? instanceLineColors : instanceFillColors;\n\n  // if alpha == 0.0 or z < 0.0, do not render element\n  float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);\n  float cellWidth = coverage * scale;\n\n  // Get position directly from quadbin, rather than projecting\n  // Important to set geometry.position before using project_ methods below\n  // as geometry.worldPosition is not set (we don't know our lat/long)\n  geometry.position = vec4(tileOrigin + cellCenter, 0.0, 1.0);\n  if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {\n    geometry.position.xyz -= project_uCommonOrigin;\n  }\n\n  // calculate elevation, if 3d not enabled set to 0\n  // cylindar geometry height are between -1.0 to 1.0, transform it to between 0, 1\n  float elevation = 0.0;\n  // calculate stroke offset\n  float strokeOffsetRatio = 1.0;\n\n  if (extruded) {\n    elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;\n  } else if (stroked) {\n    float halfOffset = project_pixel_size(widthScale) / cellWidth;\n    if (isStroke) {\n      strokeOffsetRatio -= sign(positions.z) * halfOffset;\n    } else {\n      strokeOffsetRatio -= halfOffset;\n    }\n  }\n\n  geometry.pickingColor = instancePickingColors;\n\n  // Cell coordinates centered on origin\n  vec2 base = positions.xy * scale * strokeOffsetRatio * coverage * shouldRender;\n  vec3 cell = vec3(base, project_size(elevation));\n  DECKGL_FILTER_SIZE(cell, geometry);\n\n  geometry.position.xyz += cell;\n  gl_Position = project_common_position_to_clipspace(geometry.position);\n\n  geometry.normal = project_normal(normals);\n  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n  // Light calculations\n  if (extruded && !isStroke) {\n#ifdef FLAT_SHADING\n    position_commonspace = geometry.position;\n    vColor = vec4(color.rgb, color.a * opacity);\n#else\n    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);\n    vColor = vec4(lightColor, color.a * opacity);\n#endif\n  } else {\n    vColor = vec4(color.rgb, color.a * opacity);\n  }\n\n  DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
 export default _default;
 //# sourceMappingURL=raster-layer-vertex.glsl.d.ts.map

package/dist/layers/raster-layer-vertex.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raster-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/layers/raster-layer-vertex.glsl.ts"],"names":[],"mappings":";AAAA,wBAiGE"}
+{"version":3,"file":"raster-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/layers/raster-layer-vertex.glsl.ts"],"names":[],"mappings":";AAAA,wBAmGE"}

package/dist/layers/raster-layer-vertex.glsl.js

@@ -20,15 +20,15 @@ out vec4 vColor;
 out vec4 position_commonspace;
 #endif
 void main(void) {
-vec2 common_position = offset.xy;
+vec2 tileOrigin = offset.xy;
 float scale = offset.z;
 int yIndex = - (gl_InstanceID / BLOCK_WIDTH);
 int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);
-common_position += scale * vec2(float(xIndex), float(yIndex - 1));
+vec2 cellCenter = scale * vec2(float(xIndex) + 0.5, float(yIndex) - 0.5);
 vec4 color = isStroke ? instanceLineColors : instanceFillColors;
 float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);
 float cellWidth = coverage * scale;
-geometry.position = vec4(common_position, 0.0, 1.0);
+geometry.position = vec4(tileOrigin + cellCenter, 0.0, 1.0);
 if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
 geometry.position.xyz -= project_uCommonOrigin;
 }
@@ -45,10 +45,10 @@ strokeOffsetRatio -= halfOffset;
 }
 }
 geometry.pickingColor = instancePickingColors;
-vec2 offset = (vec2(0.5) + positions.xy * strokeOffsetRatio) * cellWidth * shouldRender;
-vec3 pos = vec3(offset, project_size(elevation));
-DECKGL_FILTER_SIZE(pos, geometry);
-geometry.position.xyz += pos;
+vec2 base = positions.xy * scale * strokeOffsetRatio * coverage * shouldRender;
+vec3 cell = vec3(base, project_size(elevation));
+DECKGL_FILTER_SIZE(cell, geometry);
+geometry.position.xyz += cell;
 gl_Position = project_common_position_to_clipspace(geometry.position);
 geometry.normal = project_normal(normals);
 DECKGL_FILTER_GL_POSITION(gl_Position, geometry);

package/dist/layers/raster-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raster-layer.d.ts","sourceRoot":"","sources":["../../src/layers/raster-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAc,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAyD9D,+CAA+C;AAC/C,MAAM,MAAM,gBAAgB,CAAC,KAAK,GAAG,OAAO,IAAI,iBAAiB,GAC/D,gBAAgB,CAAC,KAAK,CAAC,GACvB,mBAAmB,CAAC;AAEtB,uCAAuC;AACvC,KAAK,iBAAiB,GAAG;IACvB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAYF,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,cAAc,CACnF,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAC/C;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,0CAAgB;IAEnC,KAAK,EAAG;QACN,sBAAsB,EAAE,MAAM,CAAC;QAC/B,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;IAEF,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IA4CzC,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC;IAetF,cAAc,CAAC,MAAM,EAAE,GAAG;;;;;;;;;;;;;;;IAa1B,oBAAoB,CAAC,IAAI,EAAE,WAAW;CAoBvC"}
+{"version":3,"file":"raster-layer.d.ts","sourceRoot":"","sources":["../../src/layers/raster-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAc,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AA2D9D,+CAA+C;AAC/C,MAAM,MAAM,gBAAgB,CAAC,KAAK,GAAG,OAAO,IAAI,iBAAiB,GAC/D,gBAAgB,CAAC,KAAK,CAAC,GACvB,mBAAmB,CAAC;AAEtB,uCAAuC;AACvC,KAAK,iBAAiB,GAAG;IACvB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAYF,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,cAAc,CACnF,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAC/C;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,0CAAgB;IAEnC,KAAK,EAAG;QACN,sBAAsB,EAAE,MAAM,CAAC;QAC/B,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;IAEF,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAuDzC,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC;IAetF,cAAc,CAAC,MAAM,EAAE,GAAG;;;;;;;;;;;;;;;IAa1B,oBAAoB,CAAC,IAAI,EAAE,WAAW;CAoBvC"}

package/dist/layers/raster-layer.js

@@ -3,6 +3,7 @@ import { ColumnLayer } from '@deck.gl/layers';
 import { quadbinToOffset } from "./quadbin-utils.js";
 import vs from "./raster-layer-vertex.glsl.js";
 import { createBinaryProxy } from "../utils.js";
+import { RTTModifier } from "./post-process-utils.js";
 const defaultProps = {
     ...ColumnLayer.defaultProps,
     extruded: false,
@@ -15,7 +16,8 @@ const defaultProps = {
     ]
 };
 // Modified ColumnLayer with custom vertex shader
-class RasterColumnLayer extends ColumnLayer {
+// Use RTT to avoid inter-tile seams
+class RasterColumnLayer extends RTTModifier(ColumnLayer) {
     getShaders() {
         const shaders = super.getShaders();
         const data = this.props.data;
@@ -81,7 +83,17 @@ class RasterLayer extends CompositeLayer {
             dataComparator: wrappedDataComparator,
             offset,
             highlightedObjectIndex,
-            highlightColor
+            highlightColor,
+            // RTT requires blending otherwise opacity < 1 blends with black
+            // render target
+            parameters: {
+                blendColorSrcFactor: 'one',
+                blendAlphaSrcFactor: 'one',
+                blendColorDstFactor: 'zero',
+                blendAlphaDstFactor: 'zero',
+                blendColorOperation: 'add',
+                blendAlphaOperation: 'add'
+            }
         });
     }
     getSubLayerAccessor(accessor) {

package/dist/layers/raster-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/raster-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,WAAW,EAAE,EAAC,gBAAgB,EAAC,0BAAuB;AAE7D,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAGrD,OAAO,EAAY,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAE9D,eAAO,MAAM,eAAe;;SAI3B,CAAC;AAOF,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,mBAAmB,CAAC;AAEtB,2CAA2C;AAC3C,KAAK,qBAAqB,CAAC,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACvE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG;IACpC,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,cAAc,IAAI,GAAG;IAOrB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAiB1C"}
+{"version":3,"file":"raster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/raster-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EAEZ,KAAK,EACL,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,WAAW,EAAE,EAAC,gBAAgB,EAAC,0BAAuB;AAE7D,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAGrD,OAAO,EAAY,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAG9D,eAAO,MAAM,eAAe;;SAI3B,CAAC;AAQF,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,mBAAmB,CAAC;AAEtB,2CAA2C;AAC3C,KAAK,qBAAqB,CAAC,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACvE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG;IACpC,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAYJ,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,cAAc,IAAI,GAAG;IAOrB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAoB1C"}

package/dist/layers/raster-tile-layer.js

@@ -4,6 +4,7 @@ import QuadbinTileset2D from "./quadbin-tileset-2d.js";
 import { injectAccessToken, TilejsonPropType } from "./utils.js";
 import { DEFAULT_TILE_SIZE } from "../constants.js";
 import { TileLayer } from '@deck.gl/geo-layers';
+import { copy, PostProcessModifier } from "./post-process-utils.js";
 export const renderSubLayers = props => {
     const tileIndex = props.tile?.index?.q;
     if (!tileIndex)
@@ -12,8 +13,18 @@ export const renderSubLayers = props => {
 };
 const defaultProps = {
     data: TilejsonPropType,
+    refinementStrategy: 'no-overlap',
     tileSize: DEFAULT_TILE_SIZE
 };
+class PostProcessTileLayer extends PostProcessModifier(TileLayer, copy) {
+    filterSubLayer(context) {
+        // Handle DrawCallbackLayer
+        const { tile } = context.layer.props;
+        if (!tile)
+            return true;
+        return super.filterSubLayer(context);
+    }
+}
 class RasterTileLayer extends CompositeLayer {
     getLoadOptions() {
         const loadOptions = super.getLoadOptions() || {};
@@ -25,8 +36,8 @@ class RasterTileLayer extends CompositeLayer {
         const tileJSON = this.props.data;
         if (!tileJSON)
             return null;
-        const { tiles: data, minzoom: minZoom, maxzoom: maxZoom } = tileJSON;
-        const SubLayerClass = this.getSubLayerClass('tile', TileLayer);
+        const { tiles: data, minzoom: minZoom, maxzoom: maxZoom, raster_metadata: metadata } = tileJSON;
+        const SubLayerClass = this.getSubLayerClass('tile', PostProcessTileLayer);
         return new SubLayerClass(this.props, {
             id: `raster-tile-layer-${this.props.id}`,
             data,
@@ -35,7 +46,10 @@ class RasterTileLayer extends CompositeLayer {
             renderSubLayers,
             minZoom,
             maxZoom,
-            loadOptions: this.getLoadOptions()
+            loadOptions: {
+                cartoRasterTile: { metadata },
+                ...this.getLoadOptions()
+            }
         });
     }
 }

package/dist/layers/schema/carto-properties-tile-loader.js

@@ -8,7 +8,7 @@ const CartoPropertiesTileLoader = {
     extensions: ['pbf'],
     mimeTypes: ['application/vnd.carto-properties-tile'],
     category: 'geometry',
-    worker: false,
+    worker: true,
     parse: async (arrayBuffer, options) => parseCartoPropertiesTile(arrayBuffer, options),
     parseSync: parseCartoPropertiesTile,
     options: {}

package/dist/layers/schema/carto-raster-tile-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-raster-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKzE,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,+BAA4B;AAiB7D,QAAA,MAAM,qBAAqB,EAAE,gBAa5B,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE;QACL,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,EAAE,UAAU,EAAE,CAAC;KAC1B,CAAC;CACH,CAAC;AAiBF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"carto-raster-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKzE,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,+BAA4B;AAmB7D,QAAA,MAAM,qBAAqB,EAAE,gBAa5B,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE;QACL,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,EAAE,UAAU,EAAE,CAAC;KAC1B,CAAC;CACH,CAAC;AAoBF,eAAe,qBAAqB,CAAC"}

package/dist/layers/schema/carto-raster-tile-loader.js

@@ -1,10 +1,11 @@
 import { TileReader } from "./carto-raster-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
-const VERSION = typeof "9.0.37" !== 'undefined' ? "9.0.37" : 'latest';
+const VERSION = typeof "9.0.40" !== 'undefined' ? "9.0.40" : 'latest';
 const id = 'cartoRasterTile';
 const DEFAULT_OPTIONS = {
     cartoRasterTile: {
+        metadata: null,
         workerUrl: getWorkerUrl(id, VERSION)
     }
 };
@@ -22,9 +23,12 @@ const CartoRasterTileLoader = {
     options: DEFAULT_OPTIONS
 };
 function parseCartoRasterTile(arrayBuffer, options) {
-    if (!arrayBuffer)
+    const metadata = options?.cartoRasterTile?.metadata;
+    if (!arrayBuffer || !metadata)
         return null;
-    const { bands, blockSize } = parsePbf(arrayBuffer, TileReader);
+    TileReader.compression = metadata.compression;
+    const out = parsePbf(arrayBuffer, TileReader);
+    const { bands, blockSize } = out;
     const numericProps = {};
     for (let i = 0; i < bands.length; i++) {
         const { name, data } = bands[i];

package/dist/layers/schema/carto-raster-tile.d.ts

@@ -3,6 +3,7 @@ export declare class BandReader {
     static _readField(this: void, tag: any, obj: any, pbf: any): void;
 }
 export declare class TileReader {
+    static compression: null | 'gzip';
     static read(pbf: any, end: any): any;
     static _readField(this: void, tag: any, obj: any, pbf: any): void;
 }

package/dist/layers/schema/carto-raster-tile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-raster-tile.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile.ts"],"names":[],"mappings":"AAiBA,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM;IAI7B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;CAY5C;AAED,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA;IAGpB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;CAI5C"}
+{"version":3,"file":"carto-raster-tile.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile.ts"],"names":[],"mappings":"AAiBA,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM;IAI7B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;CAa5C;AAED,qBAAa,UAAU;IACrB,OAAc,WAAW,EAAE,IAAI,GAAG,MAAM,CAAC;IACzC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA;IAGpB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;CAI5C"}

package/dist/layers/schema/carto-raster-tile.js

@@ -27,7 +27,8 @@ export class BandReader {
                 throw Error(`Invalid data type: ${obj.type}`);
             }
             obj.data = {};
-            readPackedTypedArray(TypedArray, pbf, obj.data);
+            const { compression } = TileReader;
+            readPackedTypedArray(TypedArray, pbf, obj.data, { compression });
         }
     }
 }

package/dist/layers/schema/carto-spatial-tile-loader.js

@@ -2,7 +2,7 @@ import { TileReader } from "./carto-spatial-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
 import { binaryToSpatialjson } from "./spatialjson-utils.js";
-const VERSION = typeof "9.0.37" !== 'undefined' ? "9.0.37" : 'latest';
+const VERSION = typeof "9.0.40" !== 'undefined' ? "9.0.40" : 'latest';
 const id = 'cartoSpatialTile';
 const DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/layers/schema/carto-vector-tile-loader.js

@@ -2,7 +2,7 @@ import earcut from 'earcut';
 import { TileReader } from "./carto-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
-const VERSION = typeof "9.0.37" !== 'undefined' ? "9.0.37" : 'latest';
+const VERSION = typeof "9.0.40" !== 'undefined' ? "9.0.40" : 'latest';
 const id = 'cartoVectorTile';
 const DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/layers/schema/fast-pbf.d.ts

@@ -1,2 +1,6 @@
-export declare function readPackedTypedArray(TypedArray: any, pbf: any, obj: any): any;
+type ReadPackedOptions = {
+    compression: null | 'gzip';
+};
+export declare function readPackedTypedArray(TypedArray: any, pbf: any, obj: any, options?: ReadPackedOptions): any;
+export {};
 //# sourceMappingURL=fast-pbf.d.ts.map

package/dist/layers/schema/fast-pbf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fast-pbf.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/fast-pbf.ts"],"names":[],"mappings":"AACA,wBAAgB,oBAAoB,CAAC,UAAU,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,OAKxD"}
+{"version":3,"file":"fast-pbf.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/fast-pbf.ts"],"names":[],"mappings":"AAEA,KAAK,iBAAiB,GAAG;IACvB,WAAW,EAAE,IAAI,GAAG,MAAM,CAAC;CAC5B,CAAC;AAGF,wBAAgB,oBAAoB,CAAC,UAAU,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,OAAO,CAAC,EAAE,iBAAiB,OAcrF"}

package/dist/layers/schema/fast-pbf.js

@@ -1,7 +1,16 @@
+import { GZipCompression } from '@loaders.gl/compression';
 // Optimized (100X speed improvement) reading function for binary data
-export function readPackedTypedArray(TypedArray, pbf, obj) {
+export function readPackedTypedArray(TypedArray, pbf, obj, options) {
     const end = pbf.type === 2 ? pbf.readVarint() + pbf.pos : pbf.pos + 1;
-    obj.value = new TypedArray(pbf.buf.buffer.slice(pbf.pos, end));
+    const data = pbf.buf.buffer.slice(pbf.pos, end);
+    if (options?.compression === 'gzip') {
+        const compression = new GZipCompression();
+        const decompressedData = compression.decompressSync(data);
+        obj.value = new TypedArray(decompressedData);
+    }
+    else {
+        obj.value = new TypedArray(data);
+    }
     pbf.pos = end;
     return obj.value;
 }