Skip to content

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

[Bug] validate s2 token in s2 geometry layer (#1805)

Shan Heca45cef8c934
diff --git a/src/layers/s2-geometry-layer/s2-geometry-layer.ts b/src/layers/s2-geometry-layer/s2-geometry-layer.ts
index ba9ba23ec..ae0601d29 100644
--- a/src/layers/s2-geometry-layer/s2-geometry-layer.ts
+++ b/src/layers/s2-geometry-layer/s2-geometry-layer.ts
@@ -41,7 +41,7 @@ import {
VisConfigRange
} from '../layer-factory';
import S2LayerIcon from './s2-layer-icon';
-import {getS2Center} from './s2-utils';
+import {getS2Center, validS2Token} from './s2-utils';
export type S2GeometryLayerVisConfigSettings = {
opacity: VisConfigNumber;
@@ -241,8 +241,7 @@ export default class S2GeometryLayer extends Layer {
for (let i = 0; i < filteredIndex.length; i++) {
const index = filteredIndex[i];
const token = getS2Token({index});
-
- if (token) {
+ if (validS2Token(token)) {
data.push({
index,
token
@@ -257,9 +256,10 @@ export default class S2GeometryLayer extends Layer {
const centroids = dataContainer.reduce(
(acc, entry, index) => {
const s2Token = getS2Token({index});
- if (s2Token) {
+ if (validS2Token(s2Token)) {
acc.push(getS2Center(s2Token));
}
+
return acc;
},
[],
diff --git a/src/layers/s2-geometry-layer/s2-utils.ts b/src/layers/s2-geometry-layer/s2-utils.ts
index f12c34802..57a98b16a 100644
--- a/src/layers/s2-geometry-layer/s2-utils.ts
+++ b/src/layers/s2-geometry-layer/s2-utils.ts
@@ -34,3 +34,9 @@ export function getS2Center(s2Token) {
const {lat, lng} = S2.idToLatLng(s2Id.toString());
return [lng, lat];
}
+
+const re = new RegExp('^[0-9a-z]*$', 'g');
+// simple test to see if token only contains numbers and letters
+export function validS2Token(token) {
+ return typeof token === 'string' && Boolean(token.match(re));
+}