@deck.gl/carto 9.1.5 → 9.1.7
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.d.ts.map +1 -1
- package/dist/api/parse-map.js +3 -5
- 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 +107 -94
- package/dist/index.cjs +115 -101
- package/dist/index.cjs.map +4 -4
- package/dist/layers/raster-tile-layer.d.ts.map +1 -1
- package/dist/layers/raster-tile-layer.js +3 -0
- package/dist/layers/raster-tile-layer.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/layers/spatial-index-tile-layer.d.ts.map +1 -1
- package/dist/layers/spatial-index-tile-layer.js +1 -2
- package/dist/layers/spatial-index-tile-layer.js.map +1 -1
- package/dist/layers/vector-tile-layer.d.ts.map +1 -1
- package/dist/layers/vector-tile-layer.js +14 -1
- package/dist/layers/vector-tile-layer.js.map +1 -1
- package/dist.min.js +9 -9
- package/package.json +5 -5
- package/src/api/parse-map.ts +3 -6
- package/src/layers/raster-tile-layer.ts +4 -0
- package/src/layers/spatial-index-tile-layer.ts +1 -2
- package/src/layers/vector-tile-layer.ts +15 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/raster-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EAEZ,KAAK,EACL,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,WAAW,EAAE,EAAC,gBAAgB,EAAC,0BAAuB;AAE7D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EAAY,cAAc,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"raster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/raster-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EAEZ,KAAK,EACL,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,WAAW,EAAE,EAAC,gBAAgB,EAAC,0BAAuB;AAE7D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EAAY,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAO9D,eAAO,MAAM,eAAe;;SAI3B,CAAC;AAQF,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,mBAAmB,CAAC;AAEtB,2CAA2C;AAC3C,KAAK,qBAAqB,CAAC,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACvE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG;IACpC,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAYJ,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;CAoB1C"}
|
|
@@ -8,6 +8,9 @@ import { injectAccessToken, TilejsonPropType } from "./utils.js";
|
|
|
8
8
|
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
9
9
|
import { TileLayer } from '@deck.gl/geo-layers';
|
|
10
10
|
import { copy, PostProcessModifier } from "./post-process-utils.js";
|
|
11
|
+
import { registerLoaders } from '@loaders.gl/core';
|
|
12
|
+
import CartoRasterTileLoader from "./schema/carto-raster-tile-loader.js";
|
|
13
|
+
registerLoaders([CartoRasterTileLoader]);
|
|
11
14
|
export const renderSubLayers = props => {
|
|
12
15
|
const tileIndex = props.tile?.index?.q;
|
|
13
16
|
if (!tileIndex)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raster-tile-layer.js","sourceRoot":"","sources":["../../src/layers/raster-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,cAAc,EAMf,MAAM,eAAe,CAAC;AACvB,OAAO,WAA+B,0BAAuB;AAC7D,OAAO,gBAAgB,gCAA6B;AAEpD,OAAO,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,mBAAgB;AAC5D,OAAO,EAAC,iBAAiB,EAAC,wBAAqB;AAC/C,OAAO,EAAC,SAAS,EAAiB,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAC,IAAI,EAAE,mBAAmB,EAAC,gCAA6B;
|
|
1
|
+
{"version":3,"file":"raster-tile-layer.js","sourceRoot":"","sources":["../../src/layers/raster-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,cAAc,EAMf,MAAM,eAAe,CAAC;AACvB,OAAO,WAA+B,0BAAuB;AAC7D,OAAO,gBAAgB,gCAA6B;AAEpD,OAAO,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,mBAAgB;AAC5D,OAAO,EAAC,iBAAiB,EAAC,wBAAqB;AAC/C,OAAO,EAAC,SAAS,EAAiB,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAC,IAAI,EAAE,mBAAmB,EAAC,gCAA6B;AAC/D,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,qBAAqB,6CAA0C;AAEtE,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC,EAAE;IACrC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACvC,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5B,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,EAAC,SAAS,EAAC,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,YAAY,GAAuC;IACvD,IAAI,EAAE,gBAAgB;IACtB,kBAAkB,EAAE,YAAY;IAChC,QAAQ,EAAE,iBAAiB;CAC5B,CAAC;AAYF,MAAM,oBAAqB,SAAQ,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC;IACrE,cAAc,CAAC,OAAsB;QACnC,2BAA2B;QAC3B,MAAM,EAAC,IAAI,EAAC,GAAI,OAAO,CAAC,KAA4B,CAAC,KAAK,CAAC;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QAEvB,OAAO,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;CACF;AAED,MAAqB,eAGnB,SAAQ,cAAmE;IAI3E,cAAc;QACZ,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAsB,CAAC;QACnD,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QACrD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,YAAY;QACV,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAsB,CAAC;QACnD,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,MAAM,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAC,GAAG,QAAQ,CAAC;QAC9F,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAC1E,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE;YACnC,EAAE,EAAE,qBAAqB,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE;YACxC,IAAI;YACJ,wDAAwD;YACxD,YAAY,EAAE,gBAAuB;YACrC,eAAe;YACf,OAAO;YACP,OAAO;YACP,WAAW,EAAE;gBACX,eAAe,EAAE,EAAC,QAAQ,EAAC;gBAC3B,GAAG,IAAI,CAAC,cAAc,EAAE;aACzB;SACF,CAAC,CAAC;IACL,CAAC;;AA7BM,yBAAS,GAAG,iBAAiB,CAAC;AAC9B,4BAAY,GAAG,YAAY,CAAC;eALhB,eAAe"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { TileReader } from "./carto-properties-tile.js";
|
|
5
5
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
6
6
|
import { getWorkerUrl } from "../../utils.js";
|
|
7
|
-
const VERSION = typeof "9.1.
|
|
7
|
+
const VERSION = typeof "9.1.7" !== 'undefined' ? "9.1.7" : 'latest';
|
|
8
8
|
const id = 'cartoPropertiesTile';
|
|
9
9
|
const DEFAULT_OPTIONS = {
|
|
10
10
|
cartoPropertiesTile: {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { TileReader } from "./carto-raster-tile.js";
|
|
5
5
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
6
6
|
import { getWorkerUrl } from "../../utils.js";
|
|
7
|
-
const VERSION = typeof "9.1.
|
|
7
|
+
const VERSION = typeof "9.1.7" !== 'undefined' ? "9.1.7" : 'latest';
|
|
8
8
|
const id = 'cartoRasterTile';
|
|
9
9
|
const DEFAULT_OPTIONS = {
|
|
10
10
|
cartoRasterTile: {
|
|
@@ -5,7 +5,7 @@ import { TileReader } from "./carto-spatial-tile.js";
|
|
|
5
5
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
6
6
|
import { getWorkerUrl } from "../../utils.js";
|
|
7
7
|
import { binaryToSpatialjson } from "./spatialjson-utils.js";
|
|
8
|
-
const VERSION = typeof "9.1.
|
|
8
|
+
const VERSION = typeof "9.1.7" !== 'undefined' ? "9.1.7" : 'latest';
|
|
9
9
|
const id = 'cartoSpatialTile';
|
|
10
10
|
const DEFAULT_OPTIONS = {
|
|
11
11
|
cartoSpatialTile: {
|
|
@@ -5,7 +5,7 @@ import earcut from 'earcut';
|
|
|
5
5
|
import { TileReader } from "./carto-tile.js";
|
|
6
6
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
7
7
|
import { getWorkerUrl } from "../../utils.js";
|
|
8
|
-
const VERSION = typeof "9.1.
|
|
8
|
+
const VERSION = typeof "9.1.7" !== 'undefined' ? "9.1.7" : 'latest';
|
|
9
9
|
const id = 'cartoVectorTile';
|
|
10
10
|
const DEFAULT_OPTIONS = {
|
|
11
11
|
cartoVectorTile: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAIvD,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,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI;IAOtE,yBAAyB,CAAC,IAAI,EAAE,YAAY;IAiB5C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;CAgB9D"}
|
|
@@ -2,9 +2,8 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { registerLoaders } from '@loaders.gl/core';
|
|
5
|
-
import CartoRasterTileLoader from "./schema/carto-raster-tile-loader.js";
|
|
6
5
|
import CartoSpatialTileLoader from "./schema/carto-spatial-tile-loader.js";
|
|
7
|
-
registerLoaders([
|
|
6
|
+
registerLoaders([CartoSpatialTileLoader]);
|
|
8
7
|
import { TileLayer } from '@deck.gl/geo-layers';
|
|
9
8
|
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
10
9
|
function isFeatureIdDefined(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spatial-index-tile-layer.js","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,
|
|
1
|
+
{"version":3,"file":"spatial-index-tile-layer.js","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,sBAAsB,8CAA2C;AACxE,eAAe,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC;AAG1C,OAAO,EAAC,SAAS,EAAgD,MAAM,qBAAqB,CAAC;AAC7F,OAAO,EAAC,iBAAiB,EAAC,wBAAqB;AAE/C,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;AAC/D,CAAC;AAED,MAAM,YAAY,GAA6C;IAC7D,QAAQ,EAAE,iBAAiB;CAC5B,CAAC;AASF,MAAqB,qBAGnB,SAAQ,SAAoE;IASlE,oBAAoB,CAAC,IAAiB;QAC9C,MAAM,EAAC,gBAAgB,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC;QACnC,IAAI,mBAAmB,GAA2B,IAAI,CAAC;QAEvD,IAAI,cAAc,EAAE,CAAC;YACnB,mBAAmB,GAAG,cAAc,CAAC,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,gBAAgB,KAAK,mBAAmB,EAAE,CAAC;YAC7C,IAAI,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAClC,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;gBACzC,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC;gBACZ,cAAc;gBACd,gBAAgB,EAAE,mBAAmB;aACtC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,sBAAsB,CAAC,IAAkB;QACvC,OAAO;YACL,sBAAsB,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAC5D,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;SAC1C,CAAC;IACJ,CAAC;IAED,yBAAyB,CAAC,IAAkB;QAC1C,MAAM,EAAC,gBAAgB,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAE1B,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAChE,IACE,CAAC,kBAAkB;YACnB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACpB,yEAAyE;YACzE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAiB,CAAC,EAC7C,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,gBAAgB,CAAC,CAAC;IACpE,CAAC;IAED,cAAc,CAAC,IAAkB,EAAE,SAA0B;QAC3D,iFAAiF;QACjF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAQ,CAAC;QACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjD,aAAa;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACrC,uEAAuE;QACvE,IAAI,YAAY,GAAQ,EAAC,CAAC,GAAG,CAAC,EAAE,SAAS,EAAC,CAAC;QAC3C,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACpD,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ,CAAC,EAAE,CAAC;YAClC,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;YACpD,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,YAAY,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;;AArEM,+BAAS,GAAG,uBAAuB,CAAC;AACpC,kCAAY,GAAG,YAAY,CAAC;eALhB,qBAAqB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AASA,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;AAE7C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AASA,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;AAE7C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAYtD,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;IASf,WAAW,CAAC,IAAI,EAAE,aAAa;IAqCrC,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;cAwDH,QAAQ,IAAI,OAAO;CAKvC"}
|
|
@@ -5,11 +5,12 @@ import { registerLoaders } from '@loaders.gl/core';
|
|
|
5
5
|
import CartoPropertiesTileLoader from "./schema/carto-properties-tile-loader.js";
|
|
6
6
|
import CartoVectorTileLoader from "./schema/carto-vector-tile-loader.js";
|
|
7
7
|
registerLoaders([CartoPropertiesTileLoader, CartoVectorTileLoader]);
|
|
8
|
-
import { ClipExtension } from '@deck.gl/extensions';
|
|
8
|
+
import { ClipExtension, CollisionFilterExtension } from '@deck.gl/extensions';
|
|
9
9
|
import { MVTLayer, _getURLFromTemplate } from '@deck.gl/geo-layers';
|
|
10
10
|
import { GeoJsonLayer } from '@deck.gl/layers';
|
|
11
11
|
import { TilejsonPropType, injectAccessToken, mergeBoundaryData } from "./utils.js";
|
|
12
12
|
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
13
|
+
import PointLabelLayer from "./point-label-layer.js";
|
|
13
14
|
const defaultProps = {
|
|
14
15
|
...MVTLayer.defaultProps,
|
|
15
16
|
data: TilejsonPropType,
|
|
@@ -97,12 +98,24 @@ class VectorTileLayer extends MVTLayer {
|
|
|
97
98
|
}
|
|
98
99
|
};
|
|
99
100
|
};
|
|
101
|
+
const defaultToPointLabelLayer = {
|
|
102
|
+
'points-text': {
|
|
103
|
+
type: PointLabelLayer,
|
|
104
|
+
...props?._subLayerProps?.['points-text'],
|
|
105
|
+
extensions: [
|
|
106
|
+
new CollisionFilterExtension(),
|
|
107
|
+
...(props.extensions || []),
|
|
108
|
+
...(props?._subLayerProps?.['points-text']?.extensions || [])
|
|
109
|
+
]
|
|
110
|
+
}
|
|
111
|
+
};
|
|
100
112
|
const subLayerProps = {
|
|
101
113
|
...props,
|
|
102
114
|
autoHighlight: false,
|
|
103
115
|
// Do not perform clipping on points (#9059)
|
|
104
116
|
_subLayerProps: {
|
|
105
117
|
...props._subLayerProps,
|
|
118
|
+
...defaultToPointLabelLayer,
|
|
106
119
|
...applyClipExtensionToSublayerProps('polygons-fill'),
|
|
107
120
|
...applyClipExtensionToSublayerProps('polygons-stroke'),
|
|
108
121
|
...applyClipExtensionToSublayerProps('linestrings')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-tile-layer.js","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,yBAAyB,iDAA8C;AAC9E,OAAO,qBAAqB,6CAA0C;AACtE,eAAe,CAAC,CAAC,yBAAyB,EAAE,qBAAqB,CAAC,CAAC,CAAC;AAGpE,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"vector-tile-layer.js","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,yBAAyB,iDAA8C;AAC9E,OAAO,qBAAqB,6CAA0C;AACtE,eAAe,CAAC,CAAC,yBAAyB,EAAE,qBAAqB,CAAC,CAAC,CAAC;AAGpE,OAAO,EAAC,aAAa,EAAE,wBAAwB,EAAC,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EACL,QAAQ,EAGR,mBAAmB,EAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAE,iBAAiB,EAAC,mBAAgB;AAC/E,OAAO,EAAC,iBAAiB,EAAC,wBAAqB;AAC/C,OAAO,eAAe,+BAA4B;AAElD,MAAM,YAAY,GAAuC;IACvD,GAAG,QAAQ,CAAC,YAAY;IACxB,IAAI,EAAE,gBAAgB;IACtB,cAAc,EAAE,gBAAgB,CAAC,KAAK;IACtC,QAAQ,EAAE,iBAAiB;CAC5B,CAAC;AAWF,aAAa;AACb,MAAqB,eAGnB,SAAQ,QAA0E;IAQlF,YAAY,GAAG,WAAuD;QACpE,kFAAkF;QAClF,aAAa;QACb,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC;IACxB,CAAC;IAED,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;IAChC,CAAC;IAED,WAAW,CAAC,UAAU;QACpB,MAAM,EAAC,KAAK,EAAC,GAAG,UAAU,CAAC;QAC3B,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAE9B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACjF,MAAM,GAAG,GAAG,WAAW,KAAK,KAAK,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,EAAC,GAAG,EAAC,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,cAAc;QACZ,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAsB,CAAC;QACnD,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QACrD,WAAW,CAAC,GAAG,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAC,CAAC,CAAC,6BAA6B;QACnE,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,8BAA8B;IAC9B,KAAK,CAAC,WAAW,CAAC,IAAmB;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAsB,CAAC;QACnD,MAAM,EAAC,KAAK,EAAE,gBAAgB,EAAC,GAAG,QAAQ,CAAC;QAC3C,MAAM,GAAG,GAAG,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC;QAEtB,2CAA2C;QAC3C,MAAM,aAAa,GAAG,KAAK,CAAC,GAAG,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;QAEvF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO,MAAM,aAAa,CAAC;QAC7B,CAAC;QAED,MAAM,aAAa,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,eAAe,GAAG,KAAK,CAAC,aAAa,EAAE;YAC3C,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,IAAI;YACX,WAAW;YACX,MAAM;SACP,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,OAAO,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACzE,CAAC;IACD,6BAA6B;IAE7B,eAAe,CACb,KAKC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC,eAAe,CAAC,KAAK,CAAiB,CAAC;QACtD,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAW,CAAC;QACxC,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,QAAQ,CAAC;QAE5C,MAAM,UAAU,GAAG,CAAC,IAAI,aAAa,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG;YAChB,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC;SACvC,CAAC;QAEF,MAAM,iCAAiC,GAAG,CAAC,UAAkB,EAAE,EAAE;YAC/D,OAAO;gBACL,CAAC,UAAU,CAAC,EAAE;oBACZ,GAAG,SAAS;oBACZ,GAAG,KAAK,EAAE,cAAc,EAAE,CAAC,UAAU,CAAC;oBACtC,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC,UAAU,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;iBACxF;aACF,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,wBAAwB,GAAG;YAC/B,aAAa,EAAE;gBACb,IAAI,EAAE,eAAe;gBACrB,GAAG,KAAK,EAAE,cAAc,EAAE,CAAC,aAAa,CAAC;gBACzC,UAAU,EAAE;oBACV,IAAI,wBAAwB,EAAE;oBAC9B,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC;oBAC3B,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC;iBAC9D;aACF;SACF,CAAC;QAEF,MAAM,aAAa,GAAG;YACpB,GAAG,KAAK;YACR,aAAa,EAAE,KAAK;YACpB,4CAA4C;YAC5C,cAAc,EAAE;gBACd,GAAG,KAAK,CAAC,cAAc;gBACvB,GAAG,wBAAwB;gBAC3B,GAAG,iCAAiC,CAAC,eAAe,CAAC;gBACrD,GAAG,iCAAiC,CAAC,iBAAiB,CAAC;gBACvD,GAAG,iCAAiC,CAAC,aAAa,CAAC;aACpD;SACF,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,aAAa,CAAC,CAAC;QACjD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEkB,QAAQ;QACzB,4EAA4E;QAC5E,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;;AA9IM,yBAAS,GAAG,iBAAiB,CAAC;AAC9B,4BAAY,GAAG,YAAY,CAAC;eALhB,eAAe"}
|