@deck.gl/carto 9.0.34 → 9.0.36

package/dist/index.d.ts

@@ -15,6 +15,19 @@ declare const CARTO_LAYERS: {
     VectorTileLayer: typeof VectorTileLayer;
 };
 export { CARTO_LAYERS, ClusterTileLayer, H3TileLayer, HeatmapTileLayer, _PointLabelLayer, QuadbinTileLayer, RasterTileLayer, VectorTileLayer };
+export { default as _QuadbinLayer } from "./layers/quadbin-layer.js";
+export { default as _RasterLayer } from "./layers/raster-layer.js";
+export { default as _SpatialIndexTileLayer } from "./layers/spatial-index-tile-layer.js";
+export type { ClusterTileLayerProps } from "./layers/cluster-tile-layer.js";
+export type { H3TileLayerProps } from "./layers/h3-tile-layer.js";
+export type { HeatmapTileLayerProps } from "./layers/heatmap-tile-layer.js";
+export type { PointLabelLayerProps } from "./layers/point-label-layer.js";
+export type { QuadbinLayerProps } from "./layers/quadbin-layer.js";
+export type { QuadbinTileLayerProps } from "./layers/quadbin-tile-layer.js";
+export type { RasterLayerProps } from "./layers/raster-layer.js";
+export type { RasterTileLayerProps } from "./layers/raster-tile-layer.js";
+export type { SpatialIndexTileLayerProps } from "./layers/spatial-index-tile-layer.js";
+export type { VectorTileLayerProps } from "./layers/vector-tile-layer.js";
 export { default as BASEMAP, GOOGLE_BASEMAPS as _GOOGLE_BASEMAPS, getStyleUrl as _getStyleUrl, fetchStyle as _fetchStyle, applyLayerGroupFilters as _applyLayerGroupFilters, STYLE_LAYER_GROUPS as _STYLE_LAYER_GROUPS } from "./basemap.js";
 export { default as colorBins } from "./style/color-bins-style.js";
 export { default as colorCategories } from "./style/color-categories-style.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,uCAAoC;AACxE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,kCAA+B;AAC9D,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,uCAAoC;AACxE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,sCAAmC;AACvE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,uCAAoC;AACxE,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,sCAAmC;AACtE,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,sCAAmC;AACtE,QAAA,MAAM,YAAY;;;;;;;;CAQjB,CAAC;AACF,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,eAAe,EAChB,CAAC;AAEF,OAAO,EACL,OAAO,IAAI,OAAO,EAClB,eAAe,IAAI,gBAAgB,EACnC,WAAW,IAAI,YAAY,EAC3B,UAAU,IAAI,WAAW,EACzB,sBAAsB,IAAI,uBAAuB,EACjD,kBAAkB,IAAI,mBAAmB,EAC1C,qBAAkB;AACnB,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,oCAAiC;AAC9D,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,0CAAuC;AAC1E,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,0CAAuC;AAC1E,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,uBAAoB;AAC3D,OAAO,EAAC,iBAAiB,EAAC,yBAAsB;AAChD,YAAY,EACV,eAAe,EACf,eAAe,EACf,cAAc,EACd,MAAM,EACN,OAAO,EACP,WAAW,EACX,eAAe,EACf,YAAY,EACZ,OAAO,IAAI,QAAQ,EACnB,eAAe,IAAI,gBAAgB,EACnC,aAAa,IAAI,cAAc,EAChC,uBAAoB;AAErB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EAChB,2BAAwB;AAEzB,QAAA,MAAM,aAAa;;;;;;;;;;;;;CAalB,CAAC;AAEF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,eAAe,EAChB,CAAC;AAEF,YAAY,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,0BAA0B,EAC1B,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,EACnB,yBAAyB,EACzB,yBAAyB,EACzB,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,0BAA0B,EAC3B,2BAAwB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,3 +1,4 @@
