@deck.gl/carto 9.0.36 → 9.0.38

package/dist/cartoRasterTile-worker.js

@@ -1008,7 +1008,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.36" : "latest";
+  var VERSION = true ? "9.0.38" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -1397,7 +1397,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.36" : "latest";
+  var VERSION = true ? "9.0.38" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1625,7 +1625,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.36" : "latest";
+  var VERSION = true ? "9.0.38" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -8524,8 +8524,25 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
         });
         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;
   }
+  var fs2 = `vec4 copy_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+  return color;
+}
+`;
+  var copy = {
+    name: "copy",
+    fs: fs2,
+    getUniforms: () => ({}),
+    passes: [{ filter: true }]
+  };
 
   // src/layers/quadbin-tile-layer.ts
   var import_core10 = __toESM(require_core2(), 1);
@@ -9019,12 +9036,14 @@ out vec4 position_commonspace;
 
 void main(void) {
   // Rather than positioning using attribute, layout pixel grid using gl_InstanceID
-  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));
+
+  // Avoid precision issues by applying 0.5 offset here, rather than when laying out vertices
+  vec2 cellCenter = scale * vec2(float(xIndex) + 0.5, float(yIndex) - 0.5);
 
   vec4 color = isStroke ? instanceLineColors : instanceFillColors;
 
@@ -9035,7 +9054,7 @@ void main(void) {
   // Get position directly from quadbin, rather than projecting
   // Important to set geometry.position before using project_ methods below
   // as geometry.worldPosition is not set (we don't know our lat/long)
-  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;
   }
@@ -9059,12 +9078,12 @@ void main(void) {
 
   geometry.pickingColor = instancePickingColors;
 
-  // project center of column
-  vec2 offset = (vec2(0.5) + positions.xy * strokeOffsetRatio) * cellWidth * shouldRender;
-  vec3 pos = vec3(offset, project_size(elevation));
-  DECKGL_FILTER_SIZE(pos, geometry);
+  // Cell coordinates centered on origin
+  vec2 base = positions.xy * scale * strokeOffsetRatio * coverage * shouldRender;
+  vec3 cell = vec3(base, project_size(elevation));
+  DECKGL_FILTER_SIZE(cell, geometry);
 
-  geometry.position.xyz += pos;
+  geometry.position.xyz += cell;
   gl_Position = project_common_position_to_clipspace(geometry.position);
 
   geometry.normal = project_normal(normals);
@@ -9099,7 +9118,7 @@ void main(void) {
       [-0.5, 0.5]
     ]
   };
