@deck.gl/carto 9.0.34 → 9.1.0-beta.1

package/dist/layers/heatmap.js

@@ -1,143 +1,127 @@
-const glsl = (s) => `${s}`;
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 /**
  * @filter       Heatmap
  * @param radiusPixels Blur radius in pixels, controls smoothness of heatmap
  * @param colorDomain Domain to apply to values prior to applying color scale
- * @param color1-6 Colors to use in color scale
+ * @param colorTexture 1D RGB lookup texture for color scale
+ * @param intensity Multiplier to apply to value
+ * @param opacity Output opacity
  */
-const fs = `\
+const fs = /* glsl */ `\
 uniform heatmapUniforms {
-vec2 delta;
-float radiusPixels;
-vec2 colorDomain;
-vec3 color1;
-vec3 color2;
-vec3 color3;
-vec3 color4;
-vec3 color5;
-vec3 color6;
-float intensity;
-float opacity;
+  vec2 colorDomain;
+  vec2 delta;
+  float intensity;
+  float opacity;
+  float radiusPixels;
 } heatmap;
-const vec4 STOPS = vec4(0.2, 0.4, 0.6, 0.8);
+
+uniform sampler2D colorTexture;
+
 vec3 colorGradient(float value) {
-vec3 c1;
-vec3 c2;
-vec2 range;
-if (value < STOPS.x) {
-range = vec2(0.0, STOPS.x);
-c1 = heatmap.color1; c2 = heatmap.color2;
-} else if (value < STOPS.y) {
-range = STOPS.xy;
-c1 = heatmap.color2; c2 = heatmap.color3;
-} else if (value < STOPS.z) {
-range = STOPS.yz;
-c1 = heatmap.color3; c2 = heatmap.color4;
-} else if (value < STOPS.w) {
-range = STOPS.zw;
-c1 = heatmap.color4; c2 = heatmap.color5;
-} else {
-range = vec2(STOPS.w, 1.0);
-c1 = heatmap.color5; c2 = heatmap.color6;
-}
-float f = (clamp(value, 0.0, 1.0) - range.x) / (range.y - range.x);
-return mix(c1, c2, f) / 255.0;
+  return texture(colorTexture, vec2(value, 0.5)).rgb;
 }
+
 const vec3 SHIFT = vec3(1.0, 256.0, 256.0 * 256.0);
 const float MAX_VAL = SHIFT.z * 255.0;
 const float SCALE = MAX_VAL / 8.0;
 vec4 pack(float value) {
-return vec4(mod(vec3(value, floor(value / SHIFT.yz)), 256.0), 255.0) / 255.0;
+  return vec4(mod(vec3(value, floor(value / SHIFT.yz)), 256.0), 255.0) / 255.0;
 }
 float unpack(vec3 color) {
-return 255.0 * dot(color, SHIFT);
+  return 255.0 * dot(color, SHIFT);
 }
+
 vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
