@deck.gl/carto 9.1.4 → 9.1.6
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 +16 -7
- package/dist/cartoVectorTile-worker.js +1 -1
- package/dist/dist.dev.js +45 -31
- package/dist/index.cjs +25 -12
- package/dist/index.cjs.map +3 -3
- package/dist/layers/raster-layer-vertex.glsl.d.ts +1 -1
- package/dist/layers/raster-layer-vertex.glsl.d.ts.map +1 -1
- package/dist/layers/raster-layer-vertex.glsl.js +2 -1
- package/dist/layers/raster-layer-vertex.glsl.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/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 +12 -11
- package/package.json +6 -6
- package/src/api/parse-map.ts +3 -6
- package/src/layers/raster-layer-vertex.glsl.ts +5 -1
- package/src/layers/vector-tile-layer.ts +15 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-map.d.ts","sourceRoot":"","sources":["../../src/api/parse-map.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,KAAK,EAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-map.d.ts","sourceRoot":"","sources":["../../src/api/parse-map.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,KAAK,EAAM,MAAM,eAAe,CAAC;AAiBzC,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IAEX,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAC;IAEd,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,GAAG,CAAC;IAEtB,iCAAiC;IACjC,QAAQ,EAAE,GAAG,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,wBAAgB,QAAQ,CAAC,IAAI,KAAA;;;;;;;IAazB,iCAAiC;;;;;;;EA4BpC"}
|
package/dist/api/parse-map.js
CHANGED
|
@@ -3,10 +3,7 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { log } from '@deck.gl/core';
|
|
5
5
|
import { AGGREGATION, getLayer, getColorAccessor, getColorValueAccessor, getSizeAccessor, getTextAccessor, OPACITY_MAP, opacityToAlpha, getIconUrlAccessor, negateAccessor, getMaxMarkerSize } from "./layer-map.js";
|
|
6
|
-
import PointLabelLayer from "../layers/point-label-layer.js";
|
|
7
|
-
import { CollisionFilterExtension } from '@deck.gl/extensions';
|
|
8
6
|
import { assert } from "../utils.js";
|
|
9
|
-
const collisionFilterExtension = new CollisionFilterExtension();
|
|
10
7
|
export function parseMap(json) {
|
|
11
8
|
const { keplerMapConfig, datasets, token } = json;
|
|
12
9
|
assert(keplerMapConfig.version === 'v1', 'Only support Kepler v1');
|
|
@@ -235,8 +232,9 @@ function createChannelProps(id, type, config, visualChannels, data) {
|
|
|
235
232
|
result._subLayerProps = {
|
|
236
233
|
...result._subLayerProps,
|
|
237
234
|
'points-text': {
|
|
238
|
-
|
|
239
|
-
|
|
235
|
+
// The following props are injected by default by VectorTileLayer:
|
|
236
|
+
// type: PointLabelLayer,
|
|
237
|
+
// extensions: [new CollisionFilterExtension()],
|
|
240
238
|
collisionEnabled: true,
|
|
241
239
|
collisionGroup,
|
|
242
240
|
// getPointRadius already has radiusScale baked in, so only pass one or the other
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-map.js","sourceRoot":"","sources":["../../src/api/parse-map.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAQ,GAAG,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EACL,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,uBAAoB;AACrB,OAAO,
|
|
1
|
+
{"version":3,"file":"parse-map.js","sourceRoot":"","sources":["../../src/api/parse-map.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAQ,GAAG,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EACL,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,uBAAoB;AACrB,OAAO,EAAC,MAAM,EAAC,oBAAiB;AAuBhC,MAAM,UAAU,QAAQ,CAAC,IAAI;IAC3B,MAAM,EAAC,eAAe,EAAE,QAAQ,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC;IAChD,MAAM,CAAC,eAAe,CAAC,OAAO,KAAK,IAAI,EAAE,wBAAwB,CAAC,CAAC;IACnE,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,eAAe,CAAC,MAAyB,CAAC;IACvE,MAAM,EAAC,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAC,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC;IAEnF,OAAO;QACL,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,gBAAgB,EAAE,QAAQ;QAC1B,iCAAiC;QACjC,QAAQ;QACR,KAAK;QACL,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,EAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAC,EAAE,EAAE;YAClE,IAAI,CAAC;gBACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,CAAC;gBACxB,MAAM,OAAO,GAAsB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;gBACvE,MAAM,CAAC,OAAO,EAAE,+BAA+B,MAAM,EAAE,CAAC,CAAC;gBACzD,MAAM,EAAC,IAAI,EAAC,GAAG,OAAO,CAAC;gBACvB,MAAM,CAAC,IAAI,EAAE,8BAA8B,MAAM,EAAE,CAAC,CAAC;gBACrD,MAAM,EAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBACvE,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACrD,OAAO,IAAI,KAAK,CAAC;oBACf,EAAE;oBACF,IAAI;oBACJ,GAAG,YAAY;oBACf,GAAG,sBAAsB,CAAC,iBAAiB,CAAC;oBAC5C,GAAG,UAAU;oBACb,GAAG,kBAAkB,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE,wBAAwB;oBACvF,GAAG,oBAAoB,CAAC,aAAa,EAAE,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,wBAAwB;oBAC7F,GAAG,iBAAiB,CAAC,KAAK,CAAC;iBAC5B,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvB,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC,CAAC;KACH,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,aAAqB,EAAE,UAA2B;IAC9E,IAAI,aAAa,KAAK,UAAU,EAAE,CAAC;QACjC,UAAU,CAAC,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,GAAG,WAAW,CAAC;QAC9E,UAAU,CAAC,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,GAAG,WAAW,CAAC;QAC9E,UAAU,CAAC,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,GAAG,KAAK,CAAC;IAC1E,CAAC;SAAM,IAAI,aAAa,KAAK,aAAa,EAAE,CAAC;QAC3C,UAAU,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACvC,UAAU,CAAC,mBAAmB,GAAG,qBAAqB,CAAC;QACvD,UAAU,CAAC,mBAAmB,GAAG,WAAW,CAAC;QAC7C,UAAU,CAAC,mBAAmB,GAAG,WAAW,CAAC;QAC7C,UAAU,CAAC,mBAAmB,GAAG,UAAU,CAAC;QAC5C,UAAU,CAAC,mBAAmB,GAAG,KAAK,CAAC;IACzC,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,UAAU,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC;AAED,SAAS,sBAAsB,CAAC,iBAAiB;IAC/C,MAAM,QAAQ,GAAG,iBAAiB,IAAI,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC;IACxE,OAAO;QACL,aAAa,EAAE,QAAQ;QACvB,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO;IACvC,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,uCAAuC;YACvC,SAAS;QACX,CAAC;QACD,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;QAClC,CAAC;aAAM,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE,CAAC;YAC3C,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;aAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YACzC,kEAAkE;YAClE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAsB,EAAE,OAAO;IACvD,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAElC,8EAA8E;IAC9E,sDAAsD;IACtD,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAC3C,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,KAAK,MAAM,aAAa,IAAI,WAAW,EAAE,CAAC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;YACzC,MAAM,UAAU,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;YAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC7C,KAAK,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;QAChC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC9F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+CAA+C;AAC/C,SAAS,kBAAkB,CACzB,EAAU,EACV,IAAY,EACZ,MAAsB,EACtB,cAA8B,EAC9B,IAAI;IAEJ,MAAM,EACJ,UAAU,EACV,UAAU,EACV,WAAW,EACX,WAAW,EACX,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACZ,GAAG,cAAc,CAAC;IACnB,IAAI,EAAC,WAAW,EAAE,WAAW,EAAC,GAAG,cAAc,CAAC;IAChD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,WAAW,GAAG,SAAS,CAAC;QACxB,WAAW,GAAG,SAAS,CAAC;IAC1B,CAAC;IACD,MAAM,EAAC,SAAS,EAAE,SAAS,EAAC,GAAG,MAAM,CAAC;IACtC,MAAM,MAAM,GAAwB,EAAE,CAAC;IAEvC,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,CAAC,cAAc,GAAG,UAAU,CAAC;QACnC,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,EAAC,gBAAgB,EAAC,GAAG,MAAM,CAAC,SAAS,CAAC;YAC5C,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACnC,MAAM,CAAC,aAAa,GAAG,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;YACnF,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,UAAU,EAAE,CAAC;QACtB,MAAM,EAAC,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,EAAC,GAAG,SAAS,CAAC;QACrE,MAAM,CAAC,YAAY,GAAG,gBAAgB,CACpC,UAAU;QACV,aAAa;QACb,UAAU,EACV,EAAC,WAAW,EAAE,KAAK,EAAC,EACpB,SAAS,CAAC,OAAO,EACjB,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC1C,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,EAAE;gBAC5B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,QAAQ,EAAE,UAAU,EAAC,EAAE,EAAE;oBAC/C,MAAM,EAAC,IAAI,EAAE,WAAW,EAAC,GAAG,QAAQ,CAAC;oBACrC,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;wBACrB,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;oBACxC,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,WAAW,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,cAAc,GAAG,eAAe;QACrC,aAAa;QACb,WAAW,IAAI,SAAS;QACxB,aAAa;QACb,WAAW,IAAI,SAAS,EACxB,SAAS,CAAC,eAAe,EACzB,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,SAAS,EAC5C,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,eAAe,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,OAAO,GACX,SAAS,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;QACpF,MAAM,EAAC,sBAAsB,EAAE,WAAW,EAAE,gBAAgB,EAAE,KAAK,EAAC,GAAG,SAAS,CAAC;QACjF,MAAM,CAAC,YAAY,GAAG,gBAAgB,CACpC,gBAAgB;QAChB,aAAa;QACb,gBAAgB;QAChB,aAAa;QACb,EAAC,WAAW,EAAE,KAAK,EAAC,EACpB,OAAO,EACP,IAAI,CACL,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,CAAC,YAAY,GAAG,eAAe,CACnC,WAAW;QACX,aAAa;QACb,WAAW,EACX,SAAS,CAAC,iBAAiB,EAC3B,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,SAAS,EAC5C,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,SAAS,GAAG,eAAe,CAChC,WAAW,EACX,SAAS,EACT,SAAS,CAAC,iBAAiB,EAC3B,SAAS,EACT,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAChE,MAAM,EAAC,cAAc,EAAE,YAAY,EAAC,GAAG,MAAM,CAAC;QAC9C,MAAM,EAAC,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,EAAE,cAAc,EAAC,GAAG,SAAS,CAAC;QAEjF,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC;QAC1B,MAAM,CAAC,OAAO,GAAG,kBAAkB,CACjC,cAAc,CAAC,kBAAkB,EACjC,kBAAkB,EAClB,EAAC,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,cAAc,EAAC,EAC5D,IAAI,CACL,CAAC;QACF,MAAM,CAAC,cAAc,GAAG;YACtB,aAAa,EAAE;gBACb,WAAW,EAAE;oBACX,KAAK,EAAE;wBACL,IAAI,EAAE,aAAa;qBACpB;oBACD,WAAW,EAAE;wBACX,WAAW,EAAE,WAAW;wBACxB,YAAY,EAAE,WAAW;wBACzB,aAAa,EAAE,MAAM;qBACtB;iBACF;aACF;SACF,CAAC;QAEF,IAAI,YAAY,IAAI,cAAc,EAAE,CAAC;YACnC,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;QACrC,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,CAAC,WAAW,GAAG,cAAc,CAAC;QACtC,CAAC;QAED,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;YACjC,MAAM,CAAC,YAAY,GAAG,cAAc,CAClC,eAAe,CAAC,cAAc,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAChF,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAClD,MAAM,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAED,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACxD,MAAM,CAAC,SAAS,EAAE,cAAc,CAAC,GAAG,SAAS,CAAC;QAC9C,MAAM,cAAc,GAAG,EAAE,CAAC;QAE1B,CAAC;YACC,SAAS,EAAE,MAAM,CAAC,wBAAwB;YAC1C,MAAM,EAAE,MAAM,CAAC,aAAa;YAC5B,KAAK,EAAE,MAAM,CAAC,YAAY;YAC1B,YAAY,EAAE,MAAM,CAAC,gBAAgB;YACrC,IAAI,EAAE,MAAM,CAAC,aAAa;SAC3B,GAAG,SAAS,CAAC,CAAC;QACf,MAAM,EACJ,KAAK,EAAE,iBAAiB,EACxB,KAAK,EAAE,cAAc,EACrB,YAAY,EAAE,qBAAqB,EACnC,IAAI,EAAE,kBAAkB,EACzB,GAAG,cAAc,IAAI,EAAE,CAAC;QAEzB,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC,KAAK,IAAI,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3E,MAAM,gBAAgB,GAAG,cAAc,IAAI,eAAe,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAEjF,MAAM,CAAC,SAAS,GAAG,GAAG,MAAM,CAAC,SAAS,OAAO,CAAC;QAC9C,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC;QACjC,MAAM,CAAC,cAAc,GAAG,aAAa,CAAC;QACtC,MAAM,CAAC,gBAAgB,GAAG,EAAC,GAAG,EAAE,IAAI,EAAC,CAAC;QACtC,MAAM,CAAC,cAAc,GAAG,GAAG,CAAC;QAC5B,MAAM,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAE5B,MAAM,CAAC,cAAc,GAAG;YACtB,GAAG,MAAM,CAAC,cAAc;YACxB,aAAa,EAAE;gBACb,kEAAkE;gBAClE,yBAAyB;gBACzB,gDAAgD;gBAChD,gBAAgB,EAAE,IAAI;gBACtB,cAAc;gBAEd,iFAAiF;gBACjF,GAAG,CAAC,MAAM,CAAC,cAAc;oBACvB,CAAC,CAAC,EAAC,SAAS,EAAE,MAAM,CAAC,cAAc,EAAC;oBACpC,CAAC,CAAC,EAAC,WAAW,EAAE,SAAS,CAAC,MAAM,EAAC,CAAC;gBAEpC,GAAG,CAAC,cAAc,IAAI;oBACpB,gBAAgB;oBAChB,iBAAiB;oBACjB,kBAAkB;oBAClB,qBAAqB;iBACtB,CAAC;aACH;SACF,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAmB;IAC5C,OAAO;QACL,WAAW,EAAE,EAAC,KAAK,EAAE,EAAC,OAAO,EAAE,EAAC,aAAa,EAAE,UAAU,WAAW,EAAE,EAAC,EAAC,EAAC;KAC1E,CAAC;AACJ,CAAC"}
|
|
@@ -5522,7 +5522,7 @@
|
|
|
5522
5522
|
}
|
|
5523
5523
|
|
|
5524
5524
|
// src/layers/schema/carto-properties-tile-loader.ts
|
|
5525
|
-
var VERSION = true ? "9.1.
|
|
5525
|
+
var VERSION = true ? "9.1.6" : "latest";
|
|
5526
5526
|
var id = "cartoPropertiesTile";
|
|
5527
5527
|
var DEFAULT_OPTIONS = {
|
|
5528
5528
|
cartoPropertiesTile: {
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
7
7
|
var __getProtoOf = Object.getPrototypeOf;
|
|
8
8
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
9
|
-
var __commonJS = (cb,
|
|
10
|
-
return
|
|
9
|
+
var __commonJS = (cb, mod2) => function __require() {
|
|
10
|
+
return mod2 || (0, cb[__getOwnPropNames(cb)[0]])((mod2 = { exports: {} }).exports, mod2), mod2.exports;
|
|
11
11
|
};
|
|
12
12
|
var __copyProps = (to, from, except, desc) => {
|
|
13
13
|
if (from && typeof from === "object" || typeof from === "function") {
|
|
@@ -17,13 +17,13 @@
|
|
|
17
17
|
}
|
|
18
18
|
return to;
|
|
19
19
|
};
|
|
20
|
-
var __toESM = (
|
|
20
|
+
var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__getProtoOf(mod2)) : {}, __copyProps(
|
|
21
21
|
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
22
|
// file that has been converted to a CommonJS file using a Babel-
|
|
23
23
|
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
24
|
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
-
isNodeMode || !
|
|
26
|
-
|
|
25
|
+
isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
|
|
26
|
+
mod2
|
|
27
27
|
));
|
|
28
28
|
|
|
29
29
|
// ../../node_modules/pako/lib/utils/common.js
|
|
@@ -5870,12 +5870,21 @@
|
|
|
5870
5870
|
return tile;
|
|
5871
5871
|
}
|
|
5872
5872
|
|
|
5873
|
+
// ../../node_modules/@math.gl/web-mercator/dist/web-mercator-utils.js
|
|
5874
|
+
var PI = Math.PI;
|
|
5875
|
+
var PI_4 = PI / 4;
|
|
5876
|
+
var DEGREES_TO_RADIANS = PI / 180;
|
|
5877
|
+
var RADIANS_TO_DEGREES = 180 / PI;
|
|
5878
|
+
|
|
5879
|
+
// ../../node_modules/@math.gl/web-mercator/dist/get-bounds.js
|
|
5880
|
+
var DEGREES_TO_RADIANS2 = Math.PI / 180;
|
|
5881
|
+
|
|
5873
5882
|
// src/utils.ts
|
|
5874
5883
|
function getWorkerUrl(id2, version) {
|
|
5875
5884
|
return `https://unpkg.com/@deck.gl/carto@${version}/dist/${id2}-worker.js`;
|
|
5876
5885
|
}
|
|
5877
5886
|
|
|
5878
|
-
// ../../node_modules/quadbin/dist/
|
|
5887
|
+
// ../../node_modules/quadbin/dist/index.esm.js
|
|
5879
5888
|
var import_tile_cover = __toESM(require_tile_cover(), 1);
|
|
5880
5889
|
function bigIntToHex(index) {
|
|
5881
5890
|
return index.toString(16);
|
|
@@ -5898,7 +5907,7 @@
|
|
|
5898
5907
|
}
|
|
5899
5908
|
|
|
5900
5909
|
// src/layers/schema/carto-spatial-tile-loader.ts
|
|
5901
|
-
var VERSION = true ? "9.1.
|
|
5910
|
+
var VERSION = true ? "9.1.6" : "latest";
|
|
5902
5911
|
var id = "cartoSpatialTile";
|
|
5903
5912
|
var DEFAULT_OPTIONS = {
|
|
5904
5913
|
cartoSpatialTile: {
|
package/dist/dist.dev.js
CHANGED
|
@@ -11440,16 +11440,27 @@ var __exports__ = (() => {
|
|
|
11440
11440
|
// src/layers/cluster-tile-layer.ts
|
|
11441
11441
|
var import_core6 = __toESM(require_core2(), 1);
|
|
11442
11442
|
|
|
11443
|
-
// ../../node_modules/quadbin/dist/
|
|
11443
|
+
// ../../node_modules/quadbin/dist/index.esm.js
|
|
11444
11444
|
var import_tile_cover = __toESM(require_tile_cover(), 1);
|
|
11445
|
-
|
|
11446
|
-
|
|
11447
|
-
|
|
11448
|
-
|
|
11449
|
-
|
|
11450
|
-
|
|
11451
|
-
|
|
11452
|
-
|
|
11445
|
+
|
|
11446
|
+
// ../../node_modules/@math.gl/web-mercator/dist/web-mercator-utils.js
|
|
11447
|
+
var PI = Math.PI;
|
|
11448
|
+
var PI_4 = PI / 4;
|
|
11449
|
+
var DEGREES_TO_RADIANS = PI / 180;
|
|
11450
|
+
var RADIANS_TO_DEGREES = 180 / PI;
|
|
11451
|
+
var TILE_SIZE = 512;
|
|
11452
|
+
function worldToLngLat(xy) {
|
|
11453
|
+
const [x, y] = xy;
|
|
11454
|
+
const lambda2 = x / TILE_SIZE * (2 * PI) - PI;
|
|
11455
|
+
const phi2 = 2 * (Math.atan(Math.exp(y / TILE_SIZE * (2 * PI) - PI)) - PI_4);
|
|
11456
|
+
return [lambda2 * RADIANS_TO_DEGREES, phi2 * RADIANS_TO_DEGREES];
|
|
11457
|
+
}
|
|
11458
|
+
|
|
11459
|
+
// ../../node_modules/@math.gl/web-mercator/dist/get-bounds.js
|
|
11460
|
+
var DEGREES_TO_RADIANS2 = Math.PI / 180;
|
|
11461
|
+
|
|
11462
|
+
// ../../node_modules/quadbin/dist/index.esm.js
|
|
11463
|
+
var B = [0x5555555555555555n, 0x3333333333333333n, 0x0f0f0f0f0f0f0f0fn, 0x00ff00ff00ff00ffn, 0x0000ffff0000ffffn, 0x00000000ffffffffn];
|
|
11453
11464
|
var S = [0n, 1n, 2n, 4n, 8n, 16n];
|
|
11454
11465
|
function hexToBigInt(hex2) {
|
|
11455
11466
|
return BigInt(`0x${hex2}`);
|
|
@@ -11492,7 +11503,11 @@ var __exports__ = (() => {
|
|
|
11492
11503
|
}
|
|
11493
11504
|
x = x >> 32n - z;
|
|
11494
11505
|
y = y >> 32n - z;
|
|
11495
|
-
return {
|
|
11506
|
+
return {
|
|
11507
|
+
z: Number(z),
|
|
11508
|
+
x: Number(x),
|
|
11509
|
+
y: Number(y)
|
|
11510
|
+
};
|
|
11496
11511
|
}
|
|
11497
11512
|
function getResolution(quadbin) {
|
|
11498
11513
|
return quadbin >> 52n & 0x1fn;
|
|
@@ -11651,22 +11666,6 @@ var __exports__ = (() => {
|
|
|
11651
11666
|
}
|
|
11652
11667
|
};
|
|
11653
11668
|
|
|
11654
|
-
// ../../node_modules/@math.gl/web-mercator/dist/web-mercator-utils.js
|
|
11655
|
-
var PI = Math.PI;
|
|
11656
|
-
var PI_4 = PI / 4;
|
|
11657
|
-
var DEGREES_TO_RADIANS = PI / 180;
|
|
11658
|
-
var RADIANS_TO_DEGREES = 180 / PI;
|
|
11659
|
-
var TILE_SIZE = 512;
|
|
11660
|
-
function worldToLngLat(xy) {
|
|
11661
|
-
const [x, y] = xy;
|
|
11662
|
-
const lambda2 = x / TILE_SIZE * (2 * PI) - PI;
|
|
11663
|
-
const phi2 = 2 * (Math.atan(Math.exp(y / TILE_SIZE * (2 * PI) - PI)) - PI_4);
|
|
11664
|
-
return [lambda2 * RADIANS_TO_DEGREES, phi2 * RADIANS_TO_DEGREES];
|
|
11665
|
-
}
|
|
11666
|
-
|
|
11667
|
-
// ../../node_modules/@math.gl/web-mercator/dist/get-bounds.js
|
|
11668
|
-
var DEGREES_TO_RADIANS2 = Math.PI / 180;
|
|
11669
|
-
|
|
11670
11669
|
// src/layers/quadbin-utils.ts
|
|
11671
11670
|
var TILE_SIZE2 = 512;
|
|
11672
11671
|
function quadbinToOffset(quadbin) {
|
|
@@ -13611,11 +13610,15 @@ void main(void) {
|
|
|
13611
13610
|
// Get position directly from quadbin, rather than projecting
|
|
13612
13611
|
// Important to set geometry.position before using project_ methods below
|
|
13613
13612
|
// as geometry.worldPosition is not set (we don't know our lat/long)
|
|
13614
|
-
geometry.position = vec4(tileOrigin
|
|
13613
|
+
geometry.position = vec4(tileOrigin, 0.0, 1.0);
|
|
13615
13614
|
if (project.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
|
|
13616
13615
|
geometry.position.xyz -= project.commonOrigin;
|
|
13617
13616
|
}
|
|
13618
13617
|
|
|
13618
|
+
// Important to apply after tileOrigin & commonOrigin as they are large values which often
|
|
13619
|
+
// cancel and thus cellCenter precision is lost if applied first.
|
|
13620
|
+
geometry.position.xy += cellCenter;
|
|
13621
|
+
|
|
13619
13622
|
// calculate elevation, if 3d not enabled set to 0
|
|
13620
13623
|
// cylindar geometry height are between -1.0 to 1.0, transform it to between 0, 1
|
|
13621
13624
|
float elevation = 0.0;
|
|
@@ -14055,12 +14058,24 @@ void main(void) {
|
|
|
14055
14058
|
}
|
|
14056
14059
|
};
|
|
14057
14060
|
};
|
|
14061
|
+
const defaultToPointLabelLayer = {
|
|
14062
|
+
"points-text": {
|
|
14063
|
+
type: PointLabelLayer,
|
|
14064
|
+
...props?._subLayerProps?.["points-text"],
|
|
14065
|
+
extensions: [
|
|
14066
|
+
new import_extensions.CollisionFilterExtension(),
|
|
14067
|
+
...props.extensions || [],
|
|
14068
|
+
...props?._subLayerProps?.["points-text"]?.extensions || []
|
|
14069
|
+
]
|
|
14070
|
+
}
|
|
14071
|
+
};
|
|
14058
14072
|
const subLayerProps = {
|
|
14059
14073
|
...props,
|
|
14060
14074
|
autoHighlight: false,
|
|
14061
14075
|
// Do not perform clipping on points (#9059)
|
|
14062
14076
|
_subLayerProps: {
|
|
14063
14077
|
...props._subLayerProps,
|
|
14078
|
+
...defaultToPointLabelLayer,
|
|
14064
14079
|
...applyClipExtensionToSublayerProps("polygons-fill"),
|
|
14065
14080
|
...applyClipExtensionToSublayerProps("polygons-stroke"),
|
|
14066
14081
|
...applyClipExtensionToSublayerProps("linestrings")
|
|
@@ -19229,8 +19244,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19229
19244
|
}
|
|
19230
19245
|
|
|
19231
19246
|
// src/api/parse-map.ts
|
|
19232
|
-
var import_extensions2 = __toESM(require_extensions(), 1);
|
|
19233
|
-
var collisionFilterExtension = new import_extensions2.CollisionFilterExtension();
|
|
19234
19247
|
function parseMap(json) {
|
|
19235
19248
|
const { keplerMapConfig, datasets, token } = json;
|
|
19236
19249
|
assert2(keplerMapConfig.version === "v1", "Only support Kepler v1");
|
|
@@ -19495,8 +19508,9 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
19495
19508
|
result._subLayerProps = {
|
|
19496
19509
|
...result._subLayerProps,
|
|
19497
19510
|
"points-text": {
|
|
19498
|
-
|
|
19499
|
-
|
|
19511
|
+
// The following props are injected by default by VectorTileLayer:
|
|
19512
|
+
// type: PointLabelLayer,
|
|
19513
|
+
// extensions: [new CollisionFilterExtension()],
|
|
19500
19514
|
collisionEnabled: true,
|
|
19501
19515
|
collisionGroup,
|
|
19502
19516
|
// getPointRadius already has radiusScale baked in, so only pass one or the other
|
package/dist/index.cjs
CHANGED
|
@@ -563,7 +563,7 @@ function binaryToSpatialjson(binary) {
|
|
|
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.6" : "latest";
|
|
567
567
|
var id = "cartoSpatialTile";
|
|
568
568
|
var DEFAULT_OPTIONS = {
|
|
569
569
|
cartoSpatialTile: {
|
|
@@ -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.6" : "latest";
|
|
946
946
|
var id2 = "cartoRasterTile";
|
|
947
947
|
var DEFAULT_OPTIONS2 = {
|
|
948
948
|
cartoRasterTile: {
|
|
@@ -1815,10 +1815,11 @@ vec2 cellCenter = scale * vec2(float(xIndex) + 0.5, float(yIndex) - 0.5);
|
|
|
1815
1815
|
vec4 color = column.isStroke ? instanceLineColors : instanceFillColors;
|
|
1816
1816
|
float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);
|
|
1817
1817
|
float cellWidth = column.coverage * scale;
|
|
1818
|
-
geometry.position = vec4(tileOrigin
|
|
1818
|
+
geometry.position = vec4(tileOrigin, 0.0, 1.0);
|
|
1819
1819
|
if (project.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
|
|
1820
1820
|
geometry.position.xyz -= project.commonOrigin;
|
|
1821
1821
|
}
|
|
1822
|
+
geometry.position.xy += cellCenter;
|
|
1822
1823
|
float elevation = 0.0;
|
|
1823
1824
|
float strokeOffsetRatio = 1.0;
|
|
1824
1825
|
if (column.extruded) {
|
|
@@ -2060,7 +2061,7 @@ var TileReader4 = class {
|
|
|
2060
2061
|
};
|
|
2061
2062
|
|
|
2062
2063
|
// dist/layers/schema/carto-properties-tile-loader.js
|
|
2063
|
-
var VERSION3 = true ? "9.1.
|
|
2064
|
+
var VERSION3 = true ? "9.1.6" : "latest";
|
|
2064
2065
|
var id3 = "cartoPropertiesTile";
|
|
2065
2066
|
var DEFAULT_OPTIONS3 = {
|
|
2066
2067
|
cartoPropertiesTile: {
|
|
@@ -2089,7 +2090,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
|
|
|
2089
2090
|
|
|
2090
2091
|
// dist/layers/schema/carto-vector-tile-loader.js
|
|
2091
2092
|
var import_earcut = __toESM(require("earcut"), 1);
|
|
2092
|
-
var VERSION4 = true ? "9.1.
|
|
2093
|
+
var VERSION4 = true ? "9.1.6" : "latest";
|
|
2093
2094
|
var id4 = "cartoVectorTile";
|
|
2094
2095
|
var DEFAULT_OPTIONS4 = {
|
|
2095
2096
|
cartoVectorTile: {
|
|
@@ -2212,6 +2213,7 @@ var VectorTileLayer = class extends import_geo_layers8.MVTLayer {
|
|
|
2212
2213
|
}
|
|
2213
2214
|
/* eslint-enable camelcase */
|
|
2214
2215
|
renderSubLayers(props) {
|
|
2216
|
+
var _a, _b, _c;
|
|
2215
2217
|
if (props.data === null) {
|
|
2216
2218
|
return null;
|
|
2217
2219
|
}
|
|
@@ -2225,21 +2227,33 @@ var VectorTileLayer = class extends import_geo_layers8.MVTLayer {
|
|
|
2225
2227
|
clipBounds: [west, south, east, north]
|
|
2226
2228
|
};
|
|
2227
2229
|
const applyClipExtensionToSublayerProps = (subLayerId) => {
|
|
2228
|
-
var
|
|
2230
|
+
var _a2, _b2, _c2;
|
|
2229
2231
|
return {
|
|
2230
2232
|
[subLayerId]: {
|
|
2231
2233
|
...clipProps,
|
|
2232
|
-
...(
|
|
2233
|
-
extensions: [...extensions, ...((
|
|
2234
|
+
...(_a2 = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _a2[subLayerId],
|
|
2235
|
+
extensions: [...extensions, ...((_c2 = (_b2 = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _b2[subLayerId]) == null ? void 0 : _c2.extensions) || []]
|
|
2234
2236
|
}
|
|
2235
2237
|
};
|
|
2236
2238
|
};
|
|
2239
|
+
const defaultToPointLabelLayer = {
|
|
2240
|
+
"points-text": {
|
|
2241
|
+
type: point_label_layer_default,
|
|
2242
|
+
...(_a = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _a["points-text"],
|
|
2243
|
+
extensions: [
|
|
2244
|
+
new import_extensions.CollisionFilterExtension(),
|
|
2245
|
+
...props.extensions || [],
|
|
2246
|
+
...((_c = (_b = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _b["points-text"]) == null ? void 0 : _c.extensions) || []
|
|
2247
|
+
]
|
|
2248
|
+
}
|
|
2249
|
+
};
|
|
2237
2250
|
const subLayerProps = {
|
|
2238
2251
|
...props,
|
|
2239
2252
|
autoHighlight: false,
|
|
2240
2253
|
// Do not perform clipping on points (#9059)
|
|
2241
2254
|
_subLayerProps: {
|
|
2242
2255
|
...props._subLayerProps,
|
|
2256
|
+
...defaultToPointLabelLayer,
|
|
2243
2257
|
...applyClipExtensionToSublayerProps("polygons-fill"),
|
|
2244
2258
|
...applyClipExtensionToSublayerProps("polygons-stroke"),
|
|
2245
2259
|
...applyClipExtensionToSublayerProps("linestrings")
|
|
@@ -2832,8 +2846,6 @@ function getTextAccessor({ name, type }, data) {
|
|
|
2832
2846
|
}
|
|
2833
2847
|
|
|
2834
2848
|
// dist/api/parse-map.js
|
|
2835
|
-
var import_extensions2 = require("@deck.gl/extensions");
|
|
2836
|
-
var collisionFilterExtension = new import_extensions2.CollisionFilterExtension();
|
|
2837
2849
|
function parseMap(json) {
|
|
2838
2850
|
const { keplerMapConfig, datasets, token } = json;
|
|
2839
2851
|
assert(keplerMapConfig.version === "v1", "Only support Kepler v1");
|
|
@@ -3071,8 +3083,9 @@ function createChannelProps(id5, type, config, visualChannels, data) {
|
|
|
3071
3083
|
result._subLayerProps = {
|
|
3072
3084
|
...result._subLayerProps,
|
|
3073
3085
|
"points-text": {
|
|
3074
|
-
|
|
3075
|
-
|
|
3086
|
+
// The following props are injected by default by VectorTileLayer:
|
|
3087
|
+
// type: PointLabelLayer,
|
|
3088
|
+
// extensions: [new CollisionFilterExtension()],
|
|
3076
3089
|
collisionEnabled: true,
|
|
3077
3090
|
collisionGroup,
|
|
3078
3091
|
// getPointRadius already has radiusScale baked in, so only pass one or the other
|