-  var RasterColumnLayer = class extends import_layers4.ColumnLayer {
+  var RasterColumnLayer = class extends RTTModifier(import_layers4.ColumnLayer) {
     getShaders() {
       const shaders = super.getShaders();
       const data = this.props.data;
@@ -9171,7 +9190,15 @@ void main(void) {
           dataComparator: wrappedDataComparator,
           offset,
           highlightedObjectIndex,
-          highlightColor
+          highlightColor,
+          parameters: {
+            blendColorSrcFactor: "one",
+            blendAlphaSrcFactor: "one",
+            blendColorDstFactor: "zero",
+            blendAlphaDstFactor: "zero",
+            blendColorOperation: "add",
+            blendAlphaOperation: "add"
+          }
         }
       );
     }
@@ -9227,8 +9254,17 @@ void main(void) {
   };
   var defaultProps9 = {
     data: TilejsonPropType,
+    refinementStrategy: "no-overlap",
     tileSize: DEFAULT_TILE_SIZE
   };
+  var PostProcessTileLayer = class extends PostProcessModifier(import_geo_layers7.TileLayer, copy) {
+    filterSubLayer(context) {
+      const { tile } = context.layer.props;
+      if (!tile)
+        return true;
+      return super.filterSubLayer(context);
+    }
+  };
   var RasterTileLayer = class extends import_core14.CompositeLayer {
     getLoadOptions() {
       const loadOptions = super.getLoadOptions() || {};
@@ -9241,7 +9277,7 @@ void main(void) {
       if (!tileJSON)
         return null;
       const { tiles: data, minzoom: minZoom, maxzoom: maxZoom } = tileJSON;
-      const SubLayerClass = this.getSubLayerClass("tile", import_geo_layers7.TileLayer);
+      const SubLayerClass = this.getSubLayerClass("tile", PostProcessTileLayer);
       return new SubLayerClass(this.props, {
         id: `raster-tile-layer-${this.props.id}`,
         data,
@@ -10199,12 +10235,12 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     return initRange.apply(rescale(), arguments);
   }
   function pointish(scale) {
-    var copy2 = scale.copy;
+    var copy3 = scale.copy;
     scale.padding = scale.paddingOuter;
     delete scale.paddingInner;
     delete scale.paddingOuter;
     scale.copy = function() {
-      return pointish(copy2());
+      return pointish(copy3());
     };
     return scale;
   }
@@ -10840,7 +10876,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       return r[i2](d[i2](x));
     };
   }
-  function copy(source, target) {
+  function copy2(source, target) {
     return target.domain(source.domain()).range(source.range()).interpolate(source.interpolate()).clamp(source.clamp()).unknown(source.unknown());
   }
   function transformer() {
@@ -11224,7 +11260,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   function linear2() {
     var scale = continuous();
     scale.copy = function() {
-      return copy(scale, linear2());
+      return copy2(scale, linear2());
     };
     initRange.apply(scale, arguments);
     return linearish(scale);
@@ -11364,7 +11400,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   }
   function log5() {
     const scale = loggish(transformer()).domain([1, 10]);
-    scale.copy = () => copy(scale, log5()).base(scale.base());
+    scale.copy = () => copy2(scale, log5()).base(scale.base());
     initRange.apply(scale, arguments);
     return scale;
   }
@@ -11394,7 +11430,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   function pow() {
     var scale = powish(transformer());
     scale.copy = function() {
-      return copy(scale, pow()).exponent(scale.exponent());
+      return copy2(scale, pow()).exponent(scale.exponent());
     };
     initRange.apply(scale, arguments);
     return scale;

package/dist/index.cjs

@@ -551,7 +551,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION = true ? "9.0.36" : "latest";
+var VERSION = true ? "9.0.38" : "latest";
 var id = "cartoSpatialTile";
 var DEFAULT_OPTIONS = {
   cartoSpatialTile: {
@@ -916,7 +916,7 @@ var TileReader3 = class {
 };
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION2 = true ? "9.0.36" : "latest";
+var VERSION2 = true ? "9.0.38" : "latest";
 var id2 = "cartoRasterTile";
 var DEFAULT_OPTIONS2 = {
   cartoRasterTile: {
@@ -1266,8 +1266,25 @@ 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;
 }
+var fs2 = `vec4 copy_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+  return color;
+}
+`;
+var copy = {
+  name: "copy",
+  fs: fs2,
+  getUniforms: () => ({}),
+  passes: [{ filter: true }]
+};
 
 // dist/layers/quadbin-tile-layer.js
 var import_core10 = require("@deck.gl/core");
@@ -1704,15 +1721,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;
 }
@@ -1729,10 +1746,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);
@@ -1763,7 +1780,7 @@ var defaultProps8 = {
     [-0.5, 0.5]
   ]
 };
-var RasterColumnLayer = class extends import_layers4.ColumnLayer {
+var RasterColumnLayer = class extends RTTModifier(import_layers4.ColumnLayer) {
   getShaders() {
     const shaders = super.getShaders();
     const data = this.props.data;
@@ -1824,7 +1841,15 @@ var RasterLayer = class extends import_core13.CompositeLayer {
       dataComparator: wrappedDataComparator,
       offset,
       highlightedObjectIndex,
-      highlightColor
+      highlightColor,
+      parameters: {
+        blendColorSrcFactor: "one",
+        blendAlphaSrcFactor: "one",
+        blendColorDstFactor: "zero",
+        blendAlphaDstFactor: "zero",
+        blendColorOperation: "add",
+        blendAlphaOperation: "add"
+      }
     });
   }
   getSubLayerAccessor(accessor) {
@@ -1881,8 +1906,17 @@ var renderSubLayers3 = (props) => {
 };
 var defaultProps9 = {
   data: TilejsonPropType,
+  refinementStrategy: "no-overlap",
   tileSize: DEFAULT_TILE_SIZE
 };
+var PostProcessTileLayer = class extends PostProcessModifier(import_geo_layers7.TileLayer, copy) {
+  filterSubLayer(context) {
+    const { tile } = context.layer.props;
+    if (!tile)
+      return true;
+    return super.filterSubLayer(context);
+  }
+};
 var RasterTileLayer = class extends import_core14.CompositeLayer {
   getLoadOptions() {
     const loadOptions = super.getLoadOptions() || {};
@@ -1895,7 +1929,7 @@ var RasterTileLayer = class extends import_core14.CompositeLayer {
     if (!tileJSON)
       return null;
     const { tiles: data, minzoom: minZoom, maxzoom: maxZoom } = tileJSON;
-    const SubLayerClass = this.getSubLayerClass("tile", import_geo_layers7.TileLayer);
+    const SubLayerClass = this.getSubLayerClass("tile", PostProcessTileLayer);
     return new SubLayerClass(this.props, {
       id: `raster-tile-layer-${this.props.id}`,
       data,
@@ -1952,7 +1986,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.36" : "latest";
+var VERSION3 = true ? "9.0.38" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {