Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] Elevation zoom factor toggle (#1478)
Igor Dykhtaa09cd589becc
diff --git a/src/components/side-panel/layer-panel/layer-configurator.js b/src/components/side-panel/layer-panel/layer-configurator.jsindex 13fad1e04..a677a9c95 100644--- a/src/components/side-panel/layer-panel/layer-configurator.js+++ b/src/components/side-panel/layer-panel/layer-configurator.js@@ -383,6 +383,10 @@ export default function LayerConfiguratorFactory(description={elevationByDescription}disabled={!enable3d}/>+ <VisConfigSwitch+ {...layer.visConfigSettings.enableElevationZoomFactor}+ {...visConfiguratorProps}+ />{layer.visConfigSettings.sizeAggregation.condition(layer.config) ? (<AggregationTypeSelector{...layer.visConfigSettings.sizeAggregation}@@ -471,6 +475,10 @@ export default function LayerConfiguratorFactory({...visConfiguratorProps}label="layerVisConfigs.heightRange"/>+ <VisConfigSwitch+ {...layer.visConfigSettings.enableElevationZoomFactor}+ {...visConfiguratorProps}+ /></ConfigGroupCollapsibleContent></LayerConfigGroup></StyledLayerVisualConfigurator>@@ -716,6 +724,10 @@ export default function LayerConfiguratorFactory(channel={layer.visualChannels.height}{...layerChannelConfigProps}/>+ <VisConfigSwitch+ {...layer.visConfigSettings.enableElevationZoomFactor}+ {...visConfiguratorProps}+ /><VisConfigSwitch {...visConfiguratorProps} {...layer.visConfigSettings.wireframe} /></ConfigGroupCollapsibleContent></LayerConfigGroup>@@ -894,6 +906,10 @@ export default function LayerConfiguratorFactory({...visConfiguratorProps}label="layerVisConfigs.heightRange"/>+ <VisConfigSwitch+ {...layer.visConfigSettings.enableElevationZoomFactor}+ {...visConfiguratorProps}+ /><VisConfigSwitch {...visConfiguratorProps} {...layer.visConfigSettings.wireframe} /></ConfigGroupCollapsibleContent></LayerConfigGroup>diff --git a/src/layers/aggregation-layer.js b/src/layers/aggregation-layer.jsindex 02cbc99e6..d74c7475b 100644--- a/src/layers/aggregation-layer.js+++ b/src/layers/aggregation-layer.js@@ -80,7 +80,8 @@ export default class AggregationLayer extends Layer {'percentile','coverage','elevationPercentile',- 'elevationScale'+ 'elevationScale',+ 'enableElevationZoomFactor'];}diff --git a/src/layers/base-layer.js b/src/layers/base-layer.jsindex 6c8948ff7..65048f309 100644--- a/src/layers/base-layer.js+++ b/src/layers/base-layer.js@@ -405,7 +405,9 @@ class Layer {* @returns {number}*/getElevationZoomFactor({zoom, zoomOffset = 0}) {- return Math.pow(2, Math.max(8 - zoom + zoomOffset, 0));+ return this.config.visConfig.enableElevationZoomFactor+ ? Math.pow(2, Math.max(8 - zoom + zoomOffset, 0))+ : 1;}formatLayerData(datasets, filteredIndex) {diff --git a/src/layers/geojson-layer/geojson-layer.js b/src/layers/geojson-layer/geojson-layer.jsindex ea5745816..8f324248d 100644--- a/src/layers/geojson-layer/geojson-layer.js+++ b/src/layers/geojson-layer/geojson-layer.js@@ -53,6 +53,7 @@ export const geojsonVisConfigs = {radiusRange: 'radiusRange',heightRange: 'elevationRange',elevationScale: 'elevationScale',+ enableElevationZoomFactor: 'enableElevationZoomFactor',stroked: 'stroked',filled: 'filled',enable3d: 'enable3d',diff --git a/src/layers/grid-layer/grid-layer.js b/src/layers/grid-layer/grid-layer.jsindex a3adae5ae..744123fda 100644--- a/src/layers/grid-layer/grid-layer.js+++ b/src/layers/grid-layer/grid-layer.js@@ -33,6 +33,7 @@ export const gridVisConfigs = {percentile: 'percentile',elevationPercentile: 'elevationPercentile',elevationScale: 'elevationScale',+ enableElevationZoomFactor: 'enableElevationZoomFactor',colorAggregation: 'aggregation',sizeAggregation: 'sizeAggregation',enable3d: 'enable3d'diff --git a/src/layers/h3-hexagon-layer/h3-hexagon-layer.js b/src/layers/h3-hexagon-layer/h3-hexagon-layer.jsindex 0be118f84..8356a4b83 100644--- a/src/layers/h3-hexagon-layer/h3-hexagon-layer.js+++ b/src/layers/h3-hexagon-layer/h3-hexagon-layer.js@@ -41,7 +41,8 @@ export const HexagonIdVisConfigs = {enable3d: 'enable3d',sizeRange: 'elevationRange',coverageRange: 'coverageRange',- elevationScale: 'elevationScale'+ elevationScale: 'elevationScale',+ enableElevationZoomFactor: 'enableElevationZoomFactor'};export default class HexagonIdLayer extends Layer {diff --git a/src/layers/hexagon-layer/hexagon-layer.js b/src/layers/hexagon-layer/hexagon-layer.jsindex 83eb0bc6f..9f25fdc46 100644--- a/src/layers/hexagon-layer/hexagon-layer.js+++ b/src/layers/hexagon-layer/hexagon-layer.js@@ -35,6 +35,7 @@ export const hexagonVisConfigs = {percentile: 'percentile',elevationPercentile: 'elevationPercentile',elevationScale: 'elevationScale',+ enableElevationZoomFactor: 'enableElevationZoomFactor',colorAggregation: 'aggregation',sizeAggregation: 'sizeAggregation',enable3d: 'enable3d'diff --git a/src/layers/layer-factory.d.ts b/src/layers/layer-factory.d.tsindex fe6016b14..37311d182 100644--- a/src/layers/layer-factory.d.ts+++ b/src/layers/layer-factory.d.ts@@ -104,6 +104,7 @@ export type LayerVisConfig = {angle: VisConfigNumber;worldUnitSize: VisConfigNumber;elevationScale: VisConfigNumber;+ enableElevationZoomFactor: VisConfigBoolean;elevationRange: VisConfigRange;heightRange: VisConfigRange;coverageRange: VisConfigRange;diff --git a/src/layers/layer-factory.js b/src/layers/layer-factory.jsindex 002014434..44c9a181c 100644--- a/src/layers/layer-factory.js+++ b/src/layers/layer-factory.js@@ -314,6 +314,14 @@ export const LAYER_VIS_CONFIGS = {group: PROPERTY_GROUPS.height,property: 'elevationScale'},+ enableElevationZoomFactor: {+ type: 'boolean',+ defaultValue: true,+ label: 'layerVisConfigs.enableElevationZoomFactor',+ group: PROPERTY_GROUPS.height,+ property: 'enableElevationZoomFactor',+ description: 'layerVisConfigs.enableElevationZoomFactorDescription'+ },elevationRange: {type: 'number',defaultValue: [0, 500],diff --git a/src/layers/s2-geometry-layer/s2-geometry-layer.js b/src/layers/s2-geometry-layer/s2-geometry-layer.jsindex 32028d727..f113f0255 100644--- a/src/layers/s2-geometry-layer/s2-geometry-layer.js+++ b/src/layers/s2-geometry-layer/s2-geometry-layer.js@@ -60,6 +60,7 @@ export const S2VisConfigs = {// heightenable3d: 'enable3d',elevationScale: 'elevationScale',+ enableElevationZoomFactor: 'enableElevationZoomFactor',heightRange: 'elevationRange',// wireframediff --git a/src/localization/ca.js b/src/localization/ca.jsindex c45ac2cf9..cb99e18a0 100644--- a/src/localization/ca.js+++ b/src/localization/ca.js@@ -145,6 +145,8 @@ export default {sizeScale: 'Mida escala',worldUnitSize: 'Mida de la unitat mundial',elevationScale: 'Escala elevació',+ enableElevationZoomFactor: 'Utilitzeu el factor de zoom d’elevació',+ enableElevationZoomFactorDescription: "'Ajusteu l'elevació en funció del factor de zoom actual",heightScale: 'Escala alçada',coverageRange: 'Rang ed cobertura',highPrecisionRendering: 'Representació alta precisió',diff --git a/src/localization/en.js b/src/localization/en.jsindex 120294399..0200c2ea3 100644--- a/src/localization/en.js+++ b/src/localization/en.js@@ -145,6 +145,8 @@ export default {sizeScale: 'Size Scale',worldUnitSize: 'World Unit Size',elevationScale: 'Elevation Scale',+ enableElevationZoomFactor: 'Use elevation zoom factor',+ enableElevationZoomFactorDescription: 'Adjust elevation based on current zoom factor',heightScale: 'Height Scale',coverageRange: 'Coverage Range',highPrecisionRendering: 'High Precision Rendering',diff --git a/src/localization/es.js b/src/localization/es.jsindex 6857e22a7..919660e49 100644--- a/src/localization/es.js+++ b/src/localization/es.js@@ -145,6 +145,8 @@ export default {sizeScale: 'Medida de escala',worldUnitSize: 'Medida de la unidad mundial',elevationScale: 'Escala de elevación',+ enableElevationZoomFactor: 'Usar factor de zoom de elevación',+ enableElevationZoomFactorDescription: 'Ajuste a elevação com base no fator de zoom atual',heightScale: 'Escala de altura',coverageRange: 'Rango de cobertura',highPrecisionRendering: 'Representación de alta precisión',diff --git a/src/localization/fi.js b/src/localization/fi.jsindex 2cf452e2b..61d16b84e 100644--- a/src/localization/fi.js+++ b/src/localization/fi.js@@ -143,6 +143,8 @@ export default {sizeScale: 'Koon skaala',worldUnitSize: 'Yksikkö',elevationScale: 'Korottamisen skaala',+ enableElevationZoomFactor: 'Käytä korkeuden zoomauskerrointa',+ enableElevationZoomFactorDescription: 'Säädä korkeus nykyisen zoomauskertoimen perusteella',heightScale: 'Korkeuden skaala',coverageRange: 'Peittävyyden rajat',highPrecisionRendering: 'Tarkka renderöinti',diff --git a/src/localization/pt.js b/src/localization/pt.jsindex 5a18dac13..c7b96f908 100644--- a/src/localization/pt.js+++ b/src/localization/pt.js@@ -143,6 +143,8 @@ export default {sizeScale: 'Escala de tamanho',worldUnitSize: 'Tamanho unitário do mundo',elevationScale: 'Escala de Elevação',+ enableElevationZoomFactor: 'Use fator de zoom de elevação',+ enableElevationZoomFactorDescription: 'Ajuste a elevação com base no fator de zoom atual',heightScale: 'Escala de Altura',coverageRange: 'Alcance de cobertura',highPrecisionRendering: 'Renderização de Alta Precisão',diff --git a/test/browser/layer-tests/s2-geometry-layer-specs.js b/test/browser/layer-tests/s2-geometry-layer-specs.jsindex 567481d2a..5e78807d1 100644--- a/test/browser/layer-tests/s2-geometry-layer-specs.js+++ b/test/browser/layer-tests/s2-geometry-layer-specs.js@@ -57,6 +57,7 @@ test('#S2Geometry -> constructor', t => {'stroked','enable3d','elevationScale',+ 'enableElevationZoomFactor','heightRange','wireframe'],diff --git a/test/fixtures/state-saved-v0.js b/test/fixtures/state-saved-v0.jsindex 393bce892..01f5a7555 100644--- a/test/fixtures/state-saved-v0.js+++ b/test/fixtures/state-saved-v0.js@@ -1271,7 +1271,8 @@ mergedLayer3.config = {sizeRange: [0, 50],percentile: [0, 100],elevationPercentile: [0, 100],- elevationScale: 10+ elevationScale: 10,+ enableElevationZoomFactor: true},animation: {enabled: false}};@@ -1380,6 +1381,7 @@ mergedLayer4.config = {radiusRange: [0, 50],heightRange: [0, 500],elevationScale: 5,+ enableElevationZoomFactor: true,stroked: false,filled: true,enable3d: false,diff --git a/test/fixtures/state-saved-v1-1.js b/test/fixtures/state-saved-v1-1.jsindex 13a841838..e95b3a31c 100644--- a/test/fixtures/state-saved-v1-1.js+++ b/test/fixtures/state-saved-v1-1.js@@ -961,6 +961,7 @@ mergedLayer0.config = {radiusRange: [0, 50],heightRange: [0, 500],elevationScale: 18,+ enableElevationZoomFactor: true,stroked: true,filled: true,strokeColor: [181, 18, 65],@@ -2745,6 +2746,7 @@ mergedLayer1.config = {radiusRange: [0, 50],heightRange: [0, 500],elevationScale: 5,+ enableElevationZoomFactor: true,stroked: true,filled: false,enable3d: false,diff --git a/test/fixtures/state-saved-v1-3.js b/test/fixtures/state-saved-v1-3.jsindex fd5b4ed39..6da177873 100644--- a/test/fixtures/state-saved-v1-3.js+++ b/test/fixtures/state-saved-v1-3.js@@ -463,6 +463,7 @@ mergedLayer1.config = {percentile: [0, 96.54],elevationPercentile: [0, 100],elevationScale: 5,+ enableElevationZoomFactor: true,colorAggregation: 'average',sizeAggregation: 'average',enable3d: falsediff --git a/test/fixtures/test-csv-data.js b/test/fixtures/test-csv-data.jsindex 1a51fe3e1..927418da4 100644--- a/test/fixtures/test-csv-data.js+++ b/test/fixtures/test-csv-data.js@@ -155,6 +155,7 @@ export const config = {percentile: [0, 100],elevationPercentile: [0, 100],elevationScale: 5,+ enableElevationZoomFactor: true,colorAggregation: 'count',sizeAggregation: 'count',enable3d: falsediff --git a/test/fixtures/test-hex-id-data.js b/test/fixtures/test-hex-id-data.jsindex a74c39660..2c9419044 100644--- a/test/fixtures/test-hex-id-data.js+++ b/test/fixtures/test-hex-id-data.js@@ -90,7 +90,8 @@ export const hexIdDataConfig = {coverage: 1,sizeRange: [0, 500],coverageRange: [0, 1],- elevationScale: 5+ elevationScale: 5,+ enableElevationZoomFactor: true},textLabel: [{@@ -373,6 +374,7 @@ mergedH3Layer.config = {sizeRange: [0, 500],coverageRange: [0, 1],elevationScale: 5,+ enableElevationZoomFactor: true,enable3d: false},textLabel: [diff --git a/test/helpers/mock-state.js b/test/helpers/mock-state.jsindex e059e0c06..f2f58273f 100644--- a/test/helpers/mock-state.js+++ b/test/helpers/mock-state.js@@ -467,6 +467,7 @@ export const expectedSavedLayer0 = {percentile: [0, 100],elevationPercentile: [0, 100],elevationScale: 5,+ enableElevationZoomFactor: true,colorAggregation: 'count',sizeAggregation: 'count',enable3d: false@@ -504,6 +505,7 @@ export const expectedLoadedLayer0 = {percentile: [0, 100],elevationPercentile: [0, 100],elevationScale: 5,+ enableElevationZoomFactor: true,colorAggregation: 'count',sizeAggregation: 'count',enable3d: false@@ -647,6 +649,7 @@ export const expectedSavedLayer2 = {radiusRange: [0, 50],heightRange: [0, 500],elevationScale: 5,+ enableElevationZoomFactor: true,stroked: true,filled: true,enable3d: false,@@ -693,6 +696,7 @@ export const expectedLoadedLayer2 = {radiusRange: [0, 50],heightRange: [0, 500],elevationScale: 5,+ enableElevationZoomFactor: true,stroked: true,filled: true,enable3d: false,