@deck.gl/carto 9.2.0-alpha.2 → 9.2.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/parse-map.js +1 -1
- package/dist/api/parse-map.js.map +1 -1
- package/dist/cartoPropertiesTile-worker.js +1 -1
- package/dist/cartoRasterTile-worker.js +1 -1
- package/dist/cartoSpatialTile-worker.js +1 -1
- package/dist/cartoVectorTile-worker.js +1 -1
- package/dist/dist.dev.js +67 -49
- package/dist/index.cjs +66 -48
- package/dist/index.cjs.map +3 -3
- package/dist/layers/h3-tileset-2d.d.ts.map +1 -1
- package/dist/layers/h3-tileset-2d.js +16 -5
- package/dist/layers/h3-tileset-2d.js.map +1 -1
- package/dist/layers/heatmap-tile-layer.d.ts +3 -1
- package/dist/layers/heatmap-tile-layer.d.ts.map +1 -1
- package/dist/layers/heatmap-tile-layer.js +69 -35
- package/dist/layers/heatmap-tile-layer.js.map +1 -1
- package/dist/layers/heatmap.d.ts +1 -1
- package/dist/layers/heatmap.d.ts.map +1 -1
- package/dist/layers/heatmap.js +3 -0
- package/dist/layers/heatmap.js.map +1 -1
- package/dist/layers/post-process-utils.d.ts.map +1 -1
- package/dist/layers/post-process-utils.js +2 -1
- package/dist/layers/post-process-utils.js.map +1 -1
- package/dist/layers/raster-layer.d.ts.map +1 -1
- package/dist/layers/raster-layer.js +1 -11
- package/dist/layers/raster-layer.js.map +1 -1
- package/dist/layers/schema/carto-properties-tile-loader.js +1 -1
- package/dist/layers/schema/carto-properties-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-spatial-tile-loader.js +1 -1
- package/dist/layers/schema/carto-spatial-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js.map +1 -1
- package/dist.min.js +12 -9
- package/package.json +5 -5
- package/src/api/parse-map.ts +1 -1
- package/src/layers/h3-tileset-2d.ts +18 -5
- package/src/layers/heatmap-tile-layer.ts +78 -35
- package/src/layers/heatmap.ts +3 -0
- package/src/layers/post-process-utils.ts +2 -1
- package/src/layers/raster-layer.ts +1 -12
package/dist/api/parse-map.js
CHANGED
|
@@ -54,7 +54,7 @@ function createParametersProp(layerBlending, parameters) {
|
|
|
54
54
|
}
|
|
55
55
|
else if (layerBlending === 'subtractive') {
|
|
56
56
|
parameters.blendColorSrcFactor = 'one';
|
|
57
|
-
parameters.blendColorDstFactor = 'one-minus-dst
|
|
57
|
+
parameters.blendColorDstFactor = 'one-minus-dst';
|
|
58
58
|
parameters.blendAlphaSrcFactor = 'src-alpha';
|
|
59
59
|
parameters.blendAlphaDstFactor = 'dst-alpha';
|
|
60
60
|
parameters.blendColorOperation = 'subtract';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-map.js","sourceRoot":"","sources":["../../src/api/parse-map.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parse-map.js","sourceRoot":"","sources":["../../src/api/parse-map.ts"],"names":[],"mappings":"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"}
|
|
@@ -5530,7 +5530,7 @@
|
|
|
5530
5530
|
};
|
|
5531
5531
|
|
|
5532
5532
|
// src/layers/schema/carto-properties-tile-loader.ts
|
|
5533
|
-
var VERSION = true ? "9.2.0-
|
|
5533
|
+
var VERSION = true ? "9.2.0-beta.1" : "latest";
|
|
5534
5534
|
var id = "cartoPropertiesTile";
|
|
5535
5535
|
var DEFAULT_OPTIONS = {
|
|
5536
5536
|
cartoPropertiesTile: {
|
|
@@ -5516,7 +5516,7 @@
|
|
|
5516
5516
|
};
|
|
5517
5517
|
|
|
5518
5518
|
// src/layers/schema/carto-raster-tile-loader.ts
|
|
5519
|
-
var VERSION = true ? "9.2.0-
|
|
5519
|
+
var VERSION = true ? "9.2.0-beta.1" : "latest";
|
|
5520
5520
|
var id = "cartoRasterTile";
|
|
5521
5521
|
var DEFAULT_OPTIONS = {
|
|
5522
5522
|
cartoRasterTile: {
|
|
@@ -5915,7 +5915,7 @@
|
|
|
5915
5915
|
}
|
|
5916
5916
|
|
|
5917
5917
|
// src/layers/schema/carto-spatial-tile-loader.ts
|
|
5918
|
-
var VERSION = true ? "9.2.0-
|
|
5918
|
+
var VERSION = true ? "9.2.0-beta.1" : "latest";
|
|
5919
5919
|
var id = "cartoSpatialTile";
|
|
5920
5920
|
var DEFAULT_OPTIONS = {
|
|
5921
5921
|
cartoSpatialTile: {
|
|
@@ -6135,7 +6135,7 @@
|
|
|
6135
6135
|
};
|
|
6136
6136
|
|
|
6137
6137
|
// src/layers/schema/carto-vector-tile-loader.ts
|
|
6138
|
-
var VERSION = true ? "9.2.0-
|
|
6138
|
+
var VERSION = true ? "9.2.0-beta.1" : "latest";
|
|
6139
6139
|
var id = "cartoVectorTile";
|
|
6140
6140
|
var DEFAULT_OPTIONS = {
|
|
6141
6141
|
cartoVectorTile: {
|
package/dist/dist.dev.js
CHANGED
|
@@ -7117,7 +7117,7 @@ var __exports__ = (() => {
|
|
|
7117
7117
|
var import_geo_layers3 = __toESM(require_geo_layers(), 1);
|
|
7118
7118
|
var import_h3_js = __toESM(require_h3_js(), 1);
|
|
7119
7119
|
var MAX_LATITUDE2 = 85.051128;
|
|
7120
|
-
function padBoundingBox({ west, north, east, south }, resolution) {
|
|
7120
|
+
function padBoundingBox({ west, north, east, south }, resolution, scale = 1) {
|
|
7121
7121
|
const corners = [
|
|
7122
7122
|
[north, east],
|
|
7123
7123
|
[south, east],
|
|
@@ -7128,7 +7128,7 @@ var __exports__ = (() => {
|
|
|
7128
7128
|
const cornerEdgeLengths = cornerCells.map(
|
|
7129
7129
|
(c) => Math.max(...(0, import_h3_js.originToDirectedEdges)(c).map((e) => (0, import_h3_js.edgeLength)(e, import_h3_js.UNITS.rads))) * 180 / Math.PI
|
|
7130
7130
|
);
|
|
7131
|
-
const bufferLat = Math.max(...cornerEdgeLengths);
|
|
7131
|
+
const bufferLat = Math.max(...cornerEdgeLengths) * scale;
|
|
7132
7132
|
const bufferLon = Math.min(180, bufferLat / Math.cos((north + south) / 2 * Math.PI / 180));
|
|
7133
7133
|
return {
|
|
7134
7134
|
north: Math.min(north + bufferLat, MAX_LATITUDE2),
|
|
@@ -7168,7 +7168,8 @@ var __exports__ = (() => {
|
|
|
7168
7168
|
const south = Math.min(...latitudes);
|
|
7169
7169
|
const east = Math.max(...longitudes);
|
|
7170
7170
|
const north = Math.max(...latitudes);
|
|
7171
|
-
|
|
7171
|
+
const bbox2 = { west, south, east, north };
|
|
7172
|
+
return padBoundingBox(bbox2, (0, import_h3_js.getResolution)(index2), 0.12);
|
|
7172
7173
|
}
|
|
7173
7174
|
var BIAS = 2;
|
|
7174
7175
|
function getHexagonResolution(viewport, tileSize) {
|
|
@@ -7348,6 +7349,7 @@ var __exports__ = (() => {
|
|
|
7348
7349
|
H3TileLayer.defaultProps = defaultProps3;
|
|
7349
7350
|
|
|
7350
7351
|
// src/layers/heatmap-tile-layer.ts
|
|
7352
|
+
var import_h3_js2 = __toESM(require_h3_js(), 1);
|
|
7351
7353
|
var import_core11 = __toESM(require_core2(), 1);
|
|
7352
7354
|
var import_layers2 = __toESM(require_layers(), 1);
|
|
7353
7355
|
|
|
@@ -7428,6 +7430,9 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7428
7430
|
color.a = pow(color.a, 1.0 / 2.2);
|
|
7429
7431
|
color.a *= heatmap.opacity;
|
|
7430
7432
|
|
|
7433
|
+
// Use premultiplied alpha for compatibility with blending in ScreenPass
|
|
7434
|
+
color.rgb *= color.a;
|
|
7435
|
+
|
|
7431
7436
|
return color;
|
|
7432
7437
|
}
|
|
7433
7438
|
`
|
|
@@ -7482,7 +7487,8 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7482
7487
|
var import_core9 = __toESM(require_core2(), 1);
|
|
7483
7488
|
var TEXTURE_PROPS = {
|
|
7484
7489
|
format: "rgba8unorm",
|
|
7485
|
-
|
|
7490
|
+
width: 1,
|
|
7491
|
+
height: 1,
|
|
7486
7492
|
sampler: {
|
|
7487
7493
|
minFilter: "linear",
|
|
7488
7494
|
magFilter: "linear",
|
|
@@ -7692,7 +7698,9 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7692
7698
|
];
|
|
7693
7699
|
var TEXTURE_PROPS2 = {
|
|
7694
7700
|
format: "rgba8unorm",
|
|
7695
|
-
|
|
7701
|
+
dimension: "2d",
|
|
7702
|
+
width: 1,
|
|
7703
|
+
height: 1,
|
|
7696
7704
|
sampler: {
|
|
7697
7705
|
minFilter: "linear",
|
|
7698
7706
|
magFilter: "linear",
|
|
@@ -7700,10 +7708,14 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7700
7708
|
addressModeV: "clamp-to-edge"
|
|
7701
7709
|
}
|
|
7702
7710
|
};
|
|
7703
|
-
function
|
|
7711
|
+
function unitDensityForQuadbinCell(cell) {
|
|
7704
7712
|
const cellResolution = Number(getResolution(cell));
|
|
7705
7713
|
return Math.pow(4, cellResolution);
|
|
7706
7714
|
}
|
|
7715
|
+
function unitDensityForH3Cell(cellId) {
|
|
7716
|
+
const cellResolution = Number((0, import_h3_js2.getResolution)(cellId));
|
|
7717
|
+
return (0, import_h3_js2.getNumCells)(cellResolution);
|
|
7718
|
+
}
|
|
7707
7719
|
function colorRangeToFlatArray(colorRange) {
|
|
7708
7720
|
const flatArray = new Uint8Array(colorRange.length * 4);
|
|
7709
7721
|
let index2 = 0;
|
|
@@ -7755,18 +7767,21 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7755
7767
|
}
|
|
7756
7768
|
draw(opts) {
|
|
7757
7769
|
const cell = this.props.data[0];
|
|
7758
|
-
|
|
7759
|
-
|
|
7760
|
-
|
|
7761
|
-
|
|
7762
|
-
|
|
7763
|
-
|
|
7770
|
+
if (cell) {
|
|
7771
|
+
const maxDensity = this.props.elevationScale;
|
|
7772
|
+
const { scheme } = this.parent.parent.parent.parent.parent.state;
|
|
7773
|
+
const unitDensity = scheme === "h3" ? unitDensityForH3Cell(cell.id) : unitDensityForQuadbinCell(cell.id);
|
|
7774
|
+
const densityProps = { factor: unitDensity / maxDensity };
|
|
7775
|
+
for (const model of this.state.models) {
|
|
7776
|
+
model.shaderInputs.setProps({ density: densityProps });
|
|
7777
|
+
}
|
|
7764
7778
|
}
|
|
7765
7779
|
super.draw(opts);
|
|
7766
7780
|
}
|
|
7767
7781
|
};
|
|
7768
7782
|
RTTSolidPolygonLayer.layerName = "RTTSolidPolygonLayer";
|
|
7769
7783
|
var PostProcessQuadbinTileLayer = PostProcessModifier(QuadbinTileLayer, heatmap);
|
|
7784
|
+
var PostProcessH3TileLayer = PostProcessModifier(H3TileLayer, heatmap);
|
|
7770
7785
|
var defaultProps6 = {
|
|
7771
7786
|
data: TilejsonPropType,
|
|
7772
7787
|
getWeight: { type: "accessor", value: 1 },
|
|
@@ -7780,6 +7795,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7780
7795
|
initializeState() {
|
|
7781
7796
|
this.state = {
|
|
7782
7797
|
isLoaded: false,
|
|
7798
|
+
scheme: null,
|
|
7783
7799
|
tiles: /* @__PURE__ */ new Set(),
|
|
7784
7800
|
viewportChanged: false
|
|
7785
7801
|
};
|
|
@@ -7792,9 +7808,14 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7792
7808
|
updateState(opts) {
|
|
7793
7809
|
const { props, oldProps } = opts;
|
|
7794
7810
|
super.updateState(opts);
|
|
7795
|
-
if (props.colorRange
|
|
7811
|
+
if (!(0, import_core11._deepEqual)(props.colorRange, oldProps.colorRange, 2)) {
|
|
7796
7812
|
this._updateColorTexture(opts);
|
|
7797
7813
|
}
|
|
7814
|
+
const scheme = props.data && "scheme" in props.data ? props.data.scheme : null;
|
|
7815
|
+
if (this.state.scheme !== scheme) {
|
|
7816
|
+
this.setState({ scheme });
|
|
7817
|
+
this.state.tiles.clear();
|
|
7818
|
+
}
|
|
7798
7819
|
}
|
|
7799
7820
|
renderLayers() {
|
|
7800
7821
|
const {
|
|
@@ -7811,14 +7832,16 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7811
7832
|
onTileUnload,
|
|
7812
7833
|
...tileLayerProps
|
|
7813
7834
|
} = this.props;
|
|
7835
|
+
const isH3 = this.state.scheme === "h3";
|
|
7836
|
+
const cellLayerName = isH3 ? "hexagon-cell-hifi" : "cell";
|
|
7814
7837
|
const subLayerProps = {
|
|
7815
7838
|
..._subLayerProps,
|
|
7816
|
-
|
|
7817
|
-
..._subLayerProps?.
|
|
7839
|
+
[cellLayerName]: {
|
|
7840
|
+
..._subLayerProps?.[cellLayerName],
|
|
7818
7841
|
_subLayerProps: {
|
|
7819
|
-
..._subLayerProps?.
|
|
7842
|
+
..._subLayerProps?.[cellLayerName]?._subLayerProps,
|
|
7820
7843
|
fill: {
|
|
7821
|
-
..._subLayerProps?.
|
|
7844
|
+
..._subLayerProps?.[cellLayerName]?._subLayerProps?.fill,
|
|
7822
7845
|
type: RTTSolidPolygonLayer
|
|
7823
7846
|
}
|
|
7824
7847
|
}
|
|
@@ -7831,18 +7854,27 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7831
7854
|
const tiles3 = visibleTiles.length ? visibleTiles : loadedTiles;
|
|
7832
7855
|
for (const tile of tiles3) {
|
|
7833
7856
|
const cell = tile.content[0];
|
|
7834
|
-
const unitDensity =
|
|
7857
|
+
const unitDensity = isH3 ? unitDensityForH3Cell(cell.id) : unitDensityForQuadbinCell(cell.id);
|
|
7835
7858
|
maxDensity = Math.max(tile.userData.maxWeight * unitDensity, maxDensity);
|
|
7836
7859
|
tileZ = Math.max(tile.zoom, tileZ);
|
|
7837
7860
|
}
|
|
7838
|
-
|
|
7839
|
-
|
|
7840
|
-
|
|
7861
|
+
let overzoom;
|
|
7862
|
+
let estimatedGrowthFactor;
|
|
7863
|
+
if (isH3) {
|
|
7864
|
+
overzoom = 2 / 3 * this.context.viewport.zoom - tileZ - 2.25;
|
|
7865
|
+
estimatedGrowthFactor = 2.2;
|
|
7866
|
+
} else {
|
|
7867
|
+
overzoom = this.context.viewport.zoom - tileZ;
|
|
7868
|
+
estimatedGrowthFactor = 2;
|
|
7869
|
+
}
|
|
7870
|
+
maxDensity = maxDensity * Math.pow(estimatedGrowthFactor, overzoom);
|
|
7841
7871
|
if (typeof onMaxDensityChange === "function") {
|
|
7842
7872
|
onMaxDensityChange(maxDensity);
|
|
7843
7873
|
}
|
|
7844
|
-
|
|
7845
|
-
|
|
7874
|
+
const PostProcessTileLayer2 = isH3 ? PostProcessH3TileLayer : PostProcessQuadbinTileLayer;
|
|
7875
|
+
const layerProps = isH3 ? tileLayerProps : tileLayerProps;
|
|
7876
|
+
return new PostProcessTileLayer2(
|
|
7877
|
+
layerProps,
|
|
7846
7878
|
this.getSubLayerProps({
|
|
7847
7879
|
id: "heatmap",
|
|
7848
7880
|
data,
|
|
@@ -7899,17 +7931,13 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
7899
7931
|
const { colorRange } = opts.props;
|
|
7900
7932
|
let { colorTexture } = this.state;
|
|
7901
7933
|
const colors = colorRangeToFlatArray(colorRange);
|
|
7902
|
-
|
|
7903
|
-
|
|
7904
|
-
|
|
7905
|
-
|
|
7906
|
-
|
|
7907
|
-
|
|
7908
|
-
|
|
7909
|
-
width: colorRange.length,
|
|
7910
|
-
height: 1
|
|
7911
|
-
});
|
|
7912
|
-
}
|
|
7934
|
+
colorTexture?.destroy();
|
|
7935
|
+
colorTexture = this.context.device.createTexture({
|
|
7936
|
+
...TEXTURE_PROPS2,
|
|
7937
|
+
data: colors,
|
|
7938
|
+
width: colorRange.length,
|
|
7939
|
+
height: 1
|
|
7940
|
+
});
|
|
7913
7941
|
this.setState({ colorTexture });
|
|
7914
7942
|
}
|
|
7915
7943
|
};
|
|
@@ -8287,17 +8315,7 @@ void main(void) {
|
|
|
8287
8315
|
lineWidthScale,
|
|
8288
8316
|
// Re-use widthScale prop to pass cell scale,
|
|
8289
8317
|
highlightedObjectIndex,
|
|
8290
|
-
highlightColor
|
|
8291
|
-
// RTT requires blending otherwise opacity < 1 blends with black
|
|
8292
|
-
// render target
|
|
8293
|
-
parameters: {
|
|
8294
|
-
blendColorSrcFactor: "one",
|
|
8295
|
-
blendAlphaSrcFactor: "one",
|
|
8296
|
-
blendColorDstFactor: "zero",
|
|
8297
|
-
blendAlphaDstFactor: "zero",
|
|
8298
|
-
blendColorOperation: "add",
|
|
8299
|
-
blendAlphaOperation: "add"
|
|
8300
|
-
}
|
|
8318
|
+
highlightColor
|
|
8301
8319
|
}
|
|
8302
8320
|
);
|
|
8303
8321
|
}
|
|
@@ -9371,7 +9389,7 @@ void main(void) {
|
|
|
9371
9389
|
}
|
|
9372
9390
|
|
|
9373
9391
|
// ../../node_modules/@carto/api-client/build/api-client.js
|
|
9374
|
-
var
|
|
9392
|
+
var import_h3_js3 = __toESM(require_h3_js(), 1);
|
|
9375
9393
|
|
|
9376
9394
|
// ../../node_modules/d3-array/src/ascending.js
|
|
9377
9395
|
function ascending(a, b) {
|
|
@@ -16592,7 +16610,7 @@ void main(void) {
|
|
|
16592
16610
|
return Number(getResolution3(data[0].id));
|
|
16593
16611
|
}
|
|
16594
16612
|
if (spatialIndex === "h3") {
|
|
16595
|
-
return (0,
|
|
16613
|
+
return (0, import_h3_js3.getResolution)(data[0].id);
|
|
16596
16614
|
}
|
|
16597
16615
|
}
|
|
16598
16616
|
var bboxWest = [-180, -90, 0, 90];
|
|
@@ -16602,12 +16620,12 @@ void main(void) {
|
|
|
16602
16620
|
return geometryToCells(geometry, resolution);
|
|
16603
16621
|
}
|
|
16604
16622
|
if (spatialIndex === "h3") {
|
|
16605
|
-
return (0,
|
|
16623
|
+
return (0, import_h3_js3.polygonToCells)(
|
|
16606
16624
|
turf_bbox_clip_default(geometry, bboxWest).geometry.coordinates,
|
|
16607
16625
|
resolution,
|
|
16608
16626
|
true
|
|
16609
16627
|
).concat(
|
|
16610
|
-
(0,
|
|
16628
|
+
(0, import_h3_js3.polygonToCells)(
|
|
16611
16629
|
turf_bbox_clip_default(geometry, bboxEast).geometry.coordinates,
|
|
16612
16630
|
resolution,
|
|
16613
16631
|
true
|
package/dist/index.cjs
CHANGED
|
@@ -556,7 +556,7 @@ function binaryToSpatialjson(binary) {
|
|
|
556
556
|
}
|
|
557
557
|
|
|
558
558
|
// dist/layers/schema/carto-spatial-tile-loader.js
|
|
559
|
-
var VERSION = true ? "9.2.0-
|
|
559
|
+
var VERSION = true ? "9.2.0-beta.1" : "latest";
|
|
560
560
|
var id = "cartoSpatialTile";
|
|
561
561
|
var DEFAULT_OPTIONS = {
|
|
562
562
|
cartoSpatialTile: {
|
|
@@ -798,7 +798,7 @@ var import_geo_layers5 = require("@deck.gl/geo-layers");
|
|
|
798
798
|
var import_geo_layers3 = require("@deck.gl/geo-layers");
|
|
799
799
|
var import_h3_js = require("h3-js");
|
|
800
800
|
var MAX_LATITUDE = 85.051128;
|
|
801
|
-
function padBoundingBox({ west, north, east, south }, resolution) {
|
|
801
|
+
function padBoundingBox({ west, north, east, south }, resolution, scale = 1) {
|
|
802
802
|
const corners = [
|
|
803
803
|
[north, east],
|
|
804
804
|
[south, east],
|
|
@@ -807,7 +807,7 @@ function padBoundingBox({ west, north, east, south }, resolution) {
|
|
|
807
807
|
];
|
|
808
808
|
const cornerCells = corners.map((c) => (0, import_h3_js.latLngToCell)(c[0], c[1], resolution));
|
|
809
809
|
const cornerEdgeLengths = cornerCells.map((c) => Math.max(...(0, import_h3_js.originToDirectedEdges)(c).map((e) => (0, import_h3_js.edgeLength)(e, import_h3_js.UNITS.rads))) * 180 / Math.PI);
|
|
810
|
-
const bufferLat = Math.max(...cornerEdgeLengths);
|
|
810
|
+
const bufferLat = Math.max(...cornerEdgeLengths) * scale;
|
|
811
811
|
const bufferLon = Math.min(180, bufferLat / Math.cos((north + south) / 2 * Math.PI / 180));
|
|
812
812
|
return {
|
|
813
813
|
north: Math.min(north + bufferLat, MAX_LATITUDE),
|
|
@@ -845,7 +845,8 @@ function tileToBoundingBox(index) {
|
|
|
845
845
|
const south = Math.min(...latitudes);
|
|
846
846
|
const east = Math.max(...longitudes);
|
|
847
847
|
const north = Math.max(...latitudes);
|
|
848
|
-
|
|
848
|
+
const bbox = { west, south, east, north };
|
|
849
|
+
return padBoundingBox(bbox, (0, import_h3_js.getResolution)(index), 0.12);
|
|
849
850
|
}
|
|
850
851
|
var BIAS = 2;
|
|
851
852
|
function getHexagonResolution(viewport, tileSize) {
|
|
@@ -1022,6 +1023,7 @@ var h3_tile_layer_default = H3TileLayer;
|
|
|
1022
1023
|
|
|
1023
1024
|
// dist/layers/heatmap-tile-layer.js
|
|
1024
1025
|
var import_quadbin6 = require("quadbin");
|
|
1026
|
+
var import_h3_js2 = require("h3-js");
|
|
1025
1027
|
var import_core11 = require("@deck.gl/core");
|
|
1026
1028
|
var import_layers2 = require("@deck.gl/layers");
|
|
1027
1029
|
|
|
@@ -1102,6 +1104,9 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
1102
1104
|
color.a = pow(color.a, 1.0 / 2.2);
|
|
1103
1105
|
color.a *= heatmap.opacity;
|
|
1104
1106
|
|
|
1107
|
+
// Use premultiplied alpha for compatibility with blending in ScreenPass
|
|
1108
|
+
color.rgb *= color.a;
|
|
1109
|
+
|
|
1105
1110
|
return color;
|
|
1106
1111
|
}
|
|
1107
1112
|
`
|
|
@@ -1149,7 +1154,8 @@ var heatmap = {
|
|
|
1149
1154
|
var import_core9 = require("@deck.gl/core");
|
|
1150
1155
|
var TEXTURE_PROPS = {
|
|
1151
1156
|
format: "rgba8unorm",
|
|
1152
|
-
|
|
1157
|
+
width: 1,
|
|
1158
|
+
height: 1,
|
|
1153
1159
|
sampler: {
|
|
1154
1160
|
minFilter: "linear",
|
|
1155
1161
|
magFilter: "linear",
|
|
@@ -1362,7 +1368,9 @@ var defaultColorRange = [
|
|
|
1362
1368
|
];
|
|
1363
1369
|
var TEXTURE_PROPS2 = {
|
|
1364
1370
|
format: "rgba8unorm",
|
|
1365
|
-
|
|
1371
|
+
dimension: "2d",
|
|
1372
|
+
width: 1,
|
|
1373
|
+
height: 1,
|
|
1366
1374
|
sampler: {
|
|
1367
1375
|
minFilter: "linear",
|
|
1368
1376
|
magFilter: "linear",
|
|
@@ -1370,10 +1378,14 @@ var TEXTURE_PROPS2 = {
|
|
|
1370
1378
|
addressModeV: "clamp-to-edge"
|
|
1371
1379
|
}
|
|
1372
1380
|
};
|
|
1373
|
-
function
|
|
1381
|
+
function unitDensityForQuadbinCell(cell) {
|
|
1374
1382
|
const cellResolution = Number((0, import_quadbin6.getResolution)(cell));
|
|
1375
1383
|
return Math.pow(4, cellResolution);
|
|
1376
1384
|
}
|
|
1385
|
+
function unitDensityForH3Cell(cellId) {
|
|
1386
|
+
const cellResolution = Number((0, import_h3_js2.getResolution)(cellId));
|
|
1387
|
+
return (0, import_h3_js2.getNumCells)(cellResolution);
|
|
1388
|
+
}
|
|
1377
1389
|
function colorRangeToFlatArray(colorRange) {
|
|
1378
1390
|
const flatArray = new Uint8Array(colorRange.length * 4);
|
|
1379
1391
|
let index = 0;
|
|
@@ -1425,18 +1437,21 @@ var RTTSolidPolygonLayer = class extends RTTModifier(import_layers2.SolidPolygon
|
|
|
1425
1437
|
}
|
|
1426
1438
|
draw(opts) {
|
|
1427
1439
|
const cell = this.props.data[0];
|
|
1428
|
-
|
|
1429
|
-
|
|
1430
|
-
|
|
1431
|
-
|
|
1432
|
-
|
|
1433
|
-
|
|
1440
|
+
if (cell) {
|
|
1441
|
+
const maxDensity = this.props.elevationScale;
|
|
1442
|
+
const { scheme } = this.parent.parent.parent.parent.parent.state;
|
|
1443
|
+
const unitDensity = scheme === "h3" ? unitDensityForH3Cell(cell.id) : unitDensityForQuadbinCell(cell.id);
|
|
1444
|
+
const densityProps = { factor: unitDensity / maxDensity };
|
|
1445
|
+
for (const model of this.state.models) {
|
|
1446
|
+
model.shaderInputs.setProps({ density: densityProps });
|
|
1447
|
+
}
|
|
1434
1448
|
}
|
|
1435
1449
|
super.draw(opts);
|
|
1436
1450
|
}
|
|
1437
1451
|
};
|
|
1438
1452
|
RTTSolidPolygonLayer.layerName = "RTTSolidPolygonLayer";
|
|
1439
1453
|
var PostProcessQuadbinTileLayer = PostProcessModifier(quadbin_tile_layer_default, heatmap);
|
|
1454
|
+
var PostProcessH3TileLayer = PostProcessModifier(h3_tile_layer_default, heatmap);
|
|
1440
1455
|
var defaultProps6 = {
|
|
1441
1456
|
data: TilejsonPropType,
|
|
1442
1457
|
getWeight: { type: "accessor", value: 1 },
|
|
@@ -1450,6 +1465,7 @@ var HeatmapTileLayer = class extends import_core11.CompositeLayer {
|
|
|
1450
1465
|
initializeState() {
|
|
1451
1466
|
this.state = {
|
|
1452
1467
|
isLoaded: false,
|
|
1468
|
+
scheme: null,
|
|
1453
1469
|
tiles: /* @__PURE__ */ new Set(),
|
|
1454
1470
|
viewportChanged: false
|
|
1455
1471
|
};
|
|
@@ -1462,21 +1478,28 @@ var HeatmapTileLayer = class extends import_core11.CompositeLayer {
|
|
|
1462
1478
|
updateState(opts) {
|
|
1463
1479
|
const { props, oldProps } = opts;
|
|
1464
1480
|
super.updateState(opts);
|
|
1465
|
-
if (props.colorRange
|
|
1481
|
+
if (!(0, import_core11._deepEqual)(props.colorRange, oldProps.colorRange, 2)) {
|
|
1466
1482
|
this._updateColorTexture(opts);
|
|
1467
1483
|
}
|
|
1484
|
+
const scheme = props.data && "scheme" in props.data ? props.data.scheme : null;
|
|
1485
|
+
if (this.state.scheme !== scheme) {
|
|
1486
|
+
this.setState({ scheme });
|
|
1487
|
+
this.state.tiles.clear();
|
|
1488
|
+
}
|
|
1468
1489
|
}
|
|
1469
1490
|
renderLayers() {
|
|
1470
1491
|
var _a, _b, _c;
|
|
1471
1492
|
const { data, getWeight, colorDomain, intensity, radiusPixels, _subLayerProps, updateTriggers, onMaxDensityChange, onViewportLoad, onTileLoad, onTileUnload, ...tileLayerProps } = this.props;
|
|
1493
|
+
const isH3 = this.state.scheme === "h3";
|
|
1494
|
+
const cellLayerName = isH3 ? "hexagon-cell-hifi" : "cell";
|
|
1472
1495
|
const subLayerProps = {
|
|
1473
1496
|
..._subLayerProps,
|
|
1474
|
-
|
|
1475
|
-
..._subLayerProps == null ? void 0 : _subLayerProps
|
|
1497
|
+
[cellLayerName]: {
|
|
1498
|
+
..._subLayerProps == null ? void 0 : _subLayerProps[cellLayerName],
|
|
1476
1499
|
_subLayerProps: {
|
|
1477
|
-
...(_a = _subLayerProps == null ? void 0 : _subLayerProps
|
|
1500
|
+
...(_a = _subLayerProps == null ? void 0 : _subLayerProps[cellLayerName]) == null ? void 0 : _a._subLayerProps,
|
|
1478
1501
|
fill: {
|
|
1479
|
-
...(_c = (_b = _subLayerProps == null ? void 0 : _subLayerProps
|
|
1502
|
+
...(_c = (_b = _subLayerProps == null ? void 0 : _subLayerProps[cellLayerName]) == null ? void 0 : _b._subLayerProps) == null ? void 0 : _c.fill,
|
|
1480
1503
|
type: RTTSolidPolygonLayer
|
|
1481
1504
|
}
|
|
1482
1505
|
}
|
|
@@ -1489,17 +1512,26 @@ var HeatmapTileLayer = class extends import_core11.CompositeLayer {
|
|
|
1489
1512
|
const tiles = visibleTiles.length ? visibleTiles : loadedTiles;
|
|
1490
1513
|
for (const tile of tiles) {
|
|
1491
1514
|
const cell = tile.content[0];
|
|
1492
|
-
const unitDensity =
|
|
1515
|
+
const unitDensity = isH3 ? unitDensityForH3Cell(cell.id) : unitDensityForQuadbinCell(cell.id);
|
|
1493
1516
|
maxDensity = Math.max(tile.userData.maxWeight * unitDensity, maxDensity);
|
|
1494
1517
|
tileZ = Math.max(tile.zoom, tileZ);
|
|
1495
1518
|
}
|
|
1496
|
-
|
|
1497
|
-
|
|
1498
|
-
|
|
1519
|
+
let overzoom;
|
|
1520
|
+
let estimatedGrowthFactor;
|
|
1521
|
+
if (isH3) {
|
|
1522
|
+
overzoom = 2 / 3 * this.context.viewport.zoom - tileZ - 2.25;
|
|
1523
|
+
estimatedGrowthFactor = 2.2;
|
|
1524
|
+
} else {
|
|
1525
|
+
overzoom = this.context.viewport.zoom - tileZ;
|
|
1526
|
+
estimatedGrowthFactor = 2;
|
|
1527
|
+
}
|
|
1528
|
+
maxDensity = maxDensity * Math.pow(estimatedGrowthFactor, overzoom);
|
|
1499
1529
|
if (typeof onMaxDensityChange === "function") {
|
|
1500
1530
|
onMaxDensityChange(maxDensity);
|
|
1501
1531
|
}
|
|
1502
|
-
|
|
1532
|
+
const PostProcessTileLayer2 = isH3 ? PostProcessH3TileLayer : PostProcessQuadbinTileLayer;
|
|
1533
|
+
const layerProps = isH3 ? tileLayerProps : tileLayerProps;
|
|
1534
|
+
return new PostProcessTileLayer2(layerProps, this.getSubLayerProps({
|
|
1503
1535
|
id: "heatmap",
|
|
1504
1536
|
data,
|
|
1505
1537
|
// Re-use existing props to pass down values to sublayer
|
|
@@ -1554,17 +1586,13 @@ var HeatmapTileLayer = class extends import_core11.CompositeLayer {
|
|
|
1554
1586
|
const { colorRange } = opts.props;
|
|
1555
1587
|
let { colorTexture } = this.state;
|
|
1556
1588
|
const colors = colorRangeToFlatArray(colorRange);
|
|
1557
|
-
|
|
1558
|
-
|
|
1559
|
-
|
|
1560
|
-
|
|
1561
|
-
|
|
1562
|
-
|
|
1563
|
-
|
|
1564
|
-
width: colorRange.length,
|
|
1565
|
-
height: 1
|
|
1566
|
-
});
|
|
1567
|
-
}
|
|
1589
|
+
colorTexture == null ? void 0 : colorTexture.destroy();
|
|
1590
|
+
colorTexture = this.context.device.createTexture({
|
|
1591
|
+
...TEXTURE_PROPS2,
|
|
1592
|
+
data: colors,
|
|
1593
|
+
width: colorRange.length,
|
|
1594
|
+
height: 1
|
|
1595
|
+
});
|
|
1568
1596
|
this.setState({ colorTexture });
|
|
1569
1597
|
}
|
|
1570
1598
|
};
|
|
@@ -1861,17 +1889,7 @@ var RasterLayer = class extends import_core13.CompositeLayer {
|
|
|
1861
1889
|
lineWidthScale,
|
|
1862
1890
|
// Re-use widthScale prop to pass cell scale,
|
|
1863
1891
|
highlightedObjectIndex,
|
|
1864
|
-
highlightColor
|
|
1865
|
-
// RTT requires blending otherwise opacity < 1 blends with black
|
|
1866
|
-
// render target
|
|
1867
|
-
parameters: {
|
|
1868
|
-
blendColorSrcFactor: "one",
|
|
1869
|
-
blendAlphaSrcFactor: "one",
|
|
1870
|
-
blendColorDstFactor: "zero",
|
|
1871
|
-
blendAlphaDstFactor: "zero",
|
|
1872
|
-
blendColorOperation: "add",
|
|
1873
|
-
blendAlphaOperation: "add"
|
|
1874
|
-
}
|
|
1892
|
+
highlightColor
|
|
1875
1893
|
});
|
|
1876
1894
|
}
|
|
1877
1895
|
getSubLayerAccessor(accessor) {
|
|
@@ -1967,7 +1985,7 @@ var TileReader3 = class {
|
|
|
1967
1985
|
};
|
|
1968
1986
|
|
|
1969
1987
|
// dist/layers/schema/carto-raster-tile-loader.js
|
|
1970
|
-
var VERSION2 = true ? "9.2.0-
|
|
1988
|
+
var VERSION2 = true ? "9.2.0-beta.1" : "latest";
|
|
1971
1989
|
var id2 = "cartoRasterTile";
|
|
1972
1990
|
var DEFAULT_OPTIONS2 = {
|
|
1973
1991
|
cartoRasterTile: {
|
|
@@ -2079,7 +2097,7 @@ var TileReader4 = class {
|
|
|
2079
2097
|
};
|
|
2080
2098
|
|
|
2081
2099
|
// dist/layers/schema/carto-properties-tile-loader.js
|
|
2082
|
-
var VERSION3 = true ? "9.2.0-
|
|
2100
|
+
var VERSION3 = true ? "9.2.0-beta.1" : "latest";
|
|
2083
2101
|
var id3 = "cartoPropertiesTile";
|
|
2084
2102
|
var DEFAULT_OPTIONS3 = {
|
|
2085
2103
|
cartoPropertiesTile: {
|
|
@@ -2108,7 +2126,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
|
|
|
2108
2126
|
|
|
2109
2127
|
// dist/layers/schema/carto-vector-tile-loader.js
|
|
2110
2128
|
var import_earcut = __toESM(require("earcut"), 1);
|
|
2111
|
-
var VERSION4 = true ? "9.2.0-
|
|
2129
|
+
var VERSION4 = true ? "9.2.0-beta.1" : "latest";
|
|
2112
2130
|
var id4 = "cartoVectorTile";
|
|
2113
2131
|
var DEFAULT_OPTIONS4 = {
|
|
2114
2132
|
cartoVectorTile: {
|