Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
fix: arcgis tile 3d model crash due to unknown coord system (post deck.gl upgrade) (#3412)
Igor Dykhta43d97775a081
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsxindex ef3e11b0b..92869fa39 100644--- a/src/components/src/map-container.tsx+++ b/src/components/src/map-container.tsx@@ -967,9 +967,7 @@ export default function MapContainerFactory(? computeDeckEffects({visState, mapState, isExport: this.props.isExport}): [];- const views = deckGlProps?.views- ? deckGlProps?.views()- : new MapView({farZMultiplier: 1.2});+ const views = deckGlProps?.views ? deckGlProps?.views() : new MapView({farZMultiplier: 1.2});let allDeckGlProps = {...deckGlProps,diff --git a/src/layers/src/tile3d-layer/tile3d-layer.ts b/src/layers/src/tile3d-layer/tile3d-layer.tsindex 956efd2c8..5232de896 100644--- a/src/layers/src/tile3d-layer/tile3d-layer.ts+++ b/src/layers/src/tile3d-layer/tile3d-layer.ts@@ -2,7 +2,8 @@// Copyright contributors to the kepler.gl projectimport {Tile3DLayer as DeckTile3DLayer} from '@deck.gl/geo-layers';-import {LightingEffect as DeckLightingEffect} from '@deck.gl/core';+import {COORDINATE_SYSTEM, LightingEffect as DeckLightingEffect} from '@deck.gl/core';+import type {Layer as DeckLayer, LayersList} from '@deck.gl/core';import {Tiles3DLoader, CesiumIonLoader} from '@loaders.gl/3d-tiles';import {I3SLoader} from '@loaders.gl/i3s';import {Tileset3D, Tile3D} from '@loaders.gl/tiles';@@ -21,6 +22,20 @@ import {import {KeplerTable as KeplerDataset, Datasets as KeplerDatasets} from '@kepler.gl/table';import {VisConfigNumber, BindedLayerCallbacks} from '@kepler.gl/types';+/**+ * @loaders.gl/i3s defines its own COORDINATE_SYSTEM enum with legacy numeric+ * values (e.g. METER_OFFSETS = 2) that newer deck.gl versions no longer accept+ * (deck.gl now uses string constants like "meter-offsets"). This map converts+ * those legacy numeric values to the string constants deck.gl expects.+ */+const LEGACY_COORDINATE_SYSTEM_MAP: Record<number, string> = {+ [-1]: COORDINATE_SYSTEM.DEFAULT,+ [0]: COORDINATE_SYSTEM.CARTESIAN,+ [1]: COORDINATE_SYSTEM.LNGLAT,+ [2]: COORDINATE_SYSTEM.METER_OFFSETS,+ [3]: COORDINATE_SYSTEM.LNGLAT_OFFSETS+};+// Lazily created patched sublayer classes (see getSubLayerClass below).let _PatchedMeshLayer: any = null;let _PatchedScenegraphLayer: any = null;@@ -284,6 +299,26 @@ class KeplerTile3DLayer extends DeckTile3DLayer {return super.getSubLayerClass(id, DefaultClass);}+ /**+ * Override renderLayers to normalize legacy numeric coordinateSystem values+ * on tile content before the base class creates sublayers.+ * @loaders.gl/i3s sets content.coordinateSystem to numeric enum values+ * (e.g. 2 for METER_OFFSETS), but deck.gl now expects string constants.+ */+ renderLayers(): DeckLayer | null | LayersList {+ const {tileset3d} = this.state as any;+ if (tileset3d) {+ for (const tile of tileset3d.tiles as Tile3D[]) {+ if (tile.content && typeof tile.content.coordinateSystem === 'number') {+ tile.content.coordinateSystem =+ LEGACY_COORDINATE_SYSTEM_MAP[tile.content.coordinateSystem] ??+ COORDINATE_SYSTEM.METER_OFFSETS;+ }+ }+ }+ return super.renderLayers();+ }+/*** During video/image export, report the layer as not loaded until every* selected tile has a renderable sublayer. Hubble.gl's DeckAdapter and