minor clean up

mapbox · Jul 9, 2019 · bbc5cbf · bbc5cbf
1 parent 8be1ea0
commit bbc5cbf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/src/data/feature_index.js b/src/data/feature_index.js
@@ -11,7 +11,7 @@ import vt from '@mapbox/vector-tile';
 import Protobuf from 'pbf';
 import GeoJSONFeature from '../util/vectortile_to_geojson';
 import { arraysIntersect } from '../util/util';
-import deriveIntegerId from '../util/derive_integer_id';
+import { setIntegerId } from '../util/integer_id';
 import { OverscaledTileID } from '../source/tile_id';
 import { register } from '../util/web_worker_transfer';
 import EvaluationParameters from '../style/evaluation_parameters';
@@ -202,7 +202,7 @@ class FeatureIndex {
             }
 
             if (this.deriveIntegerId) {
-                deriveIntegerId(feature, this.deriveIntegerId);
+                setIntegerId(feature, this.deriveIntegerId);
             }
 
             const geojsonFeature = new GeoJSONFeature(feature, this.z, this.x, this.y);

diff --git a/src/source/worker_tile.js b/src/source/worker_tile.js
@@ -10,7 +10,7 @@ import LineBucket from '../data/bucket/line_bucket';
 import FillBucket from '../data/bucket/fill_bucket';
 import FillExtrusionBucket from '../data/bucket/fill_extrusion_bucket';
 import { warnOnce, mapObject, values } from '../util/util';
-import deriveIntegerId from '../util/derive_integer_id';
+import { setIntegerId } from '../util/integer_id';
 import assert from 'assert';
 import ImageAtlas from '../render/image_atlas';
 import GlyphAtlas from '../render/glyph_atlas';
@@ -99,7 +99,7 @@ class WorkerTile {
             for (let index = 0; index < sourceLayer.length; index++) {
                 const feature = sourceLayer.feature(index);
                 if (this.deriveIntegerId) {
-                    deriveIntegerId(feature, this.deriveIntegerId);
+                    setIntegerId(feature, this.deriveIntegerId);
                 }
                 features.push({ feature, index, sourceLayerIndex });
             }

diff --git a/src/util/derive_integer_id.js b/src/util/derive_integer_id.js
diff --git a/src/util/integer_id.js b/src/util/integer_id.js
@@ -0,0 +1,18 @@
+// @flow
+
+import murmur3 from 'murmurhash-js';
+
+export function setIntegerId(feature: VectorTileFeature, key: string) {
+    const value = feature.properties[key];
+    if (value !== undefined) {
+        feature.id = getIntegerId(value);
+    }
+}
+
+export function getIntegerId(value: mixed) {
+    const numValue = +value;
+    if (!isNaN(numValue) && numValue % 1 === 0) {
+        return numValue;
+    }
+    return murmur3(String(value));
+}