Make bucketLayerIDs an array

mapbox · Jul 3, 2017 · 83fb52d · 83fb52d
1 parent 9ed259e
commit 83fb52d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/data/feature_index.js b/src/data/feature_index.js
@@ -54,7 +54,7 @@ class FeatureIndex {
     grid: Grid;
     featureIndexArray: FeatureIndexArray;
     rawTileData: any;
-    bucketLayerIDs: { [string]: Array<string> };
+    bucketLayerIDs: Array<Array<string>>;
     paintPropertyStatistics: PaintPropertyStatistics;
     coord: TileCoord;
     overscaling: number;
@@ -295,8 +295,8 @@ class FeatureIndex {
     }
 
     hasLayer(id: string) {
-        for (const index in this.bucketLayerIDs) {
-            for (const layerID of this.bucketLayerIDs[index]) {
+        for (const layerIDs of this.bucketLayerIDs) {
+            for (const layerID of layerIDs) {
                 if (id === layerID) return true;
             }
         }

diff --git a/src/source/worker_tile.js b/src/source/worker_tile.js
@@ -66,10 +66,9 @@ class WorkerTile {
         const sourceLayerCoder = new DictionaryCoder(Object.keys(data.layers).sort());
 
         const featureIndex = new FeatureIndex(this.coord, this.overscaling);
-        featureIndex.bucketLayerIDs = {}; // Should this be an array?
+        featureIndex.bucketLayerIDs = [];
 
         const buckets = {};
-        let bucketIndex = 0;
 
         const options = {
             featureIndex: featureIndex,
@@ -115,17 +114,15 @@ class WorkerTile {
                 }
 
                 const bucket = buckets[layer.id] = layer.createBucket({
-                    index: bucketIndex,
+                    index: featureIndex.bucketLayerIDs.length,
                     layers: family,
                     zoom: this.zoom,
                     overscaling: this.overscaling,
                     collisionBoxArray: this.collisionBoxArray
                 });
 
                 bucket.populate(features, options);
-                featureIndex.bucketLayerIDs[String(bucketIndex)] = family.map((l) => l.id);
-
-                bucketIndex++;
+                featureIndex.bucketLayerIDs.push(family.map((l) => l.id));
             }
         }