@deck.gl/carto 9.1.1 → 9.1.2
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/cartoPropertiesTile-worker.js +5559 -0
- 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 +51 -44
- package/dist/index.cjs +43 -36
- package/dist/index.cjs.map +3 -3
- package/dist/layers/schema/carto-properties-tile-loader.d.ts.map +1 -1
- package/dist/layers/schema/carto-properties-tile-loader.js +11 -3
- 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-spatial-tile-loader.js +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist/workers/cartoPropertiesTile.d.ts +2 -0
- package/dist/workers/cartoPropertiesTile.d.ts.map +1 -0
- package/dist/workers/cartoPropertiesTile.js +7 -0
- package/dist/workers/cartoPropertiesTile.js.map +1 -0
- package/dist.min.js +10 -10
- package/package.json +3 -3
- package/src/layers/schema/carto-properties-tile-loader.ts +19 -3
- package/src/workers/cartoPropertiesTile.ts +8 -0
|
@@ -5898,7 +5898,7 @@
|
|
|
5898
5898
|
}
|
|
5899
5899
|
|
|
5900
5900
|
// src/layers/schema/carto-spatial-tile-loader.ts
|
|
5901
|
-
var VERSION = true ? "9.1.
|
|
5901
|
+
var VERSION = true ? "9.1.2" : "latest";
|
|
5902
5902
|
var id = "cartoSpatialTile";
|
|
5903
5903
|
var DEFAULT_OPTIONS = {
|
|
5904
5904
|
cartoSpatialTile: {
|
package/dist/dist.dev.js
CHANGED
|
@@ -298,12 +298,12 @@ var __exports__ = (() => {
|
|
|
298
298
|
for (var i = 0; i < tiles2.length; i++) {
|
|
299
299
|
var t = tiles2[i];
|
|
300
300
|
if (t[0] % 2 === 0 && t[1] % 2 === 0) {
|
|
301
|
-
var id22 = toID(t[0] + 1, t[1], z), id32 = toID(t[0], t[1] + 1, z),
|
|
302
|
-
if (tileHash[id22] && tileHash[id32] && tileHash[
|
|
301
|
+
var id22 = toID(t[0] + 1, t[1], z), id32 = toID(t[0], t[1] + 1, z), id42 = toID(t[0] + 1, t[1] + 1, z);
|
|
302
|
+
if (tileHash[id22] && tileHash[id32] && tileHash[id42]) {
|
|
303
303
|
tileHash[toID(t[0], t[1], t[2])] = false;
|
|
304
304
|
tileHash[id22] = false;
|
|
305
305
|
tileHash[id32] = false;
|
|
306
|
-
tileHash[
|
|
306
|
+
tileHash[id42] = false;
|
|
307
307
|
var parentTile = [t[0] / 2, t[1] / 2, z - 1];
|
|
308
308
|
if (z - 1 === limits.min_zoom)
|
|
309
309
|
mergedTiles.push(parentTile);
|
|
@@ -342,8 +342,8 @@ var __exports__ = (() => {
|
|
|
342
342
|
for (i = 0; i < intersections.length; i += 2) {
|
|
343
343
|
y = intersections[i][1];
|
|
344
344
|
for (var x = intersections[i][0] + 1; x < intersections[i + 1][0]; x++) {
|
|
345
|
-
var
|
|
346
|
-
if (!tileHash[
|
|
345
|
+
var id5 = toID(x, y, zoom);
|
|
346
|
+
if (!tileHash[id5]) {
|
|
347
347
|
tileArray.push([x, y, zoom]);
|
|
348
348
|
}
|
|
349
349
|
}
|
|
@@ -394,8 +394,8 @@ var __exports__ = (() => {
|
|
|
394
394
|
var dim = 2 * (1 << z);
|
|
395
395
|
return (dim * y + x) * 32 + z;
|
|
396
396
|
}
|
|
397
|
-
function fromID(
|
|
398
|
-
var z =
|
|
397
|
+
function fromID(id5) {
|
|
398
|
+
var z = id5 % 32, dim = 2 * (1 << z), xy = (id5 - z) / 32, x = xy % dim, y = (xy - x) / dim % dim;
|
|
399
399
|
return [x, y, z];
|
|
400
400
|
}
|
|
401
401
|
}
|
|
@@ -9835,7 +9835,7 @@ var __exports__ = (() => {
|
|
|
9835
9835
|
if (moment2.version === void 0 && moment2.default) {
|
|
9836
9836
|
moment2 = moment2.default;
|
|
9837
9837
|
}
|
|
9838
|
-
var
|
|
9838
|
+
var VERSION5 = "0.5.45", zones = {}, links = {}, countries = {}, names = {}, guesses = {}, cachedGuess;
|
|
9839
9839
|
if (!moment2 || typeof moment2.version !== "string") {
|
|
9840
9840
|
logError("Moment Timezone requires Moment.js. See https://momentjs.com/timezone/docs/#/use-it/browser/");
|
|
9841
9841
|
}
|
|
@@ -10239,7 +10239,7 @@ var __exports__ = (() => {
|
|
|
10239
10239
|
out.tz(name);
|
|
10240
10240
|
return out;
|
|
10241
10241
|
}
|
|
10242
|
-
tz.version =
|
|
10242
|
+
tz.version = VERSION5;
|
|
10243
10243
|
tz.dataVersion = "";
|
|
10244
10244
|
tz._zones = zones;
|
|
10245
10245
|
tz._links = links;
|
|
@@ -11519,14 +11519,14 @@ var __exports__ = (() => {
|
|
|
11519
11519
|
}
|
|
11520
11520
|
const out = {};
|
|
11521
11521
|
for (const cell of tile.content) {
|
|
11522
|
-
let
|
|
11522
|
+
let id5 = cell.id;
|
|
11523
11523
|
const position = typeof getPosition === "function" ? getPosition(cell, {}) : getPosition;
|
|
11524
11524
|
for (let i = 0; i < aggregationLevels - 1; i++) {
|
|
11525
|
-
|
|
11525
|
+
id5 = cellToParent(id5);
|
|
11526
11526
|
}
|
|
11527
|
-
const parentId = Number(
|
|
11527
|
+
const parentId = Number(id5);
|
|
11528
11528
|
if (!(parentId in out)) {
|
|
11529
|
-
out[parentId] = { id:
|
|
11529
|
+
out[parentId] = { id: id5, count: 0, position: [0, 0] };
|
|
11530
11530
|
for (const { name, aggregation } of properties) {
|
|
11531
11531
|
if (aggregation === "any") {
|
|
11532
11532
|
out[parentId][name] = cell.properties[name];
|
|
@@ -12238,8 +12238,8 @@ var __exports__ = (() => {
|
|
|
12238
12238
|
}
|
|
12239
12239
|
});
|
|
12240
12240
|
}
|
|
12241
|
-
function getWorkerUrl(
|
|
12242
|
-
return `https://unpkg.com/@deck.gl/carto@${version}/dist/${
|
|
12241
|
+
function getWorkerUrl(id5, version) {
|
|
12242
|
+
return `https://unpkg.com/@deck.gl/carto@${version}/dist/${id5}-worker.js`;
|
|
12243
12243
|
}
|
|
12244
12244
|
function scaleIdentity() {
|
|
12245
12245
|
let unknown;
|
|
@@ -12268,12 +12268,12 @@ var __exports__ = (() => {
|
|
|
12268
12268
|
const count = cells.indices.value.length;
|
|
12269
12269
|
const spatial = [];
|
|
12270
12270
|
for (let i = 0; i < count; i++) {
|
|
12271
|
-
const
|
|
12271
|
+
const id5 = scheme === "h3" ? bigIntToHex(cells.indices.value[i]) : cells.indices.value[i];
|
|
12272
12272
|
const properties = { ...cells.properties[i] };
|
|
12273
12273
|
for (const key of Object.keys(cells.numericProps)) {
|
|
12274
12274
|
properties[key] = cells.numericProps[key].value[i];
|
|
12275
12275
|
}
|
|
12276
|
-
spatial.push({ id:
|
|
12276
|
+
spatial.push({ id: id5, properties });
|
|
12277
12277
|
}
|
|
12278
12278
|
return spatial;
|
|
12279
12279
|
}
|
|
@@ -12383,7 +12383,7 @@ var __exports__ = (() => {
|
|
|
12383
12383
|
clusterLevel: { type: "number", value: 5, min: 1 },
|
|
12384
12384
|
getPosition: {
|
|
12385
12385
|
type: "accessor",
|
|
12386
|
-
value: ({ id:
|
|
12386
|
+
value: ({ id: id5 }) => getQuadbinPolygon(id5, 0.5).slice(2, 4)
|
|
12387
12387
|
},
|
|
12388
12388
|
getWeight: { type: "accessor", value: 1 },
|
|
12389
12389
|
refinementStrategy: "no-overlap",
|
|
@@ -13477,7 +13477,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
13477
13477
|
}
|
|
13478
13478
|
return backgroundPadding;
|
|
13479
13479
|
}
|
|
13480
|
-
renderTextLayer(
|
|
13480
|
+
renderTextLayer(id5, { updateTriggers: updateTriggersOverride = {}, ...props }) {
|
|
13481
13481
|
const {
|
|
13482
13482
|
data,
|
|
13483
13483
|
characterSet,
|
|
@@ -13496,7 +13496,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
|
|
|
13496
13496
|
} = this.props;
|
|
13497
13497
|
return new EnhancedTextLayer(
|
|
13498
13498
|
this.getSubLayerProps({
|
|
13499
|
-
id:
|
|
13499
|
+
id: id5,
|
|
13500
13500
|
data,
|
|
13501
13501
|
characterSet,
|
|
13502
13502
|
fontFamily,
|
|
@@ -13878,10 +13878,17 @@ void main(void) {
|
|
|
13878
13878
|
};
|
|
13879
13879
|
|
|
13880
13880
|
// src/layers/schema/carto-properties-tile-loader.ts
|
|
13881
|
+
var VERSION3 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
|
|
13882
|
+
var id3 = "cartoPropertiesTile";
|
|
13883
|
+
var DEFAULT_OPTIONS3 = {
|
|
13884
|
+
cartoPropertiesTile: {
|
|
13885
|
+
workerUrl: getWorkerUrl(id3, VERSION3)
|
|
13886
|
+
}
|
|
13887
|
+
};
|
|
13881
13888
|
var CartoPropertiesTileLoader = {
|
|
13882
13889
|
name: "CARTO Properties Tile",
|
|
13883
|
-
version:
|
|
13884
|
-
id:
|
|
13890
|
+
version: VERSION3,
|
|
13891
|
+
id: id3,
|
|
13885
13892
|
module: "carto",
|
|
13886
13893
|
extensions: ["pbf"],
|
|
13887
13894
|
mimeTypes: ["application/vnd.carto-properties-tile"],
|
|
@@ -13889,7 +13896,7 @@ void main(void) {
|
|
|
13889
13896
|
worker: true,
|
|
13890
13897
|
parse: async (arrayBuffer, options) => parseCartoPropertiesTile(arrayBuffer, options),
|
|
13891
13898
|
parseSync: parseCartoPropertiesTile,
|
|
13892
|
-
options:
|
|
13899
|
+
options: DEFAULT_OPTIONS3
|
|
13893
13900
|
};
|
|
13894
13901
|
function parseCartoPropertiesTile(arrayBuffer, options) {
|
|
13895
13902
|
if (!arrayBuffer)
|
|
@@ -13900,17 +13907,17 @@ void main(void) {
|
|
|
13900
13907
|
|
|
13901
13908
|
// src/layers/schema/carto-vector-tile-loader.ts
|
|
13902
13909
|
var import_earcut = __toESM(require_earcut(), 1);
|
|
13903
|
-
var
|
|
13904
|
-
var
|
|
13905
|
-
var
|
|
13910
|
+
var VERSION4 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
|
|
13911
|
+
var id4 = "cartoVectorTile";
|
|
13912
|
+
var DEFAULT_OPTIONS4 = {
|
|
13906
13913
|
cartoVectorTile: {
|
|
13907
|
-
workerUrl: getWorkerUrl(
|
|
13914
|
+
workerUrl: getWorkerUrl(id4, VERSION4)
|
|
13908
13915
|
}
|
|
13909
13916
|
};
|
|
13910
13917
|
var CartoVectorTileLoader = {
|
|
13911
13918
|
name: "CARTO Vector Tile",
|
|
13912
|
-
version:
|
|
13913
|
-
id:
|
|
13919
|
+
version: VERSION4,
|
|
13920
|
+
id: id4,
|
|
13914
13921
|
module: "carto",
|
|
13915
13922
|
extensions: ["pbf"],
|
|
13916
13923
|
mimeTypes: ["application/vnd.carto-vector-tile"],
|
|
@@ -13918,7 +13925,7 @@ void main(void) {
|
|
|
13918
13925
|
parse: async (arrayBuffer, options) => parseCartoVectorTile(arrayBuffer, options),
|
|
13919
13926
|
parseSync: parseCartoVectorTile,
|
|
13920
13927
|
worker: true,
|
|
13921
|
-
options:
|
|
13928
|
+
options: DEFAULT_OPTIONS4
|
|
13922
13929
|
};
|
|
13923
13930
|
function triangulatePolygon(polygons, target, {
|
|
13924
13931
|
startPosition,
|
|
@@ -15379,34 +15386,34 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
15379
15386
|
var STYLE_LAYER_GROUPS = [
|
|
15380
15387
|
{
|
|
15381
15388
|
slug: "label",
|
|
15382
|
-
filter: ({ id:
|
|
15383
|
-
|
|
15389
|
+
filter: ({ id: id5 }) => Boolean(
|
|
15390
|
+
id5.match(/(?=(label|_label|place-|place_|poi-|poi_|watername_|roadname_|housenumber))/)
|
|
15384
15391
|
),
|
|
15385
15392
|
defaultVisibility: true
|
|
15386
15393
|
},
|
|
15387
15394
|
{
|
|
15388
15395
|
slug: "road",
|
|
15389
|
-
filter: ({ id:
|
|
15396
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/(?=(road|railway|tunnel|street|bridge))(?!.*label)/)),
|
|
15390
15397
|
defaultVisibility: true
|
|
15391
15398
|
},
|
|
15392
15399
|
{
|
|
15393
15400
|
slug: "border",
|
|
15394
|
-
filter: ({ id:
|
|
15401
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/border|boundaries|boundary_/)),
|
|
15395
15402
|
defaultVisibility: false
|
|
15396
15403
|
},
|
|
15397
15404
|
{
|
|
15398
15405
|
slug: "building",
|
|
15399
|
-
filter: ({ id:
|
|
15406
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/building/)),
|
|
15400
15407
|
defaultVisibility: true
|
|
15401
15408
|
},
|
|
15402
15409
|
{
|
|
15403
15410
|
slug: "water",
|
|
15404
|
-
filter: ({ id:
|
|
15411
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/(?=(water|stream|ferry))/)),
|
|
15405
15412
|
defaultVisibility: true
|
|
15406
15413
|
},
|
|
15407
15414
|
{
|
|
15408
15415
|
slug: "land",
|
|
15409
|
-
filter: ({ id:
|
|
15416
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/(?=(parks|landcover|industrial|sand|hillshade|park_))/)),
|
|
15410
15417
|
defaultVisibility: true
|
|
15411
15418
|
}
|
|
15412
15419
|
];
|
|
@@ -19239,7 +19246,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19239
19246
|
/** @deprecated Use `basemap`. */
|
|
19240
19247
|
mapStyle,
|
|
19241
19248
|
token,
|
|
19242
|
-
layers: layers.reverse().map(({ id:
|
|
19249
|
+
layers: layers.reverse().map(({ id: id5, type, config, visualChannels }) => {
|
|
19243
19250
|
try {
|
|
19244
19251
|
const { dataId } = config;
|
|
19245
19252
|
const dataset = datasets.find((d) => d.id === dataId);
|
|
@@ -19249,12 +19256,12 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19249
19256
|
const { Layer: Layer10, propMap, defaultProps: defaultProps12 } = getLayer(type, config, dataset);
|
|
19250
19257
|
const styleProps = createStyleProps(config, propMap);
|
|
19251
19258
|
return new Layer10({
|
|
19252
|
-
id:
|
|
19259
|
+
id: id5,
|
|
19253
19260
|
data,
|
|
19254
19261
|
...defaultProps12,
|
|
19255
19262
|
...createInteractionProps(interactionConfig),
|
|
19256
19263
|
...styleProps,
|
|
19257
|
-
...createChannelProps(
|
|
19264
|
+
...createChannelProps(id5, type, config, visualChannels, data),
|
|
19258
19265
|
// Must come after style
|
|
19259
19266
|
...createParametersProp(layerBlending, styleProps.parameters || {}),
|
|
19260
19267
|
// Must come after style
|
|
@@ -19324,7 +19331,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19324
19331
|
result.highlightColor = config.visConfig.enable3d ? [255, 255, 255, 60] : [252, 242, 26, 255];
|
|
19325
19332
|
return result;
|
|
19326
19333
|
}
|
|
19327
|
-
function createChannelProps(
|
|
19334
|
+
function createChannelProps(id5, type, config, visualChannels, data) {
|
|
19328
19335
|
const {
|
|
19329
19336
|
colorField,
|
|
19330
19337
|
colorScale,
|
|
@@ -19463,7 +19470,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19463
19470
|
}
|
|
19464
19471
|
if (textLabel && textLabel.length && textLabel[0].field) {
|
|
19465
19472
|
const [mainLabel, secondaryLabel] = textLabel;
|
|
19466
|
-
const collisionGroup =
|
|
19473
|
+
const collisionGroup = id5;
|
|
19467
19474
|
({
|
|
19468
19475
|
alignment: result.getTextAlignmentBaseline,
|
|
19469
19476
|
anchor: result.getTextAnchor,
|
|
@@ -19643,7 +19650,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19643
19650
|
return cacheChanged;
|
|
19644
19651
|
}
|
|
19645
19652
|
async function _fetchTilestats(attribute, dataset, context) {
|
|
19646
|
-
const { connectionName, data, id:
|
|
19653
|
+
const { connectionName, data, id: id5, source, type, queryParameters } = dataset;
|
|
19647
19654
|
const { apiBaseUrl } = context;
|
|
19648
19655
|
const errorContext = {
|
|
19649
19656
|
requestType: "Tile stats",
|
|
@@ -19652,7 +19659,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19652
19659
|
source
|
|
19653
19660
|
};
|
|
19654
19661
|
if (!("tilestats" in data)) {
|
|
19655
|
-
throw new CartoAPIError(new Error(`Invalid dataset for tilestats: ${
|
|
19662
|
+
throw new CartoAPIError(new Error(`Invalid dataset for tilestats: ${id5}`), errorContext);
|
|
19656
19663
|
}
|
|
19657
19664
|
const baseUrl = buildStatsUrl({ attribute, apiBaseUrl, ...dataset });
|
|
19658
19665
|
const client2 = new URLSearchParams(data.tiles[0]).get("client");
|
package/dist/index.cjs
CHANGED
|
@@ -96,14 +96,14 @@ function aggregateTile(tile, tileAggregationCache, aggregationLevels, properties
|
|
|
96
96
|
}
|
|
97
97
|
const out = {};
|
|
98
98
|
for (const cell of tile.content) {
|
|
99
|
-
let
|
|
99
|
+
let id5 = cell.id;
|
|
100
100
|
const position = typeof getPosition === "function" ? getPosition(cell, {}) : getPosition;
|
|
101
101
|
for (let i = 0; i < aggregationLevels - 1; i++) {
|
|
102
|
-
|
|
102
|
+
id5 = (0, import_quadbin.cellToParent)(id5);
|
|
103
103
|
}
|
|
104
|
-
const parentId = Number(
|
|
104
|
+
const parentId = Number(id5);
|
|
105
105
|
if (!(parentId in out)) {
|
|
106
|
-
out[parentId] = { id:
|
|
106
|
+
out[parentId] = { id: id5, count: 0, position: [0, 0] };
|
|
107
107
|
for (const { name, aggregation } of properties) {
|
|
108
108
|
if (aggregation === "any") {
|
|
109
109
|
out[parentId][name] = cell.properties[name];
|
|
@@ -521,8 +521,8 @@ function createBinaryProxy(data, index) {
|
|
|
521
521
|
}
|
|
522
522
|
});
|
|
523
523
|
}
|
|
524
|
-
function getWorkerUrl(
|
|
525
|
-
return `https://unpkg.com/@deck.gl/carto@${version}/dist/${
|
|
524
|
+
function getWorkerUrl(id5, version) {
|
|
525
|
+
return `https://unpkg.com/@deck.gl/carto@${version}/dist/${id5}-worker.js`;
|
|
526
526
|
}
|
|
527
527
|
function scaleIdentity() {
|
|
528
528
|
let unknown;
|
|
@@ -552,18 +552,18 @@ function binaryToSpatialjson(binary) {
|
|
|
552
552
|
const count = cells.indices.value.length;
|
|
553
553
|
const spatial = [];
|
|
554
554
|
for (let i = 0; i < count; i++) {
|
|
555
|
-
const
|
|
555
|
+
const id5 = scheme === "h3" ? (0, import_quadbin4.bigIntToHex)(cells.indices.value[i]) : cells.indices.value[i];
|
|
556
556
|
const properties = { ...cells.properties[i] };
|
|
557
557
|
for (const key of Object.keys(cells.numericProps)) {
|
|
558
558
|
properties[key] = cells.numericProps[key].value[i];
|
|
559
559
|
}
|
|
560
|
-
spatial.push({ id:
|
|
560
|
+
spatial.push({ id: id5, properties });
|
|
561
561
|
}
|
|
562
562
|
return spatial;
|
|
563
563
|
}
|
|
564
564
|
|
|
565
565
|
// dist/layers/schema/carto-spatial-tile-loader.js
|
|
566
|
-
var VERSION = true ? "9.1.
|
|
566
|
+
var VERSION = true ? "9.1.2" : "latest";
|
|
567
567
|
var id = "cartoSpatialTile";
|
|
568
568
|
var DEFAULT_OPTIONS = {
|
|
569
569
|
cartoSpatialTile: {
|
|
@@ -669,7 +669,7 @@ var defaultProps = {
|
|
|
669
669
|
clusterLevel: { type: "number", value: 5, min: 1 },
|
|
670
670
|
getPosition: {
|
|
671
671
|
type: "accessor",
|
|
672
|
-
value: ({ id:
|
|
672
|
+
value: ({ id: id5 }) => getQuadbinPolygon(id5, 0.5).slice(2, 4)
|
|
673
673
|
},
|
|
674
674
|
getWeight: { type: "accessor", value: 1 },
|
|
675
675
|
refinementStrategy: "no-overlap",
|
|
@@ -942,7 +942,7 @@ var TileReader3 = class {
|
|
|
942
942
|
};
|
|
943
943
|
|
|
944
944
|
// dist/layers/schema/carto-raster-tile-loader.js
|
|
945
|
-
var VERSION2 = true ? "9.1.
|
|
945
|
+
var VERSION2 = true ? "9.1.2" : "latest";
|
|
946
946
|
var id2 = "cartoRasterTile";
|
|
947
947
|
var DEFAULT_OPTIONS2 = {
|
|
948
948
|
cartoRasterTile: {
|
|
@@ -1723,10 +1723,10 @@ var PointLabelLayer = class extends import_core12.CompositeLayer {
|
|
|
1723
1723
|
}
|
|
1724
1724
|
return backgroundPadding;
|
|
1725
1725
|
}
|
|
1726
|
-
renderTextLayer(
|
|
1726
|
+
renderTextLayer(id5, { updateTriggers: updateTriggersOverride = {}, ...props }) {
|
|
1727
1727
|
const { data, characterSet, fontFamily, fontSettings, fontWeight, outlineColor, outlineWidth, sizeScale, radiusScale, getAlignmentBaseline, getColor, getPosition, getTextAnchor, updateTriggers } = this.props;
|
|
1728
1728
|
return new EnhancedTextLayer(this.getSubLayerProps({
|
|
1729
|
-
id:
|
|
1729
|
+
id: id5,
|
|
1730
1730
|
data,
|
|
1731
1731
|
characterSet,
|
|
1732
1732
|
fontFamily,
|
|
@@ -2060,10 +2060,17 @@ var TileReader4 = class {
|
|
|
2060
2060
|
};
|
|
2061
2061
|
|
|
2062
2062
|
// dist/layers/schema/carto-properties-tile-loader.js
|
|
2063
|
+
var VERSION3 = true ? "9.1.2" : "latest";
|
|
2064
|
+
var id3 = "cartoPropertiesTile";
|
|
2065
|
+
var DEFAULT_OPTIONS3 = {
|
|
2066
|
+
cartoPropertiesTile: {
|
|
2067
|
+
workerUrl: getWorkerUrl(id3, VERSION3)
|
|
2068
|
+
}
|
|
2069
|
+
};
|
|
2063
2070
|
var CartoPropertiesTileLoader = {
|
|
2064
2071
|
name: "CARTO Properties Tile",
|
|
2065
|
-
version:
|
|
2066
|
-
id:
|
|
2072
|
+
version: VERSION3,
|
|
2073
|
+
id: id3,
|
|
2067
2074
|
module: "carto",
|
|
2068
2075
|
extensions: ["pbf"],
|
|
2069
2076
|
mimeTypes: ["application/vnd.carto-properties-tile"],
|
|
@@ -2071,7 +2078,7 @@ var CartoPropertiesTileLoader = {
|
|
|
2071
2078
|
worker: true,
|
|
2072
2079
|
parse: async (arrayBuffer, options) => parseCartoPropertiesTile(arrayBuffer, options),
|
|
2073
2080
|
parseSync: parseCartoPropertiesTile,
|
|
2074
|
-
options:
|
|
2081
|
+
options: DEFAULT_OPTIONS3
|
|
2075
2082
|
};
|
|
2076
2083
|
function parseCartoPropertiesTile(arrayBuffer, options) {
|
|
2077
2084
|
if (!arrayBuffer)
|
|
@@ -2082,17 +2089,17 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
|
|
|
2082
2089
|
|
|
2083
2090
|
// dist/layers/schema/carto-vector-tile-loader.js
|
|
2084
2091
|
var import_earcut = __toESM(require("earcut"), 1);
|
|
2085
|
-
var
|
|
2086
|
-
var
|
|
2087
|
-
var
|
|
2092
|
+
var VERSION4 = true ? "9.1.2" : "latest";
|
|
2093
|
+
var id4 = "cartoVectorTile";
|
|
2094
|
+
var DEFAULT_OPTIONS4 = {
|
|
2088
2095
|
cartoVectorTile: {
|
|
2089
|
-
workerUrl: getWorkerUrl(
|
|
2096
|
+
workerUrl: getWorkerUrl(id4, VERSION4)
|
|
2090
2097
|
}
|
|
2091
2098
|
};
|
|
2092
2099
|
var CartoVectorTileLoader = {
|
|
2093
2100
|
name: "CARTO Vector Tile",
|
|
2094
|
-
version:
|
|
2095
|
-
id:
|
|
2101
|
+
version: VERSION4,
|
|
2102
|
+
id: id4,
|
|
2096
2103
|
module: "carto",
|
|
2097
2104
|
extensions: ["pbf"],
|
|
2098
2105
|
mimeTypes: ["application/vnd.carto-vector-tile"],
|
|
@@ -2100,7 +2107,7 @@ var CartoVectorTileLoader = {
|
|
|
2100
2107
|
parse: async (arrayBuffer, options) => parseCartoVectorTile(arrayBuffer, options),
|
|
2101
2108
|
parseSync: parseCartoVectorTile,
|
|
2102
2109
|
worker: true,
|
|
2103
|
-
options:
|
|
2110
|
+
options: DEFAULT_OPTIONS4
|
|
2104
2111
|
};
|
|
2105
2112
|
function triangulatePolygon(polygons, target, { startPosition, endPosition, indices }) {
|
|
2106
2113
|
const coordLength = polygons.positions.size;
|
|
@@ -2285,32 +2292,32 @@ var GOOGLE_BASEMAPS = {
|
|
|
2285
2292
|
var STYLE_LAYER_GROUPS = [
|
|
2286
2293
|
{
|
|
2287
2294
|
slug: "label",
|
|
2288
|
-
filter: ({ id:
|
|
2295
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/(?=(label|_label|place-|place_|poi-|poi_|watername_|roadname_|housenumber))/)),
|
|
2289
2296
|
defaultVisibility: true
|
|
2290
2297
|
},
|
|
2291
2298
|
{
|
|
2292
2299
|
slug: "road",
|
|
2293
|
-
filter: ({ id:
|
|
2300
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/(?=(road|railway|tunnel|street|bridge))(?!.*label)/)),
|
|
2294
2301
|
defaultVisibility: true
|
|
2295
2302
|
},
|
|
2296
2303
|
{
|
|
2297
2304
|
slug: "border",
|
|
2298
|
-
filter: ({ id:
|
|
2305
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/border|boundaries|boundary_/)),
|
|
2299
2306
|
defaultVisibility: false
|
|
2300
2307
|
},
|
|
2301
2308
|
{
|
|
2302
2309
|
slug: "building",
|
|
2303
|
-
filter: ({ id:
|
|
2310
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/building/)),
|
|
2304
2311
|
defaultVisibility: true
|
|
2305
2312
|
},
|
|
2306
2313
|
{
|
|
2307
2314
|
slug: "water",
|
|
2308
|
-
filter: ({ id:
|
|
2315
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/(?=(water|stream|ferry))/)),
|
|
2309
2316
|
defaultVisibility: true
|
|
2310
2317
|
},
|
|
2311
2318
|
{
|
|
2312
2319
|
slug: "land",
|
|
2313
|
-
filter: ({ id:
|
|
2320
|
+
filter: ({ id: id5 }) => Boolean(id5.match(/(?=(parks|landcover|industrial|sand|hillshade|park_))/)),
|
|
2314
2321
|
defaultVisibility: true
|
|
2315
2322
|
}
|
|
2316
2323
|
];
|
|
@@ -2842,7 +2849,7 @@ function parseMap(json) {
|
|
|
2842
2849
|
/** @deprecated Use `basemap`. */
|
|
2843
2850
|
mapStyle,
|
|
2844
2851
|
token,
|
|
2845
|
-
layers: layers.reverse().map(({ id:
|
|
2852
|
+
layers: layers.reverse().map(({ id: id5, type, config, visualChannels }) => {
|
|
2846
2853
|
try {
|
|
2847
2854
|
const { dataId } = config;
|
|
2848
2855
|
const dataset = datasets.find((d) => d.id === dataId);
|
|
@@ -2852,12 +2859,12 @@ function parseMap(json) {
|
|
|
2852
2859
|
const { Layer: Layer2, propMap, defaultProps: defaultProps12 } = getLayer(type, config, dataset);
|
|
2853
2860
|
const styleProps = createStyleProps(config, propMap);
|
|
2854
2861
|
return new Layer2({
|
|
2855
|
-
id:
|
|
2862
|
+
id: id5,
|
|
2856
2863
|
data,
|
|
2857
2864
|
...defaultProps12,
|
|
2858
2865
|
...createInteractionProps(interactionConfig),
|
|
2859
2866
|
...styleProps,
|
|
2860
|
-
...createChannelProps(
|
|
2867
|
+
...createChannelProps(id5, type, config, visualChannels, data),
|
|
2861
2868
|
// Must come after style
|
|
2862
2869
|
...createParametersProp(layerBlending, styleProps.parameters || {}),
|
|
2863
2870
|
// Must come after style
|
|
@@ -2927,7 +2934,7 @@ function createStyleProps(config, mapping) {
|
|
|
2927
2934
|
result.highlightColor = config.visConfig.enable3d ? [255, 255, 255, 60] : [252, 242, 26, 255];
|
|
2928
2935
|
return result;
|
|
2929
2936
|
}
|
|
2930
|
-
function createChannelProps(
|
|
2937
|
+
function createChannelProps(id5, type, config, visualChannels, data) {
|
|
2931
2938
|
var _a;
|
|
2932
2939
|
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale, weightField } = visualChannels;
|
|
2933
2940
|
let { heightField, heightScale } = visualChannels;
|
|
@@ -3044,7 +3051,7 @@ function createChannelProps(id4, type, config, visualChannels, data) {
|
|
|
3044
3051
|
}
|
|
3045
3052
|
if (textLabel && textLabel.length && textLabel[0].field) {
|
|
3046
3053
|
const [mainLabel, secondaryLabel] = textLabel;
|
|
3047
|
-
const collisionGroup =
|
|
3054
|
+
const collisionGroup = id5;
|
|
3048
3055
|
({
|
|
3049
3056
|
alignment: result.getTextAlignmentBaseline,
|
|
3050
3057
|
anchor: result.getTextAnchor,
|
|
@@ -3206,7 +3213,7 @@ async function _fetchMapDataset(dataset, context) {
|
|
|
3206
3213
|
return cacheChanged;
|
|
3207
3214
|
}
|
|
3208
3215
|
async function _fetchTilestats(attribute, dataset, context) {
|
|
3209
|
-
const { connectionName, data, id:
|
|
3216
|
+
const { connectionName, data, id: id5, source, type, queryParameters } = dataset;
|
|
3210
3217
|
const { apiBaseUrl } = context;
|
|
3211
3218
|
const errorContext = {
|
|
3212
3219
|
requestType: "Tile stats",
|
|
@@ -3215,7 +3222,7 @@ async function _fetchTilestats(attribute, dataset, context) {
|
|
|
3215
3222
|
source
|
|
3216
3223
|
};
|
|
3217
3224
|
if (!("tilestats" in data)) {
|
|
3218
|
-
throw new import_api_client2.CartoAPIError(new Error(`Invalid dataset for tilestats: ${
|
|
3225
|
+
throw new import_api_client2.CartoAPIError(new Error(`Invalid dataset for tilestats: ${id5}`), errorContext);
|
|
3219
3226
|
}
|
|
3220
3227
|
const baseUrl = (0, import_api_client2.buildStatsUrl)({ attribute, apiBaseUrl, ...dataset });
|
|
3221
3228
|
const client = new URLSearchParams(data.tiles[0]).get("client");
|