@deck.gl/carto 9.0.30 → 9.0.32
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/layer-map.d.ts.map +1 -1
- package/dist/api/layer-map.js +10 -1
- package/dist/api/parse-map.js +4 -1
- package/dist/api/types.d.ts +2 -0
- package/dist/api/types.d.ts.map +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 +21 -2
- package/dist/index.cjs +100 -153
- package/dist/index.cjs.map +2 -2
- package/dist/layers/cluster-tile-layer.js +8 -7
- package/dist/layers/h3-tile-layer.js +4 -3
- package/dist/layers/heatmap-tile-layer.js +3 -3
- package/dist/layers/point-label-layer.js +6 -5
- package/dist/layers/post-process-utils.js +89 -85
- package/dist/layers/quadbin-layer.js +4 -3
- package/dist/layers/quadbin-tile-layer.js +4 -3
- package/dist/layers/raster-layer.js +5 -4
- package/dist/layers/raster-tile-layer.js +4 -3
- 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.js +4 -3
- package/dist/layers/vector-tile-layer.js +4 -3
- package/dist.min.js +9 -9
- package/package.json +2 -2
- package/src/api/layer-map.ts +11 -1
- package/src/api/parse-map.ts +12 -2
- package/src/api/types.ts +4 -0
package/dist/index.cjs
CHANGED
|
@@ -30,15 +30,15 @@ __export(dist_exports, {
|
|
|
30
30
|
CARTO_LAYERS: () => CARTO_LAYERS,
|
|
31
31
|
CARTO_SOURCES: () => CARTO_SOURCES,
|
|
32
32
|
CartoAPIError: () => CartoAPIError,
|
|
33
|
-
ClusterTileLayer: () =>
|
|
34
|
-
H3TileLayer: () =>
|
|
33
|
+
ClusterTileLayer: () => cluster_tile_layer_default,
|
|
34
|
+
H3TileLayer: () => h3_tile_layer_default,
|
|
35
35
|
HeatmapTileLayer: () => heatmap_tile_layer_default,
|
|
36
|
-
QuadbinTileLayer: () =>
|
|
37
|
-
RasterTileLayer: () =>
|
|
36
|
+
QuadbinTileLayer: () => quadbin_tile_layer_default,
|
|
37
|
+
RasterTileLayer: () => raster_tile_layer_default,
|
|
38
38
|
SOURCE_DEFAULTS: () => SOURCE_DEFAULTS,
|
|
39
|
-
VectorTileLayer: () =>
|
|
39
|
+
VectorTileLayer: () => vector_tile_layer_default,
|
|
40
40
|
_GOOGLE_BASEMAPS: () => GOOGLE_BASEMAPS,
|
|
41
|
-
_PointLabelLayer: () =>
|
|
41
|
+
_PointLabelLayer: () => point_label_layer_default,
|
|
42
42
|
_STYLE_LAYER_GROUPS: () => STYLE_LAYER_GROUPS,
|
|
43
43
|
_applyLayerGroupFilters: () => applyLayerGroupFilters,
|
|
44
44
|
_fetchStyle: () => fetchStyle,
|
|
@@ -548,7 +548,7 @@ function binaryToSpatialjson(binary) {
|
|
|
548
548
|
}
|
|
549
549
|
|
|
550
550
|
// dist/layers/schema/carto-spatial-tile-loader.js
|
|
551
|
-
var VERSION = true ? "9.0.
|
|
551
|
+
var VERSION = true ? "9.0.32" : "latest";
|
|
552
552
|
var id = "cartoSpatialTile";
|
|
553
553
|
var DEFAULT_OPTIONS = {
|
|
554
554
|
cartoSpatialTile: {
|
|
@@ -660,7 +660,7 @@ var defaultProps = {
|
|
|
660
660
|
refinementStrategy: "no-overlap",
|
|
661
661
|
tileSize: DEFAULT_TILE_SIZE
|
|
662
662
|
};
|
|
663
|
-
var
|
|
663
|
+
var ClusterGeoJsonLayer = class extends import_geo_layers2.TileLayer {
|
|
664
664
|
initializeState() {
|
|
665
665
|
super.initializeState();
|
|
666
666
|
this.state.aggregationCache = /* @__PURE__ */ new WeakMap();
|
|
@@ -689,12 +689,12 @@ var _ClusterGeoJsonLayer = class extends import_geo_layers2.TileLayer {
|
|
|
689
689
|
aggregationCache.set(tile.content, tileAggregationCache);
|
|
690
690
|
}
|
|
691
691
|
const didAggregate = aggregateTile(tile, tileAggregationCache, aggregationLevels, properties, getPosition, getWeight);
|
|
692
|
-
needsUpdate
|
|
692
|
+
needsUpdate || (needsUpdate = didAggregate);
|
|
693
693
|
data.push(...tileAggregationCache.get(aggregationLevels));
|
|
694
694
|
}
|
|
695
695
|
data.sort((a, b) => Number(b.count - a.count));
|
|
696
696
|
const clusterIds = data == null ? void 0 : data.map((tile) => tile.id);
|
|
697
|
-
needsUpdate
|
|
697
|
+
needsUpdate || (needsUpdate = !(0, import_core6._deepEqual)(clusterIds, this.state.clusterIds, 1));
|
|
698
698
|
this.setState({ clusterIds });
|
|
699
699
|
if (needsUpdate) {
|
|
700
700
|
const stats = computeAggregationStats(data, properties);
|
|
@@ -734,14 +734,9 @@ var _ClusterGeoJsonLayer = class extends import_geo_layers2.TileLayer {
|
|
|
734
734
|
return true;
|
|
735
735
|
}
|
|
736
736
|
};
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
})();
|
|
741
|
-
(() => {
|
|
742
|
-
_ClusterGeoJsonLayer.defaultProps = defaultProps;
|
|
743
|
-
})();
|
|
744
|
-
var _ClusterTileLayer = class extends import_core6.CompositeLayer {
|
|
737
|
+
ClusterGeoJsonLayer.layerName = "ClusterGeoJsonLayer";
|
|
738
|
+
ClusterGeoJsonLayer.defaultProps = defaultProps;
|
|
739
|
+
var ClusterTileLayer = class extends import_core6.CompositeLayer {
|
|
745
740
|
getLoadOptions() {
|
|
746
741
|
const loadOptions = super.getLoadOptions() || {};
|
|
747
742
|
const tileJSON = this.props.data;
|
|
@@ -765,13 +760,9 @@ var _ClusterTileLayer = class extends import_core6.CompositeLayer {
|
|
|
765
760
|
];
|
|
766
761
|
}
|
|
767
762
|
};
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
})();
|
|
772
|
-
(() => {
|
|
773
|
-
_ClusterTileLayer.defaultProps = defaultProps;
|
|
774
|
-
})();
|
|
763
|
+
ClusterTileLayer.layerName = "ClusterTileLayer";
|
|
764
|
+
ClusterTileLayer.defaultProps = defaultProps;
|
|
765
|
+
var cluster_tile_layer_default = ClusterTileLayer;
|
|
775
766
|
|
|
776
767
|
// dist/layers/h3-tile-layer.js
|
|
777
768
|
var import_core8 = require("@deck.gl/core");
|
|
@@ -922,7 +913,7 @@ var TileReader3 = class {
|
|
|
922
913
|
};
|
|
923
914
|
|
|
924
915
|
// dist/layers/schema/carto-raster-tile-loader.js
|
|
925
|
-
var VERSION2 = true ? "9.0.
|
|
916
|
+
var VERSION2 = true ? "9.0.32" : "latest";
|
|
926
917
|
var id2 = "cartoRasterTile";
|
|
927
918
|
var DEFAULT_OPTIONS2 = {
|
|
928
919
|
cartoRasterTile: {
|
|
@@ -964,7 +955,7 @@ function isFeatureIdDefined(value) {
|
|
|
964
955
|
var defaultProps2 = {
|
|
965
956
|
tileSize: DEFAULT_TILE_SIZE
|
|
966
957
|
};
|
|
967
|
-
var
|
|
958
|
+
var SpatialIndexTileLayer = class extends import_geo_layers4.TileLayer {
|
|
968
959
|
_updateAutoHighlight(info) {
|
|
969
960
|
const { hoveredFeatureId } = this.state;
|
|
970
961
|
const hoveredFeature = info.object;
|
|
@@ -1011,13 +1002,9 @@ var _SpatialIndexTileLayer = class extends import_geo_layers4.TileLayer {
|
|
|
1011
1002
|
return featureIndex[KEY] === tile.index[KEY];
|
|
1012
1003
|
}
|
|
1013
1004
|
};
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
})();
|
|
1018
|
-
(() => {
|
|
1019
|
-
_SpatialIndexTileLayer.defaultProps = defaultProps2;
|
|
1020
|
-
})();
|
|
1005
|
+
SpatialIndexTileLayer.layerName = "SpatialIndexTileLayer";
|
|
1006
|
+
SpatialIndexTileLayer.defaultProps = defaultProps2;
|
|
1007
|
+
var spatial_index_tile_layer_default = SpatialIndexTileLayer;
|
|
1021
1008
|
|
|
1022
1009
|
// dist/layers/h3-tile-layer.js
|
|
1023
1010
|
var renderSubLayers = (props) => {
|
|
@@ -1035,7 +1022,7 @@ var defaultProps3 = {
|
|
|
1035
1022
|
data: TilejsonPropType,
|
|
1036
1023
|
tileSize: DEFAULT_TILE_SIZE
|
|
1037
1024
|
};
|
|
1038
|
-
var
|
|
1025
|
+
var H3TileLayer = class extends import_core8.CompositeLayer {
|
|
1039
1026
|
initializeState() {
|
|
1040
1027
|
import_geo_layers5.H3HexagonLayer._checkH3Lib();
|
|
1041
1028
|
}
|
|
@@ -1059,7 +1046,7 @@ var _H3TileLayer = class extends import_core8.CompositeLayer {
|
|
|
1059
1046
|
maxresolution = Math.min(maxresolution, getHexagonResolution({ zoom: this.props.maxZoom, latitude: 0 }, this.props.tileSize));
|
|
1060
1047
|
}
|
|
1061
1048
|
return [
|
|
1062
|
-
new
|
|
1049
|
+
new spatial_index_tile_layer_default(this.props, {
|
|
1063
1050
|
id: `h3-tile-layer-${this.props.id}`,
|
|
1064
1051
|
data,
|
|
1065
1052
|
TilesetClass: H3Tileset2D,
|
|
@@ -1071,13 +1058,9 @@ var _H3TileLayer = class extends import_core8.CompositeLayer {
|
|
|
1071
1058
|
];
|
|
1072
1059
|
}
|
|
1073
1060
|
};
|
|
1074
|
-
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
})();
|
|
1078
|
-
(() => {
|
|
1079
|
-
_H3TileLayer.defaultProps = defaultProps3;
|
|
1080
|
-
})();
|
|
1061
|
+
H3TileLayer.layerName = "H3TileLayer";
|
|
1062
|
+
H3TileLayer.defaultProps = defaultProps3;
|
|
1063
|
+
var h3_tile_layer_default = H3TileLayer;
|
|
1081
1064
|
|
|
1082
1065
|
// dist/layers/heatmap-tile-layer.js
|
|
1083
1066
|
var import_quadbin6 = require("quadbin");
|
|
@@ -1238,7 +1221,7 @@ function getPostProcessLayer(layer) {
|
|
|
1238
1221
|
}
|
|
1239
1222
|
return layer;
|
|
1240
1223
|
}
|
|
1241
|
-
var
|
|
1224
|
+
var DrawCallbackLayer = class extends import_core9.Layer {
|
|
1242
1225
|
initializeState() {
|
|
1243
1226
|
this.id = `draw-callback-${getPostProcessLayer(this).props.id}`;
|
|
1244
1227
|
}
|
|
@@ -1246,13 +1229,10 @@ var _DrawCallbackLayer = class extends import_core9.Layer {
|
|
|
1246
1229
|
getPostProcessLayer(this).applyPostProcess();
|
|
1247
1230
|
}
|
|
1248
1231
|
};
|
|
1249
|
-
|
|
1250
|
-
(() => {
|
|
1251
|
-
_DrawCallbackLayer.layerName = "DrawCallbackLayer";
|
|
1252
|
-
})();
|
|
1232
|
+
DrawCallbackLayer.layerName = "DrawCallbackLayer";
|
|
1253
1233
|
function RTTModifier(BaseLayer) {
|
|
1254
1234
|
var _a;
|
|
1255
|
-
return _a = class extends BaseLayer {
|
|
1235
|
+
return _a = class RTTLayer extends BaseLayer {
|
|
1256
1236
|
draw(opts) {
|
|
1257
1237
|
const { moduleParameters } = opts;
|
|
1258
1238
|
const { picking } = moduleParameters;
|
|
@@ -1265,13 +1245,11 @@ function RTTModifier(BaseLayer) {
|
|
|
1265
1245
|
postProcessLayer.disableRTT();
|
|
1266
1246
|
}
|
|
1267
1247
|
}
|
|
1268
|
-
},
|
|
1269
|
-
_a.layerName = `RTT-${BaseLayer.layerName}`;
|
|
1270
|
-
})(), _a;
|
|
1248
|
+
}, _a.layerName = `RTT-${BaseLayer.layerName}`, _a;
|
|
1271
1249
|
}
|
|
1272
1250
|
function PostProcessModifier(BaseLayer, effect) {
|
|
1273
1251
|
var _a;
|
|
1274
|
-
return _a = class extends BaseLayer {
|
|
1252
|
+
return _a = class PostProcessLayer extends BaseLayer {
|
|
1275
1253
|
initializeState(context) {
|
|
1276
1254
|
super.initializeState(context);
|
|
1277
1255
|
this._createTextures();
|
|
@@ -1336,9 +1314,7 @@ function PostProcessModifier(BaseLayer, effect) {
|
|
|
1336
1314
|
});
|
|
1337
1315
|
this.internalState.renderInProgress = false;
|
|
1338
1316
|
}
|
|
1339
|
-
},
|
|
1340
|
-
_a.layerName = `PostProcess${BaseLayer.layerName}`;
|
|
1341
|
-
})(), _a;
|
|
1317
|
+
}, _a.layerName = `PostProcess${BaseLayer.layerName}`, _a;
|
|
1342
1318
|
}
|
|
1343
1319
|
|
|
1344
1320
|
// dist/layers/quadbin-tile-layer.js
|
|
@@ -1349,7 +1325,7 @@ var import_geo_layers6 = require("@deck.gl/geo-layers");
|
|
|
1349
1325
|
var defaultProps4 = {
|
|
1350
1326
|
getQuadbin: { type: "accessor", value: (d) => d.quadbin }
|
|
1351
1327
|
};
|
|
1352
|
-
var
|
|
1328
|
+
var QuadbinLayer = class extends import_geo_layers6._GeoCellLayer {
|
|
1353
1329
|
indexToBounds() {
|
|
1354
1330
|
const { data, extruded, getQuadbin } = this.props;
|
|
1355
1331
|
const coverage = extruded ? 0.99 : 1;
|
|
@@ -1362,13 +1338,9 @@ var _QuadbinLayer = class extends import_geo_layers6._GeoCellLayer {
|
|
|
1362
1338
|
};
|
|
1363
1339
|
}
|
|
1364
1340
|
};
|
|
1365
|
-
|
|
1366
|
-
|
|
1367
|
-
|
|
1368
|
-
})();
|
|
1369
|
-
(() => {
|
|
1370
|
-
_QuadbinLayer.defaultProps = defaultProps4;
|
|
1371
|
-
})();
|
|
1341
|
+
QuadbinLayer.layerName = "QuadbinLayer";
|
|
1342
|
+
QuadbinLayer.defaultProps = defaultProps4;
|
|
1343
|
+
var quadbin_layer_default = QuadbinLayer;
|
|
1372
1344
|
|
|
1373
1345
|
// dist/layers/quadbin-tile-layer.js
|
|
1374
1346
|
var import_quadbin5 = require("quadbin");
|
|
@@ -1377,7 +1349,7 @@ var renderSubLayers2 = (props) => {
|
|
|
1377
1349
|
if (!data || !data.length)
|
|
1378
1350
|
return null;
|
|
1379
1351
|
const isBigInt = typeof data[0].id === "bigint";
|
|
1380
|
-
return new
|
|
1352
|
+
return new quadbin_layer_default(props, {
|
|
1381
1353
|
getQuadbin: isBigInt ? (d) => d.id : (d) => (0, import_quadbin5.hexToBigInt)(d.id)
|
|
1382
1354
|
});
|
|
1383
1355
|
};
|
|
@@ -1385,7 +1357,7 @@ var defaultProps5 = {
|
|
|
1385
1357
|
data: TilejsonPropType,
|
|
1386
1358
|
tileSize: DEFAULT_TILE_SIZE
|
|
1387
1359
|
};
|
|
1388
|
-
var
|
|
1360
|
+
var QuadbinTileLayer = class extends import_core10.CompositeLayer {
|
|
1389
1361
|
getLoadOptions() {
|
|
1390
1362
|
const loadOptions = super.getLoadOptions() || {};
|
|
1391
1363
|
const tileJSON = this.props.data;
|
|
@@ -1399,7 +1371,7 @@ var _QuadbinTileLayer = class extends import_core10.CompositeLayer {
|
|
|
1399
1371
|
return null;
|
|
1400
1372
|
const { tiles: data, maxresolution: maxZoom } = tileJSON;
|
|
1401
1373
|
return [
|
|
1402
|
-
new
|
|
1374
|
+
new spatial_index_tile_layer_default(this.props, {
|
|
1403
1375
|
id: `quadbin-tile-layer-${this.props.id}`,
|
|
1404
1376
|
data,
|
|
1405
1377
|
TilesetClass: QuadbinTileset2D,
|
|
@@ -1410,20 +1382,16 @@ var _QuadbinTileLayer = class extends import_core10.CompositeLayer {
|
|
|
1410
1382
|
];
|
|
1411
1383
|
}
|
|
1412
1384
|
};
|
|
1413
|
-
|
|
1414
|
-
|
|
1415
|
-
|
|
1416
|
-
})();
|
|
1417
|
-
(() => {
|
|
1418
|
-
_QuadbinTileLayer.defaultProps = defaultProps5;
|
|
1419
|
-
})();
|
|
1385
|
+
QuadbinTileLayer.layerName = "QuadbinTileLayer";
|
|
1386
|
+
QuadbinTileLayer.defaultProps = defaultProps5;
|
|
1387
|
+
var quadbin_tile_layer_default = QuadbinTileLayer;
|
|
1420
1388
|
|
|
1421
1389
|
// dist/layers/heatmap-tile-layer.js
|
|
1422
1390
|
function unitDensityForCell(cell) {
|
|
1423
1391
|
const cellResolution = Number((0, import_quadbin6.getResolution)(cell));
|
|
1424
1392
|
return Math.pow(4, cellResolution);
|
|
1425
1393
|
}
|
|
1426
|
-
var
|
|
1394
|
+
var RTTSolidPolygonLayer = class extends RTTModifier(import_layers2.SolidPolygonLayer) {
|
|
1427
1395
|
getShaders(type) {
|
|
1428
1396
|
const shaders = super.getShaders(type);
|
|
1429
1397
|
shaders.inject = {
|
|
@@ -1461,11 +1429,8 @@ uniform float densityFactor;
|
|
|
1461
1429
|
super.draw(opts);
|
|
1462
1430
|
}
|
|
1463
1431
|
};
|
|
1464
|
-
|
|
1465
|
-
(
|
|
1466
|
-
_RTTSolidPolygonLayer.layerName = "RTTSolidPolygonLayer";
|
|
1467
|
-
})();
|
|
1468
|
-
var PostProcessQuadbinTileLayer = PostProcessModifier(QuadbinTileLayer, heatmap);
|
|
1432
|
+
RTTSolidPolygonLayer.layerName = "RTTSolidPolygonLayer";
|
|
1433
|
+
var PostProcessQuadbinTileLayer = PostProcessModifier(quadbin_tile_layer_default, heatmap);
|
|
1469
1434
|
var defaultProps6 = {
|
|
1470
1435
|
data: TilejsonPropType,
|
|
1471
1436
|
getWeight: { type: "accessor", value: 1 },
|
|
@@ -1474,7 +1439,7 @@ var defaultProps6 = {
|
|
|
1474
1439
|
intensity: { type: "number", value: 1 },
|
|
1475
1440
|
radiusPixels: { type: "number", min: 0, max: 100, value: 20 }
|
|
1476
1441
|
};
|
|
1477
|
-
var
|
|
1442
|
+
var HeatmapTileLayer = class extends import_core11.CompositeLayer {
|
|
1478
1443
|
initializeState() {
|
|
1479
1444
|
this.state = {
|
|
1480
1445
|
isLoaded: false,
|
|
@@ -1566,20 +1531,15 @@ var _HeatmapTileLayer = class extends import_core11.CompositeLayer {
|
|
|
1566
1531
|
}));
|
|
1567
1532
|
}
|
|
1568
1533
|
};
|
|
1569
|
-
|
|
1570
|
-
|
|
1571
|
-
_HeatmapTileLayer.layerName = "HeatmapTileLayer";
|
|
1572
|
-
})();
|
|
1573
|
-
(() => {
|
|
1574
|
-
_HeatmapTileLayer.defaultProps = defaultProps6;
|
|
1575
|
-
})();
|
|
1534
|
+
HeatmapTileLayer.layerName = "HeatmapTileLayer";
|
|
1535
|
+
HeatmapTileLayer.defaultProps = defaultProps6;
|
|
1576
1536
|
var heatmap_tile_layer_default = HeatmapTileLayer;
|
|
1577
1537
|
|
|
1578
1538
|
// dist/layers/point-label-layer.js
|
|
1579
1539
|
var import_core12 = require("@deck.gl/core");
|
|
1580
1540
|
var import_layers3 = require("@deck.gl/layers");
|
|
1581
1541
|
var [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];
|
|
1582
|
-
var
|
|
1542
|
+
var EnhancedTextBackgroundLayer = class extends import_layers3._TextBackgroundLayer {
|
|
1583
1543
|
getShaders() {
|
|
1584
1544
|
const shaders = super.getShaders();
|
|
1585
1545
|
let vs = shaders.vs;
|
|
@@ -1588,11 +1548,8 @@ var _EnhancedTextBackgroundLayer = class extends import_layers3._TextBackgroundL
|
|
|
1588
1548
|
return { ...shaders, vs };
|
|
1589
1549
|
}
|
|
1590
1550
|
};
|
|
1591
|
-
|
|
1592
|
-
|
|
1593
|
-
_EnhancedTextBackgroundLayer.layerName = "EnhancedTextBackgroundLayer";
|
|
1594
|
-
})();
|
|
1595
|
-
var _EnhancedTextLayer = class extends import_layers3.TextLayer {
|
|
1551
|
+
EnhancedTextBackgroundLayer.layerName = "EnhancedTextBackgroundLayer";
|
|
1552
|
+
var EnhancedTextLayer = class extends import_layers3.TextLayer {
|
|
1596
1553
|
filterSubLayer({ layer, renderPass }) {
|
|
1597
1554
|
const background = layer.id.includes("primary-background");
|
|
1598
1555
|
if (renderPass === "collision") {
|
|
@@ -1601,16 +1558,13 @@ var _EnhancedTextLayer = class extends import_layers3.TextLayer {
|
|
|
1601
1558
|
return !background;
|
|
1602
1559
|
}
|
|
1603
1560
|
};
|
|
1604
|
-
|
|
1605
|
-
(() => {
|
|
1606
|
-
_EnhancedTextLayer.layerName = "EnhancedTextLayer";
|
|
1607
|
-
})();
|
|
1561
|
+
EnhancedTextLayer.layerName = "EnhancedTextLayer";
|
|
1608
1562
|
var defaultProps7 = {
|
|
1609
1563
|
...import_layers3.TextLayer.defaultProps,
|
|
1610
1564
|
getRadius: { type: "accessor", value: 1 },
|
|
1611
1565
|
radiusScale: { type: "number", min: 0, value: 1 }
|
|
1612
1566
|
};
|
|
1613
|
-
var
|
|
1567
|
+
var PointLabelLayer = class extends import_core12.CompositeLayer {
|
|
1614
1568
|
calculatePixelOffset(secondary) {
|
|
1615
1569
|
const { getTextAnchor: anchor, getAlignmentBaseline: alignment, getRadius, getSecondaryText, radiusScale, secondarySizeScale, sizeScale } = this.props;
|
|
1616
1570
|
const xMult = anchor === "middle" ? 0 : anchor === "start" ? 1 : -1;
|
|
@@ -1711,13 +1665,9 @@ var _PointLabelLayer = class extends import_core12.CompositeLayer {
|
|
|
1711
1665
|
return out;
|
|
1712
1666
|
}
|
|
1713
1667
|
};
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
|
|
1717
|
-
})();
|
|
1718
|
-
(() => {
|
|
1719
|
-
_PointLabelLayer.defaultProps = defaultProps7;
|
|
1720
|
-
})();
|
|
1668
|
+
PointLabelLayer.layerName = "PointLabelLayer";
|
|
1669
|
+
PointLabelLayer.defaultProps = defaultProps7;
|
|
1670
|
+
var point_label_layer_default = PointLabelLayer;
|
|
1721
1671
|
|
|
1722
1672
|
// dist/layers/raster-tile-layer.js
|
|
1723
1673
|
var import_core14 = require("@deck.gl/core");
|
|
@@ -1807,7 +1757,7 @@ var defaultProps8 = {
|
|
|
1807
1757
|
[-0.5, 0.5]
|
|
1808
1758
|
]
|
|
1809
1759
|
};
|
|
1810
|
-
var
|
|
1760
|
+
var RasterColumnLayer = class extends import_layers4.ColumnLayer {
|
|
1811
1761
|
getShaders() {
|
|
1812
1762
|
const shaders = super.getShaders();
|
|
1813
1763
|
const data = this.props.data;
|
|
@@ -1839,11 +1789,8 @@ var _RasterColumnLayer = class extends import_layers4.ColumnLayer {
|
|
|
1839
1789
|
});
|
|
1840
1790
|
}
|
|
1841
1791
|
};
|
|
1842
|
-
|
|
1843
|
-
|
|
1844
|
-
_RasterColumnLayer.layerName = "RasterColumnLayer";
|
|
1845
|
-
})();
|
|
1846
|
-
var _RasterLayer = class extends import_core13.CompositeLayer {
|
|
1792
|
+
RasterColumnLayer.layerName = "RasterColumnLayer";
|
|
1793
|
+
var RasterLayer = class extends import_core13.CompositeLayer {
|
|
1847
1794
|
renderLayers() {
|
|
1848
1795
|
const { data, getElevation, getFillColor, getLineColor, getLineWidth, tileIndex, updateTriggers } = this.props;
|
|
1849
1796
|
if (!data || !tileIndex)
|
|
@@ -1909,13 +1856,9 @@ var _RasterLayer = class extends import_core13.CompositeLayer {
|
|
|
1909
1856
|
}
|
|
1910
1857
|
}
|
|
1911
1858
|
};
|
|
1912
|
-
|
|
1913
|
-
|
|
1914
|
-
|
|
1915
|
-
})();
|
|
1916
|
-
(() => {
|
|
1917
|
-
_RasterLayer.defaultProps = defaultProps8;
|
|
1918
|
-
})();
|
|
1859
|
+
RasterLayer.layerName = "RasterLayer";
|
|
1860
|
+
RasterLayer.defaultProps = defaultProps8;
|
|
1861
|
+
var raster_layer_default = RasterLayer;
|
|
1919
1862
|
|
|
1920
1863
|
// dist/layers/raster-tile-layer.js
|
|
1921
1864
|
var import_geo_layers7 = require("@deck.gl/geo-layers");
|
|
@@ -1924,13 +1867,13 @@ var renderSubLayers3 = (props) => {
|
|
|
1924
1867
|
const tileIndex = (_b = (_a = props.tile) == null ? void 0 : _a.index) == null ? void 0 : _b.q;
|
|
1925
1868
|
if (!tileIndex)
|
|
1926
1869
|
return null;
|
|
1927
|
-
return new
|
|
1870
|
+
return new raster_layer_default(props, { tileIndex });
|
|
1928
1871
|
};
|
|
1929
1872
|
var defaultProps9 = {
|
|
1930
1873
|
data: TilejsonPropType,
|
|
1931
1874
|
tileSize: DEFAULT_TILE_SIZE
|
|
1932
1875
|
};
|
|
1933
|
-
var
|
|
1876
|
+
var RasterTileLayer = class extends import_core14.CompositeLayer {
|
|
1934
1877
|
getLoadOptions() {
|
|
1935
1878
|
const loadOptions = super.getLoadOptions() || {};
|
|
1936
1879
|
const tileJSON = this.props.data;
|
|
@@ -1955,13 +1898,9 @@ var _RasterTileLayer = class extends import_core14.CompositeLayer {
|
|
|
1955
1898
|
];
|
|
1956
1899
|
}
|
|
1957
1900
|
};
|
|
1958
|
-
|
|
1959
|
-
|
|
1960
|
-
|
|
1961
|
-
})();
|
|
1962
|
-
(() => {
|
|
1963
|
-
_RasterTileLayer.defaultProps = defaultProps9;
|
|
1964
|
-
})();
|
|
1901
|
+
RasterTileLayer.layerName = "RasterTileLayer";
|
|
1902
|
+
RasterTileLayer.defaultProps = defaultProps9;
|
|
1903
|
+
var raster_tile_layer_default = RasterTileLayer;
|
|
1965
1904
|
|
|
1966
1905
|
// dist/layers/vector-tile-layer.js
|
|
1967
1906
|
var import_core15 = require("@loaders.gl/core");
|
|
@@ -2004,7 +1943,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
|
|
|
2004
1943
|
|
|
2005
1944
|
// dist/layers/schema/carto-vector-tile-loader.js
|
|
2006
1945
|
var import_earcut = __toESM(require("earcut"), 1);
|
|
2007
|
-
var VERSION3 = true ? "9.0.
|
|
1946
|
+
var VERSION3 = true ? "9.0.32" : "latest";
|
|
2008
1947
|
var id3 = "cartoVectorTile";
|
|
2009
1948
|
var DEFAULT_OPTIONS3 = {
|
|
2010
1949
|
cartoVectorTile: {
|
|
@@ -2071,7 +2010,7 @@ var defaultProps10 = {
|
|
|
2071
2010
|
dataComparator: TilejsonPropType.equal,
|
|
2072
2011
|
tileSize: DEFAULT_TILE_SIZE
|
|
2073
2012
|
};
|
|
2074
|
-
var
|
|
2013
|
+
var VectorTileLayer = class extends import_geo_layers8.MVTLayer {
|
|
2075
2014
|
constructor(...propObjects) {
|
|
2076
2015
|
super(...propObjects);
|
|
2077
2016
|
}
|
|
@@ -2166,13 +2105,9 @@ var _VectorTileLayer = class extends import_geo_layers8.MVTLayer {
|
|
|
2166
2105
|
return true;
|
|
2167
2106
|
}
|
|
2168
2107
|
};
|
|
2169
|
-
|
|
2170
|
-
|
|
2171
|
-
|
|
2172
|
-
})();
|
|
2173
|
-
(() => {
|
|
2174
|
-
_VectorTileLayer.defaultProps = defaultProps10;
|
|
2175
|
-
})();
|
|
2108
|
+
VectorTileLayer.layerName = "VectorTileLayer";
|
|
2109
|
+
VectorTileLayer.defaultProps = defaultProps10;
|
|
2110
|
+
var vector_tile_layer_default = VectorTileLayer;
|
|
2176
2111
|
|
|
2177
2112
|
// dist/api/carto-api-error.js
|
|
2178
2113
|
var CartoAPIError = class extends Error {
|
|
@@ -2800,13 +2735,13 @@ var AGGREGATION_FUNC = {
|
|
|
2800
2735
|
variance: import_d3_array.variance
|
|
2801
2736
|
};
|
|
2802
2737
|
var TILE_LAYER_TYPE_TO_LAYER = {
|
|
2803
|
-
clusterTile:
|
|
2804
|
-
h3:
|
|
2738
|
+
clusterTile: cluster_tile_layer_default,
|
|
2739
|
+
h3: h3_tile_layer_default,
|
|
2805
2740
|
heatmapTile: heatmap_tile_layer_default,
|
|
2806
|
-
mvt:
|
|
2807
|
-
quadbin:
|
|
2808
|
-
raster:
|
|
2809
|
-
tileset:
|
|
2741
|
+
mvt: vector_tile_layer_default,
|
|
2742
|
+
quadbin: quadbin_tile_layer_default,
|
|
2743
|
+
raster: raster_tile_layer_default,
|
|
2744
|
+
tileset: vector_tile_layer_default
|
|
2810
2745
|
};
|
|
2811
2746
|
var hexToRGBA = (c) => {
|
|
2812
2747
|
const { r, g, b, opacity } = (0, import_d3_color.rgb)(c);
|
|
@@ -2839,6 +2774,12 @@ var customMarkersPropsMap = {
|
|
|
2839
2774
|
radius: "getIconSize"
|
|
2840
2775
|
}
|
|
2841
2776
|
};
|
|
2777
|
+
var heatmapTilePropsMap = {
|
|
2778
|
+
visConfig: {
|
|
2779
|
+
colorRange: (x) => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
2780
|
+
radius: "radiusPixels"
|
|
2781
|
+
}
|
|
2782
|
+
};
|
|
2842
2783
|
var aggregationVisConfig = {
|
|
2843
2784
|
colorAggregation: (x) => ({ colorAggregation: AGGREGATION[x] || AGGREGATION.sum }),
|
|
2844
2785
|
colorRange: (x) => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
@@ -2860,7 +2801,10 @@ function getLayer(type, config, dataset) {
|
|
|
2860
2801
|
var _a, _b;
|
|
2861
2802
|
let basePropMap = sharedPropMap;
|
|
2862
2803
|
if ((_a = config.visConfig) == null ? void 0 : _a.customMarkers) {
|
|
2863
|
-
basePropMap = mergePropMaps(
|
|
2804
|
+
basePropMap = mergePropMaps(basePropMap, customMarkersPropsMap);
|
|
2805
|
+
}
|
|
2806
|
+
if (type === "heatmapTile") {
|
|
2807
|
+
basePropMap = mergePropMaps(basePropMap, heatmapTilePropsMap);
|
|
2864
2808
|
}
|
|
2865
2809
|
if (TILE_LAYER_TYPE_TO_LAYER[type]) {
|
|
2866
2810
|
return getTileLayer(dataset, basePropMap, type);
|
|
@@ -2913,7 +2857,7 @@ function getLayer(type, config, dataset) {
|
|
|
2913
2857
|
function getTileLayer(dataset, basePropMap, type) {
|
|
2914
2858
|
const { aggregationExp, aggregationResLevel } = dataset;
|
|
2915
2859
|
return {
|
|
2916
|
-
Layer: TILE_LAYER_TYPE_TO_LAYER[type] ||
|
|
2860
|
+
Layer: TILE_LAYER_TYPE_TO_LAYER[type] || vector_tile_layer_default,
|
|
2917
2861
|
propMap: basePropMap,
|
|
2918
2862
|
defaultProps: {
|
|
2919
2863
|
...defaultProps11,
|
|
@@ -3208,7 +3152,7 @@ function createStyleProps(config, mapping) {
|
|
|
3208
3152
|
}
|
|
3209
3153
|
function createChannelProps(id4, type, config, visualChannels, data) {
|
|
3210
3154
|
var _a;
|
|
3211
|
-
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale } = visualChannels;
|
|
3155
|
+
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale, weightField } = visualChannels;
|
|
3212
3156
|
let { heightField, heightScale } = visualChannels;
|
|
3213
3157
|
if (type === "hexagonId") {
|
|
3214
3158
|
heightField = sizeField;
|
|
@@ -3280,6 +3224,9 @@ function createChannelProps(id4, type, config, visualChannels, data) {
|
|
|
3280
3224
|
data
|
|
3281
3225
|
);
|
|
3282
3226
|
}
|
|
3227
|
+
if (weightField) {
|
|
3228
|
+
result.getWeight = getSizeAccessor(weightField, void 0, visConfig.weightAggregation, void 0, data);
|
|
3229
|
+
}
|
|
3283
3230
|
if (visConfig.customMarkers) {
|
|
3284
3231
|
const maxIconSize = getMaxMarkerSize(visConfig, visualChannels);
|
|
3285
3232
|
const { getPointRadius, getFillColor } = result;
|
|
@@ -3334,7 +3281,7 @@ function createChannelProps(id4, type, config, visualChannels, data) {
|
|
|
3334
3281
|
result._subLayerProps = {
|
|
3335
3282
|
...result._subLayerProps,
|
|
3336
3283
|
"points-text": {
|
|
3337
|
-
type:
|
|
3284
|
+
type: point_label_layer_default,
|
|
3338
3285
|
extensions: [collisionFilterExtension],
|
|
3339
3286
|
collisionEnabled: true,
|
|
3340
3287
|
collisionGroup,
|
|
@@ -3626,13 +3573,13 @@ var query = async function(options) {
|
|
|
3626
3573
|
|
|
3627
3574
|
// dist/index.js
|
|
3628
3575
|
var CARTO_LAYERS = {
|
|
3629
|
-
ClusterTileLayer,
|
|
3630
|
-
H3TileLayer,
|
|
3576
|
+
ClusterTileLayer: cluster_tile_layer_default,
|
|
3577
|
+
H3TileLayer: h3_tile_layer_default,
|
|
3631
3578
|
HeatmapTileLayer: heatmap_tile_layer_default,
|
|
3632
|
-
_PointLabelLayer:
|
|
3633
|
-
QuadbinTileLayer,
|
|
3634
|
-
RasterTileLayer,
|
|
3635
|
-
VectorTileLayer
|
|
3579
|
+
_PointLabelLayer: point_label_layer_default,
|
|
3580
|
+
QuadbinTileLayer: quadbin_tile_layer_default,
|
|
3581
|
+
RasterTileLayer: raster_tile_layer_default,
|
|
3582
|
+
VectorTileLayer: vector_tile_layer_default
|
|
3636
3583
|
};
|
|
3637
3584
|
var CARTO_SOURCES = {
|
|
3638
3585
|
boundaryQuerySource,
|