Skip to content

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

[Enhancement] Support elevation in Icon layer (#1483)

Igor Dykhtab24cc57a50f6
diff --git a/src/layers/icon-layer/icon-layer.js b/src/layers/icon-layer/icon-layer.js
index 7c8ba0c37..cef1707d9 100644
--- a/src/layers/icon-layer/icon-layer.js
+++ b/src/layers/icon-layer/icon-layer.js
@@ -32,10 +32,15 @@ const brushingExtension = new BrushingExtension();
export const SVG_ICON_URL = `${CLOUDFRONT}/icons/svg-icons.json`;
-export const iconPosAccessor = ({lat, lng}) => d => [d.data[lng.fieldIdx], d.data[lat.fieldIdx]];
+export const iconPosAccessor = ({lat, lng, altitude}) => d => [
+ d.data[lng.fieldIdx],
+ d.data[lat.fieldIdx],
+ altitude?.fieldIdx > -1 ? d.data[altitude.fieldIdx] : 0
+];
export const iconAccessor = ({icon}) => d => d.data[icon.fieldIdx];
export const iconRequiredColumns = ['lat', 'lng', 'icon'];
+export const iconOptionalColumns = ['altitude'];
export const pointVisConfigs = {
radius: 'radius',
@@ -79,6 +84,10 @@ export default class IconLayer extends Layer {
return iconRequiredColumns;
}
+ get optionalColumns() {
+ return iconOptionalColumns;
+ }
+
get columnPairs() {
return this.defaultPointColumnPairs;
}
@@ -274,6 +283,11 @@ export default class IconLayer extends Layer {
];
const hoveredObject = this.hasHoveredObject(objectHovered);
+ const parameters = {
+ // icons will be flat on the map when the altitude column is not used
+ depthTest: this.config.columns.altitude.fieldIdx > -1
+ };
+
return !this.iconGeometry
? []
: [
@@ -282,6 +296,7 @@ export default class IconLayer extends Layer {
...brushingProps,
...layerProps,
...data,
+ parameters,
getIconGeometry: id => this.iconGeometry[id],
// update triggers
@@ -295,6 +310,7 @@ export default class IconLayer extends Layer {
...this.getDefaultHoverLayerProps(),
...layerProps,
data: [hoveredObject],
+ parameters,
getPosition: data.getPosition,
getRadius: data.getRadius,
getFillColor: this.config.highlightColor,
diff --git a/test/browser/layer-tests/icon-layer-specs.js b/test/browser/layer-tests/icon-layer-specs.js
index 638d89db0..565baa1be 100644
--- a/test/browser/layer-tests/icon-layer-specs.js
+++ b/test/browser/layer-tests/icon-layer-specs.js
@@ -166,7 +166,7 @@ test('#IconLayer -> formatLayerData', t => {
// getPosition
t.deepEqual(
layerData.getPosition(layerData.data[0]),
- [testRows[0][2], testRows[0][1]],
+ [testRows[0][2], testRows[0][1], 0],
'getPosition should return correct position'
);
// getFillColor
@@ -471,7 +471,7 @@ test('#IconLayer -> renderLayer', t => {
t.deepEqual(
getPosition(layerData.data[0]),
- [testRows[0][2], testRows[0][1]],
+ [testRows[0][2], testRows[0][1], 0],
'Should calculate correct getPosition'
);
t.deepEqual(getColor, DEFAULT_TEXT_LABEL.color, 'Should calculate correct getColor');