Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[fix] Improved map bounds calculation and handled latitude issues (#2632)
Igor Dykhta16a3ac26739d
diff --git a/src/reducers/src/data-utils.ts b/src/reducers/src/data-utils.tsindex 303a1d188..1d3681186 100644--- a/src/reducers/src/data-utils.ts+++ b/src/reducers/src/data-utils.ts@@ -9,6 +9,34 @@ const MIN_LATITUDE = -90;const MAX_LONGITUDE = 180;const MIN_LONGITUDE = -180;+/**+ * takes a list of layer bounds and returns a single bound+ */+export function processLayerBounds(layerBounds: Bounds[]): Bounds {+ return layerBounds.reduce(+ (res, b) => {+ const minLongitude = Math.min(res[0], b[0]);+ const minLatitude = Math.min(res[1], b[1]);+ const maxLongitude = Math.max(res[2], b[2]);+ const maxLatitude = Math.max(res[3], b[3]);++ // for some reason WebMercatorViewport can't handle latitude -90,90 and throws an error+ // so we default to lat/lng (0,0)+ // viewport.js:81 Uncaught Error: Pixel project matrix not invertible+ // at WebMercatorViewport16.Viewport5 (viewport.js:81:13)+ // at new WebMercatorViewport16 (web-mercator-viewport.js:92:5)+ // at getViewportFromMapState (map-utils.js:46:66)+ return [+ minLongitude <= MIN_LONGITUDE ? 0 : minLongitude,+ minLatitude <= MIN_LATITUDE ? 0 : minLatitude,+ maxLongitude >= MAX_LONGITUDE ? 0 : maxLongitude,+ maxLatitude >= MAX_LATITUDE ? 0 : maxLatitude+ ];+ },+ [MAX_LONGITUDE, MAX_LATITUDE, MIN_LONGITUDE, MIN_LATITUDE]+ );+}+/*** return center of map from given points* @param layers@@ -29,17 +57,5 @@ export function findMapBounds(layers: Layer[]): Bounds | null {return null;}// merge bounds in each layer- const newBounds = (availableLayerBounds as Bounds).reduce(- (res, b) => {- return [- Math.min(res[0], b[0]),- Math.min(res[1], b[1]),- Math.max(res[2], b[2]),- Math.max(res[3], b[3])- ];- },- [MAX_LONGITUDE, MAX_LATITUDE, MIN_LONGITUDE, MIN_LATITUDE]- );- // @ts-expect-error- return newBounds;+ return processLayerBounds(availableLayerBounds);}diff --git a/test/node/utils/data-utils-test.js b/test/node/utils/data-utils-test.jsindex 09cd3f357..329e9ec9d 100644--- a/test/node/utils/data-utils-test.js+++ b/test/node/utils/data-utils-test.js@@ -16,6 +16,7 @@ import {formatNumber,roundToFour} from '@kepler.gl/utils';+import {processLayerBounds} from '@kepler.gl/reducers';import {ALL_FIELD_TYPES} from '@kepler.gl/constants';test('dataUtils -> clamp', t => {@@ -237,3 +238,44 @@ test('dataUtils -> formatNumber', t => {t.end();});++test('dataUtils -> validateBounds', t => {+ const TEST_CASES = [+ {+ input: [[10, -10, 20, -20]],+ output: [10, -10, 20, -20],+ message: 'should return the same bound for a single bound'+ },+ {+ input: [+ [10, -10, 20, -20],+ [15, -15, 25, -25]+ ],+ output: [10, -15, 25, -20],+ message: 'should return a combined bound for multiple bounds'+ },+ {+ input: [+ [10, -90, 20, -20],+ [10, -10, 90, -90]+ ],+ output: [10, -10, 90, -20],+ message: 'should handle latitude -90,90 correctly'+ },+ {+ input: [+ [-180, -90, 20, -20],+ [15, -190, 25, -25]+ ],+ output: [0, 0, 25, -20],+ message: 'should handle extreme longitude values'+ }+ ];++ TEST_CASES.forEach(tc => {+ const output = processLayerBounds(tc.input);+ t.deepEqual(output, tc.output, tc.message);+ });++ t.end();+});