@carto/kepler.gl 0.0.75 → 0.0.77
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/components/kepler-gl.js +2 -11
- package/dist/components/map-container.js +1 -4
- package/dist/components/modal-container.js +1 -3
- package/dist/components/modals/add-map-style-modal.js +1 -4
- package/dist/constants/default-settings.js +1 -1
- package/dist/layers/base-layer.js +2 -2
- package/dist/utils/gl-utils.js +4 -5
- package/package.json +12 -11
- package/src/components/kepler-gl.d.ts +0 -1
- package/src/components/kepler-gl.js +0 -7
- package/src/components/map-container.js +0 -3
- package/src/components/modal-container.d.ts +0 -1
- package/src/components/modal-container.js +0 -2
- package/src/components/modals/add-map-style-modal.js +0 -3
- package/src/layers/base-layer.js +1 -1
- package/src/utils/gl-utils.js +2 -4
package/dist/utils/gl-utils.js
CHANGED
|
@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.setLayerBlending = setLayerBlending;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
-
var _core = require("@luma.gl/core");
|
|
10
9
|
var _defaultSettings = require("../constants/default-settings");
|
|
11
|
-
var _constants =
|
|
10
|
+
var _constants = require("@luma.gl/constants");
|
|
12
11
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
13
12
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // Copyright (c) 2022 Uber Technologies, Inc.
|
|
14
13
|
//
|
|
@@ -30,15 +29,15 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
30
29
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
31
30
|
// THE SOFTWARE.
|
|
32
31
|
var getGlConst = function getGlConst(d) {
|
|
33
|
-
return _constants[
|
|
32
|
+
return _constants.GL[d];
|
|
34
33
|
};
|
|
35
34
|
function setLayerBlending(gl, layerBlending) {
|
|
36
35
|
var blending = _defaultSettings.LAYER_BLENDINGS[layerBlending];
|
|
37
36
|
var blendFunc = blending.blendFunc,
|
|
38
37
|
blendEquation = blending.blendEquation;
|
|
39
|
-
|
|
38
|
+
gl.device.setParametersWebGL(_objectSpread((0, _defineProperty2["default"])({}, _constants.GL.BLEND, true), blendFunc ? {
|
|
40
39
|
blendFunc: blendFunc.map(getGlConst),
|
|
41
40
|
blendEquation: Array.isArray(blendEquation) ? blendEquation.map(getGlConst) : getGlConst(blendEquation)
|
|
42
41
|
} : {}));
|
|
43
42
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfZGVmYXVsdFNldHRpbmdzIiwicmVxdWlyZSIsIl9jb25zdGFudHMiLCJvd25LZXlzIiwiZSIsInIiLCJ0IiwiT2JqZWN0Iiwia2V5cyIsImdldE93blByb3BlcnR5U3ltYm9scyIsIm8iLCJmaWx0ZXIiLCJnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IiLCJlbnVtZXJhYmxlIiwicHVzaCIsImFwcGx5IiwiX29iamVjdFNwcmVhZCIsImFyZ3VtZW50cyIsImxlbmd0aCIsImZvckVhY2giLCJfZGVmaW5lUHJvcGVydHkyIiwiZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9ycyIsImRlZmluZVByb3BlcnRpZXMiLCJkZWZpbmVQcm9wZXJ0eSIsImdldEdsQ29uc3QiLCJkIiwiR0wiLCJzZXRMYXllckJsZW5kaW5nIiwiZ2wiLCJsYXllckJsZW5kaW5nIiwiYmxlbmRpbmciLCJMQVlFUl9CTEVORElOR1MiLCJibGVuZEZ1bmMiLCJibGVuZEVxdWF0aW9uIiwiZGV2aWNlIiwic2V0UGFyYW1ldGVyc1dlYkdMIiwiQkxFTkQiLCJtYXAiLCJBcnJheSIsImlzQXJyYXkiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZ2wtdXRpbHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiLy8gQ29weXJpZ2h0IChjKSAyMDIyIFViZXIgVGVjaG5vbG9naWVzLCBJbmMuXG4vL1xuLy8gUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3JhbnRlZCwgZnJlZSBvZiBjaGFyZ2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nIGEgY29weVxuLy8gb2YgdGhpcyBzb2Z0d2FyZSBhbmQgYXNzb2NpYXRlZCBkb2N1bWVudGF0aW9uIGZpbGVzICh0aGUgXCJTb2Z0d2FyZVwiKSwgdG8gZGVhbFxuLy8gaW4gdGhlIFNvZnR3YXJlIHdpdGhvdXQgcmVzdHJpY3Rpb24sIGluY2x1ZGluZyB3aXRob3V0IGxpbWl0YXRpb24gdGhlIHJpZ2h0c1xuLy8gdG8gdXNlLCBjb3B5LCBtb2RpZnksIG1lcmdlLCBwdWJsaXNoLCBkaXN0cmlidXRlLCBzdWJsaWNlbnNlLCBhbmQvb3Igc2VsbFxuLy8gY29waWVzIG9mIHRoZSBTb2Z0d2FyZSwgYW5kIHRvIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlIFNvZnR3YXJlIGlzXG4vLyBmdXJuaXNoZWQgdG8gZG8gc28sIHN1YmplY3QgdG8gdGhlIGZvbGxvd2luZyBjb25kaXRpb25zOlxuLy9cbi8vIFRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIHNoYWxsIGJlIGluY2x1ZGVkIGluXG4vLyBhbGwgY29waWVzIG9yIHN1YnN0YW50aWFsIHBvcnRpb25zIG9mIHRoZSBTb2Z0d2FyZS5cbi8vXG4vLyBUSEUgU09GVFdBUkUgSVMgUFJPVklERUQgXCJBUyBJU1wiLCBXSVRIT1VUIFdBUlJBTlRZIE9GIEFOWSBLSU5ELCBFWFBSRVNTIE9SXG4vLyBJTVBMSUVELCBJTkNMVURJTkcgQlVUIE5PVCBMSU1JVEVEIFRPIFRIRSBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSxcbi8vIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFORCBOT05JTkZSSU5HRU1FTlQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRVxuLy8gQVVUSE9SUyBPUiBDT1BZUklHSFQgSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWSBDTEFJTSwgREFNQUdFUyBPUiBPVEhFUlxuLy8gTElBQklMSVRZLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgVE9SVCBPUiBPVEhFUldJU0UsIEFSSVNJTkcgRlJPTSxcbi8vIE9VVCBPRiBPUiBJTiBDT05ORUNUSU9OIFdJVEggVEhFIFNPRlRXQVJFIE9SIFRIRSBVU0UgT1IgT1RIRVIgREVBTElOR1MgSU5cbi8vIFRIRSBTT0ZUV0FSRS5cblxuaW1wb3J0IHtMQVlFUl9CTEVORElOR1N9IGZyb20gJ2NvbnN0YW50cy9kZWZhdWx0LXNldHRpbmdzJztcbmltcG9ydCB7R0x9IGZyb20gJ0BsdW1hLmdsL2NvbnN0YW50cyc7XG5cbmNvbnN0IGdldEdsQ29uc3QgPSBkID0+IEdMW2RdO1xuXG5leHBvcnQgZnVuY3Rpb24gc2V0TGF5ZXJCbGVuZGluZyhnbCwgbGF5ZXJCbGVuZGluZykge1xuICBjb25zdCBibGVuZGluZyA9IExBWUVSX0JMRU5ESU5HU1tsYXllckJsZW5kaW5nXTtcbiAgY29uc3Qge2JsZW5kRnVuYywgYmxlbmRFcXVhdGlvbn0gPSBibGVuZGluZztcbiAgZ2wuZGV2aWNlLnNldFBhcmFtZXRlcnNXZWJHTCh7XG4gICAgW0dMLkJMRU5EXTogdHJ1ZSxcbiAgICAuLi4oYmxlbmRGdW5jXG4gICAgICA/IHtcbiAgICAgICAgICBibGVuZEZ1bmM6IGJsZW5kRnVuYy5tYXAoZ2V0R2xDb25zdCksXG4gICAgICAgICAgYmxlbmRFcXVhdGlvbjogQXJyYXkuaXNBcnJheShibGVuZEVxdWF0aW9uKVxuICAgICAgICAgICAgPyBibGVuZEVxdWF0aW9uLm1hcChnZXRHbENvbnN0KVxuICAgICAgICAgICAgOiBnZXRHbENvbnN0KGJsZW5kRXF1YXRpb24pXG4gICAgICAgIH1cbiAgICAgIDoge30pXG4gIH0pO1xufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQW9CQSxJQUFBQSxnQkFBQSxHQUFBQyxPQUFBO0FBQ0EsSUFBQUMsVUFBQSxHQUFBRCxPQUFBO0FBQXNDLFNBQUFFLFFBQUFDLENBQUEsRUFBQUMsQ0FBQSxRQUFBQyxDQUFBLEdBQUFDLE1BQUEsQ0FBQUMsSUFBQSxDQUFBSixDQUFBLE9BQUFHLE1BQUEsQ0FBQUUscUJBQUEsUUFBQUMsQ0FBQSxHQUFBSCxNQUFBLENBQUFFLHFCQUFBLENBQUFMLENBQUEsR0FBQUMsQ0FBQSxLQUFBSyxDQUFBLEdBQUFBLENBQUEsQ0FBQUMsTUFBQSxXQUFBTixDQUFBLFdBQUFFLE1BQUEsQ0FBQUssd0JBQUEsQ0FBQVIsQ0FBQSxFQUFBQyxDQUFBLEVBQUFRLFVBQUEsT0FBQVAsQ0FBQSxDQUFBUSxJQUFBLENBQUFDLEtBQUEsQ0FBQVQsQ0FBQSxFQUFBSSxDQUFBLFlBQUFKLENBQUE7QUFBQSxTQUFBVSxjQUFBWixDQUFBLGFBQUFDLENBQUEsTUFBQUEsQ0FBQSxHQUFBWSxTQUFBLENBQUFDLE1BQUEsRUFBQWIsQ0FBQSxVQUFBQyxDQUFBLFdBQUFXLFNBQUEsQ0FBQVosQ0FBQSxJQUFBWSxTQUFBLENBQUFaLENBQUEsUUFBQUEsQ0FBQSxPQUFBRixPQUFBLENBQUFJLE1BQUEsQ0FBQUQsQ0FBQSxPQUFBYSxPQUFBLFdBQUFkLENBQUEsUUFBQWUsZ0JBQUEsYUFBQWhCLENBQUEsRUFBQUMsQ0FBQSxFQUFBQyxDQUFBLENBQUFELENBQUEsU0FBQUUsTUFBQSxDQUFBYyx5QkFBQSxHQUFBZCxNQUFBLENBQUFlLGdCQUFBLENBQUFsQixDQUFBLEVBQUFHLE1BQUEsQ0FBQWMseUJBQUEsQ0FBQWYsQ0FBQSxLQUFBSCxPQUFBLENBQUFJLE1BQUEsQ0FBQUQsQ0FBQSxHQUFBYSxPQUFBLFdBQUFkLENBQUEsSUFBQUUsTUFBQSxDQUFBZ0IsY0FBQSxDQUFBbkIsQ0FBQSxFQUFBQyxDQUFBLEVBQUFFLE1BQUEsQ0FBQUssd0JBQUEsQ0FBQU4sQ0FBQSxFQUFBRCxDQUFBLGlCQUFBRCxDQUFBLElBckJ0QztBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUtBLElBQU1vQixVQUFVLEdBQUcsU0FBYkEsVUFBVUEsQ0FBR0MsQ0FBQztFQUFBLE9BQUlDLGFBQUUsQ0FBQ0QsQ0FBQyxDQUFDO0FBQUE7QUFFdEIsU0FBU0UsZ0JBQWdCQSxDQUFDQyxFQUFFLEVBQUVDLGFBQWEsRUFBRTtFQUNsRCxJQUFNQyxRQUFRLEdBQUdDLGdDQUFlLENBQUNGLGFBQWEsQ0FBQztFQUMvQyxJQUFPRyxTQUFTLEdBQW1CRixRQUFRLENBQXBDRSxTQUFTO0lBQUVDLGFBQWEsR0FBSUgsUUFBUSxDQUF6QkcsYUFBYTtFQUMvQkwsRUFBRSxDQUFDTSxNQUFNLENBQUNDLGtCQUFrQixDQUFBbkIsYUFBQSxLQUFBSSxnQkFBQSxpQkFDekJNLGFBQUUsQ0FBQ1UsS0FBSyxFQUFHLElBQUksR0FDWkosU0FBUyxHQUNUO0lBQ0VBLFNBQVMsRUFBRUEsU0FBUyxDQUFDSyxHQUFHLENBQUNiLFVBQVUsQ0FBQztJQUNwQ1MsYUFBYSxFQUFFSyxLQUFLLENBQUNDLE9BQU8sQ0FBQ04sYUFBYSxDQUFDLEdBQ3ZDQSxhQUFhLENBQUNJLEdBQUcsQ0FBQ2IsVUFBVSxDQUFDLEdBQzdCQSxVQUFVLENBQUNTLGFBQWE7RUFDOUIsQ0FBQyxHQUNELENBQUMsQ0FBQyxDQUNQLENBQUM7QUFDSiJ9
|
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.
|
|
5
|
+
"version": "0.0.77",
|
|
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",
|
|
@@ -229,21 +229,22 @@
|
|
|
229
229
|
"tough-cookie": "4.0.0"
|
|
230
230
|
},
|
|
231
231
|
"peerDependencies": {
|
|
232
|
-
"@deck.gl/aggregation-layers": "^
|
|
233
|
-
"@deck.gl/carto": "^
|
|
234
|
-
"@deck.gl/core": "^
|
|
235
|
-
"@deck.gl/extensions": "^
|
|
236
|
-
"@deck.gl/geo-layers": "^
|
|
237
|
-
"@deck.gl/layers": "^
|
|
238
|
-
"@deck.gl/mesh-layers": "^
|
|
239
|
-
"@deck.gl/react": "^
|
|
232
|
+
"@deck.gl/aggregation-layers": "^9.0.1",
|
|
233
|
+
"@deck.gl/carto": "^9.0.1",
|
|
234
|
+
"@deck.gl/core": "^9.0.1",
|
|
235
|
+
"@deck.gl/extensions": "^9.0.1",
|
|
236
|
+
"@deck.gl/geo-layers": "^9.0.1",
|
|
237
|
+
"@deck.gl/layers": "^9.0.1",
|
|
238
|
+
"@deck.gl/mesh-layers": "^9.0.1",
|
|
239
|
+
"@deck.gl/react": "^9.0.1",
|
|
240
240
|
"@loaders.gl/core": "^3.1.5",
|
|
241
241
|
"@loaders.gl/csv": "^3.1.5",
|
|
242
242
|
"@loaders.gl/gltf": "^3.1.5",
|
|
243
243
|
"@loaders.gl/json": "^3.1.5",
|
|
244
244
|
"@loaders.gl/loader-utils": "^3.1.5",
|
|
245
|
-
"@luma.gl/constants": "^
|
|
246
|
-
"@luma.gl/core": "^
|
|
245
|
+
"@luma.gl/constants": "^9.0.1",
|
|
246
|
+
"@luma.gl/core": "^9.0.1",
|
|
247
|
+
"@luma.gl/webgl": "^9.0.1",
|
|
247
248
|
"react": ">=16.3",
|
|
248
249
|
"react-dom": ">=16.3",
|
|
249
250
|
"styled-components": "^4.x || ^5.x"
|
|
@@ -18,7 +18,6 @@ export type KeplerGlProps = {
|
|
|
18
18
|
onViewStateChange?: () => void;
|
|
19
19
|
onDeckInitialized?: () => void;
|
|
20
20
|
onKeplerGlInitialized?: () => void;
|
|
21
|
-
mapboxApiAccessToken: string;
|
|
22
21
|
mapboxApiUrl: string;
|
|
23
22
|
getMapboxRef: () => React.RefType<any>;
|
|
24
23
|
mapStyles: {id: string; style?: object}[];
|
|
@@ -272,7 +272,6 @@ function KeplerGlFactory(
|
|
|
272
272
|
};
|
|
273
273
|
|
|
274
274
|
componentDidMount() {
|
|
275
|
-
this._validateMapboxToken();
|
|
276
275
|
this._loadMapStyle();
|
|
277
276
|
if (typeof this.props.onKeplerGlInitialized === 'function') {
|
|
278
277
|
this.props.onKeplerGlInitialized();
|
|
@@ -329,12 +328,6 @@ function KeplerGlFactory(
|
|
|
329
328
|
);
|
|
330
329
|
|
|
331
330
|
/* private methods */
|
|
332
|
-
_validateMapboxToken() {
|
|
333
|
-
const {mapboxApiAccessToken} = this.props;
|
|
334
|
-
if (!validateToken(mapboxApiAccessToken)) {
|
|
335
|
-
Console.warn(MISSING_MAPBOX_TOKEN);
|
|
336
|
-
}
|
|
337
|
-
}
|
|
338
331
|
|
|
339
332
|
_loadMapStyle = () => {
|
|
340
333
|
const defaultStyles = Object.values(this.props.mapStyle.mapStyles);
|
|
@@ -94,7 +94,6 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
|
|
|
94
94
|
mapState: PropTypes.object.isRequired,
|
|
95
95
|
mapControls: PropTypes.object.isRequired,
|
|
96
96
|
mapStyle: PropTypes.object.isRequired,
|
|
97
|
-
mapboxApiAccessToken: PropTypes.string.isRequired,
|
|
98
97
|
mapboxApiUrl: PropTypes.string,
|
|
99
98
|
visStateActions: PropTypes.object.isRequired,
|
|
100
99
|
mapStateActions: PropTypes.object.isRequired,
|
|
@@ -267,7 +266,6 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
|
|
|
267
266
|
layerOrder,
|
|
268
267
|
layers,
|
|
269
268
|
visStateActions,
|
|
270
|
-
mapboxApiAccessToken,
|
|
271
269
|
mapboxApiUrl,
|
|
272
270
|
maskPolygon
|
|
273
271
|
} = this.props;
|
|
@@ -317,7 +315,6 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
|
|
|
317
315
|
deckGlLayers.push(
|
|
318
316
|
new ThreeDBuildingLayer({
|
|
319
317
|
id: '_keplergl_3d-building',
|
|
320
|
-
mapboxApiAccessToken,
|
|
321
318
|
mapboxApiUrl,
|
|
322
319
|
threeDBuildingColor: mapStyle.threeDBuildingColor,
|
|
323
320
|
updateTriggers: {
|
|
@@ -124,7 +124,6 @@ export default function ModalContainerFactory(
|
|
|
124
124
|
rootNode: PropTypes.object,
|
|
125
125
|
containerW: PropTypes.number,
|
|
126
126
|
containerH: PropTypes.number,
|
|
127
|
-
mapboxApiAccessToken: PropTypes.string.isRequired,
|
|
128
127
|
mapboxApiUrl: PropTypes.string,
|
|
129
128
|
mapState: PropTypes.object.isRequired,
|
|
130
129
|
mapStyle: PropTypes.object.isRequired,
|
|
@@ -426,7 +425,6 @@ export default function ModalContainerFactory(
|
|
|
426
425
|
case ADD_MAP_STYLE_ID:
|
|
427
426
|
template = (
|
|
428
427
|
<AddMapStyleModal
|
|
429
|
-
mapboxApiAccessToken={this.props.mapboxApiAccessToken}
|
|
430
428
|
mapboxApiUrl={this.props.mapboxApiUrl}
|
|
431
429
|
mapState={this.props.mapState}
|
|
432
430
|
inputStyle={mapStyle.inputStyle}
|
|
@@ -110,7 +110,6 @@ function AddMapStyleModalFactory() {
|
|
|
110
110
|
inputMapStyle: PropTypes.func.isRequired,
|
|
111
111
|
inputStyle: PropTypes.object.isRequired,
|
|
112
112
|
loadCustomMapStyle: PropTypes.func.isRequired,
|
|
113
|
-
mapboxApiAccessToken: PropTypes.string.isRequired,
|
|
114
113
|
mapboxApiUrl: PropTypes.string.isRequired,
|
|
115
114
|
mapState: PropTypes.object.isRequired
|
|
116
115
|
};
|
|
@@ -166,11 +165,9 @@ function AddMapStyleModalFactory() {
|
|
|
166
165
|
render() {
|
|
167
166
|
const {inputStyle, mapState, mapboxApiUrl, intl} = this.props;
|
|
168
167
|
|
|
169
|
-
const mapboxApiAccessToken = inputStyle.accessToken || this.props.mapboxApiAccessToken;
|
|
170
168
|
const mapProps = {
|
|
171
169
|
...mapState,
|
|
172
170
|
mapboxApiUrl,
|
|
173
|
-
mapboxApiAccessToken,
|
|
174
171
|
preserveDrawingBuffer: true,
|
|
175
172
|
transformRequest
|
|
176
173
|
};
|
package/src/layers/base-layer.js
CHANGED
|
@@ -1026,7 +1026,7 @@ class Layer {
|
|
|
1026
1026
|
const channelConfig = this.config.visConfig[this.visualChannels[channel].range];
|
|
1027
1027
|
const channelField = this.config[this.visualChannels[channel].field];
|
|
1028
1028
|
|
|
1029
|
-
if (channelConfig
|
|
1029
|
+
if (channelConfig?.type === hexColor) {
|
|
1030
1030
|
const columnField = {
|
|
1031
1031
|
id: channelField.colorColumn,
|
|
1032
1032
|
name: channelField.colorColumn,
|
package/src/utils/gl-utils.js
CHANGED
|
@@ -18,17 +18,15 @@
|
|
|
18
18
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
19
19
|
// THE SOFTWARE.
|
|
20
20
|
|
|
21
|
-
import {setParameters} from '@luma.gl/core';
|
|
22
21
|
import {LAYER_BLENDINGS} from 'constants/default-settings';
|
|
23
|
-
import GL from '@luma.gl/constants';
|
|
22
|
+
import {GL} from '@luma.gl/constants';
|
|
24
23
|
|
|
25
24
|
const getGlConst = d => GL[d];
|
|
26
25
|
|
|
27
26
|
export function setLayerBlending(gl, layerBlending) {
|
|
28
27
|
const blending = LAYER_BLENDINGS[layerBlending];
|
|
29
28
|
const {blendFunc, blendEquation} = blending;
|
|
30
|
-
|
|
31
|
-
setParameters(gl, {
|
|
29
|
+
gl.device.setParametersWebGL({
|
|
32
30
|
[GL.BLEND]: true,
|
|
33
31
|
...(blendFunc
|
|
34
32
|
? {
|