-bool firstPass = (heatmap.delta.y < 0.5);
-float accumulator = 0.0;
-float SUPPORT = clamp(heatmap.radiusPixels / 2.0, 8.0, 32.0);
-float sigma = SUPPORT / 3.0;
-float a = -0.5 / (sigma * sigma);
-float w0 = 0.3989422804014327 / sigma;
-for (float t = -SUPPORT; t <= SUPPORT; t++) {
-vec2 percent = (t * heatmap.delta - 0.5) / SUPPORT;
-vec2 delta = percent * heatmap.radiusPixels / texSize;
-vec4 offsetColor = texture(source, texCoord + delta);
-float value = unpack(offsetColor.rgb);
-float weight = w0 * exp(a * t * t);
-accumulator += value * weight;
-}
-if (firstPass) {
-return pack(accumulator);
-}
-float density = 10.0 * heatmap.intensity * accumulator / SCALE;
-vec2 domain = heatmap.colorDomain;
-float f = (density - domain[0]) / (domain[1] - domain[0]);
-vec4 color = vec4(0.0);
-color.rgb = colorGradient(f);
-color.a = smoothstep(0.0, 0.1, f);
-color.a = pow(color.a, 1.0 / 2.2);
-color.a *= heatmap.opacity;
-return color;
+  bool firstPass = (heatmap.delta.y < 0.5);
+  float accumulator = 0.0;
+
+  // Controls quality of heatmap, larger values increase quality at expense of performance
+  float SUPPORT = clamp(heatmap.radiusPixels / 2.0, 8.0, 32.0);
+
+  // Gaussian normalization parameters
+  float sigma = SUPPORT / 3.0;
+  float a = -0.5 / (sigma * sigma);
+  float w0 = 0.3989422804014327 / sigma; // 1D normalization
+  for (float t = -SUPPORT; t <= SUPPORT; t++) {
+    vec2 percent = (t * heatmap.delta - 0.5) / SUPPORT;
+    vec2 delta = percent * heatmap.radiusPixels / texSize;
+    vec4 offsetColor = texture(source, texCoord + delta);
+
+    // Unpack float
+    float value = unpack(offsetColor.rgb);
+
+    // Gaussian
+    float weight = w0 * exp(a * t * t);
+    
+    accumulator += value * weight;
+  }
+
+  if (firstPass) {
+    return pack(accumulator);
+  }
+
+  // Undo scaling to obtain normalized density
+  float density = 10.0 * heatmap.intensity * accumulator / SCALE;
+ 
+  // Domain also in normalized density units
+  vec2 domain = heatmap.colorDomain;
+
+  // Apply domain
+  float f = (density - domain[0]) / (domain[1] - domain[0]);
+
+  // sqrt/log scaling??
+  // float f = (log(density) - log(domain[0] + 1.0)) / (log(domain[1] + 1.0) - log(domain[0] + 1.0));
+  // f = sqrt(f);
+
+  // Color map
+  vec4 color = vec4(0.0);
+  color.rgb = colorGradient(f);
+
+  color.a = smoothstep(0.0, 0.1, f);
+  color.a = pow(color.a, 1.0 / 2.2);
+  color.a *= heatmap.opacity;
+
+  return color;
 }
 `;
-const defaultColorRange = [
-    [255, 255, 178],
-    [254, 217, 118],
-    [254, 178, 76],
-    [253, 141, 60],
-    [240, 59, 32],
-    [189, 0, 38]
-];
 export const heatmap = {
     name: 'heatmap',
     uniformPropTypes: {
-        delta: { value: [0, 1] },
-        radiusPixels: { value: 20, min: 0, softMax: 100 },
         colorDomain: { value: [0, 1] },
-        color1: { value: [0, 0, 0] },
-        color2: { value: [0, 0, 0] },
-        color3: { value: [0, 0, 0] },
-        color4: { value: [0, 0, 0] },
-        color5: { value: [0, 0, 0] },
-        color6: { value: [0, 0, 0] },
+        delta: { value: [0, 1] },
         intensity: { value: 1, min: 0.1, max: 10 },
-        opacity: { value: 1, min: 0, max: 1 }
+        opacity: { value: 1, min: 0, max: 1 },
+        radiusPixels: { value: 20, min: 0, softMax: 100 }
     },
     uniformTypes: {
-        delta: 'vec2<f32>',
-        radiusPixels: 'f32',
         colorDomain: 'vec2<f32>',
-        color1: 'vec3<f32>',
-        color2: 'vec3<f32>',
-        color3: 'vec3<f32>',
-        color4: 'vec3<f32>',
-        color5: 'vec3<f32>',
-        color6: 'vec3<f32>',
+        delta: 'vec2<f32>',
         intensity: 'f32',
-        opacity: 'f32'
+        opacity: 'f32',
+        radiusPixels: 'f32'
     },
-    // @ts-expect-error stricter luma gl types
+    // @ts-ignore TODO v9.1
     getUniforms: opts => {
-        const { delta = [1, 0], colorRange = defaultColorRange, radiusPixels = 20, colorDomain = [0, 1], intensity = 1, opacity = 1 } = opts;
-        const [color1, color2, color3, color4, color5, color6] = colorRange;
+        if (!opts)
+            return {};
+        const { colorDomain = [0, 1], colorTexture, delta = [1, 0], intensity = 1, opacity = 1, radiusPixels = 20 } = opts;
         return {
-            delta,
-            color1,
-            color2,
-            color3,
-            color4,
-            color5,
-            color6,
-            radiusPixels,
             colorDomain,
+            colorTexture,
+            delta,
             intensity,
-            opacity
+            opacity,
+            radiusPixels
         };
     },
     fs,
     passes: [
+        // @ts-expect-error Seems typing in luma.gl should be Partial<>
         { sampler: true, uniforms: { delta: [1, 0] } },
+        // @ts-expect-error Seems typing in luma.gl should be Partial<>
         { sampler: true, uniforms: { delta: [0, 1] } }
     ]
 };

package/dist/layers/point-label-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"point-label-layer.d.ts","sourceRoot":"","sources":["../../src/layers/point-label-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,KAAK,EACL,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,SAAS,EACT,cAAc,EAEf,MAAM,iBAAiB,CAAC;AAyBzB,cAAM,iBAAkB,SAAQ,SAAS;IACvC,MAAM,CAAC,SAAS,SAAuB;IAEvC,cAAc,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC;;;KAAA;CAQnC;AAQD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,cAAc,GACd,mBAAmB,CAAC;AAEtB,2CAA2C;AAC3C,KAAK,qBAAqB,CAAC,KAAK,IAAI,cAAc,CAAC,KAAK,CAAC,GAAG;IAC1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpC;;OAEG;IACH,gBAAgB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3C;;;OAGG;IACH,qBAAqB,CAAC,EAAE,KAAK,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,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,oBAAoB,CAAC,SAAS,KAAA;IA0C9B,0BAA0B;IA2B1B,eAAe,CAAC,EAAE,KAAA,EAAE,EAAC,cAAc,EAAE,sBAA2B,EAAE,GAAG,KAAK,EAAC;;;KAAA,GAAG,iBAAiB;IA2D/F,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAmC1C"}
+{"version":3,"file":"point-label-layer.d.ts","sourceRoot":"","sources":["../../src/layers/point-label-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,KAAK,EACL,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,SAAS,EACT,cAAc,EAEf,MAAM,iBAAiB,CAAC;AAyBzB,cAAM,iBAAkB,SAAQ,SAAS;IACvC,MAAM,CAAC,SAAS,SAAuB;IAEvC,cAAc,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC;;;KAAA;CAQnC;AAQD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,cAAc,GACd,mBAAmB,CAAC;AAEtB,2CAA2C;AAC3C,KAAK,qBAAqB,CAAC,KAAK,IAAI,cAAc,CAAC,KAAK,CAAC,GAAG;IAC1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpC;;OAEG;IACH,gBAAgB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3C;;;OAGG;IACH,qBAAqB,CAAC,EAAE,KAAK,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,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,oBAAoB,CAAC,SAAS,KAAA;IA0C9B,0BAA0B;IA2B1B,eAAe,CAAC,EAAE,KAAA,EAAE,EAAC,cAAc,EAAE,sBAA2B,EAAE,GAAG,KAAK,EAAC;;;KAAA,GAAG,iBAAiB;IA2D/F,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAmC1C"}

package/dist/layers/point-label-layer.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { CompositeLayer } from '@deck.gl/core';
 import { TextLayer, _TextBackgroundLayer as TextBackgroundLayer } from '@deck.gl/layers';
 const [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];
@@ -7,8 +10,8 @@ class EnhancedTextBackgroundLayer extends TextBackgroundLayer {
         let vs = shaders.vs;
         // Modify shader so that the padding is offset by the pixel offset to ensure the padding
         // always captures the anchor point. As padding is uniform we cannot pass it a per-label value
-        vs = vs.replaceAll('padding.', '_padding.');
-        vs = vs.replace('void main(void) {', 'void main(void) {\n  vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);');
+        vs = vs.replaceAll('textBackground.padding.', '_padding.');
+        vs = vs.replace('void main(void) {', 'void main(void) {\n  vec4 _padding = textBackground.padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);');
         return { ...shaders, vs };
     }
 }

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":"AAKA,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,CAyFH"}

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

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { Layer, PostProcessEffect } from '@deck.gl/core';
 const TEXTURE_PROPS = {
     format: 'rgba8unorm',
@@ -36,8 +39,8 @@ export function RTTModifier(BaseLayer) {
     var _a;
     return _a = class RTTLayer extends BaseLayer {
             draw(opts) {
-                const { moduleParameters } = opts;
-                const { picking } = moduleParameters;
+                const { shaderModuleProps } = opts;
+                const { picking } = shaderModuleProps;
                 const postProcessLayer = getPostProcessLayer(this);
                 if (!picking.isActive) {
                     postProcessLayer.enableRTT(opts);
@@ -89,10 +92,11 @@ export function PostProcessModifier(BaseLayer, effect) {
             }
             _resizeBuffers(opts) {
                 // TODO we could likely render to a smaller buffer for better perf
-                const { moduleParameters } = opts;
+                const { shaderModuleProps } = opts;
                 const { viewport } = this.context;
-                const width = moduleParameters.devicePixelRatio * viewport.width;
-                const height = moduleParameters.devicePixelRatio * viewport.height;
+                const { devicePixelRatio } = shaderModuleProps.project;
+                const width = devicePixelRatio * viewport.width;
+                const height = devicePixelRatio * viewport.height;
                 this.internalState.renderBuffers.forEach((fbo) => fbo.resize({ width, height }));
             }
             enableRTT(opts) {

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

@@ -1 +1 @@
-{"version":3,"file":"quadbin-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,EACL,aAAa,IAAI,YAAY,EAC7B,kBAAkB,IAAI,iBAAiB,EACxC,MAAM,qBAAqB,CAAC;AAO7B,gDAAgD;AAChD,MAAM,MAAM,iBAAiB,CAAC,KAAK,GAAG,OAAO,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,wCAAwC;AACxC,KAAK,kBAAkB,CAAC,KAAK,IAAI;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC7F,KAAK,EACL,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACjD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,2CAAgB;IAEnC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAcvD"}
+{"version":3,"file":"quadbin-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,EACL,aAAa,IAAI,YAAY,EAC7B,kBAAkB,IAAI,iBAAiB,EACxC,MAAM,qBAAqB,CAAC;AAO7B,gDAAgD;AAChD,MAAM,MAAM,iBAAiB,CAAC,KAAK,GAAG,OAAO,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,wCAAwC;AACxC,KAAK,kBAAkB,CAAC,KAAK,IAAI;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC7F,KAAK,EACL,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACjD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,2CAAgB;IAEnC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAcvD"}

package/dist/layers/quadbin-layer.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { _GeoCellLayer as GeoCellLayer } from '@deck.gl/geo-layers';
 import { getQuadbinPolygon } from "./quadbin-utils.js";
 const defaultProps = {

package/dist/layers/quadbin-tile-layer.d.ts

@@ -1,7 +1,7 @@
-import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core';
+import { CompositeLayer, CompositeLayerProps, DefaultProps } from '@deck.gl/core';
 import QuadbinLayer, { QuadbinLayerProps } from "./quadbin-layer.js";
-import { SpatialIndexTileLayerProps } from "./spatial-index-tile-layer.js";
-import type { TilejsonResult } from "../sources/types.js";
+import SpatialIndexTileLayer, { SpatialIndexTileLayerProps } from "./spatial-index-tile-layer.js";
+import type { TilejsonResult } from '@carto/api-client';
 export declare const renderSubLayers: (props: any) => QuadbinLayer<any, {
     getQuadbin: (d: any) => any;
 }> | null;
@@ -15,7 +15,7 @@ export default class QuadbinTileLayer<DataT = any, ExtraProps extends {} = {}> e
     static layerName: string;
     static defaultProps: DefaultProps<QuadbinTileLayerProps<unknown>>;
     getLoadOptions(): any;
-    renderLayers(): Layer | null | LayersList;
+    renderLayers(): SpatialIndexTileLayer | null;
 }
 export {};
 //# sourceMappingURL=quadbin-tile-layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"quadbin-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,2BAAwB;AAEhE,OAA8B,EAAC,0BAA0B,EAAC,sCAAmC;AAE7F,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAIrD,eAAO,MAAM,eAAe;;SAO3B,CAAC;AAOF,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,OAAO,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAChF,mBAAmB,CAAC;AAEtB,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,KAAK,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACzE,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG;IAChD,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAkB1C"}
+{"version":3,"file":"quadbin-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAqB,YAAY,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,2BAAwB;AAEhE,OAAO,qBAAqB,EAAE,EAAC,0BAA0B,EAAC,sCAAmC;AAE7F,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAItD,eAAO,MAAM,eAAe;;SAO3B,CAAC;AAOF,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,OAAO,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAChF,mBAAmB,CAAC;AAEtB,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,KAAK,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACzE,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG;IAChD,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,qBAAqB,GAAG,IAAI;CAgB7C"}

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

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { CompositeLayer } from '@deck.gl/core';
 import QuadbinLayer from "./quadbin-layer.js";
 import QuadbinTileset2D from "./quadbin-tileset-2d.js";
@@ -31,18 +34,16 @@ class QuadbinTileLayer extends CompositeLayer {
         if (!tileJSON)
             return null;
         const { tiles: data, maxresolution: maxZoom } = tileJSON;
-        return [
-            // @ts-ignore
-            new SpatialIndexTileLayer(this.props, {
-                id: `quadbin-tile-layer-${this.props.id}`,
-                data,
-                // TODO: Tileset2D should be generic over TileIndex type
-                TilesetClass: QuadbinTileset2D,
-                renderSubLayers,
-                maxZoom,
-                loadOptions: this.getLoadOptions()
-            })
-        ];
+        const SubLayerClass = this.getSubLayerClass('spatial-index-tile', SpatialIndexTileLayer);
+        return new SubLayerClass(this.props, {
+            id: `quadbin-tile-layer-${this.props.id}`,
+            data,
+            // TODO: Tileset2D should be generic over TileIndex type
+            TilesetClass: QuadbinTileset2D,
+            renderSubLayers,
+            maxZoom,
+            loadOptions: this.getLoadOptions()
+        });
     }
 }
 QuadbinTileLayer.layerName = 'QuadbinTileLayer';

package/dist/layers/quadbin-tileset-2d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quadbin-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK5D,KAAK,gBAAgB,GAAG;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAS;IAErD,cAAc,CAAC,IAAI,KAAA,GAAG,gBAAgB,EAAE;IAQxC,SAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,EAAE,gBAAgB,GAAG,MAAM;IAK3C,eAAe,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB;IAKrC,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB,GAAG,MAAM;IAK1C,cAAc,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB,GAAG,gBAAgB;CAGxD"}
+{"version":3,"file":"quadbin-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tileset-2d.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK5D,KAAK,gBAAgB,GAAG;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAS;IAErD,cAAc,CAAC,IAAI,KAAA,GAAG,gBAAgB,EAAE;IAQxC,SAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,EAAE,gBAAgB,GAAG,MAAM;IAK3C,eAAe,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB;IAKrC,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB,GAAG,MAAM;IAK1C,cAAc,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB,GAAG,gBAAgB;CAGxD"}

package/dist/layers/quadbin-tileset-2d.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers';
 import { bigIntToHex, cellToParent, cellToTile, getResolution, tileToCell } from 'quadbin';
 export default class QuadbinTileset2D extends Tileset2D {

package/dist/layers/quadbin-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quadbin-utils.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-utils.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAIzE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAM5F;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,EAAE,CAKzE"}
+{"version":3,"file":"quadbin-utils.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-utils.ts"],"names":[],"mappings":"AASA,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAIzE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAM5F;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,EAAE,CAKzE"}

package/dist/layers/quadbin-utils.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { worldToLngLat } from '@math.gl/web-mercator';
 import { cellToTile } from 'quadbin';
 const TILE_SIZE = 512;

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));\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// 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 = column.offset.xy;\n  float scale = column.widthScale; // Re-use widthScale prop to pass cell scale\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 = column.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 = column.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.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {\n    geometry.position.xyz -= project.commonOrigin;\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 (column.extruded) {\n    elevation = instanceElevations * (positions.z + 1.0) / 2.0 * column.elevationScale;\n  } else if (column.stroked) {\n    float halfOffset = project_pixel_size(column.widthScale) / cellWidth;\n    if (column.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 (column.extruded && !column.isStroke) {\n#ifdef FLAT_SHADING\n    position_commonspace = geometry.position;\n    vColor = vec4(color.rgb, color.a * layer.opacity);\n#else\n    vec3 lightColor = lighting_getLightColor(color.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);\n    vColor = vec4(lightColor, color.a * layer.opacity);\n#endif\n  } else {\n    vColor = vec4(color.rgb, color.a * layer.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":";AAIA,wBAuFE"}

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

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export default `\
 #version 300 es
 #define SHADER_NAME raster-layer-vertex-shader
