@carto/kepler.gl 0.0.65-alpha.labels.8 → 0.0.65
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/CHANGELOG.md +5 -0
- package/README.md +2 -3
- package/dist/components/side-panel/layer-panel/layer-configurator.js +1 -2
- package/dist/components/side-panel/layer-panel/text-label-panel.js +67 -82
- package/dist/constants/default-settings.js +2 -2
- package/dist/index.js +2 -12
- package/dist/layers/base-layer.js +3 -3
- package/dist/layers/layer-factory.js +1 -16
- package/dist/layers/layer-text-label.js +9 -10
- package/dist/layers/point-layer/point-layer.js +2 -2
- package/dist/localization/en.js +3 -3
- package/dist/reducers/vis-state-updaters.js +15 -7
- package/package.json +9 -8
- package/src/components/side-panel/layer-panel/layer-configurator.js +0 -1
- package/src/components/side-panel/layer-panel/text-label-panel.js +2 -14
- package/src/index.js +0 -3
- package/src/layers/base-layer.js +1 -1
- package/src/layers/layer-factory.js +0 -15
- package/src/layers/layer-text-label.js +13 -8
- package/src/layers/point-layer/point-layer.js +1 -1
- package/src/localization/en.js +2 -2
- package/src/reducers/vis-state-updaters.js +11 -8
- package/dist/deckgl-layers/point-label-layer/point-label-layer.js +0 -280
- package/src/components/common/item-selector/.chickleted-input.js.swp +0 -0
- package/src/components/side-panel/layer-panel/.text-label-panel.js.swp +0 -0
- package/src/deckgl-layers/point-label-layer/point-label-layer.js +0 -215
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@carto/kepler.gl",
|
|
3
3
|
"author": "CARTO",
|
|
4
4
|
"homepage": "https://github.com/CartoDB/carto-kepler#readme",
|
|
5
|
-
"version": "0.0.65
|
|
5
|
+
"version": "0.0.65",
|
|
6
6
|
"description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"main": "dist/index.js",
|
|
@@ -238,13 +238,14 @@
|
|
|
238
238
|
"tough-cookie": "4.0.0"
|
|
239
239
|
},
|
|
240
240
|
"peerDependencies": {
|
|
241
|
-
"@deck.gl/aggregation-layers": "^8.
|
|
242
|
-
"@deck.gl/
|
|
243
|
-
"@deck.gl/
|
|
244
|
-
"@deck.gl/
|
|
245
|
-
"@deck.gl/layers": "^8.
|
|
246
|
-
"@deck.gl/
|
|
247
|
-
"@deck.gl/
|
|
241
|
+
"@deck.gl/aggregation-layers": "^8.9.5",
|
|
242
|
+
"@deck.gl/carto": "^8.9.5",
|
|
243
|
+
"@deck.gl/core": "^8.9.5",
|
|
244
|
+
"@deck.gl/extensions": "^8.9.5",
|
|
245
|
+
"@deck.gl/geo-layers": "^8.9.5",
|
|
246
|
+
"@deck.gl/layers": "^8.9.5",
|
|
247
|
+
"@deck.gl/mesh-layers": "^8.9.5",
|
|
248
|
+
"@deck.gl/react": "^8.9.5",
|
|
248
249
|
"@loaders.gl/core": "^3.1.5",
|
|
249
250
|
"@loaders.gl/csv": "^3.1.5",
|
|
250
251
|
"@loaders.gl/gltf": "^3.1.5",
|
|
@@ -246,7 +246,6 @@ export default function LayerConfiguratorFactory(
|
|
|
246
246
|
{/* text label */}
|
|
247
247
|
<TextLabelPanel
|
|
248
248
|
fields={visConfiguratorProps.fields}
|
|
249
|
-
layer={layer}
|
|
250
249
|
updateLayerTextLabel={this.props.updateLayerTextLabel}
|
|
251
250
|
textLabel={layer.config.textLabel}
|
|
252
251
|
colorPalette={visConfiguratorProps.colorPalette}
|
|
@@ -65,28 +65,16 @@ function TextLabelPanelFactory(RangeSlider, LayerConfigGroup, FieldSelector, Col
|
|
|
65
65
|
};
|
|
66
66
|
|
|
67
67
|
render() {
|
|
68
|
-
const {
|
|
68
|
+
const {updateLayerTextLabel, textLabel, fields, AddButton} = this.props;
|
|
69
69
|
const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => d);
|
|
70
70
|
|
|
71
71
|
return (
|
|
72
|
-
// Switch only works with group/property set to customMarkers???
|
|
73
|
-
/* <LayerConfigGroup
|
|
74
|
-
type="boolean"
|
|
75
|
-
disabled={undefined}
|
|
76
|
-
layer={layer}
|
|
77
|
-
group="labels"
|
|
78
|
-
property="labelsEnabled"
|
|
79
|
-
label="panel.text.label"
|
|
80
|
-
collapsible
|
|
81
|
-
>*/
|
|
82
72
|
<LayerConfigGroup label={'panel.text.label'} collapsible>
|
|
83
73
|
<ConfigGroupCollapsibleHeader>
|
|
84
74
|
<FieldSelector
|
|
85
75
|
fields={fields}
|
|
86
76
|
value={currentFields}
|
|
87
|
-
onSelect={selected =>
|
|
88
|
-
selected.length <= 2 && updateLayerTextLabel('all', 'fields', selected);
|
|
89
|
-
}}
|
|
77
|
+
onSelect={selected => updateLayerTextLabel('all', 'fields', selected)}
|
|
90
78
|
multiSelect
|
|
91
79
|
/>
|
|
92
80
|
</ConfigGroupCollapsibleHeader>
|
package/src/index.js
CHANGED
package/src/layers/base-layer.js
CHANGED
|
@@ -22,7 +22,7 @@ import {console as Console} from 'global/window';
|
|
|
22
22
|
import keymirror from 'keymirror';
|
|
23
23
|
import {CollisionFilterExtension, DataFilterExtension} from '@deck.gl/extensions';
|
|
24
24
|
import {COORDINATE_SYSTEM, Layer as DeckLayer} from '@deck.gl/core';
|
|
25
|
-
import {PointLabelLayer} from '
|
|
25
|
+
import {_PointLabelLayer as PointLabelLayer} from '@deck.gl/carto';
|
|
26
26
|
import DefaultLayerIcon from './default-layer-icon';
|
|
27
27
|
import {diffUpdateTriggers} from './layer-update';
|
|
28
28
|
|
|
@@ -27,7 +27,6 @@ export const PROPERTY_GROUPS = keyMirror({
|
|
|
27
27
|
color: null,
|
|
28
28
|
stroke: null,
|
|
29
29
|
customMarkers: null,
|
|
30
|
-
labels: null,
|
|
31
30
|
radius: null,
|
|
32
31
|
height: null,
|
|
33
32
|
angle: null,
|
|
@@ -396,13 +395,6 @@ export const LAYER_VIS_CONFIGS = {
|
|
|
396
395
|
group: PROPERTY_GROUPS.display,
|
|
397
396
|
property: 'filled'
|
|
398
397
|
},
|
|
399
|
-
labels: {
|
|
400
|
-
type: 'boolean',
|
|
401
|
-
label: 'layerVisConfigs.labels',
|
|
402
|
-
defaultValue: false,
|
|
403
|
-
group: PROPERTY_GROUPS.labels,
|
|
404
|
-
property: 'labels'
|
|
405
|
-
},
|
|
406
398
|
extruded: {
|
|
407
399
|
type: 'boolean',
|
|
408
400
|
defaultValue: false,
|
|
@@ -446,13 +438,6 @@ export const LAYER_VIS_CONFIGS = {
|
|
|
446
438
|
group: PROPERTY_GROUPS.customMarkers,
|
|
447
439
|
property: 'customMarkers'
|
|
448
440
|
},
|
|
449
|
-
labelsEnabled: {
|
|
450
|
-
type: 'boolean',
|
|
451
|
-
defaultValue: true,
|
|
452
|
-
label: 'layerVisConfigs.labelsEnabled',
|
|
453
|
-
group: PROPERTY_GROUPS.labels,
|
|
454
|
-
property: 'labelsEnabled'
|
|
455
|
-
},
|
|
456
441
|
customMarkersUrl: {
|
|
457
442
|
type: 'text',
|
|
458
443
|
defaultValue: '',
|
|
@@ -21,25 +21,30 @@
|
|
|
21
21
|
import {notNullorUndefined} from 'utils/data-utils';
|
|
22
22
|
import uniq from 'lodash.uniq';
|
|
23
23
|
|
|
24
|
+
export const defaultPadding = 20;
|
|
25
|
+
|
|
24
26
|
export function getTextOffsetByRadius(radiusScale, getRadius) {
|
|
25
27
|
return textLabel => {
|
|
26
28
|
const xMult = textLabel.anchor === 'middle' ? 0 : textLabel.anchor === 'start' ? 1 : -1;
|
|
27
29
|
const yMult = textLabel.alignment === 'center' ? 0 : textLabel.alignment === 'bottom' ? 1 : -1;
|
|
28
30
|
|
|
29
|
-
const sizeOffset =
|
|
31
|
+
const sizeOffset =
|
|
32
|
+
textLabel.alignment === 'center'
|
|
33
|
+
? 0
|
|
34
|
+
: textLabel.alignment === 'bottom'
|
|
35
|
+
? textLabel.size
|
|
36
|
+
: textLabel.size;
|
|
30
37
|
|
|
31
|
-
const
|
|
32
|
-
const yPadding = textLabel.size;
|
|
33
|
-
const radiusPadding = 1 + 1 / 4; // Padding based on point radius (radius/ 4)
|
|
38
|
+
const padding = defaultPadding;
|
|
34
39
|
|
|
35
40
|
return typeof getRadius === 'function'
|
|
36
41
|
? d => [
|
|
37
|
-
xMult * (getRadius(d) * radiusScale
|
|
38
|
-
yMult * (getRadius(d) * radiusScale
|
|
42
|
+
xMult * (getRadius(d) * radiusScale + padding),
|
|
43
|
+
yMult * (getRadius(d) * radiusScale + padding + sizeOffset)
|
|
39
44
|
]
|
|
40
45
|
: [
|
|
41
|
-
xMult * (getRadius * radiusScale
|
|
42
|
-
yMult * (getRadius * radiusScale
|
|
46
|
+
xMult * (getRadius * radiusScale + padding),
|
|
47
|
+
yMult * (getRadius * radiusScale + padding + sizeOffset)
|
|
43
48
|
];
|
|
44
49
|
};
|
|
45
50
|
}
|
|
@@ -47,7 +47,6 @@ export const pointVisConfigs = {
|
|
|
47
47
|
customMarkers: 'customMarkers',
|
|
48
48
|
customMarkersUrl: 'customMarkersUrl',
|
|
49
49
|
customMarkersRange: 'customMarkersRange',
|
|
50
|
-
labelsEnabled: 'labelsEnabled',
|
|
51
50
|
opacity: 'opacity',
|
|
52
51
|
outline: 'outline',
|
|
53
52
|
thickness: 'thickness',
|
|
@@ -291,6 +290,7 @@ export default class PointLayer extends Layer {
|
|
|
291
290
|
getFilterValue: data.getFilterValue,
|
|
292
291
|
extensions,
|
|
293
292
|
filterRange: defaultLayerProps.filterRange,
|
|
293
|
+
maskId: defaultLayerProps.maskId,
|
|
294
294
|
visible: defaultLayerProps.visible,
|
|
295
295
|
...brushingProps
|
|
296
296
|
};
|
package/src/localization/en.js
CHANGED
|
@@ -83,7 +83,7 @@ export default {
|
|
|
83
83
|
layer: 'Layers',
|
|
84
84
|
filter: 'Filters',
|
|
85
85
|
interaction: 'Interactions',
|
|
86
|
-
basemap: '
|
|
86
|
+
basemap: 'Basemap'
|
|
87
87
|
}
|
|
88
88
|
},
|
|
89
89
|
layer: {
|
|
@@ -216,7 +216,7 @@ export default {
|
|
|
216
216
|
hideLayerPanel: 'Hide layer panel',
|
|
217
217
|
showLayerPanel: 'Show layer panel',
|
|
218
218
|
moveToTop: 'Move to top of data layers',
|
|
219
|
-
selectBaseMapStyle: 'Select
|
|
219
|
+
selectBaseMapStyle: 'Select Basemap Style',
|
|
220
220
|
delete: 'Delete',
|
|
221
221
|
timePlayback: 'Time Playback',
|
|
222
222
|
cloudStorage: 'Cloud Storage',
|
|
@@ -315,16 +315,19 @@ function addOrRemoveTextLabels(newFields, textLabel) {
|
|
|
315
315
|
|
|
316
316
|
// delete
|
|
317
317
|
newTextLabel = newTextLabel.filter(tl => tl.field && !deleteFields.includes(tl.field.name));
|
|
318
|
-
newTextLabel = !newTextLabel.length ? [DEFAULT_TEXT_LABEL] : newTextLabel;
|
|
319
318
|
|
|
320
319
|
// add
|
|
321
|
-
newTextLabel =
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
320
|
+
newTextLabel = newTextLabel.filter(tl => tl.field);
|
|
321
|
+
const defaultLabel = newTextLabel.length ? DEFAULT_SECONDARY_TEXT_LABEL : DEFAULT_TEXT_LABEL;
|
|
322
|
+
newTextLabel = [...newTextLabel, ...addFields.map(af => ({...defaultLabel, field: af}))];
|
|
323
|
+
|
|
324
|
+
// limit to 2 labels (overwrite 2nd label with 3rd)
|
|
325
|
+
if (newTextLabel.length > 2) {
|
|
326
|
+
newTextLabel = [newTextLabel[0], newTextLabel[2]];
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
// default
|
|
330
|
+
newTextLabel = !newTextLabel.length ? [DEFAULT_TEXT_LABEL] : newTextLabel;
|
|
328
331
|
|
|
329
332
|
return newTextLabel;
|
|
330
333
|
}
|
|
@@ -1,280 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", {
|
|
6
|
-
value: true
|
|
7
|
-
});
|
|
8
|
-
exports.PointLabelLayer = void 0;
|
|
9
|
-
|
|
10
|
-
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
11
|
-
|
|
12
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
|
-
|
|
14
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
15
|
-
|
|
16
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
17
|
-
|
|
18
|
-
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
19
|
-
|
|
20
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
21
|
-
|
|
22
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
23
|
-
|
|
24
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
25
|
-
|
|
26
|
-
var _core = require("@deck.gl/core");
|
|
27
|
-
|
|
28
|
-
var _layers = require("@deck.gl/layers");
|
|
29
|
-
|
|
30
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
|
|
31
|
-
|
|
32
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
33
|
-
|
|
34
|
-
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
|
|
35
|
-
|
|
36
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
37
|
-
|
|
38
|
-
// TODO remove prior to release
|
|
39
|
-
var SHOW_TEXT_BORDER = false;
|
|
40
|
-
var LEFT = 0,
|
|
41
|
-
TOP = 1,
|
|
42
|
-
RIGHT = 2,
|
|
43
|
-
BOTTOM = 3;
|
|
44
|
-
|
|
45
|
-
var EnhancedTextBackgroundLayer = /*#__PURE__*/function (_TextBackgroundLayer) {
|
|
46
|
-
(0, _inherits2["default"])(EnhancedTextBackgroundLayer, _TextBackgroundLayer);
|
|
47
|
-
|
|
48
|
-
var _super = _createSuper(EnhancedTextBackgroundLayer);
|
|
49
|
-
|
|
50
|
-
function EnhancedTextBackgroundLayer() {
|
|
51
|
-
(0, _classCallCheck2["default"])(this, EnhancedTextBackgroundLayer);
|
|
52
|
-
return _super.apply(this, arguments);
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
(0, _createClass2["default"])(EnhancedTextBackgroundLayer, [{
|
|
56
|
-
key: "getShaders",
|
|
57
|
-
value: function getShaders() {
|
|
58
|
-
var shaders = (0, _get2["default"])((0, _getPrototypeOf2["default"])(EnhancedTextBackgroundLayer.prototype), "getShaders", this).call(this);
|
|
59
|
-
var vs = shaders.vs; // Modify shader so that the padding is offset by the pixel offset to ensure the padding
|
|
60
|
-
// always captures the anchor point. As padding is uniform we cannot pass it a per-label value
|
|
61
|
-
|
|
62
|
-
vs = vs.replaceAll('padding.', '_padding.');
|
|
63
|
-
vs = vs.replace('void main(void) {', 'void main(void) {\n vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);');
|
|
64
|
-
return _objectSpread(_objectSpread({}, shaders), {}, {
|
|
65
|
-
vs: vs
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
}]);
|
|
69
|
-
return EnhancedTextBackgroundLayer;
|
|
70
|
-
}(_layers._TextBackgroundLayer); // TextLayer which includes modified text-background-layer-vertex shader and only renders the
|
|
71
|
-
// primary background layer in the collision pass
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
var EnhancedTextLayer = /*#__PURE__*/function (_TextLayer) {
|
|
75
|
-
(0, _inherits2["default"])(EnhancedTextLayer, _TextLayer);
|
|
76
|
-
|
|
77
|
-
var _super2 = _createSuper(EnhancedTextLayer);
|
|
78
|
-
|
|
79
|
-
function EnhancedTextLayer() {
|
|
80
|
-
(0, _classCallCheck2["default"])(this, EnhancedTextLayer);
|
|
81
|
-
return _super2.apply(this, arguments);
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
(0, _createClass2["default"])(EnhancedTextLayer, [{
|
|
85
|
-
key: "filterSubLayer",
|
|
86
|
-
value: function filterSubLayer(_ref) {
|
|
87
|
-
var layer = _ref.layer,
|
|
88
|
-
renderPass = _ref.renderPass;
|
|
89
|
-
var background = layer.id.includes('primary-background');
|
|
90
|
-
|
|
91
|
-
if (renderPass === 'collision') {
|
|
92
|
-
return background; // Only draw primary background layer in collision pass
|
|
93
|
-
} else {
|
|
94
|
-
return !background || SHOW_TEXT_BORDER && this.props.getBorderWidth; // Do not draw background layer in other passes
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
}]);
|
|
98
|
-
return EnhancedTextLayer;
|
|
99
|
-
}(_layers.TextLayer);
|
|
100
|
-
|
|
101
|
-
var defaultProps = _objectSpread(_objectSpread({}, _layers.TextLayer.defaultProps), {}, {
|
|
102
|
-
getRadius: {
|
|
103
|
-
type: 'accessor',
|
|
104
|
-
value: 1
|
|
105
|
-
},
|
|
106
|
-
radiusScale: {
|
|
107
|
-
type: 'number',
|
|
108
|
-
min: 0,
|
|
109
|
-
value: 1
|
|
110
|
-
}
|
|
111
|
-
});
|
|
112
|
-
|
|
113
|
-
var PointLabelLayer = /*#__PURE__*/function (_CompositeLayer) {
|
|
114
|
-
(0, _inherits2["default"])(PointLabelLayer, _CompositeLayer);
|
|
115
|
-
|
|
116
|
-
var _super3 = _createSuper(PointLabelLayer);
|
|
117
|
-
|
|
118
|
-
function PointLabelLayer() {
|
|
119
|
-
(0, _classCallCheck2["default"])(this, PointLabelLayer);
|
|
120
|
-
return _super3.apply(this, arguments);
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
(0, _createClass2["default"])(PointLabelLayer, [{
|
|
124
|
-
key: "calculatePixelOffset",
|
|
125
|
-
value: function calculatePixelOffset(secondary) {
|
|
126
|
-
var _this$props = this.props,
|
|
127
|
-
anchor = _this$props.getTextAnchor,
|
|
128
|
-
alignment = _this$props.getAlignmentBaseline,
|
|
129
|
-
getRadius = _this$props.getRadius,
|
|
130
|
-
getSecondaryText = _this$props.getSecondaryText,
|
|
131
|
-
radiusScale = _this$props.radiusScale,
|
|
132
|
-
secondarySizeScale = _this$props.secondarySizeScale,
|
|
133
|
-
sizeScale = _this$props.sizeScale;
|
|
134
|
-
var xMult = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;
|
|
135
|
-
var yMult = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1; // Padding based on font size (font size / 4)
|
|
136
|
-
|
|
137
|
-
var xPadding = sizeScale / 4;
|
|
138
|
-
var yPadding = sizeScale * (1 + 1 / 4); // Place secondary label under main label (secondary label always 'top' baseline aligned)
|
|
139
|
-
|
|
140
|
-
var secondaryOffset = 0.6 * (1 - yMult) * sizeScale;
|
|
141
|
-
var yOffset = secondary ? secondaryOffset : 0; // Special case, position relative to secondary label
|
|
142
|
-
|
|
143
|
-
if (anchor === 'middle' && alignment === 'top' && getSecondaryText) {
|
|
144
|
-
yOffset -= secondaryOffset;
|
|
145
|
-
yOffset -= secondarySizeScale;
|
|
146
|
-
yOffset += sizeScale;
|
|
147
|
-
} // Padding based on point radius (radius/ 4)
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
var radiusPadding = 1 + 1 / 4;
|
|
151
|
-
return typeof getRadius === 'function' ? function (d, info) {
|
|
152
|
-
var r = (info ? getRadius(d, info) : 1) * radiusScale * radiusPadding;
|
|
153
|
-
return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];
|
|
154
|
-
} : [xMult * (getRadius * radiusScale * radiusPadding + xPadding), yMult * (getRadius * radiusScale * radiusPadding + yPadding) + yOffset];
|
|
155
|
-
}
|
|
156
|
-
}, {
|
|
157
|
-
key: "calculateBackgroundPadding",
|
|
158
|
-
value: function calculateBackgroundPadding() {
|
|
159
|
-
var _this$props2 = this.props,
|
|
160
|
-
anchor = _this$props2.getTextAnchor,
|
|
161
|
-
alignment = _this$props2.getAlignmentBaseline,
|
|
162
|
-
sizeScale = _this$props2.sizeScale; // Heuristics to avoid label overlap (should we base this on the text length?)
|
|
163
|
-
|
|
164
|
-
var paddingX = 12 * sizeScale;
|
|
165
|
-
var paddingY = 3 * sizeScale;
|
|
166
|
-
var backgroundPadding = [0, 0, 0, 0];
|
|
167
|
-
|
|
168
|
-
if (alignment === 'top') {
|
|
169
|
-
backgroundPadding[TOP] = paddingY;
|
|
170
|
-
} else if (alignment === 'bottom') {
|
|
171
|
-
backgroundPadding[BOTTOM] = paddingY;
|
|
172
|
-
} else {
|
|
173
|
-
backgroundPadding[TOP] = 0.5 * paddingY;
|
|
174
|
-
backgroundPadding[BOTTOM] = 0.5 * paddingY;
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
if (anchor === 'start') {
|
|
178
|
-
backgroundPadding[LEFT] = paddingX;
|
|
179
|
-
} else if (anchor === 'end') {
|
|
180
|
-
backgroundPadding[RIGHT] = paddingX;
|
|
181
|
-
} else {
|
|
182
|
-
backgroundPadding[LEFT] = 0.5 * paddingX;
|
|
183
|
-
backgroundPadding[RIGHT] = 0.5 * paddingX;
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
return backgroundPadding;
|
|
187
|
-
}
|
|
188
|
-
}, {
|
|
189
|
-
key: "renderTextLayer",
|
|
190
|
-
value: function renderTextLayer(id, _ref2) {
|
|
191
|
-
var updateTriggersOverride = _ref2.updateTriggers,
|
|
192
|
-
props = (0, _objectWithoutProperties2["default"])(_ref2, ["updateTriggers"]);
|
|
193
|
-
var _this$props3 = this.props,
|
|
194
|
-
data = _this$props3.data,
|
|
195
|
-
characterSet = _this$props3.characterSet,
|
|
196
|
-
fontFamily = _this$props3.fontFamily,
|
|
197
|
-
fontSettings = _this$props3.fontSettings,
|
|
198
|
-
fontWeight = _this$props3.fontWeight,
|
|
199
|
-
outlineColor = _this$props3.outlineColor,
|
|
200
|
-
outlineWidth = _this$props3.outlineWidth,
|
|
201
|
-
sizeScale = _this$props3.sizeScale,
|
|
202
|
-
radiusScale = _this$props3.radiusScale,
|
|
203
|
-
getAlignmentBaseline = _this$props3.getAlignmentBaseline,
|
|
204
|
-
getColor = _this$props3.getColor,
|
|
205
|
-
getPosition = _this$props3.getPosition,
|
|
206
|
-
getTextAnchor = _this$props3.getTextAnchor,
|
|
207
|
-
updateTriggers = _this$props3.updateTriggers;
|
|
208
|
-
return new EnhancedTextLayer(this.getSubLayerProps({
|
|
209
|
-
id: id,
|
|
210
|
-
data: data,
|
|
211
|
-
characterSet: characterSet,
|
|
212
|
-
fontFamily: fontFamily,
|
|
213
|
-
fontSettings: fontSettings,
|
|
214
|
-
fontWeight: fontWeight,
|
|
215
|
-
outlineColor: outlineColor,
|
|
216
|
-
outlineWidth: outlineWidth,
|
|
217
|
-
sizeScale: sizeScale,
|
|
218
|
-
getAlignmentBaseline: getAlignmentBaseline,
|
|
219
|
-
getColor: getColor,
|
|
220
|
-
getPosition: getPosition,
|
|
221
|
-
getTextAnchor: getTextAnchor,
|
|
222
|
-
updateTriggers: _objectSpread(_objectSpread(_objectSpread({}, updateTriggers), updateTriggersOverride), {}, {
|
|
223
|
-
getPixelOffset: [updateTriggers.getRadius, updateTriggers.getTextAnchor, updateTriggers.getAlignmentBaseline, radiusScale, sizeScale]
|
|
224
|
-
})
|
|
225
|
-
}), {
|
|
226
|
-
getSize: 1,
|
|
227
|
-
_subLayerProps: {
|
|
228
|
-
background: {
|
|
229
|
-
type: EnhancedTextBackgroundLayer
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
}, // DEBUG
|
|
233
|
-
SHOW_TEXT_BORDER ? {
|
|
234
|
-
getBackgroundColor: [0, 0, 0, 0],
|
|
235
|
-
getBorderColor: [255, 0, 0, 80],
|
|
236
|
-
getBorderWidth: 1
|
|
237
|
-
} : {}, props);
|
|
238
|
-
}
|
|
239
|
-
}, {
|
|
240
|
-
key: "renderLayers",
|
|
241
|
-
value: function renderLayers() {
|
|
242
|
-
var _this$props4 = this.props,
|
|
243
|
-
getText = _this$props4.getText,
|
|
244
|
-
getSecondaryColor = _this$props4.getSecondaryColor,
|
|
245
|
-
getSecondaryText = _this$props4.getSecondaryText,
|
|
246
|
-
secondaryOutlineColor = _this$props4.secondaryOutlineColor,
|
|
247
|
-
secondarySizeScale = _this$props4.secondarySizeScale,
|
|
248
|
-
updateTriggers = _this$props4.updateTriggers;
|
|
249
|
-
var getPixelOffset = this.calculatePixelOffset(false);
|
|
250
|
-
var backgroundPadding = this.calculateBackgroundPadding();
|
|
251
|
-
var out = [this.renderTextLayer('primary', {
|
|
252
|
-
backgroundPadding: backgroundPadding,
|
|
253
|
-
getText: getText,
|
|
254
|
-
getPixelOffset: getPixelOffset,
|
|
255
|
-
background: true // Only use background for primary label for faster collisions
|
|
256
|
-
|
|
257
|
-
}), getSecondaryText && this.renderTextLayer('secondary', _objectSpread(_objectSpread(_objectSpread({
|
|
258
|
-
getText: getSecondaryText,
|
|
259
|
-
getPixelOffset: this.calculatePixelOffset(true),
|
|
260
|
-
getAlignmentBaseline: 'top',
|
|
261
|
-
updateTriggers: {
|
|
262
|
-
getText: updateTriggers.getSecondaryText
|
|
263
|
-
}
|
|
264
|
-
}, getSecondaryColor && {
|
|
265
|
-
getColor: getSecondaryColor
|
|
266
|
-
}), secondarySizeScale && {
|
|
267
|
-
sizeScale: secondarySizeScale
|
|
268
|
-
}), secondaryOutlineColor && {
|
|
269
|
-
outlineColor: secondaryOutlineColor
|
|
270
|
-
}))];
|
|
271
|
-
return out;
|
|
272
|
-
}
|
|
273
|
-
}]);
|
|
274
|
-
return PointLabelLayer;
|
|
275
|
-
}(_core.CompositeLayer);
|
|
276
|
-
|
|
277
|
-
exports.PointLabelLayer = PointLabelLayer;
|
|
278
|
-
(0, _defineProperty2["default"])(PointLabelLayer, "layerName", 'PointLabelLayer');
|
|
279
|
-
(0, _defineProperty2["default"])(PointLabelLayer, "defaultProps", defaultProps);
|
|
280
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/deckgl-layers/point-label-layer/point-label-layer.js"],"names":["SHOW_TEXT_BORDER","LEFT","TOP","RIGHT","BOTTOM","EnhancedTextBackgroundLayer","shaders","vs","replaceAll","replace","TextBackgroundLayer","EnhancedTextLayer","layer","renderPass","background","id","includes","props","getBorderWidth","TextLayer","defaultProps","getRadius","type","value","radiusScale","min","PointLabelLayer","secondary","anchor","getTextAnchor","alignment","getAlignmentBaseline","getSecondaryText","secondarySizeScale","sizeScale","xMult","yMult","xPadding","yPadding","secondaryOffset","yOffset","radiusPadding","d","info","r","paddingX","paddingY","backgroundPadding","updateTriggersOverride","updateTriggers","data","characterSet","fontFamily","fontSettings","fontWeight","outlineColor","outlineWidth","getColor","getPosition","getSubLayerProps","getPixelOffset","getSize","_subLayerProps","getBackgroundColor","getBorderColor","getText","getSecondaryColor","secondaryOutlineColor","calculatePixelOffset","calculateBackgroundPadding","out","renderTextLayer","CompositeLayer"],"mappings":"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","sourcesContent":["import {CompositeLayer} from '@deck.gl/core';\nimport {TextLayer, _TextBackgroundLayer as TextBackgroundLayer} from '@deck.gl/layers';\n\n// TODO remove prior to release\nconst SHOW_TEXT_BORDER = false;\n\nconst [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];\n\nclass EnhancedTextBackgroundLayer extends TextBackgroundLayer {\n  getShaders() {\n    const shaders = super.getShaders();\n    let vs = shaders.vs;\n\n    // Modify shader so that the padding is offset by the pixel offset to ensure the padding\n    // always captures the anchor point. As padding is uniform we cannot pass it a per-label value\n    vs = vs.replaceAll('padding.', '_padding.');\n    vs = vs.replace(\n      'void main(void) {',\n      'void main(void) {\\n  vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);'\n    );\n\n    return {...shaders, vs};\n  }\n}\n\n// TextLayer which includes modified text-background-layer-vertex shader and only renders the\n// primary background layer in the collision pass\nclass EnhancedTextLayer extends TextLayer {\n  filterSubLayer({layer, renderPass}) {\n    const background = layer.id.includes('primary-background');\n    if (renderPass === 'collision') {\n      return background; // Only draw primary background layer in collision pass\n    } else {\n      return !background || (SHOW_TEXT_BORDER && this.props.getBorderWidth); // Do not draw background layer in other passes\n    }\n  }\n}\n\nconst defaultProps = {\n  ...TextLayer.defaultProps,\n  getRadius: {type: 'accessor', value: 1},\n  radiusScale: {type: 'number', min: 0, value: 1}\n};\n\nexport class PointLabelLayer extends CompositeLayer {\n  static layerName = 'PointLabelLayer';\n  static defaultProps = defaultProps;\n\n  calculatePixelOffset(secondary) {\n    const {\n      getTextAnchor: anchor,\n      getAlignmentBaseline: alignment,\n      getRadius,\n      getSecondaryText,\n      radiusScale,\n      secondarySizeScale,\n      sizeScale\n    } = this.props;\n    const xMult = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;\n    const yMult = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;\n\n    // Padding based on font size (font size / 4)\n    const xPadding = sizeScale / 4;\n    const yPadding = sizeScale * (1 + 1 / 4);\n\n    // Place secondary label under main label (secondary label always 'top' baseline aligned)\n    const secondaryOffset = 0.6 * (1 - yMult) * sizeScale;\n    let yOffset = secondary ? secondaryOffset : 0;\n\n    // Special case, position relative to secondary label\n    if (anchor === 'middle' && alignment === 'top' && getSecondaryText) {\n      yOffset -= secondaryOffset;\n      yOffset -= secondarySizeScale;\n      yOffset += sizeScale;\n    }\n\n    // Padding based on point radius (radius/ 4)\n    const radiusPadding = 1 + 1 / 4;\n\n    return typeof getRadius === 'function'\n      ? (d, info) => {\n          const r = (info ? getRadius(d, info) : 1) * radiusScale * radiusPadding;\n          return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];\n        }\n      : [\n          xMult * (getRadius * radiusScale * radiusPadding + xPadding),\n          yMult * (getRadius * radiusScale * radiusPadding + yPadding) + yOffset\n        ];\n  }\n\n  calculateBackgroundPadding() {\n    const {getTextAnchor: anchor, getAlignmentBaseline: alignment, sizeScale} = this.props;\n\n    // Heuristics to avoid label overlap (should we base this on the text length?)\n    const paddingX = 12 * sizeScale;\n    const paddingY = 3 * sizeScale;\n    const backgroundPadding = [0, 0, 0, 0];\n    if (alignment === 'top') {\n      backgroundPadding[TOP] = paddingY;\n    } else if (alignment === 'bottom') {\n      backgroundPadding[BOTTOM] = paddingY;\n    } else {\n      backgroundPadding[TOP] = 0.5 * paddingY;\n      backgroundPadding[BOTTOM] = 0.5 * paddingY;\n    }\n    if (anchor === 'start') {\n      backgroundPadding[LEFT] = paddingX;\n    } else if (anchor === 'end') {\n      backgroundPadding[RIGHT] = paddingX;\n    } else {\n      backgroundPadding[LEFT] = 0.5 * paddingX;\n      backgroundPadding[RIGHT] = 0.5 * paddingX;\n    }\n\n    return backgroundPadding;\n  }\n\n  renderTextLayer(id, {updateTriggers: updateTriggersOverride, ...props}) {\n    const {\n      data,\n\n      characterSet,\n      fontFamily,\n      fontSettings,\n      fontWeight,\n      outlineColor,\n      outlineWidth,\n      sizeScale,\n      radiusScale,\n\n      getAlignmentBaseline,\n      getColor,\n      getPosition,\n      getTextAnchor,\n\n      updateTriggers\n    } = this.props;\n\n    return new EnhancedTextLayer(\n      this.getSubLayerProps({\n        id,\n        data: data,\n\n        characterSet,\n        fontFamily,\n        fontSettings,\n        fontWeight,\n        outlineColor,\n        outlineWidth,\n        sizeScale,\n\n        getAlignmentBaseline,\n        getColor,\n        getPosition,\n        getTextAnchor,\n\n        updateTriggers: {\n          ...updateTriggers,\n          ...updateTriggersOverride,\n          getPixelOffset: [\n            updateTriggers.getRadius,\n            updateTriggers.getTextAnchor,\n            updateTriggers.getAlignmentBaseline,\n            radiusScale,\n            sizeScale\n          ]\n        }\n      }),\n      {\n        getSize: 1,\n        _subLayerProps: {background: {type: EnhancedTextBackgroundLayer}}\n      },\n      // DEBUG\n      SHOW_TEXT_BORDER\n        ? {getBackgroundColor: [0, 0, 0, 0], getBorderColor: [255, 0, 0, 80], getBorderWidth: 1}\n        : {},\n      props\n    );\n  }\n\n  renderLayers() {\n    const {\n      getText,\n      getSecondaryColor,\n      getSecondaryText,\n      secondaryOutlineColor,\n      secondarySizeScale,\n      updateTriggers\n    } = this.props;\n    const getPixelOffset = this.calculatePixelOffset(false);\n    const backgroundPadding = this.calculateBackgroundPadding();\n    const out = [\n      this.renderTextLayer('primary', {\n        backgroundPadding,\n        getText,\n        getPixelOffset,\n        background: true // Only use background for primary label for faster collisions\n      }),\n      getSecondaryText &&\n        this.renderTextLayer('secondary', {\n          getText: getSecondaryText,\n          getPixelOffset: this.calculatePixelOffset(true),\n          getAlignmentBaseline: 'top',\n          updateTriggers: {getText: updateTriggers.getSecondaryText},\n\n          // Optional overrides\n          ...(getSecondaryColor && {getColor: getSecondaryColor}),\n          ...(secondarySizeScale && {sizeScale: secondarySizeScale}),\n          ...(secondaryOutlineColor && {outlineColor: secondaryOutlineColor})\n        })\n    ];\n\n    return out;\n  }\n}\n"]}
|
|
Binary file
|
|
Binary file
|