Skip to content

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

[fix] fixes for raster tile layer (#3102)

Igor Dykhta014059b97480
diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.ts
index 79309ff51..e0fcddde8 100644
--- a/src/constants/src/default-settings.ts
+++ b/src/constants/src/default-settings.ts
@@ -1594,18 +1594,19 @@ export enum GEOARROW_EXTENSIONS {
WKB = 'geoarrow.wkb'
}
+export const LOADERS_CDN_VERSION = '4.3.2';
export const LOADERS_CDN_URL = 'https://unpkg.com/@loaders.gl';
export const getLoaderOptions = () => {
return {
mvt: {
- workerUrl: `${LOADERS_CDN_URL}/mvt/dist/mvt-worker.js`
+ workerUrl: `${LOADERS_CDN_URL}/mvt@${LOADERS_CDN_VERSION}/dist/mvt-worker.js`
},
'quantized-mesh': {
- // workerUrl: `${LOADERS_CDN_URL}/terrain/dist/quantized-mesh-worker.js`
+ workerUrl: `${LOADERS_CDN_URL}/terrain@${LOADERS_CDN_VERSION}/dist/quantized-mesh-worker.js`
},
npy: {
- // workerUrl: `${LOADERS_CDN_URL}/textures/dist/npy-worker.js`
+ workerUrl: `${LOADERS_CDN_URL}/textures@${LOADERS_CDN_VERSION}/dist/npy-worker.js`
}
};
};
diff --git a/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer-webgl2.vs.ts b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer-webgl2.vs.ts
index b3a05acf1..059b101af 100644
--- a/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer-webgl2.vs.ts
+++ b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer-webgl2.vs.ts
@@ -5,24 +5,13 @@ export default `\
#version 300 es
#define SHADER_NAME raster-mesh-layer-vs
-// Scale the model
-uniform float sizeScale;
-uniform bool composeModelMatrix;
-
// Primitive attributes
in vec3 positions;
+in vec3 positions64Low;
in vec3 normals;
in vec3 colors;
in vec2 texCoords;
-// Instance attributes
-in vec3 instancePositions;
-in vec3 instancePositions64Low;
-in vec4 instanceColors;
-in vec3 instancePickingColors;
-in mat3 instanceModelMatrix;
-in vec3 instanceTranslation;
-
// Outputs to fragment shader
out vec2 vTexCoord;
out vec3 cameraPosition;
@@ -30,32 +19,22 @@ out vec3 normals_commonspace;
out vec4 position_commonspace;
out vec4 vColor;
+const vec3 pickingColor = vec3(1.0, 0.0, 0.0);
+const vec3 defaultNormal = vec3(0.0, 0.0, 1.0);
+
void main(void) {
- geometry.worldPosition = instancePositions;
+ geometry.worldPosition = positions;
geometry.uv = texCoords;
- geometry.pickingColor = instancePickingColors;
-
- vTexCoord = texCoords;
- cameraPosition = project_uCameraPosition;
- normals_commonspace = project_normal(instanceModelMatrix * normals);
- vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
- geometry.normal = normals_commonspace;
-
- vec3 pos = (instanceModelMatrix * positions) * sizeScale + instanceTranslation;
-
- if (composeModelMatrix) {
- DECKGL_FILTER_SIZE(pos, geometry);
- gl_Position = project_position_to_clipspace(pos + instancePositions, instancePositions64Low, vec3(0.0), position_commonspace);
- }
- else {
- pos = project_size(pos);
- DECKGL_FILTER_SIZE(pos, geometry);
- gl_Position = project_position_to_clipspace(instancePositions, instancePositions64Low, pos, position_commonspace);
- }
+ geometry.pickingColor = pickingColor;
- geometry.position = position_commonspace;
+ gl_Position = project_position_to_clipspace(positions, positions64Low, vec3(0.0), geometry.position);
+ position_commonspace = geometry.position;
DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+ vTexCoord = texCoords;
+ cameraPosition = project_uCameraPosition;
+
+ vColor = vec4(colors, 1.0);
DECKGL_FILTER_COLOR(vColor, geometry);
}
`;
diff --git a/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts
index f65d0fe01..1c7aad2b6 100644
--- a/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts
+++ b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts
@@ -8,7 +8,6 @@ import {Model, Geometry, isWebGL2} from '@luma.gl/core';
import {ProgramManager} from '@luma.gl/engine';
import {UniformsOptions} from '@luma.gl/webgl/src/classes/uniforms';
-import {shouldComposeModelMatrix} from './matrix';
import fsWebGL1 from './raster-mesh-layer-webgl1.fs';
import vsWebGL1 from './raster-mesh-layer-webgl1.vs';
import fsWebGL2 from './raster-mesh-layer-webgl2.fs';
@@ -181,14 +180,12 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
return;
}
- const {viewport} = this.context;
- const {sizeScale, coordinateSystem, _instanced} = this.props;
+ const {sizeScale} = this.props;
model
.setUniforms(
Object.assign({}, uniforms, {
sizeScale,
- composeModelMatrix: !_instanced || shouldComposeModelMatrix(viewport, coordinateSystem),
flatShading: !this.state.hasNormals
})
)
@@ -221,7 +218,7 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
Object.assign({}, this.getShaders(), {
id: this.props.id,
geometry: getGeometry(mesh),
- isInstanced: true
+ isInstanced: false
})
);
diff --git a/src/layers/src/raster-tile/image.ts b/src/layers/src/raster-tile/image.ts
index 682b24b54..67ab3244b 100644
--- a/src/layers/src/raster-tile/image.ts
+++ b/src/layers/src/raster-tile/image.ts
@@ -389,13 +389,20 @@ export function getCategoricalColormapDataUrl(
return getImageDataURL(bitmap, CATEGORICAL_TEXTURE_WIDTH, 1);
}
-export function loadTerrain(props: {
+/**
+ * Load terrain mesh from raster tile server
+ * @param props - properties to load terrain data
+ * @returns terrain mesh data
+ */
+export async function loadTerrain(props: {
index: {x: number; y: number; z: number};
signal: AbortSignal;
rasterTileServerUrls: string[];
+ boundsForGeometry?: [number, number, number, number];
}): Promise<TerrainData> {
const {
index: {x, y, z},
+ boundsForGeometry,
signal,
rasterTileServerUrls
} = props;
@@ -408,6 +415,7 @@ export function loadTerrain(props: {
fetch: {signal},
'quantized-mesh': {
...loaderOptions['quantized-mesh'],
+ bounds: boundsForGeometry,
skirtHeight: meshMaxError * 2
}
}) as Promise<TerrainData>;
diff --git a/src/layers/src/raster-tile/raster-tile-layer.ts b/src/layers/src/raster-tile/raster-tile-layer.ts
index 8cb41fc21..7da8000f0 100644
--- a/src/layers/src/raster-tile/raster-tile-layer.ts
+++ b/src/layers/src/raster-tile/raster-tile-layer.ts
@@ -6,7 +6,6 @@ import {TileLayer, GeoBoundingBox} from '@deck.gl/geo-layers/typed';
import {PMTilesSource, PMTilesTileSource} from '@loaders.gl/pmtiles';
import {Texture2DProps} from '@luma.gl/webgl';
import memoize from 'lodash/memoize';
-import {Matrix4} from 'math.gl';
import {PathLayer} from '@deck.gl/layers/typed';
import {DatasetType, PMTilesType, LAYER_TYPES} from '@kepler.gl/constants';
@@ -399,7 +398,7 @@ export default class RasterTileLayer extends KeplerLayer {
}
private renderStacLayer(opts): TileLayer<any>[] {
- const {data, mapState} = opts;
+ const {data, mapState, experimentalContext} = opts;
const stac = data?.dataset?.metadata as GetTileDataCustomProps['stac'];
// If a tabular dataset is loaded, and then the layer type is switched from Point to Raster Tile
@@ -411,6 +410,8 @@ export default class RasterTileLayer extends KeplerLayer {
const {visConfig} = this.config;
const {id, opacity, visible} = this.getDefaultDeckLayerProps(opts);
+ const hasShadowEffect = experimentalContext?.hasShadowEffect;
+
const {
preset,
colormapId,
@@ -545,7 +546,8 @@ export default class RasterTileLayer extends KeplerLayer {
dataType,
minCategoricalBandValue,
maxCategoricalBandValue,
- hasCategoricalColorMap: Boolean(categoricalColorMap)
+ hasCategoricalColorMap: Boolean(categoricalColorMap),
+ hasShadowEffect
});
return [tileLayer];
@@ -627,6 +629,7 @@ export default class RasterTileLayer extends KeplerLayer {
shouldLoadTerrain &&
LOAD_ELEVATION_AFTER_ZOOM < zoom &&
(await loadTerrain({
+ boundsForGeometry: [west, north, east, south],
index: props.index,
signal: props.signal,
rasterTileServerUrls: props.stac.rasterTileServerUrls || []
@@ -648,6 +651,7 @@ export default class RasterTileLayer extends KeplerLayer {
}),
shouldLoadTerrain && LOAD_ELEVATION_AFTER_ZOOM < zoom
? loadTerrain({
+ boundsForGeometry: [west, north, east, south],
index: props.index,
signal: props.signal,
rasterTileServerUrls: props.stac.rasterTileServerUrls || []
@@ -706,6 +710,7 @@ export default class RasterTileLayer extends KeplerLayer {
const terrain =
image && shouldLoadTerrain && LOAD_ELEVATION_AFTER_ZOOM < zoom
? await loadTerrain({
+ boundsForGeometry: [west, north, east, south],
index: props.index,
signal: props.signal,
rasterTileServerUrls: metadata.rasterTileServerUrls
@@ -776,9 +781,11 @@ function renderSubLayersStac(props: RenderSubLayersProps): DeckLayer<any> | Deck
props: {...props, minPixelValue, maxPixelValue}
});
+ const idSuffix = props.hasShadowEffect ? 'shadow' : '';
+
return terrain
? new RasterMeshLayer(props, {
- id: `raster-3d-layer-${props.id}`,
+ id: `raster-3d-layer-${props.id}-${idSuffix}`,
// Dummy data
data: [1],
mesh: terrain,
@@ -787,15 +794,13 @@ function renderSubLayersStac(props: RenderSubLayersProps): DeckLayer<any> | Deck
moduleProps,
getPolygonOffset: null,
- coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
- modelMatrix: getMercatorModelMatrix(tile.index),
- getPosition: () => [0, 0, 0],
+ coordinateSystem: COORDINATE_SYSTEM.LNGLAT,
// Color to use if surfaceImage is unavailable
getColor: [255, 255, 255]
// material: false
})
: new RasterLayer(props, {
- id: `raster-2d-layer-${props.id}`,
+ id: `raster-2d-layer-${props.id}-${idSuffix}`,
images,
modules,
moduleProps,
@@ -804,20 +809,6 @@ function renderSubLayersStac(props: RenderSubLayersProps): DeckLayer<any> | Deck
});
}
-// From https://github.com/uber/deck.gl/blob/b1901b11cbdcb82b317e1579ff236d1ca1d03ea7/modules/geo-layers/src/mvt-tile-layer/mvt-tile-layer.js#L41-L52
-export function getMercatorModelMatrix(tile: {x: number; y: number; z: number}): Matrix4 {
- const WORLD_SIZE = 512;
- const worldScale = Math.pow(2, tile.z);
-
- const xScale = WORLD_SIZE / worldScale;
- const yScale = -xScale;
-
- const xOffset = (WORLD_SIZE * tile.x) / worldScale;
- const yOffset = WORLD_SIZE * (1 - tile.y / worldScale);
-
- return new Matrix4().translate([xOffset, yOffset, 0]).scale([xScale, yScale, 1]);
-}
-
function renderSubLayersPMTiles(props: {
id: string;
data: any;
@@ -906,9 +897,7 @@ function getRasterLayerPMTiles(props: {id: string; data: any; tile: any}) {
moduleProps,
getPolygonOffset: null,
- coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
- modelMatrix: getMercatorModelMatrix(tile.index),
- getPosition: () => [0, 0, 0],
+ coordinateSystem: COORDINATE_SYSTEM.LNGLAT,
// Color to use if surfaceImage is unavailable
getColor: [255, 255, 255]
// material: false
diff --git a/src/layers/src/raster-tile/types.ts b/src/layers/src/raster-tile/types.ts
index 6f99a0797..cdda13c0d 100644
--- a/src/layers/src/raster-tile/types.ts
+++ b/src/layers/src/raster-tile/types.ts
@@ -157,6 +157,7 @@ export type RenderSubLayersCustomProps = ColorRescaling &
minCategoricalBandValue?: number;
maxCategoricalBandValue?: number;
hasCategoricalColorMap: boolean;
+ hasShadowEffect?: boolean;
};
export interface RenderSubLayersDefaultProps {
diff --git a/src/reducers/src/layer-utils.ts b/src/reducers/src/layer-utils.ts
index b9dd9268d..477060f4e 100644
--- a/src/reducers/src/layer-utils.ts
+++ b/src/reducers/src/layer-utils.ts
@@ -3,7 +3,7 @@
import Console from 'global/console';
-import {GEOCODER_LAYER_ID} from '@kepler.gl/constants';
+import {GEOCODER_LAYER_ID, LIGHT_AND_SHADOW_EFFECT} from '@kepler.gl/constants';
import {Layer as DeckLayer, LayerProps as DeckLayerProps} from '@deck.gl/core/typed';
import {
Field,
@@ -236,7 +236,8 @@ export function renderDeckGlLayer(props: any, layerCallbacks: {[key: string]: an
mapState,
interactionConfig,
animationConfig,
- mapLayers
+ mapLayers,
+ experimentalContext
} = props;
const dataset = datasets[layer.config.dataId];
const {gpuFilter} = dataset || {};
@@ -253,7 +254,8 @@ export function renderDeckGlLayer(props: any, layerCallbacks: {[key: string]: an
animationConfig,
objectHovered,
visible,
- dataset
+ dataset,
+ experimentalContext
});
}
@@ -367,6 +369,7 @@ export function computeDeckLayers(
): Layer[] {
const {
datasets,
+ effects,
layers,
layerOrder,
layerData,
@@ -382,6 +385,10 @@ export function computeDeckLayers(
let dataLayers: any[] = [];
+ const hasShadowEffect = effects.some(effect => {
+ return effect.type === LIGHT_AND_SHADOW_EFFECT.type;
+ });
+
if (layerData && layerData.length) {
const mapLayers = getMapLayersFromSplitMaps(splitMaps, mapIndex || 0);
@@ -409,7 +416,10 @@ export function computeDeckLayers(
mapState,
interactionConfig,
animationConfig,
- mapLayers
+ mapLayers,
+ experimentalContext: {
+ hasShadowEffect
+ }
},
bindedLayerCallbacks
);