@@ -7,38 +10,30 @@ in float instanceElevations;
 in vec4 instanceFillColors;
 in vec4 instanceLineColors;
 in vec3 instancePickingColors;
-uniform float opacity;
-uniform bool extruded;
-uniform bool stroked;
-uniform bool isStroke;
-uniform float coverage;
-uniform float elevationScale;
-uniform float widthScale;
-uniform vec3 offset;
 out vec4 vColor;
 #ifdef FLAT_SHADING
 out vec4 position_commonspace;
 #endif
 void main(void) {
-vec2 common_position = offset.xy;
-float scale = offset.z;
+vec2 common_position = column.offset.xy;
+float scale = column.widthScale;
 int yIndex = - (gl_InstanceID / BLOCK_WIDTH);
 int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);
-common_position += scale * vec2(float(xIndex), float(yIndex));
-vec4 color = isStroke ? instanceLineColors : instanceFillColors;
+common_position += scale * vec2(float(xIndex), float(yIndex - 1));
+vec4 color = column.isStroke ? instanceLineColors : instanceFillColors;
 float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);
-float cellWidth = coverage * scale;
+float cellWidth = column.coverage * scale;
 geometry.position = vec4(common_position, 0.0, 1.0);
-if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
-geometry.position.xyz -= project_uCommonOrigin;
+if (project.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
+geometry.position.xyz -= project.commonOrigin;
 }
 float elevation = 0.0;
 float strokeOffsetRatio = 1.0;
