@deck.gl/carto 9.0.0-beta.7 → 9.0.0-beta.9
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/common.d.ts +1 -1
- package/dist/api/common.js +1 -1
- package/dist/api/fetch-map.d.ts.map +1 -1
- package/dist/api/fetch-map.js +8 -3
- package/dist/api/request-with-parameters.d.ts.map +1 -1
- package/dist/api/request-with-parameters.js +7 -3
- package/dist/cartoRasterTile-worker.js +16 -54
- package/dist/cartoSpatialTile-worker.js +12 -47
- package/dist/cartoVectorTile-worker.js +12 -47
- package/dist/constants.d.ts +5 -0
- package/dist/constants.d.ts.map +1 -0
- package/dist/constants.js +4 -0
- package/dist/dist.dev.js +100 -100
- package/dist/index.cjs +70 -43
- package/dist/index.cjs.map +4 -4
- package/dist/layers/h3-tile-layer.d.ts.map +1 -1
- package/dist/layers/h3-tile-layer.js +3 -1
- package/dist/layers/quadbin-tile-layer.d.ts.map +1 -1
- package/dist/layers/quadbin-tile-layer.js +3 -1
- package/dist/layers/raster-layer.d.ts.map +1 -1
- package/dist/layers/raster-layer.js +5 -6
- package/dist/layers/raster-tile-layer.d.ts.map +1 -1
- package/dist/layers/raster-tile-layer.js +3 -1
- package/dist/layers/schema/carto-raster-tile-loader.d.ts +2 -2
- package/dist/layers/schema/carto-raster-tile-loader.d.ts.map +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js +3 -4
- package/dist/layers/schema/carto-raster-tile.d.ts.map +1 -1
- package/dist/layers/schema/carto-raster-tile.js +2 -4
- package/dist/layers/schema/carto-spatial-tile-loader.js +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist/layers/spatial-index-tile-layer.d.ts.map +1 -1
- package/dist/layers/spatial-index-tile-layer.js +4 -1
- package/dist/layers/vector-tile-layer.d.ts +4 -4
- package/dist/layers/vector-tile-layer.d.ts.map +1 -1
- package/dist/layers/vector-tile-layer.js +3 -1
- package/dist/sources/h3-query-source.d.ts.map +1 -1
- package/dist/sources/h3-query-source.js +2 -1
- package/dist/sources/h3-table-source.d.ts.map +1 -1
- package/dist/sources/h3-table-source.js +2 -4
- package/dist/sources/quadbin-query-source.d.ts.map +1 -1
- package/dist/sources/quadbin-query-source.js +2 -1
- package/dist/sources/quadbin-table-source.d.ts.map +1 -1
- package/dist/sources/quadbin-table-source.js +2 -4
- package/dist/sources/types.d.ts +38 -6
- package/dist/sources/types.d.ts.map +1 -1
- package/dist/sources/vector-query-source.d.ts +2 -4
- package/dist/sources/vector-query-source.d.ts.map +1 -1
- package/dist/sources/vector-query-source.js +8 -2
- package/dist/sources/vector-table-source.d.ts +2 -2
- package/dist/sources/vector-table-source.d.ts.map +1 -1
- package/dist/sources/vector-table-source.js +8 -2
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +5 -1
- package/dist.min.js +7 -7
- package/package.json +10 -10
- package/src/api/common.ts +1 -1
- package/src/api/fetch-map.ts +8 -3
- package/src/api/request-with-parameters.ts +16 -5
- package/src/constants.ts +5 -0
- package/src/layers/h3-tile-layer.ts +3 -1
- package/src/layers/quadbin-tile-layer.ts +3 -1
- package/src/layers/raster-layer.ts +7 -12
- package/src/layers/raster-tile-layer.ts +3 -1
- package/src/layers/schema/carto-raster-tile-loader.ts +5 -5
- package/src/layers/schema/carto-raster-tile.ts +3 -4
- package/src/layers/spatial-index-tile-layer.ts +4 -1
- package/src/layers/vector-tile-layer.ts +10 -6
- package/src/sources/h3-query-source.ts +2 -1
- package/src/sources/h3-table-source.ts +2 -6
- package/src/sources/quadbin-query-source.ts +2 -1
- package/src/sources/quadbin-table-source.ts +2 -6
- package/src/sources/types.ts +41 -6
- package/src/sources/vector-query-source.ts +22 -6
- package/src/sources/vector-table-source.ts +21 -3
- package/src/utils.ts +5 -1
|
@@ -1 +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;
|
|
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"}
|
|
@@ -3,6 +3,7 @@ import { H3HexagonLayer } from '@deck.gl/geo-layers';
|
|
|
3
3
|
import H3Tileset2D, { getHexagonResolution } from "./h3-tileset-2d.js";
|
|
4
4
|
import SpatialIndexTileLayer from "./spatial-index-tile-layer.js";
|
|
5
5
|
import { injectAccessToken, TilejsonPropType } from "./utils.js";
|
|
6
|
+
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
6
7
|
export const renderSubLayers = props => {
|
|
7
8
|
const { data } = props;
|
|
8
9
|
const { index } = props.tile;
|
|
@@ -15,7 +16,8 @@ export const renderSubLayers = props => {
|
|
|
15
16
|
});
|
|
16
17
|
};
|
|
17
18
|
const defaultProps = {
|
|
18
|
-
data: TilejsonPropType
|
|
19
|
+
data: TilejsonPropType,
|
|
20
|
+
tileSize: DEFAULT_TILE_SIZE
|
|
19
21
|
};
|
|
20
22
|
export default class H3TileLayer extends CompositeLayer {
|
|
21
23
|
static { this.layerName = 'H3TileLayer'; }
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -4,6 +4,7 @@ import QuadbinTileset2D from "./quadbin-tileset-2d.js";
|
|
|
4
4
|
import SpatialIndexTileLayer from "./spatial-index-tile-layer.js";
|
|
5
5
|
import { hexToBigInt } from 'quadbin';
|
|
6
6
|
import { injectAccessToken, TilejsonPropType } from "./utils.js";
|
|
7
|
+
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
7
8
|
export const renderSubLayers = props => {
|
|
8
9
|
const { data } = props;
|
|
9
10
|
if (!data || !data.length)
|
|
@@ -14,7 +15,8 @@ export const renderSubLayers = props => {
|
|
|
14
15
|
});
|
|
15
16
|
};
|
|
16
17
|
const defaultProps = {
|
|
17
|
-
data: TilejsonPropType
|
|
18
|
+
data: TilejsonPropType,
|
|
19
|
+
tileSize: DEFAULT_TILE_SIZE
|
|
18
20
|
};
|
|
19
21
|
export default class QuadbinTileLayer extends CompositeLayer {
|
|
20
22
|
static { this.layerName = 'QuadbinTileLayer'; }
|
|
@@ -1 +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,EACb,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;AAGF,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,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;
|
|
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,EACb,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;AAGF,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,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAwCzC,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC;CAcvF"}
|
|
@@ -2,7 +2,7 @@ import { CompositeLayer } from '@deck.gl/core';
|
|
|
2
2
|
import { ColumnLayer } from '@deck.gl/layers';
|
|
3
3
|
import { quadbinToOffset } from "./quadbin-utils.js";
|
|
4
4
|
import vs from "./raster-layer-vertex.glsl.js";
|
|
5
|
-
import {
|
|
5
|
+
import { createBinaryProxy } from "../utils.js";
|
|
6
6
|
const defaultProps = {
|
|
7
7
|
...ColumnLayer.defaultProps,
|
|
8
8
|
extruded: false,
|
|
@@ -20,7 +20,7 @@ class RasterColumnLayer extends ColumnLayer {
|
|
|
20
20
|
getShaders() {
|
|
21
21
|
const shaders = super.getShaders();
|
|
22
22
|
const data = this.props.data;
|
|
23
|
-
const BLOCK_WIDTH = data.
|
|
23
|
+
const BLOCK_WIDTH = data.data.blockSize ?? Math.sqrt(data.length);
|
|
24
24
|
return { ...shaders, defines: { ...shaders.defines, BLOCK_WIDTH }, vs };
|
|
25
25
|
}
|
|
26
26
|
initializeState() {
|
|
@@ -59,10 +59,9 @@ export default class RasterLayer extends CompositeLayer {
|
|
|
59
59
|
const { data, getElevation, getFillColor, getLineColor, getLineWidth, tileIndex, updateTriggers } = this.props;
|
|
60
60
|
if (!data || !tileIndex)
|
|
61
61
|
return null;
|
|
62
|
-
const
|
|
63
|
-
assert(blockWidth === blockHeight, `blockWidth (${blockWidth}) must equal blockHeight (${blockHeight})`);
|
|
62
|
+
const blockSize = data.blockSize ?? 0;
|
|
64
63
|
const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);
|
|
65
|
-
const offset = [xOffset, yOffset, scale /
|
|
64
|
+
const offset = [xOffset, yOffset, scale / blockSize];
|
|
66
65
|
// Filled Column Layer
|
|
67
66
|
const CellLayer = this.getSubLayerClass('column', RasterColumnLayer);
|
|
68
67
|
return new CellLayer(this.props, this.getSubLayerProps({
|
|
@@ -75,7 +74,7 @@ export default class RasterLayer extends CompositeLayer {
|
|
|
75
74
|
}), {
|
|
76
75
|
data: {
|
|
77
76
|
data, // Pass through data for getSubLayerAccessor()
|
|
78
|
-
length:
|
|
77
|
+
length: blockSize * blockSize
|
|
79
78
|
},
|
|
80
79
|
offset
|
|
81
80
|
});
|
|
@@ -1 +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,OAA8B,EAAC,0BAA0B,EAAC,sCAAmC;AAC7F,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;
|
|
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,OAA8B,EAAC,0BAA0B,EAAC,sCAAmC;AAC7F,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAIrD,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,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,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"}
|
|
@@ -3,6 +3,7 @@ import RasterLayer from "./raster-layer.js";
|
|
|
3
3
|
import QuadbinTileset2D from "./quadbin-tileset-2d.js";
|
|
4
4
|
import SpatialIndexTileLayer from "./spatial-index-tile-layer.js";
|
|
5
5
|
import { injectAccessToken, TilejsonPropType } from "./utils.js";
|
|
6
|
+
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
6
7
|
export const renderSubLayers = props => {
|
|
7
8
|
const tileIndex = props.tile?.index?.q;
|
|
8
9
|
if (!tileIndex)
|
|
@@ -10,7 +11,8 @@ export const renderSubLayers = props => {
|
|
|
10
11
|
return new RasterLayer(props, { tileIndex });
|
|
11
12
|
};
|
|
12
13
|
const defaultProps = {
|
|
13
|
-
data: TilejsonPropType
|
|
14
|
+
data: TilejsonPropType,
|
|
15
|
+
tileSize: DEFAULT_TILE_SIZE
|
|
14
16
|
};
|
|
15
17
|
export default class RasterTileLayer extends CompositeLayer {
|
|
16
18
|
static { this.layerName = 'RasterTileLayer'; }
|
|
@@ -2,8 +2,8 @@ import { LoaderWithParser } from '@loaders.gl/loader-utils';
|
|
|
2
2
|
import { NumericProps, Properties } from "./spatialjson-utils.js";
|
|
3
3
|
declare const CartoRasterTileLoader: LoaderWithParser;
|
|
4
4
|
export type Raster = {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
/** Raster tiles are square, with 'blockSize' width and height in pixels. */
|
|
6
|
+
blockSize: number;
|
|
7
7
|
cells: {
|
|
8
8
|
numericProps: NumericProps;
|
|
9
9
|
properties: Properties[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carto-raster-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKzE,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,+BAA4B;AAiB7D,QAAA,MAAM,qBAAqB,EAAE,gBAa5B,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,
|
|
1
|
+
{"version":3,"file":"carto-raster-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKzE,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,+BAA4B;AAiB7D,QAAA,MAAM,qBAAqB,EAAE,gBAa5B,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE;QACL,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,EAAE,UAAU,EAAE,CAAC;KAC1B,CAAC;CACH,CAAC;AAiBF,eAAe,qBAAqB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { TileReader } from "./carto-raster-tile.js";
|
|
2
2
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
3
3
|
import { getWorkerUrl } from "../../utils.js";
|
|
4
|
-
const VERSION = typeof "9.0.0-beta.
|
|
4
|
+
const VERSION = typeof "9.0.0-beta.8" !== 'undefined' ? "9.0.0-beta.8" : 'latest';
|
|
5
5
|
const id = 'cartoRasterTile';
|
|
6
6
|
const DEFAULT_OPTIONS = {
|
|
7
7
|
cartoRasterTile: {
|
|
@@ -24,13 +24,12 @@ const CartoRasterTileLoader = {
|
|
|
24
24
|
function parseCartoRasterTile(arrayBuffer, options) {
|
|
25
25
|
if (!arrayBuffer)
|
|
26
26
|
return null;
|
|
27
|
-
const
|
|
28
|
-
const { bands, blockHeight, blockWidth } = tile;
|
|
27
|
+
const { bands, blockSize } = parsePbf(arrayBuffer, TileReader);
|
|
29
28
|
const numericProps = {};
|
|
30
29
|
for (let i = 0; i < bands.length; i++) {
|
|
31
30
|
const { name, data } = bands[i];
|
|
32
31
|
numericProps[name] = data;
|
|
33
32
|
}
|
|
34
|
-
return {
|
|
33
|
+
return { blockSize, cells: { numericProps, properties: [] } };
|
|
35
34
|
}
|
|
36
35
|
export default CartoRasterTileLoader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carto-raster-tile.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile.ts"],"names":[],"mappings":"AAiBA,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM;IAI7B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;CAY5C;AAED,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA;IAGpB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;
|
|
1
|
+
{"version":3,"file":"carto-raster-tile.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile.ts"],"names":[],"mappings":"AAiBA,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM;IAI7B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;CAY5C;AAED,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA;IAGpB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA;CAI5C"}
|
|
@@ -33,14 +33,12 @@ export class BandReader {
|
|
|
33
33
|
}
|
|
34
34
|
export class TileReader {
|
|
35
35
|
static read(pbf, end) {
|
|
36
|
-
return pbf.readFields(TileReader._readField, {
|
|
36
|
+
return pbf.readFields(TileReader._readField, { blockSize: 0, bands: [] }, end);
|
|
37
37
|
}
|
|
38
38
|
static _readField(tag, obj, pbf) {
|
|
39
39
|
if (tag === 1)
|
|
40
|
-
obj.
|
|
40
|
+
obj.blockSize = pbf.readVarint();
|
|
41
41
|
else if (tag === 2)
|
|
42
|
-
obj.blockHeight = pbf.readVarint();
|
|
43
|
-
else if (tag === 3)
|
|
44
42
|
obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
|
|
45
43
|
}
|
|
46
44
|
}
|
|
@@ -2,7 +2,7 @@ import { TileReader } from "./carto-spatial-tile.js";
|
|
|
2
2
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
3
3
|
import { getWorkerUrl } from "../../utils.js";
|
|
4
4
|
import { binaryToSpatialjson } from "./spatialjson-utils.js";
|
|
5
|
-
const VERSION = typeof "9.0.0-beta.
|
|
5
|
+
const VERSION = typeof "9.0.0-beta.8" !== 'undefined' ? "9.0.0-beta.8" : 'latest';
|
|
6
6
|
const id = 'cartoSpatialTile';
|
|
7
7
|
const DEFAULT_OPTIONS = {
|
|
8
8
|
cartoSpatialTile: {
|
|
@@ -2,7 +2,7 @@ import earcut from 'earcut';
|
|
|
2
2
|
import { TileReader } from "./carto-tile.js";
|
|
3
3
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
4
4
|
import { getWorkerUrl } from "../../utils.js";
|
|
5
|
-
const VERSION = typeof "9.0.0-beta.
|
|
5
|
+
const VERSION = typeof "9.0.0-beta.8" !== 'undefined' ? "9.0.0-beta.8" : 'latest';
|
|
6
6
|
const id = 'cartoVectorTile';
|
|
7
7
|
const DEFAULT_OPTIONS = {
|
|
8
8
|
cartoVectorTile: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAE,aAAa,IAAI,YAAY,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAE,aAAa,IAAI,YAAY,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAW7F,yDAAyD;AACzD,MAAM,MAAM,0BAA0B,CAAC,KAAK,GAAG,OAAO,IAAI,2BAA2B,GACnF,cAAc,CAAC,KAAK,CAAC,CAAC;AAExB,iDAAiD;AACjD,KAAK,2BAA2B,GAAG,EAAE,CAAC;AAEtC,MAAM,CAAC,OAAO,OAAO,qBAAqB,CACxC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;IAC5E,MAAM,CAAC,SAAS,SAA2B;IAC3C,MAAM,CAAC,YAAY,oDAAgB;IAEnC,KAAK,EAAG,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG;QAClC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;QACzC,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;IAEF,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;IAiB5C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;CAgB9D"}
|
|
@@ -3,10 +3,13 @@ import CartoRasterTileLoader from "./schema/carto-raster-tile-loader.js";
|
|
|
3
3
|
import CartoSpatialTileLoader from "./schema/carto-spatial-tile-loader.js";
|
|
4
4
|
registerLoaders([CartoRasterTileLoader, CartoSpatialTileLoader]);
|
|
5
5
|
import { TileLayer } from '@deck.gl/geo-layers';
|
|
6
|
+
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
6
7
|
function isFeatureIdDefined(value) {
|
|
7
8
|
return value !== undefined && value !== null && value !== '';
|
|
8
9
|
}
|
|
9
|
-
const defaultProps = {
|
|
10
|
+
const defaultProps = {
|
|
11
|
+
tileSize: DEFAULT_TILE_SIZE
|
|
12
|
+
};
|
|
10
13
|
export default class SpatialIndexTileLayer extends TileLayer {
|
|
11
14
|
static { this.layerName = 'SpatialIndexTileLayer'; }
|
|
12
15
|
static { this.defaultProps = defaultProps; }
|
|
@@ -3,18 +3,18 @@ import { MVTLayer, MVTLayerProps, TileLayer, _Tile2DHeader, _TileLoadProps as Ti
|
|
|
3
3
|
import { GeoJsonLayer } from '@deck.gl/layers';
|
|
4
4
|
import type { TilejsonResult } from "../sources/types.js";
|
|
5
5
|
/** All properties supported by VectorTileLayer. */
|
|
6
|
-
export type VectorTileLayerProps = _VectorTileLayerProps & Omit<MVTLayerProps
|
|
6
|
+
export type VectorTileLayerProps<FeaturePropertiesT = unknown> = _VectorTileLayerProps & Omit<MVTLayerProps<FeaturePropertiesT>, 'data'>;
|
|
7
7
|
/** Properties added by VectorTileLayer. */
|
|
8
8
|
type _VectorTileLayerProps = {
|
|
9
9
|
data: null | TilejsonResult | Promise<TilejsonResult>;
|
|
10
10
|
};
|
|
11
|
-
export default class VectorTileLayer<ExtraProps extends {} = {}> extends MVTLayer<Required<_VectorTileLayerProps> & ExtraProps> {
|
|
11
|
+
export default class VectorTileLayer<FeaturePropertiesT = any, ExtraProps extends {} = {}> extends MVTLayer<FeaturePropertiesT, Required<_VectorTileLayerProps> & ExtraProps> {
|
|
12
12
|
static layerName: string;
|
|
13
|
-
static defaultProps: DefaultProps<VectorTileLayerProps
|
|
13
|
+
static defaultProps: DefaultProps<VectorTileLayerProps<unknown>>;
|
|
14
14
|
state: MVTLayer['state'] & {
|
|
15
15
|
mvt: boolean;
|
|
16
16
|
};
|
|
17
|
-
constructor(...propObjects: VectorTileLayerProps[]);
|
|
17
|
+
constructor(...propObjects: VectorTileLayerProps<FeaturePropertiesT>[]);
|
|
18
18
|
initializeState(): void;
|
|
19
19
|
updateState(parameters: any): void;
|
|
20
20
|
getLoadOptions(): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAK7C,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;
|
|
1
|
+
{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAK7C,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAWrD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,kBAAkB,GAAG,OAAO,IAAI,qBAAqB,GACpF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;AAElD,2CAA2C;AAC3C,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC;IAClF,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,KAAK,EAAG,QAAQ,CAAC,OAAO,CAAC,GAAG;QAC1B,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;gBAEU,GAAG,WAAW,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,EAAE;IAMtE,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,UAAU,KAAA;IAWtB,cAAc,IAAI,GAAG;IAQf,WAAW,CAAC,IAAI,EAAE,aAAa;IAoCrC,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAuBtB,cAAc,CAAC,MAAM,KAAA;CAYtB"}
|
|
@@ -7,10 +7,12 @@ import { MVTLayer, _getURLFromTemplate } from '@deck.gl/geo-layers';
|
|
|
7
7
|
import { GeoJsonLayer } from '@deck.gl/layers';
|
|
8
8
|
import { binaryToGeojson } from '@loaders.gl/gis';
|
|
9
9
|
import { TilejsonPropType, injectAccessToken, mergeBoundaryData } from "./utils.js";
|
|
10
|
+
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
10
11
|
const defaultProps = {
|
|
11
12
|
...MVTLayer.defaultProps,
|
|
12
13
|
data: TilejsonPropType,
|
|
13
|
-
dataComparator: TilejsonPropType.equal
|
|
14
|
+
dataComparator: TilejsonPropType.equal,
|
|
15
|
+
tileSize: DEFAULT_TILE_SIZE
|
|
14
16
|
};
|
|
15
17
|
// @ts-ignore
|
|
16
18
|
export default class VectorTileLayer extends MVTLayer {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h3-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/h3-query-source.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"h3-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/h3-query-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EAEb,cAAc,EACf,mBAAgB;AAEjB,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAU3F,eAAO,MAAM,aAAa,YACf,oBAAoB,KAC5B,QAAQ,cAAc,CAsBxB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/* eslint-disable camelcase */
|
|
2
|
+
import { DEFAULT_AGGREGATION_RES_LEVEL_H3 } from "../constants.js";
|
|
2
3
|
import { baseSource } from "./base-source.js";
|
|
3
4
|
export const h3QuerySource = async function (options) {
|
|
4
|
-
const { aggregationExp, aggregationResLevel =
|
|
5
|
+
const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, sqlQuery, spatialDataColumn = 'h3', queryParameters } = options;
|
|
5
6
|
const urlParameters = {
|
|
6
7
|
aggregationExp,
|
|
7
8
|
spatialDataColumn,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h3-table-source.d.ts","sourceRoot":"","sources":["../../src/sources/h3-table-source.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"h3-table-source.d.ts","sourceRoot":"","sources":["../../src/sources/h3-table-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EAEb,kBAAkB,EAClB,cAAc,EACf,mBAAgB;AAEjB,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAU3F,eAAO,MAAM,aAAa,YACf,oBAAoB,KAC5B,QAAQ,cAAc,CAkBxB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/* eslint-disable camelcase */
|
|
2
|
+
import { DEFAULT_AGGREGATION_RES_LEVEL_H3 } from "../constants.js";
|
|
2
3
|
import { baseSource } from "./base-source.js";
|
|
3
4
|
export const h3TableSource = async function (options) {
|
|
4
|
-
const { aggregationExp, aggregationResLevel =
|
|
5
|
+
const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, spatialDataColumn = 'h3', tableName } = options;
|
|
5
6
|
const urlParameters = {
|
|
6
7
|
aggregationExp,
|
|
7
8
|
name: tableName,
|
|
@@ -11,8 +12,5 @@ export const h3TableSource = async function (options) {
|
|
|
11
12
|
if (aggregationResLevel) {
|
|
12
13
|
urlParameters.aggregationResLevel = String(aggregationResLevel);
|
|
13
14
|
}
|
|
14
|
-
if (columns) {
|
|
15
|
-
urlParameters.columns = columns.join(',');
|
|
16
|
-
}
|
|
17
15
|
return baseSource('table', options, urlParameters);
|
|
18
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quadbin-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/quadbin-query-source.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"quadbin-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/quadbin-query-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EAEb,cAAc,EACf,mBAAgB;AAEjB,MAAM,MAAM,yBAAyB,GAAG,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAWhG,eAAO,MAAM,kBAAkB,YACpB,yBAAyB,KACjC,QAAQ,cAAc,CAsBxB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/* eslint-disable camelcase */
|
|
2
|
+
import { DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN } from "../constants.js";
|
|
2
3
|
import { baseSource } from "./base-source.js";
|
|
3
4
|
export const quadbinQuerySource = async function (options) {
|
|
4
|
-
const { aggregationExp, aggregationResLevel =
|
|
5
|
+
const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, sqlQuery, spatialDataColumn = 'quadbin', queryParameters } = options;
|
|
5
6
|
const urlParameters = {
|
|
6
7
|
aggregationExp,
|
|
7
8
|
q: sqlQuery,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quadbin-table-source.d.ts","sourceRoot":"","sources":["../../src/sources/quadbin-table-source.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"quadbin-table-source.d.ts","sourceRoot":"","sources":["../../src/sources/quadbin-table-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EAEb,kBAAkB,EAClB,cAAc,EACf,mBAAgB;AAEjB,MAAM,MAAM,yBAAyB,GAAG,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAUhG,eAAO,MAAM,kBAAkB,YACpB,yBAAyB,KACjC,QAAQ,cAAc,CAmBxB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/* eslint-disable camelcase */
|
|
2
|
+
import { DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN } from "../constants.js";
|
|
2
3
|
import { baseSource } from "./base-source.js";
|
|
3
4
|
export const quadbinTableSource = async function (options) {
|
|
4
|
-
const { aggregationExp, aggregationResLevel =
|
|
5
|
+
const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, spatialDataColumn = 'quadbin', tableName } = options;
|
|
5
6
|
const urlParameters = {
|
|
6
7
|
aggregationExp,
|
|
7
8
|
name: tableName,
|
|
@@ -11,8 +12,5 @@ export const quadbinTableSource = async function (options) {
|
|
|
11
12
|
if (aggregationResLevel) {
|
|
12
13
|
urlParameters.aggregationResLevel = String(aggregationResLevel);
|
|
13
14
|
}
|
|
14
|
-
if (columns) {
|
|
15
|
-
urlParameters.columns = columns.join(',');
|
|
16
|
-
}
|
|
17
15
|
return baseSource('table', options, urlParameters);
|
|
18
16
|
};
|
package/dist/sources/types.d.ts
CHANGED
|
@@ -64,6 +64,20 @@ export type QuerySourceOptions = {
|
|
|
64
64
|
spatialDataColumn?: string;
|
|
65
65
|
/** SQL query. */
|
|
66
66
|
sqlQuery: string;
|
|
67
|
+
/**
|
|
68
|
+
* Relative resolution of a tile. Higher values increase density and data size. At `tileResolution = 1`, tile geometry is
|
|
69
|
+
* quantized to a 1024x1024 grid. Increasing or decreasing the resolution will increase or decrease the dimensions of
|
|
70
|
+
* the quantization grid proportionately.
|
|
71
|
+
*
|
|
72
|
+
* Supported `tileResolution` values, with corresponding grid sizes:
|
|
73
|
+
*
|
|
74
|
+
* - 0.25: 256x256
|
|
75
|
+
* - 0.5: 512x512
|
|
76
|
+
* - 1: 1024x1024
|
|
77
|
+
* - 2: 2048x2048
|
|
78
|
+
* - 4: 4096x4096
|
|
79
|
+
*/
|
|
80
|
+
tileResolution?: TileResolution;
|
|
67
81
|
/**
|
|
68
82
|
* Values for named or positional paramteres in the query.
|
|
69
83
|
*
|
|
@@ -95,18 +109,26 @@ export type TableSourceOptions = {
|
|
|
95
109
|
* Fully qualified name of table.
|
|
96
110
|
*/
|
|
97
111
|
tableName: string;
|
|
98
|
-
/**
|
|
99
|
-
* Columns to retrieve from the table.
|
|
100
|
-
*
|
|
101
|
-
* If not present, all columns are returned.
|
|
102
|
-
*/
|
|
103
|
-
columns?: string[];
|
|
104
112
|
/**
|
|
105
113
|
* The column name and the type of geospatial support.
|
|
106
114
|
*
|
|
107
115
|
* If not present, defaults to `'geom'` for generic tables, `'quadbin'` for Quadbin sources and `'h3'` for H3 sources.
|
|
108
116
|
*/
|
|
109
117
|
spatialDataColumn?: string;
|
|
118
|
+
/**
|
|
119
|
+
* Relative resolution of a tile. Higher values increase density and data size. At `tileResolution = 1`, tile geometry is
|
|
120
|
+
* quantized to a 1024x1024 grid. Increasing or decreasing the resolution will increase or decrease the dimensions of
|
|
121
|
+
* the quantization grid proportionately.
|
|
122
|
+
*
|
|
123
|
+
* Supported `tileResolution` values, with corresponding grid sizes:
|
|
124
|
+
*
|
|
125
|
+
* - 0.25: 256x256
|
|
126
|
+
* - 0.5: 512x512
|
|
127
|
+
* - 1: 1024x1024
|
|
128
|
+
* - 2: 2048x2048
|
|
129
|
+
* - 4: 4096x4096
|
|
130
|
+
*/
|
|
131
|
+
tileResolution?: TileResolution;
|
|
110
132
|
};
|
|
111
133
|
export type TilesetSourceOptions = {
|
|
112
134
|
/**
|
|
@@ -114,12 +136,21 @@ export type TilesetSourceOptions = {
|
|
|
114
136
|
*/
|
|
115
137
|
tableName: string;
|
|
116
138
|
};
|
|
139
|
+
export type ColumnsOption = {
|
|
140
|
+
/**
|
|
141
|
+
* Columns to retrieve from the table.
|
|
142
|
+
*
|
|
143
|
+
* If not present, all columns are returned.
|
|
144
|
+
*/
|
|
145
|
+
columns?: string[];
|
|
146
|
+
};
|
|
117
147
|
export type SpatialDataType = 'geo' | 'h3' | 'quadbin';
|
|
118
148
|
export type TilejsonMapInstantiation = MapInstantiation & {
|
|
119
149
|
tilejson: {
|
|
120
150
|
url: string[];
|
|
121
151
|
};
|
|
122
152
|
};
|
|
153
|
+
export type TileResolution = 0.25 | 0.5 | 1 | 2 | 4;
|
|
123
154
|
export interface Tilejson {
|
|
124
155
|
tilejson: string;
|
|
125
156
|
name: string;
|
|
@@ -137,6 +168,7 @@ export interface Tilejson {
|
|
|
137
168
|
center: [number, number, number];
|
|
138
169
|
vector_layers: VectorLayer[];
|
|
139
170
|
tilestats: Tilestats;
|
|
171
|
+
tileResolution?: TileResolution;
|
|
140
172
|
}
|
|
141
173
|
export interface Tilestats {
|
|
142
174
|
layerCount: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/sources/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,eAAe,EAAC,wBAAqB;AAErF,MAAM,MAAM,qBAAqB,GAAG;IAClC,mCAAmC;IACnC,WAAW,EAAE,MAAM,CAAC;IAEpB,wDAAwD;IACxD,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhC;;;;;OAKG;IACH,KAAK,CAAC,EAAE;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IAEzB,QAAQ,EAAE,MAAM,CAAC;IACjB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,iBAAiB;IACjB,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/sources/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import type { FilterOptions, SourceOptions, QuerySourceOptions, TilejsonResult } from "./types.js";
|
|
2
|
-
export type VectorQuerySourceOptions = SourceOptions & QuerySourceOptions & FilterOptions &
|
|
3
|
-
columns?: string[];
|
|
4
|
-
};
|
|
1
|
+
import type { FilterOptions, SourceOptions, QuerySourceOptions, TilejsonResult, ColumnsOption } from "./types.js";
|
|
2
|
+
export type VectorQuerySourceOptions = SourceOptions & QuerySourceOptions & FilterOptions & ColumnsOption;
|
|
5
3
|
export declare const vectorQuerySource: (options: VectorQuerySourceOptions) => Promise<TilejsonResult>;
|
|
6
4
|
//# sourceMappingURL=vector-query-source.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/vector-query-source.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vector-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/vector-query-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,kBAAkB,EAElB,cAAc,EACd,aAAa,EACd,mBAAgB;AAEjB,MAAM,MAAM,wBAAwB,GAAG,aAAa,GAClD,kBAAkB,GAClB,aAAa,GACb,aAAa,CAAC;AAYhB,eAAO,MAAM,iBAAiB,YACnB,wBAAwB,KAChC,QAAQ,cAAc,CA2BxB,CAAC"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
/* eslint-disable camelcase */
|
|
2
|
+
import { DEFAULT_TILE_RESOLUTION } from "../constants.js";
|
|
2
3
|
import { baseSource } from "./base-source.js";
|
|
3
4
|
export const vectorQuerySource = async function (options) {
|
|
4
|
-
const { columns, filters, spatialDataColumn = 'geom', sqlQuery, queryParameters } = options;
|
|
5
|
-
const urlParameters = {
|
|
5
|
+
const { columns, filters, spatialDataColumn = 'geom', sqlQuery, tileResolution = DEFAULT_TILE_RESOLUTION, queryParameters } = options;
|
|
6
|
+
const urlParameters = {
|
|
7
|
+
spatialDataColumn,
|
|
8
|
+
spatialDataType: 'geo',
|
|
9
|
+
tileResolution: tileResolution.toString(),
|
|
10
|
+
q: sqlQuery
|
|
11
|
+
};
|
|
6
12
|
if (columns) {
|
|
7
13
|
urlParameters.columns = columns.join(',');
|
|
8
14
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { FilterOptions, SourceOptions, TableSourceOptions, TilejsonResult } from "./types.js";
|
|
2
|
-
export type VectorTableSourceOptions = SourceOptions & TableSourceOptions & FilterOptions;
|
|
1
|
+
import type { FilterOptions, ColumnsOption, SourceOptions, TableSourceOptions, TilejsonResult } from "./types.js";
|
|
2
|
+
export type VectorTableSourceOptions = SourceOptions & TableSourceOptions & FilterOptions & ColumnsOption;
|
|
3
3
|
export declare const vectorTableSource: (options: VectorTableSourceOptions) => Promise<TilejsonResult>;
|
|
4
4
|
//# sourceMappingURL=vector-table-source.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-table-source.d.ts","sourceRoot":"","sources":["../../src/sources/vector-table-source.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vector-table-source.d.ts","sourceRoot":"","sources":["../../src/sources/vector-table-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,aAAa,EAEb,kBAAkB,EAClB,cAAc,EACf,mBAAgB;AAEjB,MAAM,MAAM,wBAAwB,GAAG,aAAa,GAClD,kBAAkB,GAClB,aAAa,GACb,aAAa,CAAC;AAUhB,eAAO,MAAM,iBAAiB,YACnB,wBAAwB,KAChC,QAAQ,cAAc,CAuBxB,CAAC"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
/* eslint-disable camelcase */
|
|
2
|
+
import { DEFAULT_TILE_RESOLUTION } from "../constants.js";
|
|
2
3
|
import { baseSource } from "./base-source.js";
|
|
3
4
|
export const vectorTableSource = async function (options) {
|
|
4
|
-
const { columns, filters, spatialDataColumn = 'geom', tableName } = options;
|
|
5
|
-
const urlParameters = {
|
|
5
|
+
const { columns, filters, spatialDataColumn = 'geom', tableName, tileResolution = DEFAULT_TILE_RESOLUTION } = options;
|
|
6
|
+
const urlParameters = {
|
|
7
|
+
name: tableName,
|
|
8
|
+
spatialDataColumn,
|
|
9
|
+
spatialDataType: 'geo',
|
|
10
|
+
tileResolution: tileResolution.toString()
|
|
11
|
+
};
|
|
6
12
|
if (columns) {
|
|
7
13
|
urlParameters.columns = columns.join(',');
|
|
8
14
|
}
|
package/dist/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAC,6CAA0C;AAEhF,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAE9E;AAID,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE;IAAC,YAAY,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,UAAU,EAAE,CAAA;CAAC,EAC5D,KAAK,EAAE,MAAM,cAed;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAIvD;AAED,wBAAgB,aAAa;;;;;;;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAC,6CAA0C;AAEhF,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAE9E;AAID,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE;IAAC,YAAY,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,UAAU,EAAE,CAAA;CAAC,EAC5D,KAAK,EAAE,MAAM,cAed;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAIvD;AAED,wBAAgB,aAAa;;;;;;;EA0B5B"}
|
package/dist/utils.js
CHANGED
|
@@ -36,6 +36,10 @@ export function scaleIdentity() {
|
|
|
36
36
|
}
|
|
37
37
|
return unknown;
|
|
38
38
|
};
|
|
39
|
-
scale.copy = () =>
|
|
39
|
+
scale.copy = () => {
|
|
40
|
+
const scaleCopy = scaleIdentity();
|
|
41
|
+
scaleCopy.unknown(unknown);
|
|
42
|
+
return scaleCopy;
|
|
43
|
+
};
|
|
40
44
|
return scale;
|
|
41
45
|
}
|