Remove this.features dependency from buckets

Author: jfirebaugh

js/data/bucket.js

@@ -80,9 +80,9 @@ function Bucket(options) {
  * Build the buffers! Features are set directly to the `features` property.
  * @private
  */
-Bucket.prototype.addFeatures = function() {
-    for (var i = 0; i < this.features.length; i++) {
-        this.addFeature(this.features[i]);
+Bucket.prototype.addFeatures = function(features) {
+    for (var i = 0; i < features.length; i++) {
+        this.addFeature(features[i]);
     }
 };
 

js/data/symbol_bucket.js

@@ -111,15 +111,14 @@ SymbolBucket.prototype.shaders = {
     }
 };
 
-SymbolBucket.prototype.addFeatures = function(collisionTile, stacks, icons) {
+SymbolBucket.prototype.addFeatures = function(features, collisionTile, stacks, icons) {
     var tileSize = 512 * this.overscaling;
     var tileExtent = 4096;
     this.tilePixelRatio = tileExtent / tileSize;
     this.compareText = {};
     this.symbolInstances = [];
 
     var layout = this.layoutProperties;
-    var features = this.features;
     var textFeatures = this.textFeatures;
 
     var horizontalAlign = 0.5,
@@ -441,22 +440,22 @@ SymbolBucket.prototype.addSymbols = function(shaderName, quads, scale, keepUprig
 
 };
 
-SymbolBucket.prototype.updateIcons = function(icons) {
+SymbolBucket.prototype.updateIcons = function(features, icons) {
     var iconValue = this.layoutProperties['icon-image'];
     if (!iconValue) return;
 
-    for (var i = 0; i < this.features.length; i++) {
-        var iconName = resolveTokens(this.features[i].properties, iconValue);
+    for (var i = 0; i < features.length; i++) {
+        var iconName = resolveTokens(features[i].properties, iconValue);
         if (iconName)
             icons[iconName] = true;
     }
 };
 
-SymbolBucket.prototype.updateFont = function(stacks) {
+SymbolBucket.prototype.updateFont = function(features, stacks) {
     var fontName = this.layoutProperties['text-font'],
         stack = stacks[fontName] = stacks[fontName] || {};
 
-    this.textFeatures = resolveText(this.features, this.layoutProperties, stack);
+    this.textFeatures = resolveText(features, this.layoutProperties, stack);
 };
 
 SymbolBucket.prototype.addToDebugBuffers = function(collisionTile) {

js/source/worker_tile.js

@@ -117,8 +117,9 @@ WorkerTile.prototype.parse = function(data, layers, actor, callback) {
 
         // Get dependencies for symbol buckets
         for (i = symbolBuckets.length - 1; i >= 0; i--) {
-            symbolBuckets[i].updateIcons(icons);
-            symbolBuckets[i].updateFont(stacks);
+            bucket = symbolBuckets[i];
+            bucket.updateIcons(bucket.features, icons);
+            bucket.updateFont(bucket.features, stacks);
         }
 
         for (var fontName in stacks) {
@@ -165,7 +166,7 @@ WorkerTile.prototype.parse = function(data, layers, actor, callback) {
 
     function parseBucket(tile, bucket) {
         var now = Date.now();
-        bucket.addFeatures(collisionTile, stacks, icons);
+        bucket.addFeatures(bucket.features, collisionTile, stacks, icons);
         var time = Date.now() - now;
 
         if (bucket.interactive) {

test/js/data/bucket.test.js

@@ -65,8 +65,7 @@ test('Bucket', function(t) {
     t.test('add features', function(t) {
         var builder = create();
 
-        builder.features = [createFeature(17, 42)];
-        builder.addFeatures();
+        builder.addFeatures([createFeature(17, 42)]);
 
         var testVertex = builder.buffers.testVertex;
         t.equal(testVertex.type, Buffer.BufferType.VERTEX);
@@ -89,8 +88,7 @@ test('Bucket', function(t) {
     t.test('reset buffers', function(t) {
         var builder = create();
 
-        builder.features = [createFeature(17, 42)];
-        builder.addFeatures();
+        builder.addFeatures([createFeature(17, 42)]);
 
         var buffers = {};
         builder.resetBuffers(buffers);
@@ -106,11 +104,9 @@ test('Bucket', function(t) {
     t.test('add features after resetting buffers', function(t) {
         var builder = create();
 
-        builder.features = [createFeature(1, 5)];
-        builder.addFeatures();
+        builder.addFeatures([createFeature(1, 5)]);
         builder.resetBuffers({});
-        builder.features = [createFeature(17, 42)];
-        builder.addFeatures();
+        builder.addFeatures([createFeature(17, 42)]);
 
         var testVertex = builder.buffers.testVertex;
         t.equal(testVertex.length, 1);

test/js/data/symbol_bucket.test.js

@@ -34,7 +34,6 @@ test('SymbolBucket', function(t) {
             layer: { id: 'test', type: 'symbol', layout: {'text-font': ['Test'] }}
         });
         bucket.textFeatures = ['abcde'];
-        bucket.features = [feature];
         t.ok(bucket, 'bucketSetup');
         return bucket;
     }
@@ -44,13 +43,13 @@ test('SymbolBucket', function(t) {
 
     // add feature from bucket A
     var a = JSON.stringify(collision);
-    t.equal(bucketA.addFeatures(collision, stacks), undefined);
+    t.equal(bucketA.addFeatures([feature], collision, stacks), undefined);
     var b = JSON.stringify(collision);
     t.notEqual(a, b, 'places feature');
 
     // add same feature from bucket B
     a = JSON.stringify(collision);
-    t.equal(bucketB.addFeatures(collision, stacks), undefined);
+    t.equal(bucketB.addFeatures([feature], collision, stacks), undefined);
     b = JSON.stringify(collision);
     t.equal(a, b, 'detects collision and does not place feature');