-if (extruded) {
-elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;
-} else if (stroked) {
-float halfOffset = project_pixel_size(widthScale) / cellWidth;
-if (isStroke) {
+if (column.extruded) {
+elevation = instanceElevations * (positions.z + 1.0) / 2.0 * column.elevationScale;
+} else if (column.stroked) {
+float halfOffset = project_pixel_size(column.widthScale) / cellWidth;
+if (column.isStroke) {
 strokeOffsetRatio -= sign(positions.z) * halfOffset;
 } else {
 strokeOffsetRatio -= halfOffset;
@@ -52,16 +47,16 @@ geometry.position.xyz += pos;
 gl_Position = project_common_position_to_clipspace(geometry.position);
 geometry.normal = project_normal(normals);
 DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
-if (extruded && !isStroke) {
+if (column.extruded && !column.isStroke) {
 #ifdef FLAT_SHADING
 position_commonspace = geometry.position;
-vColor = vec4(color.rgb, color.a * opacity);
+vColor = vec4(color.rgb, color.a * layer.opacity);
 #else
-vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);
-vColor = vec4(lightColor, color.a * opacity);
+vec3 lightColor = lighting_getLightColor(color.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);
+vColor = vec4(lightColor, color.a * layer.opacity);
 #endif
 } else {
-vColor = vec4(color.rgb, color.a * opacity);
+vColor = vec4(color.rgb, color.a * layer.opacity);
 }
 DECKGL_FILTER_COLOR(vColor, geometry);
 }

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

@@ -20,17 +20,17 @@ export default class RasterLayer<DataT = any, ExtraProps = {}> extends Composite
     protected getSubLayerAccessor<In, Out>(accessor: Accessor<In, Out>): Accessor<In, Out>;
     getPickingInfo(params: any): {
         color: Uint8Array | null;
-        layer: Layer<{}> | null;
-        sourceLayer?: Layer<{}> | null | undefined;
-        viewport?: import("@deck.gl/core").Viewport | undefined;
+        layer: Layer | null;
+        sourceLayer?: Layer | null;
+        viewport?: import("@deck.gl/core").Viewport;
         index: number;
         picked: boolean;
         object?: any;
         x: number;
         y: number;
-        pixel?: [number, number] | undefined;
-        coordinate?: number[] | undefined;
-        devicePixel?: [number, number] | undefined;
+        pixel?: [number, number];
+        coordinate?: number[];
+        devicePixel?: [number, number];
         pixelRatio: number;
     };
     _updateAutoHighlight(info: PickingInfo): void;

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":"AAIA,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;IA8CzC,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

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { CompositeLayer } from '@deck.gl/core';
 import { ColumnLayer } from '@deck.gl/layers';
 import { quadbinToOffset } from "./quadbin-utils.js";
@@ -62,7 +65,8 @@ class RasterLayer extends CompositeLayer {
             return null;
         const blockSize = data.blockSize ?? 0;
         const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);
-        const offset = [xOffset, yOffset, scale / blockSize];
+        const offset = [xOffset, yOffset];
+        const lineWidthScale = scale / blockSize;
         // Filled Column Layer
         const CellLayer = this.getSubLayerClass('column', RasterColumnLayer);
         const { highlightedObjectIndex, highlightColor } = this.state;
@@ -80,6 +84,7 @@ class RasterLayer extends CompositeLayer {
             },
             dataComparator: wrappedDataComparator,
             offset,
+            lineWidthScale, // Re-use widthScale prop to pass cell scale,
             highlightedObjectIndex,
             highlightColor
         });

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

@@ -1,6 +1,6 @@
 import { CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList } from '@deck.gl/core';
 import RasterLayer, { RasterLayerProps } from "./raster-layer.js";
-import type { TilejsonResult } from "../sources/types.js";
+import type { TilejsonResult } from '@carto/api-client';
 import { TileLayerProps } from '@deck.gl/geo-layers';
 export declare const renderSubLayers: (props: any) => RasterLayer<any, {
     tileIndex: any;

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;CAmB1C"}
+{"version":3,"file":"raster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/raster-tile-layer.ts"],"names":[],"mappings":"AAIA,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,MAAM,mBAAmB,CAAC;AAGtD,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"}

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

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { CompositeLayer } from '@deck.gl/core';
 import RasterLayer from "./raster-layer.js";
 import QuadbinTileset2D from "./quadbin-tileset-2d.js";
@@ -26,19 +29,17 @@ class RasterTileLayer extends CompositeLayer {
         if (!tileJSON)
             return null;
         const { tiles: data, minzoom: minZoom, maxzoom: maxZoom } = tileJSON;
-        return [
-            // @ts-ignore
-            new TileLayer(this.props, {
-                id: `raster-tile-layer-${this.props.id}`,
-                data,
-                // TODO: Tileset2D should be generic over TileIndex type
-                TilesetClass: QuadbinTileset2D,
-                renderSubLayers,
-                minZoom,
-                maxZoom,
-                loadOptions: this.getLoadOptions()
-            })
-        ];
+        const SubLayerClass = this.getSubLayerClass('tile', TileLayer);
+        return new SubLayerClass(this.props, {
+            id: `raster-tile-layer-${this.props.id}`,
+            data,
+            // TODO: Tileset2D should be generic over TileIndex type
+            TilesetClass: QuadbinTileset2D,
+            renderSubLayers,
+            minZoom,
+            maxZoom,
+            loadOptions: this.getLoadOptions()
+        });
     }
 }
 RasterTileLayer.layerName = 'RasterTileLayer';

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

@@ -1 +1 @@
-{"version":3,"file":"carto-properties-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-properties-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKzE,QAAA,MAAM,yBAAyB,EAAE,gBAYhC,CAAC;AAOF,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"carto-properties-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-properties-tile-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKzE,QAAA,MAAM,yBAAyB,EAAE,gBAYhC,CAAC;AAOF,eAAe,yBAAyB,CAAC"}