Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

fix(globe): layer blending and overlay blending in Globe mode (#3594)

Igor Dykhtabdc6bd393461
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsx
index 6272f5d48..03d152bbf 100644
--- a/src/components/src/map-container.tsx
+++ b/src/components/src/map-container.tsx
@@ -870,45 +870,6 @@ export default function MapContainerFactory(
const {setFeatures, onLayerClick, setSelectedFeature} = visStateActions;
const generateDeckGLLayersMethod = generateDeckGLLayers ?? computeDeckLayers;
- const deckGlLayers = generateDeckGLLayersMethod(
- {
- visState,
- mapState: internalMapState,
- mapStyle
- },
- {
- mapIndex: index,
- primaryMap,
- mapboxApiAccessToken,
- mapboxApiUrl,
- layersForDeck,
- editorInfo: primaryMap
- ? {
- editor,
- editorMenuActive,
- onSetFeatures: setFeatures,
- setSelectedFeature,
- onApplyPolygonFilterAll: visStateActions.setPolygonFilterAllLayers,
- // @ts-ignore Argument of type 'Readonly<MapContainerProps>' is not assignable to parameter of type 'never'
- featureCollection: this.featureCollectionSelector(this.props),
- selectedFeatureIndexes: this.selectedFeatureIndexArraySelector(
- // @ts-ignore Argument of type 'unknown' is not assignable to parameter of type 'number'.
- editorFeatureSelectedIndex
- ),
- viewport
- }
- : undefined
- },
- {
- onLayerHover: this._onLayerHover,
- onSetLayerDomain: this._onLayerSetDomain,
- onFilteredItemsChange: this._onLayerFilteredItemsChange,
- onWMSFeatureInfo: this._onWMSFeatureInfo,
- onRedrawNeeded: this._onRedrawNeeded,
- onFitBounds: this._onFitBounds
- },
- deckGlProps
- );
const extraDeckParams: {
getTooltip?: (info: any) => object | null;
@@ -949,6 +910,61 @@ export default function MapContainerFactory(
const isGlobeMode = mapState.globe?.enabled;
+ // In globe mode with a non-default blend mode, forward pre-computed layer
+ // rendering parameters into mapState so individual layers can merge them into
+ // their own parameters objects. The global DeckGL parameters cannot be used in
+ // globe mode because they are merged into globe system layers (atmosphere,
+ // surface, etc.) and alter their carefully tuned blend/depth state.
+ // 'normal' is omitted — it is the WebGL default and injecting it would
+ // override intentional blend:false settings on layers like trip/scenegraph.
+ const layerBlendingParams =
+ isGlobeMode && visState.layerBlending && visState.layerBlending !== 'normal'
+ ? getLayerBlendingParameters(visState.layerBlending)
+ : undefined;
+ const deckLayersMapState = layerBlendingParams
+ ? {...internalMapState, layerParameters: layerBlendingParams}
+ : internalMapState;
+
+ const deckGlLayers = generateDeckGLLayersMethod(
+ {
+ visState,
+ mapState: deckLayersMapState,
+ mapStyle
+ },
+ {
+ mapIndex: index,
+ primaryMap,
+ mapboxApiAccessToken,
+ mapboxApiUrl,
+ layersForDeck,
+ editorInfo: primaryMap
+ ? {
+ editor,
+ editorMenuActive,
+ onSetFeatures: setFeatures,
+ setSelectedFeature,
+ onApplyPolygonFilterAll: visStateActions.setPolygonFilterAllLayers,
+ // @ts-ignore Argument of type 'Readonly<MapContainerProps>' is not assignable to parameter of type 'never'
+ featureCollection: this.featureCollectionSelector(this.props),
+ selectedFeatureIndexes: this.selectedFeatureIndexArraySelector(
+ // @ts-ignore Argument of type 'unknown' is not assignable to parameter of type 'number'.
+ editorFeatureSelectedIndex
+ ),
+ viewport
+ }
+ : undefined
+ },
+ {
+ onLayerHover: this._onLayerHover,
+ onSetLayerDomain: this._onLayerSetDomain,
+ onFilteredItemsChange: this._onLayerFilteredItemsChange,
+ onWMSFeatureInfo: this._onWMSFeatureInfo,
+ onRedrawNeeded: this._onRedrawNeeded,
+ onFitBounds: this._onFitBounds
+ },
+ deckGlProps
+ );
+
// Follow the selected basemap style's library so the globe uses the same
// provider as the flat 2D map (CARTO tiles for MapLibre styles, Mapbox
// tiles for Mapbox styles).
diff --git a/src/layers/src/arc-layer/arc-layer.ts b/src/layers/src/arc-layer/arc-layer.ts
index ec9443f2e..f4006d2bc 100644
--- a/src/layers/src/arc-layer/arc-layer.ts
+++ b/src/layers/src/arc-layer/arc-layer.ts
@@ -519,7 +519,8 @@ export default class ArcLayer extends Layer {
// whole ribbon renders, without changing the global culling that the globe
// surface relies on.
const isGlobeMode = Boolean(mapState?.globe?.enabled);
- const globeParameters = isGlobeMode ? {parameters: {cull: false}} : {};
+ const blendingParameters = mapState?.layerParameters ?? {};
+ const globeParameters = isGlobeMode ? {parameters: {cull: false, ...blendingParameters}} : {};
const useArrowLayer = Boolean(this.geoArrowVector0);
diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.ts
index 930da58a1..c46bfa101 100644
--- a/src/layers/src/base-layer.ts
+++ b/src/layers/src/base-layer.ts
@@ -1531,13 +1531,17 @@ class Layer implements KeplerLayer {
layerCallbacks: any;
visible: boolean;
}) {
+ const blendingParameters = mapState.layerParameters ?? {};
return {
id: this.id,
idx,
coordinateSystem: COORDINATE_SYSTEM.LNGLAT,
pickable: true,
wrapLongitude: true,
- parameters: {depthTest: Boolean(mapState.dragRotate || this.config.visConfig.enable3d)},
+ parameters: {
+ depthTest: Boolean(mapState.dragRotate || this.config.visConfig.enable3d),
+ ...blendingParameters
+ },
hidden: this.config.hidden,
// visconfig
opacity: this.config.visConfig.opacity,
@@ -1626,7 +1630,8 @@ class Layer implements KeplerLayer {
},
parameters: {
// text will always show on top of all layers
- depthTest: false
+ depthTest: false,
+ ...(mapState?.layerParameters ?? {})
},
getFilterValue: data.getFilterValue,
@@ -1651,7 +1656,8 @@ class Layer implements KeplerLayer {
? {
background: {
parameters: {
- cull: false
+ cull: false,
+ ...(mapState?.layerParameters ?? {})
}
}
}
diff --git a/src/layers/src/editor-layer/editor-layer.ts b/src/layers/src/editor-layer/editor-layer.ts
index 90da24eb8..e7ac38b0e 100644
--- a/src/layers/src/editor-layer/editor-layer.ts
+++ b/src/layers/src/editor-layer/editor-layer.ts
@@ -38,7 +38,7 @@ export type GetEditorLayerProps = {
features: Feature[];
};
selectedFeatureIndexes: number[];
- mapState?: {globe?: {enabled: boolean}};
+ mapState?: {globe?: {enabled: boolean}; layerParameters?: Record<string, string | boolean>};
};
/**
@@ -177,7 +177,9 @@ export function getEditorLayer({
// Globe mode needs explicit depth testing so the editor overlay is occluded
// by the sphere; in flat 2D/3D keep deck.gl's default (empty parameters) so
// this matches the pre-globe behavior exactly.
- parameters: mapState?.globe?.enabled ? {depthTest: true} : {},
+ parameters: mapState?.globe?.enabled
+ ? {depthTest: true, ...(mapState?.layerParameters ?? {})}
+ : {},
shadowEnabled: false,
_subLayerProps: {
geojson: {shadowEnabled: false},
diff --git a/src/layers/src/flow-layer/flow-layer.ts b/src/layers/src/flow-layer/flow-layer.ts
index be4d4db7f..ab116d290 100644
--- a/src/layers/src/flow-layer/flow-layer.ts
+++ b/src/layers/src/flow-layer/flow-layer.ts
@@ -531,10 +531,11 @@ export default class FlowLayer extends Layer {
// a top-level `parameters` won't reach them — we override via _subLayerProps, which
// getSubLayerProps applies last. cullMode 'none' keeps both faces (arrows are flat).
const isGlobeMode = Boolean(opts.mapState?.globe?.enabled);
+ const blendingParameters = opts.mapState?.layerParameters ?? {};
const globeSubLayerProps = isGlobeMode
? (() => {
const depthParams = {
- parameters: {cull: false, depthTest: true, depthCompare: 'less-equal', cullMode: 'none'}
+ parameters: {cull: false, depthTest: true, depthCompare: 'less-equal', cullMode: 'none', ...blendingParameters}
};
return {
_subLayerProps: {
@@ -572,7 +573,8 @@ export default class FlowLayer extends Layer {
onHover: layerCallbacks.onLayerHover,
parameters: {
...(cleanProps.parameters || {}),
- cull: false
+ cull: false,
+ ...blendingParameters
}
})
];
diff --git a/src/layers/src/line-layer/line-layer.ts b/src/layers/src/line-layer/line-layer.ts
index 723229711..a4e73ac5b 100644
--- a/src/layers/src/line-layer/line-layer.ts
+++ b/src/layers/src/line-layer/line-layer.ts
@@ -285,6 +285,7 @@ export default class LineLayer extends ArcLayer {
const hoveredObject = this.hasHoveredObject(objectHovered);
const globeMode = mapState?.globe?.enabled;
+ const blendingParameters = mapState?.layerParameters ?? {};
if (globeMode) {
const id = `${defaultLayerProps.id}-globe`;
@@ -305,7 +306,7 @@ export default class LineLayer extends ArcLayer {
// otherwise deck.gl defaults: depth test on + depth write on, so the
// depth disk occludes segments on the far side of the globe).
getHeight: 0,
- parameters: {cull: false},
+ parameters: {cull: false, ...blendingParameters},
// A Kepler line has a single color channel; an ArcLayer interpolates
// between source and target colors, so feed the same color to both
// ends (otherwise the target end falls back to deck.gl's default).
@@ -321,7 +322,7 @@ export default class LineLayer extends ArcLayer {
id: `${id}-hovered`,
data: [hoveredObject],
getHeight: 0,
- parameters: {cull: false},
+ parameters: {cull: false, ...blendingParameters},
getSourceColor: this.config.highlightColor,
getTargetColor: this.config.highlightColor,
getWidth: data.getWidth,
diff --git a/src/layers/src/point-layer/point-layer.ts b/src/layers/src/point-layer/point-layer.ts
index a3a90a407..5ab058bf9 100644
--- a/src/layers/src/point-layer/point-layer.ts
+++ b/src/layers/src/point-layer/point-layer.ts
@@ -594,7 +594,8 @@ export default class PointLayer extends Layer {
getPosition,
parameters: {
// circles will be flat on the map when the altitude column is not used
- depthTest: (this.config.columns.altitude?.fieldIdx as number) > -1
+ depthTest: (this.config.columns.altitude?.fieldIdx as number) > -1,
+ ...(mapState?.layerParameters ?? {})
},
lineWidthUnits: 'pixels',
updateTriggers,
diff --git a/src/layers/src/scenegraph-layer/scenegraph-layer.ts b/src/layers/src/scenegraph-layer/scenegraph-layer.ts
index 0d69164e2..3fce03043 100644
--- a/src/layers/src/scenegraph-layer/scenegraph-layer.ts
+++ b/src/layers/src/scenegraph-layer/scenegraph-layer.ts
@@ -220,7 +220,7 @@ export default class ScenegraphLayer extends Layer {
getOrientation: [angleX, adjustedAngleY, angleZ],
getColor: DEFAULT_COLOR,
// parameters
- parameters: {depthTest: true, blend: false},
+ parameters: {depthTest: true, blend: false, ...(mapState?.layerParameters ?? {})},
// update triggers
updateTriggers: {
getOrientation: {angleX, adjustedAngleY, angleZ},
diff --git a/src/layers/src/trip-layer/trip-layer.ts b/src/layers/src/trip-layer/trip-layer.ts
index b949f842e..3987dc2d2 100644
--- a/src/layers/src/trip-layer/trip-layer.ts
+++ b/src/layers/src/trip-layer/trip-layer.ts
@@ -788,7 +788,8 @@ export default class TripLayer extends Layer {
wrapLongitude: false,
parameters: {
depthTest: mapState.dragRotate,
- depthMask: false
+ depthMask: false,
+ ...(mapState?.layerParameters ?? {})
},
trailLength: visConfig.trailLength * 1000,
fadeTrail: visConfig.fadeTrail,
@@ -826,10 +827,9 @@ export default class TripLayer extends Layer {
_animations: {
'*': {speed: 5}
},
- parameters: {depthTest: true, blend: false},
+ parameters: {depthTest: true, blend: false, ...(mapState?.layerParameters ?? {})},
updateTriggers: {
getTransformMatrix: {
- ...this.config.columns,
currentTime: animationConfig.currentTime,
rollField,
pitchField,
diff --git a/src/layers/src/vector-tile/vector-tile-layer.ts b/src/layers/src/vector-tile/vector-tile-layer.ts
index 4e959239b..2d2af9c87 100644
--- a/src/layers/src/vector-tile/vector-tile-layer.ts
+++ b/src/layers/src/vector-tile/vector-tile-layer.ts
@@ -688,7 +688,8 @@ export default class VectorTileLayer extends AbstractTileLayer<VectorTile, Featu
'polygons-stroke': {opacity: visConfig.strokeOpacity},
'polygons-fill': {
parameters: {
- cullMode: CULL_MODE.BACK
+ cullMode: CULL_MODE.BACK,
+ ...(mapState?.layerParameters ?? {})
}
}
},
diff --git a/src/types/reducers.d.ts b/src/types/reducers.d.ts
index 9f6877d72..c50e90b7e 100644
--- a/src/types/reducers.d.ts
+++ b/src/types/reducers.d.ts
@@ -29,6 +29,8 @@ export type MapState = {
maxBounds?: Bounds;
initialState?: any;
scale?: number;
+ /** Layer rendering parameters forwarded from visState for use during layer construction in globe mode. */
+ layerParameters?: Record<string, string | boolean>;
// the following 4 properties assist with split viewports that can optionally have (un)synced viewports and zooms
/** Is the application split into 2 maps? */