Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] check bounds before calling fitbounds (#1348)
Shan He7f3be27f43d1
diff --git a/src/layers/geojson-layer/geojson-layer.js b/src/layers/geojson-layer/geojson-layer.jsindex bb82ef99b..fa3a2584a 100644--- a/src/layers/geojson-layer/geojson-layer.js+++ b/src/layers/geojson-layer/geojson-layer.js@@ -264,7 +264,7 @@ export default class GeoJsonLayer extends Layer {}renderLayer(opts) {- const {data, gpuFilter, objectHovered, mapState} = opts;+ const {data, gpuFilter, objectHovered, mapState, interactionConfig} = opts;const {fixedRadius, featureTypes} = this.meta;const radiusScale = this.getRadiusScaleByZoom(mapState, fixedRadius);@@ -290,13 +290,15 @@ export default class GeoJsonLayer extends Layer {opacity: visConfig.strokeOpacity};+ const pickable = interactionConfig.tooltip.enabled;return [new DeckGLGeoJsonLayer({...defaultLayerProps,...layerProps,...data,+ pickable,highlightColor: HIGHLIGH_COLOR_3D,- autoHighlight: visConfig.enable3d,+ autoHighlight: visConfig.enable3d && pickable,stroked: visConfig.stroked,filled: visConfig.filled,extruded: visConfig.enable3d,diff --git a/src/reducers/map-state-updaters.js b/src/reducers/map-state-updaters.jsindex 2fe45ed58..96fed7595 100644--- a/src/reducers/map-state-updaters.js+++ b/src/reducers/map-state-updaters.js@@ -19,6 +19,8 @@// THE SOFTWARE.import geoViewport from '@mapbox/geo-viewport';+import {validateBounds} from 'utils/projection-utils';+import Console from 'global/console';/** @typedef {import('./map-state-updaters').MapState} MapState */@@ -109,7 +111,11 @@ export const updateMapUpdater = (state, action) => ({* @public*/export const fitBoundsUpdater = (state, action) => {- const bounds = action.payload;+ const bounds = validateBounds(action.payload);+ if (!bounds) {+ Console.warn('invalid map bounds provided')+ return state;+ }const {zoom} = geoViewport.viewport(bounds, [state.width, state.height]);// center being calculated by geo-vieweport.viewport has a complex logic that// projects and then unprojects the coordinates to determine the centerdiff --git a/src/utils/projection-utils.js b/src/utils/projection-utils.jsnew file mode 100644index 000000000..1eae56e80--- /dev/null+++ b/src/utils/projection-utils.js@@ -0,0 +1,24 @@+function isLat(num) {+ return Number.isFinite(num) && num <= 90 && num >= -90;+}+function isLng(num) {+ return Number.isFinite(num) && num <= 180 && num >= -180;+}++/**+ * bounds should be [minLng, minLat, maxLng, maxLat]+ * @param {*} bounds+ */+export function validateBounds(bounds) {+ // array: [ -180, -85.05112877980659, 180, 85.0511287798066 ]+ // validate bounds+ if (+ Array.isArray(bounds) &&+ bounds.length === 4 &&+ [bounds[0], bounds[2]].every(isLng) &&+ [bounds[1], bounds[3]].every(isLat)+ ) {+ return bounds;+ }+ return null;+}diff --git a/test/node/reducers/map-state-test.js b/test/node/reducers/map-state-test.jsindex 341359048..d281e7326 100644--- a/test/node/reducers/map-state-test.js+++ b/test/node/reducers/map-state-test.js@@ -111,6 +111,24 @@ test('#mapStateReducer -> FIT_BOUNDS', t => {t.end();});+test('#mapStateReducer -> FIT_BOUNDS.invalid', t => {+ // default input and output in @mapbox/geo-viewport+ // https://github.com/mapbox/geo-viewport++ const mapUpdate = {+ width: 640,+ height: 480+ };++ const stateWidthMapDimension = reducer(undefined, updateMap(mapUpdate));+ const updatedState = reducer(stateWidthMapDimension, fitBounds(null));+ t.equal(updatedState, stateWidthMapDimension, 'should not update state when bounds is invalid');+ const updatedState2 = reducer(stateWidthMapDimension, fitBounds([500, -100, 322, 9]));+ t.equal(updatedState2, stateWidthMapDimension, 'should not update state when bounds is invalid');++ t.end();+});+test('#mapStateReducer -> SPLIT_MAP: toggle', t => {let newState = reducer(INITIAL_MAP_STATE, toggleSplitMap());