@deck.gl/carto 9.0.31 → 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 +17 -5
- package/dist/index.cjs.map +2 -2
- 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.min.js +8 -8
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer-map.d.ts","sourceRoot":"","sources":["../../src/api/layer-map.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,aAAa,EACb,aAAa,EACb,SAAS,EACT,cAAc,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,cAAc,IAAI,aAAa,EAAC,MAAM,eAAe,CAAC;AAU/E,OAAO,EAA4B,aAAa,EAAC,oBAAiB;AAClE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,qBAAqB,EACrB,SAAS,EACT,kBAAkB,EAClB,cAAc,EACf,mBAAgB;AAGjB,QAAA,MAAM,WAAW;;;;;;;;;;CAUhB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,WAAW,CAAC;AAElD,KAAK,aAAa,GACd,aAAa,GACb,IAAI,GACJ,aAAa,GACb,KAAK,GACL,SAAS,GACT,QAAQ,GACR,SAAS,CAAC;AACd,KAAK,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;AAC5F,KAAK,SAAS,GAAG,aAAa,GAAG,iBAAiB,CAAC;AAQnD,eAAO,MAAM,WAAW;;;;;CAKvB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;CAIvB,CAAC;
|
|
1
|
+
{"version":3,"file":"layer-map.d.ts","sourceRoot":"","sources":["../../src/api/layer-map.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,aAAa,EACb,aAAa,EACb,SAAS,EACT,cAAc,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,cAAc,IAAI,aAAa,EAAC,MAAM,eAAe,CAAC;AAU/E,OAAO,EAA4B,aAAa,EAAC,oBAAiB;AAClE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,qBAAqB,EACrB,SAAS,EACT,kBAAkB,EAClB,cAAc,EACf,mBAAgB;AAGjB,QAAA,MAAM,WAAW;;;;;;;;;;CAUhB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,WAAW,CAAC;AAElD,KAAK,aAAa,GACd,aAAa,GACb,IAAI,GACJ,aAAa,GACb,KAAK,GACL,SAAS,GACT,QAAQ,GACR,SAAS,CAAC;AACd,KAAK,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;AAC5F,KAAK,SAAS,GAAG,aAAa,GAAG,iBAAiB,CAAC;AAQnD,eAAO,MAAM,WAAW;;;;;CAKvB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;CAIvB,CAAC;AAwFF,wBAAgB,QAAQ,CACtB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,UAAU,GAClB;IAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC;IAAC,YAAY,EAAE,GAAG,CAAA;CAAC,CAgEhE;AAmCD,iBAAS,gBAAgB,CAAC,MAAM,KAAA,EAAE,SAAS,EAAE,UAAU,OActD;AAoCD,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,UAE9C;AAqBD,wBAAgB,qBAAqB,CAAC,EAAC,IAAI,EAAC;;CAAA,EAAE,gBAAgB,KAAA,EAAE,IAAI,EAAE,GAAG,OAIxE;AAED,wBAAgB,gBAAgB,CAC9B,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,kBAAkB,EACvC,SAAS,EAAE,UAAU,EACrB,EAAC,WAAW,EAAE,KAAK,EAAC;;;CAAA,EACpB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,IAAI,EAAE,GAAG,OAeV;AAmCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,EAC5C,KAAK,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,EAC5C,EAAC,WAAW,EAAE,WAAW,EAAE,cAAc,EAAC;;;;CAAA,EAC1C,IAAI,EAAE,GAAG,OAgCV;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAK7F;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAEpF;AAED,wBAAgB,eAAe,CAC7B,EAAC,IAAI,EAAC;;CAAA,EACN,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,WAAW,KAAA,EACX,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,EAClC,IAAI,EAAE,GAAG,OAmBV;AAUD,wBAAgB,eAAe,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,kBAAkB,EAAE,IAAI,KAAA,OAMrE;AAED,OAAO,EAAC,gBAAgB,IAAI,iBAAiB,EAAC,CAAC"}
|
package/dist/api/layer-map.js
CHANGED
|
@@ -93,6 +93,12 @@ const customMarkersPropsMap = {
|
|
|
93
93
|
radius: 'getIconSize'
|
|
94
94
|
}
|
|
95
95
|
};
|
|
96
|
+
const heatmapTilePropsMap = {
|
|
97
|
+
visConfig: {
|
|
98
|
+
colorRange: x => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
99
|
+
radius: 'radiusPixels'
|
|
100
|
+
}
|
|
101
|
+
};
|
|
96
102
|
const aggregationVisConfig = {
|
|
97
103
|
colorAggregation: x => ({ colorAggregation: AGGREGATION[x] || AGGREGATION.sum }),
|
|
98
104
|
colorRange: x => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
@@ -113,7 +119,10 @@ function mergePropMaps(a = {}, b = {}) {
|
|
|
113
119
|
export function getLayer(type, config, dataset) {
|
|
114
120
|
let basePropMap = sharedPropMap;
|
|
115
121
|
if (config.visConfig?.customMarkers) {
|
|
116
|
-
basePropMap = mergePropMaps(
|
|
122
|
+
basePropMap = mergePropMaps(basePropMap, customMarkersPropsMap);
|
|
123
|
+
}
|
|
124
|
+
if (type === 'heatmapTile') {
|
|
125
|
+
basePropMap = mergePropMaps(basePropMap, heatmapTilePropsMap);
|
|
117
126
|
}
|
|
118
127
|
if (TILE_LAYER_TYPE_TO_LAYER[type]) {
|
|
119
128
|
return getTileLayer(dataset, basePropMap, type);
|
package/dist/api/parse-map.js
CHANGED
|
@@ -112,7 +112,7 @@ function createStyleProps(config, mapping) {
|
|
|
112
112
|
}
|
|
113
113
|
/* eslint-disable complexity, max-statements */
|
|
114
114
|
function createChannelProps(id, type, config, visualChannels, data) {
|
|
115
|
-
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale } = visualChannels;
|
|
115
|
+
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale, weightField } = visualChannels;
|
|
116
116
|
let { heightField, heightScale } = visualChannels;
|
|
117
117
|
if (type === 'hexagonId') {
|
|
118
118
|
heightField = sizeField;
|
|
@@ -174,6 +174,9 @@ function createChannelProps(id, type, config, visualChannels, data) {
|
|
|
174
174
|
// @ts-ignore
|
|
175
175
|
heightScale, visConfig.heightAggregation, visConfig.heightRange || visConfig.sizeRange, data);
|
|
176
176
|
}
|
|
177
|
+
if (weightField) {
|
|
178
|
+
result.getWeight = getSizeAccessor(weightField, undefined, visConfig.weightAggregation, undefined, data);
|
|
179
|
+
}
|
|
177
180
|
if (visConfig.customMarkers) {
|
|
178
181
|
const maxIconSize = getMaxMarkerSize(visConfig, visualChannels);
|
|
179
182
|
const { getPointRadius, getFillColor } = result;
|
package/dist/api/types.d.ts
CHANGED
|
@@ -74,6 +74,7 @@ export type VisualChannels = {
|
|
|
74
74
|
strokeColorScale?: SCALE_TYPE;
|
|
75
75
|
heightField?: VisualChannelField;
|
|
76
76
|
heightScale?: SCALE_TYPE;
|
|
77
|
+
weightField?: VisualChannelField;
|
|
77
78
|
};
|
|
78
79
|
export type ColorRange = {
|
|
79
80
|
category: string;
|
|
@@ -107,6 +108,7 @@ export type VisConfig = {
|
|
|
107
108
|
strokeColorRange?: ColorRange;
|
|
108
109
|
heightRange?: any;
|
|
109
110
|
heightAggregation?: any;
|
|
111
|
+
weightAggregation?: any;
|
|
110
112
|
};
|
|
111
113
|
export type TextLabel = {
|
|
112
114
|
field: VisualChannelField | null | undefined;
|
package/dist/api/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/api/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/api/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1008,7 +1008,7 @@
|
|
|
1008
1008
|
}
|
|
1009
1009
|
|
|
1010
1010
|
// src/layers/schema/carto-raster-tile-loader.ts
|
|
1011
|
-
var VERSION = true ? "9.0.
|
|
1011
|
+
var VERSION = true ? "9.0.32" : "latest";
|
|
1012
1012
|
var id = "cartoRasterTile";
|
|
1013
1013
|
var DEFAULT_OPTIONS = {
|
|
1014
1014
|
cartoRasterTile: {
|
|
@@ -1397,7 +1397,7 @@
|
|
|
1397
1397
|
}
|
|
1398
1398
|
|
|
1399
1399
|
// src/layers/schema/carto-spatial-tile-loader.ts
|
|
1400
|
-
var VERSION = true ? "9.0.
|
|
1400
|
+
var VERSION = true ? "9.0.32" : "latest";
|
|
1401
1401
|
var id = "cartoSpatialTile";
|
|
1402
1402
|
var DEFAULT_OPTIONS = {
|
|
1403
1403
|
cartoSpatialTile: {
|
|
@@ -1625,7 +1625,7 @@
|
|
|
1625
1625
|
}
|
|
1626
1626
|
|
|
1627
1627
|
// src/layers/schema/carto-vector-tile-loader.ts
|
|
1628
|
-
var VERSION = true ? "9.0.
|
|
1628
|
+
var VERSION = true ? "9.0.32" : "latest";
|
|
1629
1629
|
var id = "cartoVectorTile";
|
|
1630
1630
|
var DEFAULT_OPTIONS = {
|
|
1631
1631
|
cartoVectorTile: {
|
package/dist/dist.dev.js
CHANGED
|
@@ -13485,6 +13485,12 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
13485
13485
|
radius: "getIconSize"
|
|
13486
13486
|
}
|
|
13487
13487
|
};
|
|
13488
|
+
var heatmapTilePropsMap = {
|
|
13489
|
+
visConfig: {
|
|
13490
|
+
colorRange: (x) => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
13491
|
+
radius: "radiusPixels"
|
|
13492
|
+
}
|
|
13493
|
+
};
|
|
13488
13494
|
var aggregationVisConfig = {
|
|
13489
13495
|
colorAggregation: (x) => ({ colorAggregation: AGGREGATION[x] || AGGREGATION.sum }),
|
|
13490
13496
|
colorRange: (x) => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
@@ -13505,7 +13511,10 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
13505
13511
|
function getLayer(type, config, dataset) {
|
|
13506
13512
|
let basePropMap = sharedPropMap;
|
|
13507
13513
|
if (config.visConfig?.customMarkers) {
|
|
13508
|
-
basePropMap = mergePropMaps(
|
|
13514
|
+
basePropMap = mergePropMaps(basePropMap, customMarkersPropsMap);
|
|
13515
|
+
}
|
|
13516
|
+
if (type === "heatmapTile") {
|
|
13517
|
+
basePropMap = mergePropMaps(basePropMap, heatmapTilePropsMap);
|
|
13509
13518
|
}
|
|
13510
13519
|
if (TILE_LAYER_TYPE_TO_LAYER[type]) {
|
|
13511
13520
|
return getTileLayer(dataset, basePropMap, type);
|
|
@@ -13864,7 +13873,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
13864
13873
|
sizeField,
|
|
13865
13874
|
sizeScale,
|
|
13866
13875
|
strokeColorField,
|
|
13867
|
-
strokeColorScale
|
|
13876
|
+
strokeColorScale,
|
|
13877
|
+
weightField
|
|
13868
13878
|
} = visualChannels;
|
|
13869
13879
|
let { heightField, heightScale } = visualChannels;
|
|
13870
13880
|
if (type === "hexagonId") {
|
|
@@ -13937,6 +13947,15 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
|
|
|
13937
13947
|
data
|
|
13938
13948
|
);
|
|
13939
13949
|
}
|
|
13950
|
+
if (weightField) {
|
|
13951
|
+
result.getWeight = getSizeAccessor(
|
|
13952
|
+
weightField,
|
|
13953
|
+
void 0,
|
|
13954
|
+
visConfig.weightAggregation,
|
|
13955
|
+
void 0,
|
|
13956
|
+
data
|
|
13957
|
+
);
|
|
13958
|
+
}
|
|
13940
13959
|
if (visConfig.customMarkers) {
|
|
13941
13960
|
const maxIconSize = getMaxMarkerSize(visConfig, visualChannels);
|
|
13942
13961
|
const { getPointRadius, getFillColor } = result;
|
package/dist/index.cjs
CHANGED
|
@@ -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: {
|
|
@@ -913,7 +913,7 @@ var TileReader3 = class {
|
|
|
913
913
|
};
|
|
914
914
|
|
|
915
915
|
// dist/layers/schema/carto-raster-tile-loader.js
|
|
916
|
-
var VERSION2 = true ? "9.0.
|
|
916
|
+
var VERSION2 = true ? "9.0.32" : "latest";
|
|
917
917
|
var id2 = "cartoRasterTile";
|
|
918
918
|
var DEFAULT_OPTIONS2 = {
|
|
919
919
|
cartoRasterTile: {
|
|
@@ -1943,7 +1943,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
|
|
|
1943
1943
|
|
|
1944
1944
|
// dist/layers/schema/carto-vector-tile-loader.js
|
|
1945
1945
|
var import_earcut = __toESM(require("earcut"), 1);
|
|
1946
|
-
var VERSION3 = true ? "9.0.
|
|
1946
|
+
var VERSION3 = true ? "9.0.32" : "latest";
|
|
1947
1947
|
var id3 = "cartoVectorTile";
|
|
1948
1948
|
var DEFAULT_OPTIONS3 = {
|
|
1949
1949
|
cartoVectorTile: {
|
|
@@ -2774,6 +2774,12 @@ var customMarkersPropsMap = {
|
|
|
2774
2774
|
radius: "getIconSize"
|
|
2775
2775
|
}
|
|
2776
2776
|
};
|
|
2777
|
+
var heatmapTilePropsMap = {
|
|
2778
|
+
visConfig: {
|
|
2779
|
+
colorRange: (x) => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
2780
|
+
radius: "radiusPixels"
|
|
2781
|
+
}
|
|
2782
|
+
};
|
|
2777
2783
|
var aggregationVisConfig = {
|
|
2778
2784
|
colorAggregation: (x) => ({ colorAggregation: AGGREGATION[x] || AGGREGATION.sum }),
|
|
2779
2785
|
colorRange: (x) => ({ colorRange: x.colors.map(hexToRGBA) }),
|
|
@@ -2795,7 +2801,10 @@ function getLayer(type, config, dataset) {
|
|
|
2795
2801
|
var _a, _b;
|
|
2796
2802
|
let basePropMap = sharedPropMap;
|
|
2797
2803
|
if ((_a = config.visConfig) == null ? void 0 : _a.customMarkers) {
|
|
2798
|
-
basePropMap = mergePropMaps(
|
|
2804
|
+
basePropMap = mergePropMaps(basePropMap, customMarkersPropsMap);
|
|
2805
|
+
}
|
|
2806
|
+
if (type === "heatmapTile") {
|
|
2807
|
+
basePropMap = mergePropMaps(basePropMap, heatmapTilePropsMap);
|
|
2799
2808
|
}
|
|
2800
2809
|
if (TILE_LAYER_TYPE_TO_LAYER[type]) {
|
|
2801
2810
|
return getTileLayer(dataset, basePropMap, type);
|
|
@@ -3143,7 +3152,7 @@ function createStyleProps(config, mapping) {
|
|
|
3143
3152
|
}
|
|
3144
3153
|
function createChannelProps(id4, type, config, visualChannels, data) {
|
|
3145
3154
|
var _a;
|
|
3146
|
-
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale } = visualChannels;
|
|
3155
|
+
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale, weightField } = visualChannels;
|
|
3147
3156
|
let { heightField, heightScale } = visualChannels;
|
|
3148
3157
|
if (type === "hexagonId") {
|
|
3149
3158
|
heightField = sizeField;
|
|
@@ -3215,6 +3224,9 @@ function createChannelProps(id4, type, config, visualChannels, data) {
|
|
|
3215
3224
|
data
|
|
3216
3225
|
);
|
|
3217
3226
|
}
|
|
3227
|
+
if (weightField) {
|
|
3228
|
+
result.getWeight = getSizeAccessor(weightField, void 0, visConfig.weightAggregation, void 0, data);
|
|
3229
|
+
}
|
|
3218
3230
|
if (visConfig.customMarkers) {
|
|
3219
3231
|
const maxIconSize = getMaxMarkerSize(visConfig, visualChannels);
|
|
3220
3232
|
const { getPointRadius, getFillColor } = result;
|