@mapwhit/tilerenderer 0.52.1 → 1.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapwhit/tilerenderer",
   "description": "A WebGL interactive maps library",
-  "version": "0.52.1",
+  "version": "1.0.0",
   "exports": {
     ".": "./src/index.js",
     "./worker": "./src/worker.js"
@@ -21,9 +21,9 @@
     "@mapwhit/pbf": "^1.0.0",
     "@mapwhit/style-expressions": "^1.1.0",
     "@mapwhit/vector-tile": "^2.0.1",
-    "@mapwhit/vt-pbf": "^2.0.0",
     "@pirxpilot/nanoassert": "~1",
     "csscolorparser": "^1.0.3",
+    "dynload": "^1.0.2",
     "earcut": "^3.0.1",
     "geojson-vt": "^4.0.2",
     "grid-index": "^1.1.0",
@@ -39,7 +39,7 @@
   },
   "scripts": {
     "test": "make check",
-    "prepublish": "make prebuild"
+    "prepare": "make prebuild"
   },
   "files": [
     "src",

package/src/data/array_types.js

@@ -2,8 +2,6 @@
 
 const assert = require('assert');
 const { Struct, StructArray } = require('../util/struct_array');
-const { register } = require('../util/transfer_registry');
-const { default: Point } = require('@mapbox/point-geometry');
 
 /**
  * Implementation of the StructArray layout:
@@ -35,7 +33,6 @@ class StructArrayLayout2i4 extends StructArray {
 }
 
 StructArrayLayout2i4.prototype.bytesPerElement = 4;
-register('StructArrayLayout2i4', StructArrayLayout2i4);
 
 /**
  * Implementation of the StructArray layout:
@@ -71,7 +68,6 @@ class StructArrayLayout4i8 extends StructArray {
 }
 
 StructArrayLayout4i8.prototype.bytesPerElement = 8;
-register('StructArrayLayout4i8', StructArrayLayout4i8);
 
 /**
  * Implementation of the StructArray layout:
@@ -112,7 +108,6 @@ class StructArrayLayout2i4i12 extends StructArray {
 }
 
 StructArrayLayout2i4i12.prototype.bytesPerElement = 12;
-register('StructArrayLayout2i4i12', StructArrayLayout2i4i12);
 
 /**
  * Implementation of the StructArray layout:
@@ -159,7 +154,6 @@ class StructArrayLayout4i4ub12 extends StructArray {
 }
 
 StructArrayLayout4i4ub12.prototype.bytesPerElement = 12;
-register('StructArrayLayout4i4ub12', StructArrayLayout4i4ub12);
 
 /**
  * Implementation of the StructArray layout:
@@ -203,7 +197,6 @@ class StructArrayLayout8ui16 extends StructArray {
 }
 
 StructArrayLayout8ui16.prototype.bytesPerElement = 16;
-register('StructArrayLayout8ui16', StructArrayLayout8ui16);
 
 /**
  * Implementation of the StructArray layout:
@@ -249,7 +242,6 @@ class StructArrayLayout4i4ui16 extends StructArray {
 }
 
 StructArrayLayout4i4ui16.prototype.bytesPerElement = 16;
-register('StructArrayLayout4i4ui16', StructArrayLayout4i4ui16);
 
 /**
  * Implementation of the StructArray layout:
@@ -283,7 +275,6 @@ class StructArrayLayout3f12 extends StructArray {
 }
 
 StructArrayLayout3f12.prototype.bytesPerElement = 12;
-register('StructArrayLayout3f12', StructArrayLayout3f12);
 
 /**
  * Implementation of the StructArray layout:
@@ -313,7 +304,6 @@ class StructArrayLayout1ul4 extends StructArray {
 }
 
 StructArrayLayout1ul4.prototype.bytesPerElement = 4;
-register('StructArrayLayout1ul4', StructArrayLayout1ul4);
 
 /**
  * Implementation of the StructArray layout:
@@ -370,7 +360,6 @@ class StructArrayLayout6i1ul2ui2i24 extends StructArray {
 }
 
 StructArrayLayout6i1ul2ui2i24.prototype.bytesPerElement = 24;
-register('StructArrayLayout6i1ul2ui2i24', StructArrayLayout6i1ul2ui2i24);
 
 /**
  * Implementation of the StructArray layout:
@@ -412,7 +401,6 @@ class StructArrayLayout2i2i2i12 extends StructArray {
 }
 
 StructArrayLayout2i2i2i12.prototype.bytesPerElement = 12;
-register('StructArrayLayout2i2i2i12', StructArrayLayout2i2i2i12);
 
 /**
  * Implementation of the StructArray layout:
@@ -443,7 +431,6 @@ class StructArrayLayout2ub4 extends StructArray {
 }
 
 StructArrayLayout2ub4.prototype.bytesPerElement = 4;
-register('StructArrayLayout2ub4', StructArrayLayout2ub4);
 
 /**
  * Implementation of the StructArray layout:
@@ -511,7 +498,6 @@ class StructArrayLayout2i2ui3ul3ui2f2ub40 extends StructArray {
 }
 
 StructArrayLayout2i2ui3ul3ui2f2ub40.prototype.bytesPerElement = 40;
-register('StructArrayLayout2i2ui3ul3ui2f2ub40', StructArrayLayout2i2ui3ul3ui2f2ub40);
 
 /**
  * Implementation of the StructArray layout:
@@ -573,7 +559,6 @@ class StructArrayLayout4i9ui1ul32 extends StructArray {
 }
 
 StructArrayLayout4i9ui1ul32.prototype.bytesPerElement = 32;
-register('StructArrayLayout4i9ui1ul32', StructArrayLayout4i9ui1ul32);
 
 /**
  * Implementation of the StructArray layout:
@@ -603,7 +588,6 @@ class StructArrayLayout1f4 extends StructArray {
 }
 
 StructArrayLayout1f4.prototype.bytesPerElement = 4;
-register('StructArrayLayout1f4', StructArrayLayout1f4);
 
 /**
  * Implementation of the StructArray layout:
@@ -637,7 +621,6 @@ class StructArrayLayout3i6 extends StructArray {
 }
 
 StructArrayLayout3i6.prototype.bytesPerElement = 6;
-register('StructArrayLayout3i6', StructArrayLayout3i6);
 
 /**
  * Implementation of the StructArray layout:
@@ -675,7 +658,6 @@ class StructArrayLayout1ul2ui8 extends StructArray {
 }
 
 StructArrayLayout1ul2ui8.prototype.bytesPerElement = 8;
-register('StructArrayLayout1ul2ui8', StructArrayLayout1ul2ui8);
 
 /**
  * Implementation of the StructArray layout:
@@ -709,7 +691,6 @@ class StructArrayLayout3ui6 extends StructArray {
 }
 
 StructArrayLayout3ui6.prototype.bytesPerElement = 6;
-register('StructArrayLayout3ui6', StructArrayLayout3ui6);
 
 /**
  * Implementation of the StructArray layout:
@@ -741,7 +722,6 @@ class StructArrayLayout2ui4 extends StructArray {
 }
 
 StructArrayLayout2ui4.prototype.bytesPerElement = 4;
-register('StructArrayLayout2ui4', StructArrayLayout2ui4);
 
 /**
  * Implementation of the StructArray layout:
@@ -771,7 +751,6 @@ class StructArrayLayout1ui2 extends StructArray {
 }
 
 StructArrayLayout1ui2.prototype.bytesPerElement = 2;
-register('StructArrayLayout1ui2', StructArrayLayout1ui2);
 
 /**
  * Implementation of the StructArray layout:
@@ -803,7 +782,6 @@ class StructArrayLayout2f8 extends StructArray {
 }
 
 StructArrayLayout2f8.prototype.bytesPerElement = 8;
-register('StructArrayLayout2f8', StructArrayLayout2f8);
 
 /**
  * Implementation of the StructArray layout:
@@ -839,7 +817,6 @@ class StructArrayLayout4f16 extends StructArray {
 }
 
 StructArrayLayout4f16.prototype.bytesPerElement = 16;
-register('StructArrayLayout4f16', StructArrayLayout4f16);
 
 class CollisionBoxStruct extends Struct {
   get anchorPointX() {
@@ -909,7 +886,7 @@ class CollisionBoxStruct extends Struct {
     this._structArray.int16[this._pos2 + 11] = x;
   }
   get anchorPoint() {
-    return new Point(this.anchorPointX, this.anchorPointY);
+    return { x: this.anchorPointX, y: this.anchorPointY };
   }
 }
 
@@ -929,8 +906,6 @@ class CollisionBoxArray extends StructArrayLayout6i1ul2ui2i24 {
   }
 }
 
-register('CollisionBoxArray', CollisionBoxArray);
-
 class PlacedSymbolStruct extends Struct {
   get anchorX() {
     return this._structArray.int16[this._pos2 + 0];
@@ -1034,8 +1009,6 @@ class PlacedSymbolArray extends StructArrayLayout2i2ui3ul3ui2f2ub40 {
   }
 }
 
-register('PlacedSymbolArray', PlacedSymbolArray);
-
 class SymbolInstanceStruct extends Struct {
   get anchorX() {
     return this._structArray.int16[this._pos2 + 0];
@@ -1139,8 +1112,6 @@ class SymbolInstanceArray extends StructArrayLayout4i9ui1ul32 {
   }
 }
 
-register('SymbolInstanceArray', SymbolInstanceArray);
-
 class GlyphOffsetStruct extends Struct {
   get offsetX() {
     return this._structArray.float32[this._pos4 + 0];
@@ -1169,8 +1140,6 @@ class GlyphOffsetArray extends StructArrayLayout1f4 {
   }
 }
 
-register('GlyphOffsetArray', GlyphOffsetArray);
-
 class SymbolLineVertexStruct extends Struct {
   get x() {
     return this._structArray.int16[this._pos2 + 0];
@@ -1217,8 +1186,6 @@ class SymbolLineVertexArray extends StructArrayLayout3i6 {
   }
 }
 
-register('SymbolLineVertexArray', SymbolLineVertexArray);
-
 class FeatureIndexStruct extends Struct {
   get featureIndex() {
     return this._structArray.uint32[this._pos4 + 0];
@@ -1256,8 +1223,6 @@ class FeatureIndexArray extends StructArrayLayout1ul2ui8 {
   }
 }
 
-register('FeatureIndexArray', FeatureIndexArray);
-
 module.exports = {
   StructArrayLayout2i4,
   StructArrayLayout4i8,

package/src/data/bucket/circle_bucket.js

@@ -6,7 +6,6 @@ const { ProgramConfigurationSet } = require('../program_configuration');
 const { TriangleIndexArray } = require('../index_array_type');
 const loadGeometry = require('../load_geometry');
 const EXTENT = require('../extent');
-const { register } = require('../../util/transfer_registry');
 const EvaluationParameters = require('../../style/evaluation_parameters');
 
 function addCircleVertex(layoutVertexArray, x, y, extrudeX, extrudeY) {
@@ -122,6 +121,4 @@ class CircleBucket {
   }
 }
 
-register('CircleBucket', CircleBucket, { omit: ['layers'] });
-
 module.exports = CircleBucket;

package/src/data/bucket/fill_bucket.js

@@ -8,7 +8,6 @@ const { default: earcut } = require('earcut');
 const classifyRings = require('../../util/classify_rings');
 const assert = require('assert');
 const EARCUT_MAX_RINGS = 500;
-const { register } = require('../../util/transfer_registry');
 const { hasPattern, addPatternDependencies } = require('./pattern_bucket_features');
 const loadGeometry = require('../load_geometry');
 const EvaluationParameters = require('../../style/evaluation_parameters');
@@ -171,6 +170,4 @@ class FillBucket {
   }
 }
 
-register('FillBucket', FillBucket, { omit: ['layers', 'features'] });
-
 module.exports = FillBucket;

package/src/data/bucket/fill_extrusion_bucket.js

@@ -12,7 +12,6 @@ const {
 const classifyRings = require('../../util/classify_rings');
 const assert = require('assert');
 const EARCUT_MAX_RINGS = 500;
-const { register } = require('../../util/transfer_registry');
 const { hasPattern, addPatternDependencies } = require('./pattern_bucket_features');
 const loadGeometry = require('../load_geometry');
 const EvaluationParameters = require('../../style/evaluation_parameters');
@@ -239,8 +238,6 @@ class FillExtrusionBucket {
   }
 }
 
-register('FillExtrusionBucket', FillExtrusionBucket, { omit: ['layers', 'features'] });
-
 module.exports = FillExtrusionBucket;
 
 function isBoundaryEdge(p1, p2) {

package/src/data/bucket/heatmap_bucket.js

@@ -1,12 +1,8 @@
 const CircleBucket = require('./circle_bucket');
 
-const { register } = require('../../util/transfer_registry');
-
 class HeatmapBucket extends CircleBucket {
   // Needed for flow to accept omit: ['layers'] below, due to
   // https://github.com/facebook/flow/issues/4262
 }
 
-register('HeatmapBucket', HeatmapBucket, { omit: ['layers'] });
-
 module.exports = HeatmapBucket;

package/src/data/bucket/line_bucket.js

@@ -7,7 +7,6 @@ const { TriangleIndexArray } = require('../index_array_type');
 const EXTENT = require('../extent');
 const mvt = require('@mapwhit/vector-tile');
 const vectorTileFeatureTypes = mvt.VectorTileFeature.types;
-const { register } = require('../../util/transfer_registry');
 const { hasPattern, addPatternDependencies } = require('./pattern_bucket_features');
 const loadGeometry = require('../load_geometry');
 const EvaluationParameters = require('../../style/evaluation_parameters');
@@ -162,7 +161,7 @@ class LineBucket {
   }
 
   addFeature(feature, geometry, index, imagePositions) {
-    const layout = this.layers[0].layout;
+    const layout = this.layers[0]._layout;
     const join = layout.get('line-join').evaluate(feature, {});
     const cap = layout.get('line-cap');
     const miterLimit = layout.get('line-miter-limit');
@@ -630,6 +629,4 @@ function calculateFullDistance(vertices, first, len) {
   return total;
 }
 
-register('LineBucket', LineBucket, { omit: ['layers', 'features'] });
-
 module.exports = LineBucket;

package/src/data/bucket/pattern_bucket_features.js

@@ -3,7 +3,7 @@ function hasPattern(type, layers, options) {
   let hasPattern = false;
 
   for (const layer of layers) {
-    const patternProperty = layer.paint.get(`${type}-pattern`);
+    const patternProperty = layer._paint.get(`${type}-pattern`);
     if (!patternProperty.isConstant()) {
       hasPattern = true;
     }
@@ -22,7 +22,7 @@ function hasPattern(type, layers, options) {
 function addPatternDependencies(type, layers, patternFeature, zoom, options) {
   const patterns = options.patternDependencies;
   for (const layer of layers) {
-    const patternProperty = layer.paint.get(`${type}-pattern`);
+    const patternProperty = layer._paint.get(`${type}-pattern`);
 
     const patternPropertyValue = patternProperty.value;
     if (patternPropertyValue.kind !== 'constant') {

package/src/data/bucket/symbol_bucket.js

@@ -18,7 +18,6 @@ const {
   GlyphOffsetArray,
   SymbolLineVertexArray
 } = require('../array_types');
-const { default: Point } = require('@mapbox/point-geometry');
 const SegmentVector = require('../segment');
 const { ProgramConfigurationSet } = require('../program_configuration');
 const { TriangleIndexArray, LineIndexArray } = require('../index_array_type');
@@ -30,7 +29,6 @@ const mvt = require('@mapwhit/vector-tile');
 const vectorTileFeatureTypes = mvt.VectorTileFeature.types;
 const { verticalizedCharacterMap } = require('../../util/verticalize_punctuation');
 const { getSizeData } = require('../../symbol/symbol_size');
-const { register } = require('../../util/transfer_registry');
 const EvaluationParameters = require('../../style/evaluation_parameters');
 const { Formatted } = require('@mapwhit/style-expressions');
 
@@ -108,8 +106,6 @@ class SymbolBuffers {
   }
 }
 
-register('SymbolBuffers', SymbolBuffers);
-
 class CollisionBuffers {
   constructor(LayoutArray, layoutAttributes, IndexArray) {
     this.layoutVertexArray = new LayoutArray();
@@ -138,8 +134,6 @@ class CollisionBuffers {
   }
 }
 
-register('CollisionBuffers', CollisionBuffers);
-
 /**
  * Unlike other buckets, which simply implement #addFeature with type-specific
  * logic for (essentially) triangulating feature geometries, SymbolBucket
@@ -191,7 +185,7 @@ class SymbolBucket {
     this.textSizeData = getSizeData(this.zoom, unevaluatedLayoutValues['text-size']);
     this.iconSizeData = getSizeData(this.zoom, unevaluatedLayoutValues['icon-size']);
 
-    const layout = this.layers[0].layout;
+    const layout = this.layers[0]._layout;
     const zOrderByViewportY = layout.get('symbol-z-order') === 'viewport-y';
     this.sortFeaturesByY =
       zOrderByViewportY &&
@@ -241,7 +235,7 @@ class SymbolBucket {
 
   populate(features, options) {
     const layer = this.layers[0];
-    const layout = layer.layout;
+    const layout = layer._layout;
 
     const textFont = layout.get('text-font');
     const textField = layout.get('text-field');
@@ -470,73 +464,25 @@ class SymbolBucket {
     });
   }
 
-  _addCollisionDebugVertex(layoutVertexArray, collisionVertexArray, point, anchorX, anchorY, extrude) {
-    collisionVertexArray.emplaceBack(0, 0);
-    return layoutVertexArray.emplaceBack(
-      // pos
-      point.x,
-      point.y,
-      // a_anchor_pos
-      anchorX,
-      anchorY,
-      // extrude
-      Math.round(extrude.x),
-      Math.round(extrude.y)
-    );
-  }
-
   addCollisionDebugVertices(x1, y1, x2, y2, arrays, boxAnchorPoint, symbolInstance, isCircle) {
-    const segment = arrays.segments.prepareSegment(4, arrays.layoutVertexArray, arrays.indexArray);
+    const { layoutVertexArray, collisionVertexArray, indexArray } = arrays;
+    const { anchorX, anchorY } = symbolInstance;
+
+    const segment = arrays.segments.prepareSegment(4, layoutVertexArray, indexArray);
     const index = segment.vertexLength;
 
-    const layoutVertexArray = arrays.layoutVertexArray;
-    const collisionVertexArray = arrays.collisionVertexArray;
-
-    const anchorX = symbolInstance.anchorX;
-    const anchorY = symbolInstance.anchorY;
-
-    this._addCollisionDebugVertex(
-      layoutVertexArray,
-      collisionVertexArray,
-      boxAnchorPoint,
-      anchorX,
-      anchorY,
-      new Point(x1, y1)
-    );
-    this._addCollisionDebugVertex(
-      layoutVertexArray,
-      collisionVertexArray,
-      boxAnchorPoint,
-      anchorX,
-      anchorY,
-      new Point(x2, y1)
-    );
-    this._addCollisionDebugVertex(
-      layoutVertexArray,
-      collisionVertexArray,
-      boxAnchorPoint,
-      anchorX,
-      anchorY,
-      new Point(x2, y2)
-    );
-    this._addCollisionDebugVertex(
-      layoutVertexArray,
-      collisionVertexArray,
-      boxAnchorPoint,
-      anchorX,
-      anchorY,
-      new Point(x1, y2)
-    );
+    addCollisionDebugVertex(layoutVertexArray, collisionVertexArray, boxAnchorPoint, anchorX, anchorY, x1, y1);
+    addCollisionDebugVertex(layoutVertexArray, collisionVertexArray, boxAnchorPoint, anchorX, anchorY, x2, y1);
+    addCollisionDebugVertex(layoutVertexArray, collisionVertexArray, boxAnchorPoint, anchorX, anchorY, x2, y2);
+    addCollisionDebugVertex(layoutVertexArray, collisionVertexArray, boxAnchorPoint, anchorX, anchorY, x1, y2);
 
     segment.vertexLength += 4;
     if (isCircle) {
-      const indexArray = arrays.indexArray;
       indexArray.emplaceBack(index, index + 1, index + 2);
       indexArray.emplaceBack(index, index + 2, index + 3);
 
       segment.primitiveLength += 2;
     } else {
-      const indexArray = arrays.indexArray;
       indexArray.emplaceBack(index, index + 1);
       indexArray.emplaceBack(index + 1, index + 2);
       indexArray.emplaceBack(index + 2, index + 3);
@@ -578,68 +524,16 @@ class SymbolBucket {
     }
   }
 
-  // These flat arrays are meant to be quicker to iterate over than the source
-  // CollisionBoxArray
-  _deserializeCollisionBoxesForSymbol(collisionBoxArray, textStartIndex, textEndIndex, iconStartIndex, iconEndIndex) {
-    const collisionArrays = {};
-    for (let k = textStartIndex; k < textEndIndex; k++) {
-      const box = collisionBoxArray.get(k);
-      if (box.radius === 0) {
-        collisionArrays.textBox = {
-          x1: box.x1,
-          y1: box.y1,
-          x2: box.x2,
-          y2: box.y2,
-          anchorPointX: box.anchorPointX,
-          anchorPointY: box.anchorPointY
-        };
-        collisionArrays.textFeatureIndex = box.featureIndex;
-        break; // Only one box allowed per instance
-      }
-      if (!collisionArrays.textCircles) {
-        collisionArrays.textCircles = [];
-        collisionArrays.textFeatureIndex = box.featureIndex;
-      }
-      const used = 1; // May be updated at collision detection time
-      collisionArrays.textCircles.push(
-        box.anchorPointX,
-        box.anchorPointY,
-        box.radius,
-        box.signedDistanceFromAnchor,
-        used
-      );
-    }
-    for (let k = iconStartIndex; k < iconEndIndex; k++) {
-      // An icon can only have one box now, so this indexing is a bit vestigial...
-      const box = collisionBoxArray.get(k);
-      if (box.radius === 0) {
-        collisionArrays.iconBox = {
-          x1: box.x1,
-          y1: box.y1,
-          x2: box.x2,
-          y2: box.y2,
-          anchorPointX: box.anchorPointX,
-          anchorPointY: box.anchorPointY
-        };
-        collisionArrays.iconFeatureIndex = box.featureIndex;
-        break; // Only one box allowed per instance
-      }
-    }
-    return collisionArrays;
-  }
-
   deserializeCollisionBoxes(collisionBoxArray) {
-    this.collisionArrays = [];
+    this.collisionArrays = new Array(this.symbolInstances.length);
     for (let i = 0; i < this.symbolInstances.length; i++) {
       const symbolInstance = this.symbolInstances.get(i);
-      this.collisionArrays.push(
-        this._deserializeCollisionBoxesForSymbol(
-          collisionBoxArray,
-          symbolInstance.textBoxStartIndex,
-          symbolInstance.textBoxEndIndex,
-          symbolInstance.iconBoxStartIndex,
-          symbolInstance.iconBoxEndIndex
-        )
+      this.collisionArrays[i] = deserializeCollisionBoxesForSymbol(
+        collisionBoxArray,
+        symbolInstance.textBoxStartIndex,
+        symbolInstance.textBoxEndIndex,
+        symbolInstance.iconBoxStartIndex,
+        symbolInstance.iconBoxEndIndex
       );
     }
   }
@@ -734,9 +628,76 @@ class SymbolBucket {
   }
 }
 
-register('SymbolBucket', SymbolBucket, {
-  omit: ['layers', 'collisionBoxArray', 'features', 'compareText']
-});
+function addCollisionDebugVertex(layoutVertexArray, collisionVertexArray, point, anchorX, anchorY, extrudeX, extrudeY) {
+  collisionVertexArray.emplaceBack(0, 0);
+  return layoutVertexArray.emplaceBack(
+    // pos
+    point.x,
+    point.y,
+    // a_anchor_pos
+    anchorX,
+    anchorY,
+    // extrude
+    Math.round(extrudeX),
+    Math.round(extrudeY)
+  );
+}
+
+// These flat arrays are meant to be quicker to iterate over than the source
+// CollisionBoxArray
+function deserializeCollisionBoxesForSymbol(
+  collisionBoxArray,
+  textStartIndex,
+  textEndIndex,
+  iconStartIndex,
+  iconEndIndex
+) {
+  const collisionArrays = {};
+  for (let k = textStartIndex; k < textEndIndex; k++) {
+    const box = collisionBoxArray.get(k);
+    if (box.radius === 0) {
+      collisionArrays.textBox = {
+        x1: box.x1,
+        y1: box.y1,
+        x2: box.x2,
+        y2: box.y2,
+        anchorPointX: box.anchorPointX,
+        anchorPointY: box.anchorPointY
+      };
+      collisionArrays.textFeatureIndex = box.featureIndex;
+      break; // Only one box allowed per instance
+    }
+    if (!collisionArrays.textCircles) {
+      collisionArrays.textCircles = [];
+      collisionArrays.textFeatureIndex = box.featureIndex;
+    }
+    const used = 1; // May be updated at collision detection time
+    collisionArrays.textCircles.push(
+      box.anchorPointX,
+      box.anchorPointY,
+      box.radius,
+      box.signedDistanceFromAnchor,
+      used
+    );
+  }
+  for (let k = iconStartIndex; k < iconEndIndex; k++) {
+    // An icon can only have one box now, so this indexing is a bit vestigial...
+    const box = collisionBoxArray.get(k);
+    if (box.radius === 0) {
+      collisionArrays.iconBox = {
+        x1: box.x1,
+        y1: box.y1,
+        x2: box.x2,
+        y2: box.y2,
+        anchorPointX: box.anchorPointX,
+        anchorPointY: box.anchorPointY
+      };
+      collisionArrays.iconFeatureIndex = box.featureIndex;
+      break; // Only one box allowed per instance
+    }
+  }
+  return collisionArrays;
+}
 
 // this constant is based on the size of StructArray indexes used in a symbol
 // bucket--namely, glyphOffsetArrayStart