+// CARTO Layers
 import { default as ClusterTileLayer } from "./layers/cluster-tile-layer.js";
 import { default as H3TileLayer } from "./layers/h3-tile-layer.js";
 import { default as HeatmapTileLayer } from "./layers/heatmap-tile-layer.js";
@@ -5,6 +6,7 @@ import { default as _PointLabelLayer } from "./layers/point-label-layer.js";
 import { default as QuadbinTileLayer } from "./layers/quadbin-tile-layer.js";
 import { default as RasterTileLayer } from "./layers/raster-tile-layer.js";
 import { default as VectorTileLayer } from "./layers/vector-tile-layer.js";
+// Exports for playground/bindings
 const CARTO_LAYERS = {
     ClusterTileLayer,
     H3TileLayer,
@@ -15,6 +17,11 @@ const CARTO_LAYERS = {
     VectorTileLayer
 };
 export { CARTO_LAYERS, ClusterTileLayer, H3TileLayer, HeatmapTileLayer, _PointLabelLayer, QuadbinTileLayer, RasterTileLayer, VectorTileLayer };
+// Internal Layers
+export { default as _QuadbinLayer } from "./layers/quadbin-layer.js";
+export { default as _RasterLayer } from "./layers/raster-layer.js";
+export { default as _SpatialIndexTileLayer } from "./layers/spatial-index-tile-layer.js";
+// Helpers
 export { default as BASEMAP, GOOGLE_BASEMAPS as _GOOGLE_BASEMAPS, getStyleUrl as _getStyleUrl, fetchStyle as _fetchStyle, applyLayerGroupFilters as _applyLayerGroupFilters, STYLE_LAYER_GROUPS as _STYLE_LAYER_GROUPS } from "./basemap.js";
 export { default as colorBins } from "./style/color-bins-style.js";
 export { default as colorCategories } from "./style/color-categories-style.js";

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

@@ -1,6 +1,6 @@
-import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core';
+import { CompositeLayer, CompositeLayerProps, DefaultProps } from '@deck.gl/core';
 import { H3HexagonLayer, H3HexagonLayerProps } from '@deck.gl/geo-layers';
-import { SpatialIndexTileLayerProps } from "./spatial-index-tile-layer.js";
+import SpatialIndexTileLayer, { SpatialIndexTileLayerProps } from "./spatial-index-tile-layer.js";
 import type { TilejsonResult } from "../sources/types.js";
 export declare const renderSubLayers: (props: any) => H3HexagonLayer<any, {
     getHexagon: (d: any) => any;
@@ -18,7 +18,7 @@ export default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> exten
     static defaultProps: DefaultProps<H3TileLayerProps<unknown>>;
     initializeState(): void;
     getLoadOptions(): any;
-    renderLayers(): Layer | null | LayersList;
+    renderLayers(): SpatialIndexTileLayer | null;
 }
 export {};
 //# sourceMappingURL=h3-tile-layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAExE,OAA8B,EAAC,0BAA0B,EAAC,sCAAmC;AAC7F,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAIrD,eAAO,MAAM,eAAe;;;;SAU3B,CAAC;AAOF,+CAA+C;AAC/C,MAAM,MAAM,gBAAgB,CAAC,KAAK,GAAG,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC;AAE/F,uCAAuC;AACvC,KAAK,iBAAiB,CAAC,KAAK,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACtE,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,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CACjD;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,0CAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAsC1C"}
+{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAqB,YAAY,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAExE,OAAO,qBAAqB,EAAE,EAAC,0BAA0B,EAAC,sCAAmC;AAC7F,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAIrD,eAAO,MAAM,eAAe;;;;SAU3B,CAAC;AAOF,+CAA+C;AAC/C,MAAM,MAAM,gBAAgB,CAAC,KAAK,GAAG,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC;AAE/F,uCAAuC;AACvC,KAAK,iBAAiB,CAAC,KAAK,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACtE,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,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CACjD;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,0CAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,qBAAqB,GAAG,IAAI;CAoC7C"}

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

@@ -44,22 +44,20 @@ class H3TileLayer extends CompositeLayer {
         if (this.props.maxZoom) {
             maxresolution = Math.min(maxresolution, getHexagonResolution({ zoom: this.props.maxZoom, latitude: 0 }, this.props.tileSize));
         }
+        const SubLayerClass = this.getSubLayerClass('spatial-index-tile', SpatialIndexTileLayer);
         // The naming is unfortunate, but minZoom & maxZoom in the context
         // of a Tileset2D refer to the resolution levels, not the Mercator zooms
-        return [
-            // @ts-ignore
-            new SpatialIndexTileLayer(this.props, {
-                id: `h3-tile-layer-${this.props.id}`,
-                data,
-                // TODO: Tileset2D should be generic over TileIndex type
-                TilesetClass: H3Tileset2D,
-                renderSubLayers,
-                // minZoom and maxZoom are H3 resolutions, however we must use this naming as that is what the Tileset2D class expects
-                minZoom: minresolution,
-                maxZoom: maxresolution,
-                loadOptions: this.getLoadOptions()
-            })
-        ];
+        return new SubLayerClass(this.props, {
+            id: `h3-tile-layer-${this.props.id}`,
+            data,
+            // TODO: Tileset2D should be generic over TileIndex type
+            TilesetClass: H3Tileset2D,
+            renderSubLayers,
+            // minZoom and maxZoom are H3 resolutions, however we must use this naming as that is what the Tileset2D class expects
+            minZoom: minresolution,
+            maxZoom: maxresolution,
+            loadOptions: this.getLoadOptions()
+        });
     }
 }
 H3TileLayer.layerName = 'H3TileLayer';

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

@@ -1,14 +1,21 @@
-import { Accessor, CompositeLayer, CompositeLayerProps, DefaultProps, Layer } from '@deck.gl/core';
+import { Accessor, Color, CompositeLayer, CompositeLayerProps, DefaultProps, Layer, UpdateParameters } from '@deck.gl/core';
 import { HeatmapProps } from "./heatmap.js";
 import { QuadbinTileLayerProps } from "./quadbin-tile-layer.js";
 import { TilejsonResult } from "../sources.js";
 import { _Tile2DHeader as Tile2DHeader } from '@deck.gl/geo-layers';
+import { Texture } from '@luma.gl/core';
 /** All properties supported by HeatmapTileLayer. */
 export type HeatmapTileLayerProps<DataT = unknown> = _HeatmapTileLayerProps<DataT> & CompositeLayerProps & {
     data: null | TilejsonResult | Promise<TilejsonResult>;
 };
 /** Properties added by HeatmapTileLayer. */
 type _HeatmapTileLayerProps<DataT> = QuadbinTileLayerProps<DataT> & HeatmapProps & {
+    /**
+     * Specified as an array of colors [color1, color2, ...].
+     *
+     * @default `6-class YlOrRd` - [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6)
+     */
+    colorRange: Color[];
     /**
      * The weight of each object.
      *
@@ -22,6 +29,7 @@ declare class HeatmapTileLayer<DataT = any, ExtraProps extends {} = {}> extends
     static layerName: string;
     static defaultProps: DefaultProps<HeatmapTileLayerProps<unknown>>;
     state: {
+        colorTexture?: Texture;
         isLoaded: boolean;
         tiles: Set<Tile2DHeader>;
         viewportChanged?: boolean;
@@ -30,7 +38,9 @@ declare class HeatmapTileLayer<DataT = any, ExtraProps extends {} = {}> extends
     shouldUpdateState({ changeFlags }: {
         changeFlags: any;
     }): boolean;
+    updateState(opts: UpdateParameters<this>): void;
     renderLayers(): Layer;
+    _updateColorTexture(opts: any): void;
 }
 export default HeatmapTileLayer;
 //# sourceMappingURL=heatmap-tile-layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"heatmap-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap-tile-layer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAE,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,eAAe,CAAC;AAGjG,OAAO,EAAC,YAAY,EAAU,qBAAkB;AAEhD,OAAyB,EAAC,qBAAqB,EAAC,gCAA6B;AAE7E,OAAO,EAAC,cAAc,EAAC,sBAAmB;AAC1C,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAkElE,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,OAAO,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAChF,mBAAmB,GAAG;IACpB,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC/D,YAAY,GAAG;IACb;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEpC,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5D,CAAC;AAEJ,cAAM,gBAAgB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACpF,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CACrD;IACC,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,OAAO,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;IACF,eAAe;IAQf,iBAAiB,CAAC,EAAC,WAAW,EAAC;;KAAA,GAAG,OAAO;IAMzC,YAAY,IAAI,KAAK;CAgHtB;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"heatmap-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap-tile-layer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,KAAK,EACL,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAC,YAAY,EAAU,qBAAkB;AAEhD,OAAyB,EAAC,qBAAqB,EAAC,gCAA6B;AAE7E,OAAO,EAAC,cAAc,EAAC,sBAAmB;AAC1C,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAC;AAwGpD,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,OAAO,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAChF,mBAAmB,GAAG;IACpB,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC/D,YAAY,GAAG;IACb;;;;OAIG;IACH,UAAU,EAAE,KAAK,EAAE,CAAC;IAEpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEpC,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5D,CAAC;AAEJ,cAAM,gBAAgB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACpF,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CACrD;IACC,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,KAAK,EAAG;QACN,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,QAAQ,EAAE,OAAO,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;IACF,eAAe;IAQf,iBAAiB,CAAC,EAAC,WAAW,EAAC;;KAAA,GAAG,OAAO;IAMzC,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAQxC,YAAY,IAAI,KAAK;IAiHrB,mBAAmB,CAAC,IAAI,KAAA;CAmBzB;AAED,eAAe,gBAAgB,CAAC"}

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

@@ -5,6 +5,24 @@ import { heatmap } from "./heatmap.js";
 import { RTTModifier, PostProcessModifier } from "./post-process-utils.js";
 import QuadbinTileLayer from "./quadbin-tile-layer.js";
 import { TilejsonPropType } from "./utils.js";
+const defaultColorRange = [
+    [255, 255, 178],
+    [254, 217, 118],
+    [254, 178, 76],
+    [253, 141, 60],
+    [240, 59, 32],
+    [189, 0, 38]
+];
+const TEXTURE_PROPS = {
+    format: 'rgba8unorm',
+    mipmaps: false,
+    sampler: {
+        minFilter: 'linear',
+        magFilter: 'linear',
+        addressModeU: 'clamp-to-edge',
+        addressModeV: 'clamp-to-edge'
+    }
+};
 /**
  * Computes the unit density (inverse of cell area)
  */
@@ -12,6 +30,21 @@ function unitDensityForCell(cell) {
     const cellResolution = Number(getResolution(cell));
     return Math.pow(4.0, cellResolution);
 }
+/**
+ * Converts a colorRange array to a flat array with 4 components per color
+ */
+function colorRangeToFlatArray(colorRange) {
+    const flatArray = new Uint8Array(colorRange.length * 4);
+    let index = 0;
+    for (let i = 0; i < colorRange.length; i++) {
+        const color = colorRange[i];
+        flatArray[index++] = color[0];
+        flatArray[index++] = color[1];
+        flatArray[index++] = color[2];
+        flatArray[index++] = Number.isFinite(color[3]) ? color[3] : 255;
+    }
+    return flatArray;
+}
 // Modified polygon layer to draw offscreen and output value expected by heatmap
 class RTTSolidPolygonLayer extends RTTModifier(SolidPolygonLayer) {
     getShaders(type) {
@@ -59,6 +92,7 @@ const defaultProps = {
     getWeight: { type: 'accessor', value: 1 },
     onMaxDensityChange: { type: 'function', optional: true, value: null },
     colorDomain: { type: 'array', value: [0, 1] },
+    colorRange: defaultColorRange,
     intensity: { type: 'number', value: 1 },
     radiusPixels: { type: 'number', min: 0, max: 100, value: 20 }
 };
@@ -75,8 +109,15 @@ class HeatmapTileLayer extends CompositeLayer {
         this.setState({ viewportChanged });
         return changeFlags.somethingChanged;
     }
+    updateState(opts) {
+        const { props, oldProps } = opts;
+        super.updateState(opts);
+        if (props.colorRange !== oldProps.colorRange) {
+            this._updateColorTexture(opts);
+        }
+    }
     renderLayers() {
-        const { data, getWeight, colorDomain, colorRange, intensity, radiusPixels, _subLayerProps, updateTriggers, onMaxDensityChange, onViewportLoad, onTileLoad, onTileUnload, ...tileLayerProps } = this.props;
+        const { data, getWeight, colorDomain, intensity, radiusPixels, _subLayerProps, updateTriggers, onMaxDensityChange, onViewportLoad, onTileLoad, onTileUnload, ...tileLayerProps } = this.props;
         // Inject modified polygon layer as sublayer into TileLayer
         const subLayerProps = {
             ..._subLayerProps,
@@ -116,11 +157,11 @@ class HeatmapTileLayer extends CompositeLayer {
             getElevation: getWeight,
             elevationScale: maxDensity,
             colorDomain,
-            colorRange,
             radiusPixels,
             intensity,
             _subLayerProps: subLayerProps,
             refinementStrategy: 'no-overlap',
+            colorTexture: this.state.colorTexture,
             // Disable line rendering
             extruded: false,
             stroked: false,
@@ -159,6 +200,25 @@ class HeatmapTileLayer extends CompositeLayer {
             transitions: { elevationScale: { type: 'spring', stiffness: 0.3, damping: 0.5 } }
         }));
     }
+    _updateColorTexture(opts) {
+        const { colorRange } = opts.props;
+        let { colorTexture } = this.state;
+        const colors = colorRangeToFlatArray(colorRange);
+        if (colorTexture && colorTexture?.width === colorRange.length) {
+            // TODO(v9): Unclear whether `setSubImageData` is a public API, or what to use if not.
+            colorTexture.setSubImageData({ data: colors });
+        }
+        else {
+            colorTexture?.destroy();
+            colorTexture = this.context.device.createTexture({
+                ...TEXTURE_PROPS,
+                data: colors,
+                width: colorRange.length,
+                height: 1
+            });
+        }
+        this.setState({ colorTexture });
+    }
 }
 HeatmapTileLayer.layerName = 'HeatmapTileLayer';
 HeatmapTileLayer.defaultProps = defaultProps;

package/dist/layers/heatmap.d.ts

@@ -1,5 +1,4 @@
-import type { ShaderPass } from '@luma.gl/shadertools';
-import { Color } from '@deck.gl/core';
+import { Texture } from '@luma.gl/core';
 export type HeatmapProps = {
     /**
      * Radius of the heatmap blur in pixels, to which the weight of a cell is distributed.
@@ -8,35 +7,83 @@ export type HeatmapProps = {
      */
     radiusPixels?: number;
     /**
-     * Controls how weight values are mapped to the `colorRange`, as an array of two numbers [`minValue`, `maxValue`].
+     * Controls how weight values are mapped to the colors in `colorTexture`, as an array of two numbers [`minValue`, `maxValue`].
      *
      * @default [0, 1]
      */
     colorDomain?: [number, number];
-    /**
-     * Specified as an array of colors [color1, color2, ...].
-     *
-     * @default `6-class YlOrRd` - [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6)
-     */
-    colorRange: Color[];
     /**
      * Value that is multiplied with the total weight at a pixel to obtain the final weight. A value larger than 1 biases the output color towards the higher end of the spectrum, and a value less than 1 biases the output color towards the lower end of the spectrum.
      */
     intensity?: number;
+    /**
+     * Color LUT for color gradient
+     */
+    colorTexture: Texture;
     opacity: number;
 };
-export type HeatmapUniforms = {
-    delta?: [number, number];
-    radiusPixels?: number;
-    colorDomain?: [number, number];
-    color1?: [number, number, number];
-    color2?: [number, number, number];
-    color3?: [number, number, number];
-    color4?: [number, number, number];
-    color5?: [number, number, number];
-    color6?: [number, number, number];
-    intensity: number;
-    opacity?: number;
+type PassProps = {
+    delta: [number, number];
+};
+export declare const heatmap: {
+    readonly name: "heatmap";
+    readonly uniformPropTypes: {
+        readonly colorDomain: {
+            readonly value: readonly [0, 1];
+        };
+        readonly delta: {
+            readonly value: readonly [0, 1];
+        };
+        readonly intensity: {
+            readonly value: 1;
+            readonly min: 0.1;
+            readonly max: 10;
+        };
+        readonly opacity: {
+            readonly value: 1;
+            readonly min: 0;
+            readonly max: 1;
+        };
+        readonly radiusPixels: {
+            readonly value: 20;
+            readonly min: 0;
+            readonly softMax: 100;
+        };
+    };
+    readonly uniformTypes: {
+        readonly colorDomain: "vec2<f32>";
+        readonly delta: "vec2<f32>";
+        readonly intensity: "f32";
+        readonly opacity: "f32";
+        readonly radiusPixels: "f32";
+    };
+    readonly getUniforms: (opts: Partial<HeatmapProps & PassProps> | undefined) => {
+        colorDomain?: undefined;
+        colorTexture?: undefined;
+        delta?: undefined;
+        intensity?: undefined;
+        opacity?: undefined;
+        radiusPixels?: undefined;
+    } | {
+        colorDomain: [number, number];
+        colorTexture: Texture<import("@luma.gl/core").TextureProps> | undefined;
+        delta: [number, number];
+        intensity: number;
+        opacity: number;
+        radiusPixels: number;
+    };
+    readonly fs: string;
+    readonly passes: [{
+        readonly sampler: true;
+        readonly uniforms: {
+            readonly delta: [1, 0];
+        };
+    }, {
+        readonly sampler: true;
+        readonly uniforms: {
+            readonly delta: [0, 1];
+        };
+    }];
 };
-export declare const heatmap: ShaderPass<HeatmapProps, HeatmapUniforms>;
+export {};
 //# sourceMappingURL=heatmap.d.ts.map

package/dist/layers/heatmap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heatmap.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AA6HpC,MAAM,MAAM,YAAY,GAAG;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,eAAe,CA0D7D,CAAC"}
+{"version":3,"file":"heatmap.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AA2FtC,MAAM,MAAM,YAAY,GAAG;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCqC,CAAC"}

package/dist/layers/heatmap.js

@@ -3,45 +3,21 @@ const glsl = (s) => `${s}`;
  * @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 = `\
 uniform heatmapUniforms {
-vec2 delta;
-float radiusPixels;
 vec2 colorDomain;
-vec3 color1;
-vec3 color2;
-vec3 color3;
-vec3 color4;
-vec3 color5;
-vec3 color6;
+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;
@@ -81,58 +57,33 @@ 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
     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,

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

@@ -1,6 +1,6 @@
-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 SpatialIndexTileLayer, { SpatialIndexTileLayerProps } from "./spatial-index-tile-layer.js";
 import type { TilejsonResult } from "../sources/types.js";
 export declare const renderSubLayers: (props: any) => QuadbinLayer<any, {
     getQuadbin: (d: any) => any;
@@ -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":"AAAA,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,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,qBAAqB,GAAG,IAAI;CAgB7C"}

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

@@ -31,18 +31,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/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// 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";
 export default _default;
 //# sourceMappingURL=raster-layer-vertex.glsl.d.ts.map

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

@@ -24,7 +24,7 @@ vec2 common_position = 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));
+common_position += scale * vec2(float(xIndex), float(yIndex - 1));
 vec4 color = isStroke ? instanceLineColors : instanceFillColors;
 float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);
 float cellWidth = coverage * scale;

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":"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"}