@deck.gl/carto 9.1.8 → 9.1.10
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 +1 -0
- package/dist/api/fetch-map.js.map +1 -1
- package/dist/api/parse-map.d.ts.map +1 -1
- package/dist/api/parse-map.js.map +1 -1
- package/dist/cartoPropertiesTile-worker.js +9 -1
- package/dist/cartoRasterTile-worker.js +9 -1
- package/dist/cartoSpatialTile-worker.js +9 -1
- package/dist/cartoVectorTile-worker.js +9 -1
- package/dist/dist.dev.js +475 -141
- package/dist/index.cjs +429 -142
- package/dist/index.cjs.map +4 -4
- package/dist/layers/cluster-tile-layer.d.ts.map +1 -1
- package/dist/layers/cluster-tile-layer.js +6 -5
- package/dist/layers/cluster-tile-layer.js.map +1 -1
- package/dist/layers/cluster-utils.d.ts.map +1 -1
- package/dist/layers/cluster-utils.js +3 -28
- package/dist/layers/cluster-utils.js.map +1 -1
- package/dist/layers/h3-tile-layer.d.ts.map +1 -1
- package/dist/layers/h3-tile-layer.js +5 -5
- package/dist/layers/h3-tile-layer.js.map +1 -1
- package/dist/layers/heatmap-tile-layer.d.ts.map +1 -1
- package/dist/layers/heatmap-tile-layer.js +5 -1
- package/dist/layers/heatmap-tile-layer.js.map +1 -1
- package/dist/layers/label-utils.d.ts +7 -0
- package/dist/layers/label-utils.d.ts.map +1 -0
- package/dist/layers/label-utils.js +218 -0
- package/dist/layers/label-utils.js.map +1 -0
- package/dist/layers/point-label-layer.d.ts +6 -0
- package/dist/layers/point-label-layer.d.ts.map +1 -1
- package/dist/layers/point-label-layer.js +13 -1
- package/dist/layers/point-label-layer.js.map +1 -1
- package/dist/layers/quadbin-tile-layer.d.ts.map +1 -1
- package/dist/layers/quadbin-tile-layer.js +5 -5
- package/dist/layers/quadbin-tile-layer.js.map +1 -1
- package/dist/layers/raster-tile-layer.d.ts.map +1 -1
- package/dist/layers/raster-tile-layer.js +7 -6
- 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-properties-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-spatial-tile-loader.js +1 -1
- package/dist/layers/schema/carto-spatial-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-tile.d.ts +3 -1
- package/dist/layers/schema/carto-tile.d.ts.map +1 -1
- package/dist/layers/schema/carto-tile.js.map +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js.map +1 -1
- package/dist/layers/schema/spatialjson-utils.d.ts +4 -7
- package/dist/layers/schema/spatialjson-utils.d.ts.map +1 -1
- package/dist/layers/schema/spatialjson-utils.js.map +1 -1
- package/dist/layers/utils.d.ts +3 -2
- package/dist/layers/utils.d.ts.map +1 -1
- package/dist/layers/utils.js +28 -7
- package/dist/layers/utils.js.map +1 -1
- package/dist/layers/vector-tile-layer.d.ts +12 -4
- package/dist/layers/vector-tile-layer.d.ts.map +1 -1
- package/dist/layers/vector-tile-layer.js +76 -35
- package/dist/layers/vector-tile-layer.js.map +1 -1
- package/dist/utils.d.ts +6 -1
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +53 -0
- package/dist/utils.js.map +1 -1
- package/dist.min.js +12 -12
- package/package.json +2 -2
- package/src/api/fetch-map.ts +2 -0
- package/src/api/parse-map.ts +2 -0
- package/src/layers/cluster-tile-layer.ts +7 -5
- package/src/layers/cluster-utils.ts +3 -29
- package/src/layers/h3-tile-layer.ts +6 -6
- package/src/layers/heatmap-tile-layer.ts +9 -1
- package/src/layers/label-utils.ts +304 -0
- package/src/layers/point-label-layer.ts +18 -1
- package/src/layers/quadbin-tile-layer.ts +6 -6
- package/src/layers/raster-tile-layer.ts +7 -6
- package/src/layers/schema/carto-tile.ts +3 -1
- package/src/layers/schema/spatialjson-utils.ts +4 -3
- package/src/layers/utils.ts +31 -7
- package/src/layers/vector-tile-layer.ts +100 -42
- package/src/utils.ts +79 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-tile-layer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cluster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-tile-layer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAGL,cAAc,EACd,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE/C,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,cAAc,EAGd,KAAK,EACL,UAAU,EACV,WAAW,EACZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAEL,2BAA2B,EAI3B,iBAAiB,EACjB,iBAAiB,EAClB,2BAAwB;AAMzB,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAgBtD,MAAM,MAAM,2BAA2B,CAAC,kBAAkB,GAAG,EAAE,IAAI,oBAAoB,CACrF,iBAAiB,CAAC,kBAAkB,CAAC,EACrC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CACnD,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,kBAAkB,GAAG,OAAO,IAC5D,sBAAsB,CAAC,kBAAkB,CAAC,GACxC,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAExE,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,kBAAkB,IAAI,IAAI,CACpD,iBAAiB,CAAC,2BAA2B,CAAC,kBAAkB,CAAC,CAAC,EAClE,MAAM,CACP,GAAG;IACF,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhF;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;CACrE,CAAC;AAkHF,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzF,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAiB1C"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// deck.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
+
/* eslint-disable no-shadow */
|
|
4
5
|
import { GeoJsonLayer } from '@deck.gl/layers';
|
|
5
6
|
import { TileLayer } from '@deck.gl/geo-layers';
|
|
6
7
|
import { registerLoaders } from '@loaders.gl/core';
|
|
@@ -11,7 +12,7 @@ import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
|
11
12
|
import QuadbinTileset2D from "./quadbin-tileset-2d.js";
|
|
12
13
|
import { getQuadbinPolygon } from "./quadbin-utils.js";
|
|
13
14
|
import CartoSpatialTileLoader from "./schema/carto-spatial-tile-loader.js";
|
|
14
|
-
import {
|
|
15
|
+
import { TilejsonPropType, mergeLoadOptions } from "./utils.js";
|
|
15
16
|
registerLoaders([CartoSpatialTileLoader]);
|
|
16
17
|
const defaultProps = {
|
|
17
18
|
data: TilejsonPropType,
|
|
@@ -103,11 +104,11 @@ ClusterGeoJsonLayer.defaultProps = defaultProps;
|
|
|
103
104
|
// Adapter layer around ClusterLayer that converts tileJSON into TileLayer API
|
|
104
105
|
class ClusterTileLayer extends CompositeLayer {
|
|
105
106
|
getLoadOptions() {
|
|
106
|
-
const loadOptions = super.getLoadOptions() || {};
|
|
107
107
|
const tileJSON = this.props.data;
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
return mergeLoadOptions(super.getLoadOptions(), {
|
|
109
|
+
fetch: { headers: { Authorization: `Bearer ${tileJSON.accessToken}` } },
|
|
110
|
+
cartoSpatialTile: { scheme: 'quadbin' }
|
|
111
|
+
});
|
|
111
112
|
}
|
|
112
113
|
renderLayers() {
|
|
113
114
|
const tileJSON = this.props.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-tile-layer.js","sourceRoot":"","sources":["../../src/layers/cluster-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAIhD,OAAO,EAGL,cAAc,EACd,UAAU,IAAI,SAAS,EAKxB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,aAAa,EAEb,gBAAgB,EAChB,uBAAuB,EACvB,4BAA4B,EAG7B,2BAAwB;AACzB,OAAO,EAAC,iBAAiB,EAAC,wBAAqB;AAC/C,OAAO,gBAAgB,gCAA6B;AACpD,OAAO,EAAC,iBAAiB,EAAC,2BAAwB;AAClD,OAAO,sBAAsB,8CAA2C;AACxE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"cluster-tile-layer.js","sourceRoot":"","sources":["../../src/layers/cluster-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,8BAA8B;AAE9B,OAAO,EAAC,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAIhD,OAAO,EAGL,cAAc,EACd,UAAU,IAAI,SAAS,EAKxB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,aAAa,EAEb,gBAAgB,EAChB,uBAAuB,EACvB,4BAA4B,EAG7B,2BAAwB;AACzB,OAAO,EAAC,iBAAiB,EAAC,wBAAqB;AAC/C,OAAO,gBAAgB,gCAA6B;AACpD,OAAO,EAAC,iBAAiB,EAAC,2BAAwB;AAClD,OAAO,sBAAsB,8CAA2C;AACxE,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,mBAAgB;AAG3D,eAAe,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC;AAE1C,MAAM,YAAY,GAAwC;IACxD,IAAI,EAAE,gBAAgB;IACtB,YAAY,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAC;IAChD,WAAW,EAAE;QACX,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAqB;KAC5E;IACD,SAAS,EAAE,EAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAC;IACvC,kBAAkB,EAAE,YAAY;IAChC,QAAQ,EAAE,iBAAiB;CAC5B,CAAC;AA2CF,MAAM,mBAGJ,SAAQ,SAGT;IAWC,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9C,CAAC;IAED,0CAA0C;IAC1C,YAAY;QACV,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAAkB,EAAE,EAAE;YAC3E,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClF,CAAC,CAA0D,CAAC;QAC5D,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,EAAC,IAAI,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrC,MAAM,EAAC,YAAY,EAAE,WAAW,EAAE,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1D,MAAM,EAAC,gBAAgB,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEtC,MAAM,UAAU,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,EAAuD,CAAC;QACrE,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,+CAA+C;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;YAC9D,IAAI,oBAAoB,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;gBACjC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,YAAY,GAAG,aAAa,CAChC,IAAI,EACJ,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,WAAW,EACX,SAAS,CACV,CAAC;YACF,WAAW,KAAX,WAAW,GAAK,YAAY,EAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,GAAG,CAAC,iBAAiB,CAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrD,WAAW,KAAX,WAAW,GAAK,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,EAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,EAAC,UAAU,EAAC,CAAC,CAAC;QAE5B,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,KAAK,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC1C,UAAU,CAAC,MAAM,CAAC,UAAU,GAAG,EAAC,KAAK,EAAC,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,UAAU,EAAC,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,KAAK,GAAG;YACZ,GAAG,IAAI,CAAC,KAAK;YACb,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACrB,cAAc,EAAE,CAAC,IAA8B,EAAE,OAAiC,EAAE,EAAE;gBACpF,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACrE,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACxE,OAAO,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACtC,CAAC;SACoE,CAAC;QAExE,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,cAAc,CAAC,MAA4B;QACzC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAmE,CAAC;QAExF,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,MAAM,EAAC,IAAI,EAAC,GAAG,MAAM,CAAC,WAAY,CAAC,KAAK,CAAC;YACzC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,IAA+B,EAAE;gBAC7D,eAAe,EAAE,IAAI,CAAC,KAAK;aAC5B,CAAY,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAES,oBAAoB,CAAC,IAAiB;QAC9C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACxC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;;AArGM,6BAAS,GAAG,qBAAqB,CAAC;AAClC,gCAAY,GAAG,YAAY,CAAC;AAuGrC,8EAA8E;AAC9E,MAAqB,gBAGnB,SAAQ,cAAiF;IAIzF,cAAc;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAsB,CAAC;QACnD,OAAO,gBAAgB,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE;YAC9C,KAAK,EAAE,EAAC,OAAO,EAAE,EAAC,aAAa,EAAE,UAAU,QAAQ,CAAC,WAAW,EAAE,EAAC,EAAC;YACnE,gBAAgB,EAAE,EAAC,MAAM,EAAE,SAAS,EAAC;SACtC,CAAC,CAAC;IACL,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,aAAa,EAAE,OAAO,EAAC,GAAG,QAAQ,CAAC;QACvD,OAAO;YACL,aAAa;YACb,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE;gBAClC,EAAE,EAAE,yBAAyB,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE;gBAC5C,IAAI;gBACJ,wDAAwD;gBACxD,YAAY,EAAE,gBAAuB;gBACrC,OAAO;gBACP,WAAW,EAAE,IAAI,CAAC,cAAc,EAAE;aACnC,CAAC;SACH,CAAC;IACJ,CAAC;;AA3BM,0BAAS,GAAG,kBAAkB,CAAC;AAC/B,6BAAY,GAAG,YAAY,CAAC;eALhB,gBAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-utils.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAC,QAAQ,EAAM,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"cluster-utils.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAC,QAAQ,EAAM,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAG3D,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AAC9E,MAAM,MAAM,qBAAqB,CAAC,kBAAkB,IAAI;IACtD,WAAW,EAAE,WAAW,CAAC;IACzB,IAAI,EAAE,MAAM,kBAAkB,CAAC;CAChC,EAAE,CAAC;AACJ,MAAM,MAAM,2BAA2B,CAAC,kBAAkB,IAAI,kBAAkB,GAAG;IACjF,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,iBAAiB,CAAC,kBAAkB,IAAI;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,kBAAkB,CAAA;CAAC,CAAC;AACjG,MAAM,MAAM,iBAAiB,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAE5F;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,kBAAkB,EAC9C,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,EACzD,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,CAAC,EACpF,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,YAAK,EAC1D,WAAW,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC9E,SAAS,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,GACjE,OAAO,CAoET;AAED,wBAAgB,4BAA4B,CAAC,kBAAkB,SAAS,EAAE,EACxE,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,GACxD,qBAAqB,CAAC,kBAAkB,CAAC,CAa3C;AAED,wBAAgB,uBAAuB,CAAC,kBAAkB,EACxD,IAAI,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,EACvD,UAAU,EAAE,qBAAqB,CAAC,kBAAkB,CAAC;SAEM,MAAM;SAAO,MAAM;GAY/E;AAED,KAAK,gCAAgC,CAAC,kBAAkB,IAAI,IAAI,CAC9D,uBAAuB,EACvB,QAAQ,CACT,GAAG;IACF,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,GAAG;QAC1C,UAAU,CAAC,EAAE;YACX,KAAK,EAAE,MAAM,CAAC,MAAM,kBAAkB,EAAE;gBAAC,GAAG,EAAE,MAAM,CAAC;gBAAC,GAAG,EAAE,MAAM,CAAA;aAAC,CAAC,CAAC;SACrE,CAAC;KACH,CAAC;CACH,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,kBAAkB,EACjD,IAAI,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,GACtD,gCAAgC,CAAC,kBAAkB,CAAC,CAYtD"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { cellToParent } from 'quadbin';
|
|
5
5
|
import { log } from '@deck.gl/core';
|
|
6
|
+
import { createBinaryPointFeature, createEmptyBinary } from "../utils.js";
|
|
6
7
|
/**
|
|
7
8
|
* Aggregates tile by specified properties, caching result in tile.userData
|
|
8
9
|
*
|
|
@@ -101,14 +102,6 @@ export function computeAggregationStats(data, properties) {
|
|
|
101
102
|
}
|
|
102
103
|
return stats;
|
|
103
104
|
}
|
|
104
|
-
const EMPTY_UINT16ARRAY = new Uint16Array();
|
|
105
|
-
const EMPTY_BINARY_PROPS = {
|
|
106
|
-
positions: { value: new Float32Array(), size: 2 },
|
|
107
|
-
properties: [],
|
|
108
|
-
numericProps: {},
|
|
109
|
-
featureIds: { value: EMPTY_UINT16ARRAY, size: 1 },
|
|
110
|
-
globalFeatureIds: { value: EMPTY_UINT16ARRAY, size: 1 }
|
|
111
|
-
};
|
|
112
105
|
export function clustersToBinary(data) {
|
|
113
106
|
const positions = new Float32Array(data.length * 2);
|
|
114
107
|
const featureIds = new Uint16Array(data.length);
|
|
@@ -117,26 +110,8 @@ export function clustersToBinary(data) {
|
|
|
117
110
|
featureIds[i] = i;
|
|
118
111
|
}
|
|
119
112
|
return {
|
|
120
|
-
|
|
121
|
-
points: {
|
|
122
|
-
type: 'Point',
|
|
123
|
-
positions: { value: positions, size: 2 },
|
|
124
|
-
properties: data,
|
|
125
|
-
numericProps: {},
|
|
126
|
-
featureIds: { value: featureIds, size: 1 },
|
|
127
|
-
globalFeatureIds: { value: featureIds, size: 1 }
|
|
128
|
-
},
|
|
129
|
-
lines: {
|
|
130
|
-
type: 'LineString',
|
|
131
|
-
pathIndices: { value: EMPTY_UINT16ARRAY, size: 1 },
|
|
132
|
-
...EMPTY_BINARY_PROPS
|
|
133
|
-
},
|
|
134
|
-
polygons: {
|
|
135
|
-
type: 'Polygon',
|
|
136
|
-
polygonIndices: { value: EMPTY_UINT16ARRAY, size: 1 },
|
|
137
|
-
primitivePolygonIndices: { value: EMPTY_UINT16ARRAY, size: 1 },
|
|
138
|
-
...EMPTY_BINARY_PROPS
|
|
139
|
-
}
|
|
113
|
+
...createEmptyBinary(),
|
|
114
|
+
points: createBinaryPointFeature(positions, featureIds, featureIds, {}, data)
|
|
140
115
|
};
|
|
141
116
|
}
|
|
142
117
|
//# sourceMappingURL=cluster-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-utils.js","sourceRoot":"","sources":["../../src/layers/cluster-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,OAAO,EAAW,GAAG,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"cluster-utils.js","sourceRoot":"","sources":["../../src/layers/cluster-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAExE,OAAO,qBAAqB,EAAE,EAAC,0BAA0B,EAAC,sCAAmC;AAC7F,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAItD,eAAO,MAAM,eAAe;;;;SAU3B,CAAC;AAOF,+CAA+C;AAC/C,MAAM,MAAM,gBAAgB,CAAC,KAAK,GAAG,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC;AAE/F,uCAAuC;AACvC,KAAK,iBAAiB,CAAC,KAAK,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GACtE,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG;IAChD,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CACjD;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,0CAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,qBAAqB,GAAG,IAAI;CAoC7C"}
|
|
@@ -5,7 +5,7 @@ import { CompositeLayer } from '@deck.gl/core';
|
|
|
5
5
|
import { H3HexagonLayer } from '@deck.gl/geo-layers';
|
|
6
6
|
import H3Tileset2D, { getHexagonResolution } from "./h3-tileset-2d.js";
|
|
7
7
|
import SpatialIndexTileLayer from "./spatial-index-tile-layer.js";
|
|
8
|
-
import {
|
|
8
|
+
import { TilejsonPropType, mergeLoadOptions } from "./utils.js";
|
|
9
9
|
import { DEFAULT_TILE_SIZE } from "../constants.js";
|
|
10
10
|
export const renderSubLayers = props => {
|
|
11
11
|
const { data } = props;
|
|
@@ -27,11 +27,11 @@ class H3TileLayer extends CompositeLayer {
|
|
|
27
27
|
H3HexagonLayer._checkH3Lib();
|
|
28
28
|
}
|
|
29
29
|
getLoadOptions() {
|
|
30
|
-
const loadOptions = super.getLoadOptions() || {};
|
|
31
30
|
const tileJSON = this.props.data;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
return mergeLoadOptions(super.getLoadOptions(), {
|
|
32
|
+
fetch: { headers: { Authorization: `Bearer ${tileJSON.accessToken}` } },
|
|
33
|
+
cartoSpatialTile: { scheme: 'h3' }
|
|
34
|
+
});
|
|
35
35
|
}
|
|
36
36
|
renderLayers() {
|
|
37
37
|
const tileJSON = this.props.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h3-tile-layer.js","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"h3-tile-layer.js","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heatmap-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap-tile-layer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"heatmap-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap-tile-layer.ts"],"names":[],"mappings":"AASA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,KAAK,EACL,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAC,YAAY,EAAU,qBAAkB;AAEhD,OAAyB,EAAC,qBAAqB,EAAC,gCAA6B;AAE7E,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAC;AAuHpD,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,OAAO,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAChF,mBAAmB,GAAG;IACpB,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC/D,YAAY,GAAG;IACb;;;;OAIG;IACH,UAAU,EAAE,KAAK,EAAE,CAAC;IAEpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEpC,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5D,CAAC;AAEJ,cAAM,gBAAgB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACpF,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CACrD;IACC,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,KAAK,EAAG;QACN,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,QAAQ,EAAE,OAAO,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;IACF,eAAe;IAQf,iBAAiB,CAAC,EAAC,WAAW,EAAC;;KAAA,GAAG,OAAO;IAMzC,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAQxC,YAAY,IAAI,KAAK;IAuHrB,mBAAmB,CAAC,IAAI,KAAA;CAoBzB;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -149,7 +149,11 @@ class HeatmapTileLayer extends CompositeLayer {
|
|
|
149
149
|
};
|
|
150
150
|
let tileZ = 0;
|
|
151
151
|
let maxDensity = 0;
|
|
152
|
-
const
|
|
152
|
+
const loadedTiles = [...this.state.tiles].filter(t => t.content);
|
|
153
|
+
const visibleTiles = loadedTiles.filter(t => t.isVisible);
|
|
154
|
+
// As deck.gl initially marks tiles as hidden, use hidden tiles as fallback for calculation.
|
|
155
|
+
// This avoids an ugly flash/glitch at startup when layer is first rendered
|
|
156
|
+
const tiles = visibleTiles.length ? visibleTiles : loadedTiles;
|
|
153
157
|
for (const tile of tiles) {
|
|
154
158
|
const cell = tile.content[0];
|
|
155
159
|
const unitDensity = unitDensityForCell(cell.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heatmap-tile-layer.js","sourceRoot":"","sources":["../../src/layers/heatmap-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;
|
|
1
|
+
{"version":3,"file":"heatmap-tile-layer.js","sourceRoot":"","sources":["../../src/layers/heatmap-tile-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAEtC,OAAO,EAGL,cAAc,EAKf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAe,OAAO,EAAC,qBAAkB;AAChD,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,gCAA6B;AACtE,OAAO,gBAAyC,gCAA6B;AAC7E,OAAO,EAAC,gBAAgB,EAAC,mBAAgB;AAKzC,MAAM,iBAAiB,GAAY;IACjC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACf,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACf,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;IACd,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;IACd,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC;IACb,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,MAAM,aAAa,GAAiB;IAClC,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,KAAK;IACd,OAAO,EAAE;QACP,SAAS,EAAE,QAAQ;QACnB,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,eAAe;QAC7B,YAAY,EAAE,eAAe;KAC9B;CACF,CAAC;AACF;;GAEG;AACH,SAAS,kBAAkB,CAAC,IAAY;IACtC,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;AACvC,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,UAAmB;IAChD,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC5B,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,CAAC,CAAY,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9E,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,YAAY,GAAG;;;;CAIpB,CAAC;AAGF,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,SAAS;IACf,EAAE,EAAE,YAAY;IAChB,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;CAC4C,CAAC;AAEhD,gFAAgF;AAChF,MAAM,oBAAqB,SAAQ,WAAW,CAAC,iBAAiB,CAAC;IAG/D,UAAU,CAAC,IAAI;QACb,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,CAAC,MAAM,GAAG;YACf,cAAc,EAAE;;;;;;;;;;;;;;;;;CAiBrB;SACI,CAAC;QACF,OAAO,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACxD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,CAAO,IAAS;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QAC7C,MAAM,YAAY,GAAiB;YACjC,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,UAAU;SACjD,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACtC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,YAAY,EAAC,CAAC,CAAC;QACvD,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;;AAvCM,8BAAS,GAAG,sBAAsB,CAAC;AA0C5C,+DAA+D;AAC/D,MAAM,2BAA2B,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;AAEnF,MAAM,YAAY,GAAwC;IACxD,IAAI,EAAE,gBAAgB;IACtB,SAAS,EAAE,EAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAC;IACvC,kBAAkB,EAAE,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;IACnE,WAAW,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC;IAC3C,UAAU,EAAE,iBAAiB;IAC7B,SAAS,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAC;IACrC,YAAY,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAC;CAC5D,CAAC;AA6BF,MAAM,gBAA0D,SAAQ,cAEvE;IAUC,eAAe;QACb,IAAI,CAAC,KAAK,GAAG;YACX,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,IAAI,GAAG,EAAE;YAChB,eAAe,EAAE,KAAK;SACvB,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,EAAC,WAAW,EAAC;QAC7B,MAAM,EAAC,eAAe,EAAC,GAAG,WAAW,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,EAAC,eAAe,EAAC,CAAC,CAAC;QACjC,OAAO,WAAW,CAAC,gBAAgB,CAAC;IACtC,CAAC;IAED,WAAW,CAAC,IAA4B;QACtC,MAAM,EAAC,KAAK,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC;QAC/B,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC7C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,YAAY;QACV,MAAM,EACJ,IAAI,EACJ,SAAS,EACT,WAAW,EACX,SAAS,EACT,YAAY,EACZ,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,UAAU,EACV,YAAY,EACZ,GAAG,cAAc,EAClB,GAAG,IAAI,CAAC,KAAK,CAAC;QAEf,2DAA2D;QAC3D,MAAM,aAAa,GAAG;YACpB,GAAG,cAAc;YACjB,IAAI,EAAE;gBACJ,GAAG,cAAc,EAAE,IAAI;gBACvB,cAAc,EAAE;oBACd,GAAG,cAAc,EAAE,IAAI,EAAE,cAAc;oBACvC,IAAI,EAAE;wBACJ,GAAG,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI;wBAC7C,IAAI,EAAE,oBAAoB;qBAC3B;iBACF;aACF;SACF,CAAC;QAEF,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAE1D,4FAA4F;QAC5F,2EAA2E;QAC3E,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;QAE/D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChD,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAS,CAAC,SAAS,GAAG,WAAW,EAAE,UAAU,CAAC,CAAC;YAC1E,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;QAED,8QAA8Q;QAC9Q,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;QACpD,MAAM,mBAAmB,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAE/D,UAAU,GAAG,mBAAmB,CAAC;QACjC,IAAI,OAAO,kBAAkB,KAAK,UAAU,EAAE,CAAC;YAC7C,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,2BAA2B,CACpC,cAAqD,EACrD,IAAI,CAAC,gBAAgB,CAAC;YACpB,EAAE,EAAE,SAAS;YACb,IAAI;YAEJ,wDAAwD;YACxD,iCAAiC;YACjC,YAAY,EAAE,CAAC;YACf,YAAY,EAAE,SAAS;YACvB,cAAc,EAAE,UAAU;YAE1B,WAAW;YAEX,YAAY;YACZ,SAAS;YACT,cAAc,EAAE,aAAa;YAC7B,kBAAkB,EAAE,YAAY;YAEhC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;YAErC,yBAAyB;YACzB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,KAAK;YAEd,cAAc,EAAE;gBACd,YAAY,EAAE,cAAc,CAAC,SAAS;aACvC;YAED,aAAa;YACb,cAAc,EAAE,KAAK,CAAC,EAAE;gBACtB,IAAI,CAAC,QAAQ,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;gBAChC,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;oBACzC,cAAc,CAAC,KAAK,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;YACD,UAAU,EAAE,CAAC,IAAkB,EAAE,EAAE;gBACjC,IAAI,SAAS,GAAG,CAAC,QAAQ,CAAC;gBAC1B,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE,CAAC;oBACpC,SAAS,GAAG,SAAS,CAAC;gBACxB,CAAC;qBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACxB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;wBAC7B,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,EAAS,CAAC,EAAE,SAAS,CAAC,CAAC;oBAC3D,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,QAAQ,GAAG,EAAC,SAAS,EAAC,CAAC;gBAE5B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE3B,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE,CAAC;oBACrC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,YAAY,EAAE,CAAC,IAAkB,EAAE,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC9B,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;oBACvC,YAAY,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;YACD,WAAW,EAAE,EAAC,cAAc,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAC,EAAC;SAC9E,CAAC,CACH,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,IAAI;QACtB,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,IAAI,EAAC,YAAY,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,MAAM,MAAM,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAEjD,IAAI,YAAY,IAAI,YAAY,EAAE,KAAK,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YAC9D,sFAAsF;YACrF,YAAoB,CAAC,gBAAgB,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,YAAY,EAAE,OAAO,EAAE,CAAC;YACxB,uBAAuB;YACvB,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;gBAC/C,GAAG,aAAa;gBAChB,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,UAAU,CAAC,MAAM;gBACxB,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,EAAC,YAAY,EAAC,CAAC,CAAC;IAChC,CAAC;;AAzKM,0BAAS,GAAG,kBAAkB,CAAC;AAC/B,6BAAY,GAAG,YAAY,CAAC;AA2KrC,eAAe,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { GeoBoundingBox } from '@deck.gl/geo-layers';
|
|
2
|
+
import { BinaryPointFeature, BinaryLineFeature, BinaryPolygonFeature } from '@loaders.gl/schema';
|
|
3
|
+
type TileBBox = GeoBoundingBox;
|
|
4
|
+
export declare function createPointsFromLines(lines: BinaryLineFeature, uniqueIdProperty?: string): BinaryPointFeature | null;
|
|
5
|
+
export declare function createPointsFromPolygons(polygons: Required<BinaryPolygonFeature>, tileBbox: TileBBox, props: any): BinaryPointFeature;
|
|
6
|
+
export {};
|
|
7
|
+
//# sourceMappingURL=label-utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"label-utils.d.ts","sourceRoot":"","sources":["../../src/layers/label-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAC,kBAAkB,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAI/F,KAAK,QAAQ,GAAG,cAAc,CAAC;AAI/B,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,iBAAiB,EACxB,gBAAgB,CAAC,EAAE,MAAM,GACxB,kBAAkB,GAAG,IAAI,CAsD3B;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EACxC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,GAAG,GACT,kBAAkB,CA6GpB"}
|
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
import { copyNumericProps, createBinaryPointFeature, initializeNumericProps } from "../utils.js";
|
|
2
|
+
export function createPointsFromLines(lines, uniqueIdProperty) {
|
|
3
|
+
const hasNumericUniqueId = uniqueIdProperty ? uniqueIdProperty in lines.numericProps : false;
|
|
4
|
+
const idToLineInfo = new Map();
|
|
5
|
+
// First pass: find the longest line for each unique ID
|
|
6
|
+
// If we don't have a uniqueIdProperty, treat each line as unique
|
|
7
|
+
for (let i = 0; i < lines.pathIndices.value.length - 1; i++) {
|
|
8
|
+
const pathIndex = lines.pathIndices.value[i];
|
|
9
|
+
const featureId = lines.featureIds.value[pathIndex];
|
|
10
|
+
let uniqueId;
|
|
11
|
+
if (uniqueIdProperty === undefined) {
|
|
12
|
+
uniqueId = featureId;
|
|
13
|
+
}
|
|
14
|
+
else if (hasNumericUniqueId) {
|
|
15
|
+
uniqueId = lines.numericProps[uniqueIdProperty].value[pathIndex];
|
|
16
|
+
}
|
|
17
|
+
else if (lines.properties[featureId] && uniqueIdProperty in lines.properties[featureId]) {
|
|
18
|
+
uniqueId = lines.properties[featureId][uniqueIdProperty];
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
uniqueId = undefined;
|
|
22
|
+
}
|
|
23
|
+
const length = getLineLength(lines, i);
|
|
24
|
+
if (!idToLineInfo.has(uniqueId) || length > idToLineInfo.get(uniqueId).length) {
|
|
25
|
+
idToLineInfo.set(uniqueId, { index: i, length });
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
const positions = [];
|
|
29
|
+
const properties = [];
|
|
30
|
+
const featureIds = [];
|
|
31
|
+
const globalFeatureIds = [];
|
|
32
|
+
const numericProps = initializeNumericProps(idToLineInfo.size, lines.numericProps);
|
|
33
|
+
// Second pass: create points for the longest line of each unique ID
|
|
34
|
+
let pointIndex = 0;
|
|
35
|
+
for (const [_, { index }] of idToLineInfo) {
|
|
36
|
+
const midpoint = getLineMidpoint(lines, index);
|
|
37
|
+
positions.push(...midpoint);
|
|
38
|
+
const pathIndex = lines.pathIndices.value[index];
|
|
39
|
+
const featureId = lines.featureIds.value[pathIndex];
|
|
40
|
+
featureIds.push(pointIndex);
|
|
41
|
+
properties.push(lines.properties[featureId]);
|
|
42
|
+
globalFeatureIds.push(lines.globalFeatureIds.value[pathIndex]);
|
|
43
|
+
copyNumericProps(lines.numericProps, numericProps, pathIndex, pointIndex);
|
|
44
|
+
pointIndex++;
|
|
45
|
+
}
|
|
46
|
+
return createBinaryPointFeature(positions, featureIds, globalFeatureIds, numericProps, properties);
|
|
47
|
+
}
|
|
48
|
+
export function createPointsFromPolygons(polygons, tileBbox, props) {
|
|
49
|
+
const { west, south, east, north } = tileBbox;
|
|
50
|
+
const tileArea = (east - west) * (north - south);
|
|
51
|
+
const minPolygonArea = tileArea * 0.0001; // 0.1% threshold
|
|
52
|
+
const positions = [];
|
|
53
|
+
const properties = [];
|
|
54
|
+
const featureIds = [];
|
|
55
|
+
const globalFeatureIds = [];
|
|
56
|
+
const numericProps = initializeNumericProps(polygons.polygonIndices.value.length - 1, polygons.numericProps);
|
|
57
|
+
// Process each polygon
|
|
58
|
+
let pointIndex = 0;
|
|
59
|
+
let triangleIndex = 0;
|
|
60
|
+
const { extruded } = props;
|
|
61
|
+
for (let i = 0; i < polygons.polygonIndices.value.length - 1; i++) {
|
|
62
|
+
const startIndex = polygons.polygonIndices.value[i];
|
|
63
|
+
const endIndex = polygons.polygonIndices.value[i + 1];
|
|
64
|
+
// Skip small polygons
|
|
65
|
+
if (getPolygonArea(polygons, i) < minPolygonArea) {
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
const centroid = getPolygonCentroid(polygons, i);
|
|
69
|
+
let maxArea = -1;
|
|
70
|
+
let largestTriangleCenter = [0, 0];
|
|
71
|
+
let centroidIsInside = false;
|
|
72
|
+
// Scan triangles until we find ones that don't belong to this polygon
|
|
73
|
+
while (triangleIndex < polygons.triangles.value.length) {
|
|
74
|
+
const i1 = polygons.triangles.value[triangleIndex];
|
|
75
|
+
// If we've moved past the current polygon's triangles, break
|
|
76
|
+
if (i1 >= endIndex) {
|
|
77
|
+
break;
|
|
78
|
+
}
|
|
79
|
+
// If we've already found a triangle containing the centroid, skip the rest
|
|
80
|
+
if (centroidIsInside) {
|
|
81
|
+
triangleIndex += 3;
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
const i2 = polygons.triangles.value[triangleIndex + 1];
|
|
85
|
+
const i3 = polygons.triangles.value[triangleIndex + 2];
|
|
86
|
+
const v1 = polygons.positions.value.subarray(i1 * polygons.positions.size, i1 * polygons.positions.size + polygons.positions.size);
|
|
87
|
+
const v2 = polygons.positions.value.subarray(i2 * polygons.positions.size, i2 * polygons.positions.size + polygons.positions.size);
|
|
88
|
+
const v3 = polygons.positions.value.subarray(i3 * polygons.positions.size, i3 * polygons.positions.size + polygons.positions.size);
|
|
89
|
+
if (isPointInTriangle(centroid, v1, v2, v3)) {
|
|
90
|
+
centroidIsInside = true;
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
const area = getTriangleArea(v1, v2, v3);
|
|
94
|
+
if (area > maxArea) {
|
|
95
|
+
maxArea = area;
|
|
96
|
+
largestTriangleCenter = [(v1[0] + v2[0] + v3[0]) / 3, (v1[1] + v2[1] + v3[1]) / 3];
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
triangleIndex += 3;
|
|
100
|
+
}
|
|
101
|
+
const labelPoint = centroidIsInside ? centroid : largestTriangleCenter;
|
|
102
|
+
if (isPointInBounds(labelPoint, tileBbox)) {
|
|
103
|
+
positions.push(...labelPoint);
|
|
104
|
+
const featureId = polygons.featureIds.value[startIndex];
|
|
105
|
+
if (extruded) {
|
|
106
|
+
const elevation = props.getElevation(undefined, {
|
|
107
|
+
data: polygons,
|
|
108
|
+
index: featureId
|
|
109
|
+
});
|
|
110
|
+
positions.push(elevation * props.elevationScale);
|
|
111
|
+
}
|
|
112
|
+
properties.push(polygons.properties[featureId]);
|
|
113
|
+
featureIds.push(pointIndex);
|
|
114
|
+
globalFeatureIds.push(polygons.globalFeatureIds.value[startIndex]);
|
|
115
|
+
copyNumericProps(polygons.numericProps, numericProps, startIndex, pointIndex);
|
|
116
|
+
pointIndex++;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
// Trim numeric properties arrays to actual size
|
|
120
|
+
if (polygons.numericProps) {
|
|
121
|
+
Object.keys(numericProps).forEach(prop => {
|
|
122
|
+
numericProps[prop].value = numericProps[prop].value.slice(0, pointIndex);
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
return createBinaryPointFeature(positions, featureIds, globalFeatureIds, numericProps, properties, extruded ? 3 : 2);
|
|
126
|
+
}
|
|
127
|
+
// Helper functions
|
|
128
|
+
function getPolygonArea(polygons, index) {
|
|
129
|
+
const { positions: { value: positions, size }, polygonIndices: { value: indices }, triangles: { value: triangles } } = polygons;
|
|
130
|
+
const startIndex = indices[index];
|
|
131
|
+
const endIndex = indices[index + 1];
|
|
132
|
+
let area = 0;
|
|
133
|
+
let triangleIndex = 0;
|
|
134
|
+
// Find first triangle of this polygon
|
|
135
|
+
// Note: this assumes tirnagles and polygon indices are sorted.
|
|
136
|
+
// This is true for the current implementation of geojsonToBinary
|
|
137
|
+
while (triangleIndex < triangles.length) {
|
|
138
|
+
const i1 = triangles[triangleIndex];
|
|
139
|
+
if (i1 >= startIndex)
|
|
140
|
+
break;
|
|
141
|
+
triangleIndex += 3;
|
|
142
|
+
}
|
|
143
|
+
// Process triangles until we hit the next polygon
|
|
144
|
+
while (triangleIndex < triangles.length) {
|
|
145
|
+
const i1 = triangles[triangleIndex];
|
|
146
|
+
if (i1 >= endIndex)
|
|
147
|
+
break;
|
|
148
|
+
const i2 = triangles[triangleIndex + 1];
|
|
149
|
+
const i3 = triangles[triangleIndex + 2];
|
|
150
|
+
const v1 = positions.subarray(i1 * size, i1 * size + size);
|
|
151
|
+
const v2 = positions.subarray(i2 * size, i2 * size + size);
|
|
152
|
+
const v3 = positions.subarray(i3 * size, i3 * size + size);
|
|
153
|
+
area += getTriangleArea(v1, v2, v3);
|
|
154
|
+
triangleIndex += 3;
|
|
155
|
+
}
|
|
156
|
+
return area;
|
|
157
|
+
}
|
|
158
|
+
function isPointInBounds([x, y], { west, east, south, north }) {
|
|
159
|
+
return x >= west && x < east && y >= south && y < north;
|
|
160
|
+
}
|
|
161
|
+
function isPointInTriangle(p, v1, v2, v3) {
|
|
162
|
+
const area = Math.abs((v2[0] - v1[0]) * (v3[1] - v1[1]) - (v3[0] - v1[0]) * (v2[1] - v1[1])) / 2;
|
|
163
|
+
const area1 = Math.abs((v1[0] - p[0]) * (v2[1] - p[1]) - (v2[0] - p[0]) * (v1[1] - p[1])) / 2;
|
|
164
|
+
const area2 = Math.abs((v2[0] - p[0]) * (v3[1] - p[1]) - (v3[0] - p[0]) * (v2[1] - p[1])) / 2;
|
|
165
|
+
const area3 = Math.abs((v3[0] - p[0]) * (v1[1] - p[1]) - (v1[0] - p[0]) * (v3[1] - p[1])) / 2;
|
|
166
|
+
// Account for floating point precision
|
|
167
|
+
return Math.abs(area - (area1 + area2 + area3)) < 1e-10;
|
|
168
|
+
}
|
|
169
|
+
function getTriangleArea([x1, y1], [x2, y2], [x3, y3]) {
|
|
170
|
+
return Math.abs((x1 * (y2 - y3) + x2 * (y3 - y1) + x3 * (y1 - y2)) / 2);
|
|
171
|
+
}
|
|
172
|
+
function getPolygonCentroid(polygons, index) {
|
|
173
|
+
const { positions: { value: positions, size } } = polygons;
|
|
174
|
+
const startIndex = size * polygons.polygonIndices.value[index];
|
|
175
|
+
const endIndex = size * polygons.polygonIndices.value[index + 1];
|
|
176
|
+
let minX = Infinity;
|
|
177
|
+
let minY = Infinity;
|
|
178
|
+
let maxX = -Infinity;
|
|
179
|
+
let maxY = -Infinity;
|
|
180
|
+
for (let i = startIndex; i < endIndex; i += size) {
|
|
181
|
+
const [x, y] = positions.subarray(i, i + 2);
|
|
182
|
+
minX = Math.min(minX, x);
|
|
183
|
+
minY = Math.min(minY, y);
|
|
184
|
+
maxX = Math.max(maxX, x);
|
|
185
|
+
maxY = Math.max(maxY, y);
|
|
186
|
+
}
|
|
187
|
+
return [(minX + maxX) / 2, (minY + maxY) / 2];
|
|
188
|
+
}
|
|
189
|
+
function getSegmentLength(lines, index) {
|
|
190
|
+
const { positions: { value } } = lines;
|
|
191
|
+
const [x1, y1, x2, y2] = value.subarray(index, index + 4);
|
|
192
|
+
return Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
|
|
193
|
+
}
|
|
194
|
+
function getLineLength(lines, index) {
|
|
195
|
+
const { positions: { size } } = lines;
|
|
196
|
+
const startIndex = size * lines.pathIndices.value[index];
|
|
197
|
+
const endIndex = size * lines.pathIndices.value[index + 1];
|
|
198
|
+
let length = 0;
|
|
199
|
+
for (let j = startIndex; j < endIndex; j += size) {
|
|
200
|
+
length += getSegmentLength(lines, j);
|
|
201
|
+
}
|
|
202
|
+
return length;
|
|
203
|
+
}
|
|
204
|
+
function getLineMidpoint(lines, index) {
|
|
205
|
+
const { positions: { value: positions }, pathIndices: { value: pathIndices } } = lines;
|
|
206
|
+
const startIndex = pathIndices[index] * 2;
|
|
207
|
+
const endIndex = pathIndices[index + 1] * 2;
|
|
208
|
+
const numPoints = (endIndex - startIndex) / 2;
|
|
209
|
+
if (numPoints === 2) {
|
|
210
|
+
// For lines with only two vertices, interpolate between them
|
|
211
|
+
const [x1, y1, x2, y2] = positions.subarray(startIndex, startIndex + 4);
|
|
212
|
+
return [(x1 + x2) / 2, (y1 + y2) / 2];
|
|
213
|
+
}
|
|
214
|
+
// For lines with multiple vertices, use the middle vertex
|
|
215
|
+
const midPointIndex = startIndex + Math.floor(numPoints / 2) * 2;
|
|
216
|
+
return [positions[midPointIndex], positions[midPointIndex + 1]];
|
|
217
|
+
}
|
|
218
|
+
//# sourceMappingURL=label-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"label-utils.js","sourceRoot":"","sources":["../../src/layers/label-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,gBAAgB,EAAE,wBAAwB,EAAE,sBAAsB,EAAC,oBAAiB;AAO5F,MAAM,UAAU,qBAAqB,CACnC,KAAwB,EACxB,gBAAyB;IAEzB,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7F,MAAM,YAAY,GAAG,IAAI,GAAG,EAAyC,CAAC;IAEtE,uDAAuD;IACvD,iEAAiE;IACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,QAAqC,CAAC;QAE1C,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,QAAQ,GAAG,SAAS,CAAC;QACvB,CAAC;aAAM,IAAI,kBAAkB,EAAE,CAAC;YAC9B,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC;aAAM,IAAI,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,gBAAgB,IAAI,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1F,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,SAAS,CAAC;QACvB,CAAC;QACD,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,MAAM,EAAE,CAAC;YAC/E,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAC,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAe,EAAE,CAAC;IAClC,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnF,oEAAoE;IACpE,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,KAAK,MAAM,CAAC,CAAC,EAAE,EAAC,KAAK,EAAC,CAAC,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/C,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAE5B,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACpD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7C,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/D,gBAAgB,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAC1E,UAAU,EAAE,CAAC;IACf,CAAC;IAED,OAAO,wBAAwB,CAC7B,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,CACX,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAwC,EACxC,QAAkB,EAClB,KAAU;IAEV,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,QAAQ,CAAC;IAC5C,MAAM,QAAQ,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC,iBAAiB;IAE3D,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAe,EAAE,CAAC;IAClC,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,YAAY,GAAG,sBAAsB,CACzC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EACxC,QAAQ,CAAC,YAAY,CACtB,CAAC;IAEF,uBAAuB;IACvB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,MAAM,EAAC,QAAQ,EAAC,GAAG,KAAK,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAClE,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAEtD,sBAAsB;QACtB,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC;YACjD,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACjD,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC;QACjB,IAAI,qBAAqB,GAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACrD,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAE7B,sEAAsE;QACtE,OAAO,aAAa,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACvD,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAEnD,6DAA6D;YAC7D,IAAI,EAAE,IAAI,QAAQ,EAAE,CAAC;gBACnB,MAAM;YACR,CAAC;YAED,2EAA2E;YAC3E,IAAI,gBAAgB,EAAE,CAAC;gBACrB,aAAa,IAAI,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;YACvD,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;YACvD,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAC1C,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,EAC5B,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CACvD,CAAC;YACF,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAC1C,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,EAC5B,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CACvD,CAAC;YACF,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAC1C,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,EAC5B,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CACvD,CAAC;YAEF,IAAI,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC5C,gBAAgB,GAAG,IAAI,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzC,IAAI,IAAI,GAAG,OAAO,EAAE,CAAC;oBACnB,OAAO,GAAG,IAAI,CAAC;oBACf,qBAAqB,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBACrF,CAAC;YACH,CAAC;YAED,aAAa,IAAI,CAAC,CAAC;QACrB,CAAC;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC;QACvE,IAAI,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1C,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACxD,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE;oBAC9C,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAC;gBACH,SAAS,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;YACnD,CAAC;YACD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5B,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YACnE,gBAAgB,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAC9E,UAAU,EAAE,CAAC;QACf,CAAC;IACH,CAAC;IAED,gDAAgD;IAChD,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvC,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,wBAAwB,CAC7B,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjB,CAAC;AACJ,CAAC;AAED,mBAAmB;AACnB,SAAS,cAAc,CAAC,QAAwC,EAAE,KAAa;IAC7E,MAAM,EACJ,SAAS,EAAE,EAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,EACnC,cAAc,EAAE,EAAC,KAAK,EAAE,OAAO,EAAC,EAChC,SAAS,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,EAC9B,GAAG,QAAQ,CAAC;IAEb,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACpC,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,sCAAsC;IACtC,+DAA+D;IAC/D,iEAAiE;IACjE,OAAO,aAAa,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;QACpC,IAAI,EAAE,IAAI,UAAU;YAAE,MAAM;QAC5B,aAAa,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,kDAAkD;IAClD,OAAO,aAAa,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;QACpC,IAAI,EAAE,IAAI,QAAQ;YAAE,MAAM;QAE1B,MAAM,EAAE,GAAG,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;QACxC,MAAM,EAAE,GAAG,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;QACxC,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QAC3D,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QAC3D,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QAE3D,IAAI,IAAI,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACpC,aAAa,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAmB,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAW;IACrF,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC;AAC1D,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAO,EAAE,EAAQ,EAAE,EAAQ,EAAE,EAAQ;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACjG,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC9F,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC9F,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAE9F,uCAAuC;IACvC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC;AAC1D,CAAC;AAED,SAAS,eAAe,CAAC,CAAC,EAAE,EAAE,EAAE,CAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAO;IACrE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,kBAAkB,CAAC,QAA8B,EAAE,KAAa;IACvE,MAAM,EACJ,SAAS,EAAE,EAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,EACpC,GAAG,QAAQ,CAAC;IACb,MAAM,UAAU,GAAG,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAEjE,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IACrB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5C,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAwB,EAAE,KAAa;IAC/D,MAAM,EACJ,SAAS,EAAE,EAAC,KAAK,EAAC,EACnB,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,aAAa,CAAC,KAAwB,EAAE,KAAa;IAC5D,MAAM,EACJ,SAAS,EAAE,EAAC,IAAI,EAAC,EAClB,GAAG,KAAK,CAAC;IACV,MAAM,UAAU,GAAG,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAC3D,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,KAAwB,EAAE,KAAa;IAC9D,MAAM,EACJ,SAAS,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,EAC7B,WAAW,EAAE,EAAC,KAAK,EAAE,WAAW,EAAC,EAClC,GAAG,KAAK,CAAC;IACV,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAE9C,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACpB,6DAA6D;QAC7D,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;QACxE,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC;IACD,0DAA0D;IAC1D,MAAM,aAAa,GAAG,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACjE,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -41,6 +41,12 @@ type _PointLabelLayerProps<DataT> = TextLayerProps<DataT> & {
|
|
|
41
41
|
*/
|
|
42
42
|
secondarySizeScale?: number;
|
|
43
43
|
};
|
|
44
|
+
/**
|
|
45
|
+
* PointLabelLayer is a layer that renders point labels.
|
|
46
|
+
* It is a composite layer that renders a primary and secondary label.
|
|
47
|
+
* It behaves like a TextLayer except that getTextSize is **not supported**
|
|
48
|
+
* and the text size for the primary label must be set with **sizeScale**.
|
|
49
|
+
*/
|
|
44
50
|
export default class PointLabelLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<ExtraProps & Required<_PointLabelLayerProps<DataT>>> {
|
|
45
51
|
static layerName: string;
|
|
46
52
|
static defaultProps: DefaultProps<PointLabelLayerProps<unknown>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"point-label-layer.d.ts","sourceRoot":"","sources":["../../src/layers/point-label-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,KAAK,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"point-label-layer.d.ts","sourceRoot":"","sources":["../../src/layers/point-label-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,KAAK,EACL,UAAU,EAEX,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,SAAS,EACT,cAAc,EAEf,MAAM,iBAAiB,CAAC;AA0BzB,cAAM,iBAAkB,SAAQ,SAAS;IACvC,MAAM,CAAC,SAAS,SAAuB;IAEvC,cAAc,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC;;;KAAA;CAQnC;AAQD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,cAAc,GACd,mBAAmB,CAAC;AAEtB,2CAA2C;AAC3C,KAAK,qBAAqB,CAAC,KAAK,IAAI,cAAc,CAAC,KAAK,CAAC,GAAG;IAC1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpC;;OAEG;IACH,gBAAgB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3C;;;OAGG;IACH,qBAAqB,CAAC,EAAE,KAAK,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;;;GAKG;AACH,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,oBAAoB,CAAC,SAAS,KAAA;IA0C9B,0BAA0B;IA2B1B,eAAe,CAAC,EAAE,KAAA,EAAE,EAAC,cAAc,EAAE,sBAA2B,EAAE,GAAG,KAAK,EAAC;;;KAAA,GAAG,iBAAiB;IAoE/F,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAmC1C"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// deck.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { CompositeLayer } from '@deck.gl/core';
|
|
4
|
+
import { CompositeLayer, log } from '@deck.gl/core';
|
|
5
5
|
import { TextLayer, _TextBackgroundLayer as TextBackgroundLayer } from '@deck.gl/layers';
|
|
6
6
|
const [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];
|
|
7
7
|
class EnhancedTextBackgroundLayer extends TextBackgroundLayer {
|
|
@@ -33,6 +33,12 @@ const defaultProps = {
|
|
|
33
33
|
getRadius: { type: 'accessor', value: 1 },
|
|
34
34
|
radiusScale: { type: 'number', min: 0, value: 1 }
|
|
35
35
|
};
|
|
36
|
+
/**
|
|
37
|
+
* PointLabelLayer is a layer that renders point labels.
|
|
38
|
+
* It is a composite layer that renders a primary and secondary label.
|
|
39
|
+
* It behaves like a TextLayer except that getTextSize is **not supported**
|
|
40
|
+
* and the text size for the primary label must be set with **sizeScale**.
|
|
41
|
+
*/
|
|
36
42
|
class PointLabelLayer extends CompositeLayer {
|
|
37
43
|
calculatePixelOffset(secondary) {
|
|
38
44
|
const { getTextAnchor: anchor, getAlignmentBaseline: alignment, getRadius, getSecondaryText, radiusScale, secondarySizeScale, sizeScale } = this.props;
|
|
@@ -92,6 +98,12 @@ class PointLabelLayer extends CompositeLayer {
|
|
|
92
98
|
}
|
|
93
99
|
renderTextLayer(id, { updateTriggers: updateTriggersOverride = {}, ...props }) {
|
|
94
100
|
const { data, characterSet, fontFamily, fontSettings, fontWeight, outlineColor, outlineWidth, sizeScale, radiusScale, getAlignmentBaseline, getColor, getPosition, getTextAnchor, updateTriggers } = this.props;
|
|
101
|
+
if (sizeScale < 2) {
|
|
102
|
+
const propName = this.parent?.props?.textSizeScale
|
|
103
|
+
? 'textSizeScale'
|
|
104
|
+
: 'sizeScale';
|
|
105
|
+
log.warn(`${propName} has small value (${sizeScale}). Note getTextSize is not supported on PointLabelLayer`)();
|
|
106
|
+
}
|
|
95
107
|
return new EnhancedTextLayer(this.getSubLayerProps({
|
|
96
108
|
id,
|
|
97
109
|
data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"point-label-layer.js","sourceRoot":"","sources":["../../src/layers/point-label-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAGL,cAAc,
|
|
1
|
+
{"version":3,"file":"point-label-layer.js","sourceRoot":"","sources":["../../src/layers/point-label-layer.ts"],"names":[],"mappings":"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"}
|