@deck.gl/carto 9.1.12 → 9.1.14
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/fetch-map.d.ts.map +1 -1
- package/dist/api/fetch-map.js +13 -2
- package/dist/api/fetch-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/constants.d.ts +2 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +2 -0
- package/dist/constants.js.map +1 -1
- package/dist/dist.dev.js +18 -5
- package/dist/index.cjs +22 -9
- package/dist/index.cjs.map +2 -2
- 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/schema/carto-properties-tile-loader.js +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js +1 -1
- package/dist/layers/schema/carto-spatial-tile-loader.js +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist.min.js +10 -10
- package/package.json +5 -5
- package/src/api/fetch-map.ts +13 -2
- package/src/constants.ts +3 -0
- package/src/layers/h3-tileset-2d.ts +18 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-map.d.ts","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAC,cAAc,EAAW,uBAAoB;AAErD,OAAO,KAAK,EAAC,OAAO,EAAC,mBAAgB;
|
|
1
|
+
{"version":3,"file":"fetch-map.d.ts","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAC,cAAc,EAAW,uBAAoB;AAErD,OAAO,KAAK,EAAC,OAAO,EAAC,mBAAgB;AAiLrC,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;IAE/B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAUF,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG;IAC5C;;OAEG;IACH,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B,CAAC;AAGF,wBAAsB,QAAQ,CAAC,EAC7B,WAAW,EACX,UAAiC,EACjC,UAAU,EACV,QAAQ,EACR,OAAO,EACP,WAAW,EACX,SAAS,EACT,YAAY,EACb,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA4F3C"}
|
package/dist/api/fetch-map.js
CHANGED
|
@@ -6,6 +6,7 @@ import { DEFAULT_API_BASE_URL, CartoAPIError, buildPublicMapUrl, buildStatsUrl,
|
|
|
6
6
|
import { parseMap } from "./parse-map.js";
|
|
7
7
|
import { assert } from "../utils.js";
|
|
8
8
|
import { fetchBasemapProps } from "./basemap.js";
|
|
9
|
+
import { DEFAULT_AGGREGATION_EXP } from "../constants.js";
|
|
9
10
|
/* global clearInterval, setInterval, URL */
|
|
10
11
|
/* eslint-disable complexity, max-statements, max-params */
|
|
11
12
|
async function _fetchMapDataset(dataset, context) {
|
|
@@ -39,7 +40,12 @@ async function _fetchMapDataset(dataset, context) {
|
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
else if (spatialDataType === 'h3') {
|
|
42
|
-
const options = {
|
|
43
|
+
const options = {
|
|
44
|
+
...globalOptions,
|
|
45
|
+
aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
|
|
46
|
+
aggregationResLevel,
|
|
47
|
+
spatialDataColumn
|
|
48
|
+
};
|
|
43
49
|
if (type === 'table') {
|
|
44
50
|
dataset.data = await h3TableSource({ ...options, tableName: source });
|
|
45
51
|
}
|
|
@@ -48,7 +54,12 @@ async function _fetchMapDataset(dataset, context) {
|
|
|
48
54
|
}
|
|
49
55
|
}
|
|
50
56
|
else if (spatialDataType === 'quadbin') {
|
|
51
|
-
const options = {
|
|
57
|
+
const options = {
|
|
58
|
+
...globalOptions,
|
|
59
|
+
aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
|
|
60
|
+
aggregationResLevel,
|
|
61
|
+
spatialDataColumn
|
|
62
|
+
};
|
|
52
63
|
if (type === 'table') {
|
|
53
64
|
dataset.data = await quadbinTableSource({ ...options, tableName: source });
|
|
54
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-map.js","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,iDAAiD;AAEjD,OAAO,EACL,oBAAoB,EAEpB,aAAa,EAQb,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAiB,QAAQ,EAAC,uBAAoB;AACrD,OAAO,EAAC,MAAM,EAAC,oBAAiB;AAEhC,OAAO,EAAC,iBAAiB,EAAC,qBAAkB;
|
|
1
|
+
{"version":3,"file":"fetch-map.js","sourceRoot":"","sources":["../../src/api/fetch-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.1.
|
|
5533
|
+
var VERSION = true ? "9.1.14" : "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.1.
|
|
5519
|
+
var VERSION = true ? "9.1.14" : "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.1.
|
|
5918
|
+
var VERSION = true ? "9.1.14" : "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.1.
|
|
6138
|
+
var VERSION = true ? "9.1.14" : "latest";
|
|
6139
6139
|
var id = "cartoVectorTile";
|
|
6140
6140
|
var DEFAULT_OPTIONS = {
|
|
6141
6141
|
cartoVectorTile: {
|
package/dist/constants.d.ts
CHANGED
package/dist/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,MAAM,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,eAAO,MAAM,6BAA6B,uBAAuB,CAAC;AAClE,eAAO,MAAM,uBAAuB,4BAA0C,CAAC"}
|
package/dist/constants.js
CHANGED
|
@@ -2,4 +2,6 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
export const DEFAULT_TILE_SIZE = 512;
|
|
5
|
+
export const DEFAULT_AGGREGATION_EXP_ALIAS = '__aggregationValue';
|
|
6
|
+
export const DEFAULT_AGGREGATION_EXP = `1 AS ${DEFAULT_AGGREGATION_EXP_ALIAS}`;
|
|
5
7
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAErC,MAAM,CAAC,MAAM,6BAA6B,GAAG,oBAAoB,CAAC;AAClE,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,6BAA6B,EAAE,CAAC"}
|
package/dist/dist.dev.js
CHANGED
|
@@ -11717,6 +11717,8 @@ var __exports__ = (() => {
|
|
|
11717
11717
|
|
|
11718
11718
|
// src/constants.ts
|
|
11719
11719
|
var DEFAULT_TILE_SIZE = 512;
|
|
11720
|
+
var DEFAULT_AGGREGATION_EXP_ALIAS = "__aggregationValue";
|
|
11721
|
+
var DEFAULT_AGGREGATION_EXP = `1 AS ${DEFAULT_AGGREGATION_EXP_ALIAS}`;
|
|
11720
11722
|
|
|
11721
11723
|
// src/layers/quadbin-tileset-2d.ts
|
|
11722
11724
|
var import_geo_layers = __toESM(require_geo_layers(), 1);
|
|
@@ -12551,7 +12553,7 @@ var __exports__ = (() => {
|
|
|
12551
12553
|
var import_geo_layers3 = __toESM(require_geo_layers(), 1);
|
|
12552
12554
|
var import_h3_js = __toESM(require_h3_js(), 1);
|
|
12553
12555
|
var MAX_LATITUDE2 = 85.051128;
|
|
12554
|
-
function padBoundingBox({ west, north, east, south }, resolution) {
|
|
12556
|
+
function padBoundingBox({ west, north, east, south }, resolution, scale = 1) {
|
|
12555
12557
|
const corners = [
|
|
12556
12558
|
[north, east],
|
|
12557
12559
|
[south, east],
|
|
@@ -12562,7 +12564,7 @@ var __exports__ = (() => {
|
|
|
12562
12564
|
const cornerEdgeLengths = cornerCells.map(
|
|
12563
12565
|
(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
|
|
12564
12566
|
);
|
|
12565
|
-
const bufferLat = Math.max(...cornerEdgeLengths);
|
|
12567
|
+
const bufferLat = Math.max(...cornerEdgeLengths) * scale;
|
|
12566
12568
|
const bufferLon = Math.min(180, bufferLat / Math.cos((north + south) / 2 * Math.PI / 180));
|
|
12567
12569
|
return {
|
|
12568
12570
|
north: Math.min(north + bufferLat, MAX_LATITUDE2),
|
|
@@ -12602,7 +12604,8 @@ var __exports__ = (() => {
|
|
|
12602
12604
|
const south = Math.min(...latitudes);
|
|
12603
12605
|
const east = Math.max(...longitudes);
|
|
12604
12606
|
const north = Math.max(...latitudes);
|
|
12605
|
-
|
|
12607
|
+
const bbox = { west, south, east, north };
|
|
12608
|
+
return padBoundingBox(bbox, (0, import_h3_js.getResolution)(index2), 0.12);
|
|
12606
12609
|
}
|
|
12607
12610
|
var BIAS = 2;
|
|
12608
12611
|
function getHexagonResolution(viewport, tileSize) {
|
|
@@ -19977,14 +19980,24 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19977
19980
|
});
|
|
19978
19981
|
}
|
|
19979
19982
|
} else if (spatialDataType === "h3") {
|
|
19980
|
-
const options = {
|
|
19983
|
+
const options = {
|
|
19984
|
+
...globalOptions,
|
|
19985
|
+
aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
|
|
19986
|
+
aggregationResLevel,
|
|
19987
|
+
spatialDataColumn
|
|
19988
|
+
};
|
|
19981
19989
|
if (type === "table") {
|
|
19982
19990
|
dataset.data = await h3TableSource({ ...options, tableName: source });
|
|
19983
19991
|
} else if (type === "query") {
|
|
19984
19992
|
dataset.data = await h3QuerySource({ ...options, sqlQuery: source, queryParameters });
|
|
19985
19993
|
}
|
|
19986
19994
|
} else if (spatialDataType === "quadbin") {
|
|
19987
|
-
const options = {
|
|
19995
|
+
const options = {
|
|
19996
|
+
...globalOptions,
|
|
19997
|
+
aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
|
|
19998
|
+
aggregationResLevel,
|
|
19999
|
+
spatialDataColumn
|
|
20000
|
+
};
|
|
19988
20001
|
if (type === "table") {
|
|
19989
20002
|
dataset.data = await quadbinTableSource({ ...options, tableName: source });
|
|
19990
20003
|
} else if (type === "query") {
|
package/dist/index.cjs
CHANGED
|
@@ -279,6 +279,8 @@ function clustersToBinary(data) {
|
|
|
279
279
|
|
|
280
280
|
// dist/constants.js
|
|
281
281
|
var DEFAULT_TILE_SIZE = 512;
|
|
282
|
+
var DEFAULT_AGGREGATION_EXP_ALIAS = "__aggregationValue";
|
|
283
|
+
var DEFAULT_AGGREGATION_EXP = `1 AS ${DEFAULT_AGGREGATION_EXP_ALIAS}`;
|
|
282
284
|
|
|
283
285
|
// dist/layers/quadbin-tileset-2d.js
|
|
284
286
|
var import_geo_layers = require("@deck.gl/geo-layers");
|
|
@@ -591,7 +593,7 @@ function binaryToSpatialjson(binary) {
|
|
|
591
593
|
}
|
|
592
594
|
|
|
593
595
|
// dist/layers/schema/carto-spatial-tile-loader.js
|
|
594
|
-
var VERSION = true ? "9.1.
|
|
596
|
+
var VERSION = true ? "9.1.14" : "latest";
|
|
595
597
|
var id = "cartoSpatialTile";
|
|
596
598
|
var DEFAULT_OPTIONS = {
|
|
597
599
|
cartoSpatialTile: {
|
|
@@ -833,7 +835,7 @@ var import_geo_layers5 = require("@deck.gl/geo-layers");
|
|
|
833
835
|
var import_geo_layers3 = require("@deck.gl/geo-layers");
|
|
834
836
|
var import_h3_js = require("h3-js");
|
|
835
837
|
var MAX_LATITUDE = 85.051128;
|
|
836
|
-
function padBoundingBox({ west, north, east, south }, resolution) {
|
|
838
|
+
function padBoundingBox({ west, north, east, south }, resolution, scale = 1) {
|
|
837
839
|
const corners = [
|
|
838
840
|
[north, east],
|
|
839
841
|
[south, east],
|
|
@@ -842,7 +844,7 @@ function padBoundingBox({ west, north, east, south }, resolution) {
|
|
|
842
844
|
];
|
|
843
845
|
const cornerCells = corners.map((c) => (0, import_h3_js.latLngToCell)(c[0], c[1], resolution));
|
|
844
846
|
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);
|
|
845
|
-
const bufferLat = Math.max(...cornerEdgeLengths);
|
|
847
|
+
const bufferLat = Math.max(...cornerEdgeLengths) * scale;
|
|
846
848
|
const bufferLon = Math.min(180, bufferLat / Math.cos((north + south) / 2 * Math.PI / 180));
|
|
847
849
|
return {
|
|
848
850
|
north: Math.min(north + bufferLat, MAX_LATITUDE),
|
|
@@ -880,7 +882,8 @@ function tileToBoundingBox(index) {
|
|
|
880
882
|
const south = Math.min(...latitudes);
|
|
881
883
|
const east = Math.max(...longitudes);
|
|
882
884
|
const north = Math.max(...latitudes);
|
|
883
|
-
|
|
885
|
+
const bbox = { west, south, east, north };
|
|
886
|
+
return padBoundingBox(bbox, (0, import_h3_js.getResolution)(index), 0.12);
|
|
884
887
|
}
|
|
885
888
|
var BIAS = 2;
|
|
886
889
|
function getHexagonResolution(viewport, tileSize) {
|
|
@@ -2002,7 +2005,7 @@ var TileReader3 = class {
|
|
|
2002
2005
|
};
|
|
2003
2006
|
|
|
2004
2007
|
// dist/layers/schema/carto-raster-tile-loader.js
|
|
2005
|
-
var VERSION2 = true ? "9.1.
|
|
2008
|
+
var VERSION2 = true ? "9.1.14" : "latest";
|
|
2006
2009
|
var id2 = "cartoRasterTile";
|
|
2007
2010
|
var DEFAULT_OPTIONS2 = {
|
|
2008
2011
|
cartoRasterTile: {
|
|
@@ -2114,7 +2117,7 @@ var TileReader4 = class {
|
|
|
2114
2117
|
};
|
|
2115
2118
|
|
|
2116
2119
|
// dist/layers/schema/carto-properties-tile-loader.js
|
|
2117
|
-
var VERSION3 = true ? "9.1.
|
|
2120
|
+
var VERSION3 = true ? "9.1.14" : "latest";
|
|
2118
2121
|
var id3 = "cartoPropertiesTile";
|
|
2119
2122
|
var DEFAULT_OPTIONS3 = {
|
|
2120
2123
|
cartoPropertiesTile: {
|
|
@@ -2143,7 +2146,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
|
|
|
2143
2146
|
|
|
2144
2147
|
// dist/layers/schema/carto-vector-tile-loader.js
|
|
2145
2148
|
var import_earcut = __toESM(require("earcut"), 1);
|
|
2146
|
-
var VERSION4 = true ? "9.1.
|
|
2149
|
+
var VERSION4 = true ? "9.1.14" : "latest";
|
|
2147
2150
|
var id4 = "cartoVectorTile";
|
|
2148
2151
|
var DEFAULT_OPTIONS4 = {
|
|
2149
2152
|
cartoVectorTile: {
|
|
@@ -3492,14 +3495,24 @@ async function _fetchMapDataset(dataset, context) {
|
|
|
3492
3495
|
});
|
|
3493
3496
|
}
|
|
3494
3497
|
} else if (spatialDataType === "h3") {
|
|
3495
|
-
const options = {
|
|
3498
|
+
const options = {
|
|
3499
|
+
...globalOptions,
|
|
3500
|
+
aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
|
|
3501
|
+
aggregationResLevel,
|
|
3502
|
+
spatialDataColumn
|
|
3503
|
+
};
|
|
3496
3504
|
if (type === "table") {
|
|
3497
3505
|
dataset.data = await (0, import_api_client2.h3TableSource)({ ...options, tableName: source });
|
|
3498
3506
|
} else if (type === "query") {
|
|
3499
3507
|
dataset.data = await (0, import_api_client2.h3QuerySource)({ ...options, sqlQuery: source, queryParameters });
|
|
3500
3508
|
}
|
|
3501
3509
|
} else if (spatialDataType === "quadbin") {
|
|
3502
|
-
const options = {
|
|
3510
|
+
const options = {
|
|
3511
|
+
...globalOptions,
|
|
3512
|
+
aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
|
|
3513
|
+
aggregationResLevel,
|
|
3514
|
+
spatialDataColumn
|
|
3515
|
+
};
|
|
3503
3516
|
if (type === "table") {
|
|
3504
3517
|
dataset.data = await (0, import_api_client2.quadbinTableSource)({ ...options, tableName: source });
|
|
3505
3518
|
} else if (type === "query") {
|