@mapwhit/tilerenderer 0.52.1 → 1.1.0

package/src/symbol/cross_tile_symbol_index.js

@@ -1,6 +1,4 @@
-const EXTENT = require('../data/extent');
-
-const { SymbolInstanceArray } = require('../data/array_types');
+import EXTENT from '../data/extent.js';
 
 /*
     The CrossTileSymbolIndex generally works on the assumption that
@@ -240,7 +238,9 @@ class CrossTileSymbolIndex {
 
     for (const tile of tiles) {
       const symbolBucket = tile.getBucket(styleLayer);
-      if (!symbolBucket || styleLayer.id !== symbolBucket.layerIds[0]) continue;
+      if (!symbolBucket || styleLayer.id !== symbolBucket.layers[0].id) {
+        continue;
+      }
 
       if (!symbolBucket.bucketInstanceId) {
         symbolBucket.bucketInstanceId = ++this.maxBucketInstanceId;
@@ -260,16 +260,13 @@ class CrossTileSymbolIndex {
   }
 
   pruneUnusedLayers(usedLayers) {
-    const usedLayerMap = {};
-    usedLayers.forEach(usedLayer => {
-      usedLayerMap[usedLayer] = true;
-    });
+    const usedLayersSet = new Set(usedLayers);
     for (const layerId in this.layerIndexes) {
-      if (!usedLayerMap[layerId]) {
+      if (!usedLayersSet.has(layerId)) {
         delete this.layerIndexes[layerId];
       }
     }
   }
 }
 
-module.exports = CrossTileSymbolIndex;
+export default CrossTileSymbolIndex;

package/src/symbol/get_anchors.js

@@ -1,9 +1,6 @@
-const interpolate = require('../util/interpolate');
-
-const Anchor = require('../symbol/anchor');
-const checkMaxAngle = require('./check_max_angle');
-
-module.exports = { getAnchors, getCenterAnchor };
+import Anchor from '../symbol/anchor.js';
+import interpolate from '../util/interpolate.js';
+import checkMaxAngle from './check_max_angle.js';
 
 function getLineLength(line) {
   let lineLength = 0;
@@ -24,7 +21,7 @@ function getShapedLabelLength(shapedText, shapedIcon) {
   );
 }
 
-function getCenterAnchor(line, maxAngle, shapedText, shapedIcon, glyphSize, boxScale) {
+export function getCenterAnchor(line, maxAngle, shapedText, shapedIcon, glyphSize, boxScale) {
   const angleWindowSize = getAngleWindowSize(shapedText, glyphSize, boxScale);
   const labelLength = getShapedLabelLength(shapedText, shapedIcon) * boxScale;
 
@@ -55,7 +52,17 @@ function getCenterAnchor(line, maxAngle, shapedText, shapedIcon, glyphSize, boxS
   }
 }
 
-function getAnchors(line, spacing, maxAngle, shapedText, shapedIcon, glyphSize, boxScale, overscaling, tileExtent) {
+export function getAnchors(
+  line,
+  spacing,
+  maxAngle,
+  shapedText,
+  shapedIcon,
+  glyphSize,
+  boxScale,
+  overscaling,
+  tileExtent
+) {
   // Resample a line to get anchor points for labels and check that each
   // potential label passes text-max-angle check and has enough froom to fit
   // on the line.

package/src/symbol/grid_index.js

@@ -1,4 +1,4 @@
-const { clamp } = require('../util/util');
+import { clamp } from '../util/util.js';
 
 /**
  * GridIndex is a data structure for testing the intersection of
@@ -266,7 +266,9 @@ class GridIndex {
     for (let x = cx1; x <= cx2; x++) {
       for (let y = cy1; y <= cy2; y++) {
         const cellIndex = xCellCount * y + x;
-        if (fn.call(this, x1, y1, x2, y2, cellIndex, ...args)) return;
+        if (fn.call(this, x1, y1, x2, y2, cellIndex, ...args)) {
+          return;
+        }
       }
     }
 
@@ -280,7 +282,7 @@ class GridIndex {
   }
 }
 
-module.exports = GridIndex;
+export default GridIndex;
 
 function circlesCollide(x1, y1, r1, x2, y2, r2) {
   const dx = x2 - x1;

package/src/symbol/mergelines.js

@@ -1,4 +1,4 @@
-module.exports = function (features) {
+export default function (features) {
   const leftIndex = new Map();
   const rightIndex = new Map();
   const mergedFeatures = [];
@@ -73,4 +73,4 @@ module.exports = function (features) {
     const { x, y } = geom.at(onRight ? -1 : 0);
     return `${text}:${x}:${y}`;
   }
-};
+}

package/src/symbol/opacity_state.js

@@ -1,5 +1,3 @@
-const { register } = require('../util/transfer_registry');
-
 class OpacityState {
   constructor() {
     this.opacity = 0;
@@ -16,6 +14,4 @@ class OpacityState {
   }
 }
 
-register('OpacityState', OpacityState);
-
-module.exports = OpacityState;
+export default OpacityState;

package/src/symbol/placement.js

@@ -1,12 +1,12 @@
-const CollisionIndex = require('./collision_index');
+import assert from 'assert';
+import EXTENT from '../data/extent.js';
+import pixelsToTileUnits from '../source/pixels_to_tile_units.js';
+import properties from '../style/style_layer/symbol_style_layer_properties.js';
+import CollisionIndex from './collision_index.js';
+import * as projection from './projection.js';
+import * as symbolSize from './symbol_size.js';
 
-const EXTENT = require('../data/extent');
-const symbolSize = require('./symbol_size');
-const projection = require('./projection');
-const properties = require('../style/style_layer/symbol_style_layer_properties');
 const symbolLayoutProperties = properties.layout;
-const assert = require('assert');
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
 
 class OpacityState {
   constructor(prevState, increment, placed, skipFade) {
@@ -44,7 +44,7 @@ class JointPlacement {
   }
 }
 
-class RetainedQueryData {
+export class RetainedQueryData {
   constructor(bucketInstanceId, featureIndex, sourceLayerIndex, bucketIndex, tileID) {
     this.bucketInstanceId = bucketInstanceId;
     this.featureIndex = featureIndex;
@@ -81,7 +81,7 @@ class CollisionGroups {
   }
 }
 
-class Placement {
+export class Placement {
   constructor(transform, fadeDuration, crossSourceCollisions) {
     this.transform = transform.clone();
     this.collisionIndex = new CollisionIndex(this.transform);
@@ -96,11 +96,13 @@ class Placement {
   placeLayerTile(styleLayer, tile, showCollisionBoxes, seenCrossTileIDs) {
     const symbolBucket = tile.getBucket(styleLayer);
     const bucketFeatureIndex = tile.latestFeatureIndex;
-    if (!symbolBucket || !bucketFeatureIndex || styleLayer.id !== symbolBucket.layerIds[0]) return;
+    if (!symbolBucket || !bucketFeatureIndex || styleLayer.id !== symbolBucket.layers[0].id) {
+      return;
+    }
 
     const collisionBoxArray = tile.collisionBoxArray;
 
-    const layout = symbolBucket.layers[0].layout;
+    const layout = symbolBucket.layers[0]._layout;
 
     const scale = 2 ** (this.transform.zoom - tile.tileID.overscaledZ);
     const textPixelRatio = tile.tileSize / EXTENT;
@@ -159,7 +161,7 @@ class Placement {
     seenCrossTileIDs,
     collisionBoxArray
   ) {
-    const layout = bucket.layers[0].layout;
+    const layout = bucket.layers[0]._layout;
 
     const partiallyEvaluatedTextSize = symbolSize.evaluateSizeForZoom(
       bucket.textSizeData,
@@ -399,19 +401,27 @@ class Placement {
 
     for (const tile of tiles) {
       const symbolBucket = tile.getBucket(styleLayer);
-      if (symbolBucket && tile.latestFeatureIndex && styleLayer.id === symbolBucket.layerIds[0]) {
+      if (symbolBucket && tile.latestFeatureIndex && styleLayer.id === symbolBucket.layers[0].id) {
         this.updateBucketOpacities(symbolBucket, seenCrossTileIDs, tile.collisionBoxArray);
       }
     }
   }
 
   updateBucketOpacities(bucket, seenCrossTileIDs, collisionBoxArray) {
-    if (bucket.hasTextData()) bucket.text.opacityVertexArray.clear();
-    if (bucket.hasIconData()) bucket.icon.opacityVertexArray.clear();
-    if (bucket.hasCollisionBoxData()) bucket.collisionBox.collisionVertexArray.clear();
-    if (bucket.hasCollisionCircleData()) bucket.collisionCircle.collisionVertexArray.clear();
+    if (bucket.hasTextData()) {
+      bucket.text.opacityVertexArray.clear();
+    }
+    if (bucket.hasIconData()) {
+      bucket.icon.opacityVertexArray.clear();
+    }
+    if (bucket.hasCollisionBoxData()) {
+      bucket.collisionBox.collisionVertexArray.clear();
+    }
+    if (bucket.hasCollisionCircleData()) {
+      bucket.collisionCircle.collisionVertexArray.clear();
+    }
 
-    const layout = bucket.layers[0].layout;
+    const layout = bucket.layers[0]._layout;
     const duplicateOpacityState = new JointOpacityState(null, 0, false, false, true);
     const textAllowOverlap = layout.get('text-allow-overlap');
     const iconAllowOverlap = layout.get('icon-allow-overlap');
@@ -579,8 +589,3 @@ function packOpacity(opacityState) {
     targetBit
   );
 }
-
-module.exports = {
-  RetainedQueryData,
-  Placement
-};

package/src/symbol/projection.js

@@ -1,22 +1,13 @@
-const { default: Point } = require('@mapbox/point-geometry');
-
-const { mat4, vec4 } = require('@mapbox/gl-matrix');
-const symbolSize = require('./symbol_size');
-const { addDynamicAttributes } = require('../data/bucket/symbol_bucket');
-const properties = require('../style/style_layer/symbol_style_layer_properties');
+import glMatrix from '@mapbox/gl-matrix';
+import Point from '@mapbox/point-geometry';
+import { addDynamicAttributes } from '../data/bucket/symbol_bucket.js';
+import properties from '../style/style_layer/symbol_style_layer_properties.js';
+import { WritingMode } from '../symbol/shaping.js';
+import * as symbolSize from './symbol_size.js';
+
+const { mat4, vec4 } = glMatrix;
 const symbolLayoutProperties = properties.layout;
 
-const { WritingMode } = require('../symbol/shaping');
-
-module.exports = {
-  updateLineLabels,
-  getLabelPlaneMatrix,
-  getGlCoordMatrix,
-  project,
-  placeFirstAndLastGlyph,
-  xyTransformMat4
-};
-
 /*
  * # Overview of coordinate spaces
  *
@@ -65,7 +56,7 @@ module.exports = {
 /*
  * Returns a matrix for converting from tile units to the correct label coordinate space.
  */
-function getLabelPlaneMatrix(posMatrix, pitchWithMap, rotateWithMap, transform, pixelsToTileUnits) {
+export function getLabelPlaneMatrix(posMatrix, pitchWithMap, rotateWithMap, transform, pixelsToTileUnits) {
   const m = mat4.identity(new Float32Array(16));
   if (pitchWithMap) {
     mat4.identity(m);
@@ -84,7 +75,7 @@ function getLabelPlaneMatrix(posMatrix, pitchWithMap, rotateWithMap, transform,
 /*
  * Returns a matrix for converting from the correct label coordinate space to gl coords.
  */
-function getGlCoordMatrix(posMatrix, pitchWithMap, rotateWithMap, transform, pixelsToTileUnits) {
+export function getGlCoordMatrix(posMatrix, pitchWithMap, rotateWithMap, transform, pixelsToTileUnits) {
   const m = mat4.identity(new Float32Array(16));
   if (pitchWithMap) {
     mat4.multiply(m, m, posMatrix);
@@ -100,7 +91,7 @@ function getGlCoordMatrix(posMatrix, pitchWithMap, rotateWithMap, transform, pix
   return m;
 }
 
-function project(point, matrix) {
+export function project(point, matrix) {
   const pos = [point.x, point.y, 0, 1];
   xyTransformMat4(pos, pos, matrix);
   const w = pos[3];
@@ -122,7 +113,7 @@ function isVisible(anchorPos, clippingBuffer) {
  *  Update the `dynamicLayoutVertexBuffer` for the buffer with the correct glyph positions for the current map view.
  *  This is only run on labels that are aligned with lines. Horizontal labels are handled entirely in the shader.
  */
-function updateLineLabels(
+export function updateLineLabels(
   bucket,
   posMatrix,
   painter,
@@ -233,7 +224,7 @@ function updateLineLabels(
   }
 }
 
-function placeFirstAndLastGlyph(
+export function placeFirstAndLastGlyph(
   fontScale,
   glyphOffsetArray,
   lineOffsetX,
@@ -269,7 +260,9 @@ function placeFirstAndLastGlyph(
     projectionCache,
     returnTileDistance
   );
-  if (!firstPlacedGlyph) return null;
+  if (!firstPlacedGlyph) {
+    return null;
+  }
 
   const lastPlacedGlyph = placeGlyphAlongLine(
     fontScale * lastGlyphOffset,
@@ -286,7 +279,9 @@ function placeFirstAndLastGlyph(
     projectionCache,
     returnTileDistance
   );
-  if (!lastPlacedGlyph) return null;
+  if (!lastPlacedGlyph) {
+    return null;
+  }
 
   return { first: firstPlacedGlyph, last: lastPlacedGlyph };
 }
@@ -428,7 +423,9 @@ function placeGlyphsAlongLine(
       projectionCache,
       false
     );
-    if (!singleGlyph) return { notEnoughRoom: true };
+    if (!singleGlyph) {
+      return { notEnoughRoom: true };
+    }
 
     placedGlyphs = [singleGlyph];
   }
@@ -486,7 +483,9 @@ function placeGlyphAlongLine(
     angle = Math.PI;
   }
 
-  if (dir < 0) angle += Math.PI;
+  if (dir < 0) {
+    angle += Math.PI;
+  }
 
   let currentIndex = dir > 0 ? lineStartIndex + anchorSegment : lineStartIndex + anchorSegment + 1;
 
@@ -501,7 +500,9 @@ function placeGlyphAlongLine(
     currentIndex += dir;
 
     // offset does not fit on the projected line
-    if (currentIndex < lineStartIndex || currentIndex >= lineEndIndex) return null;
+    if (currentIndex < lineStartIndex || currentIndex >= lineEndIndex) {
+      return null;
+    }
 
     prev = current;
 
@@ -591,7 +592,7 @@ function hideGlyphs(num, dynamicLayoutVertexArray) {
 
 // For line label layout, we're not using z output and our w input is always 1
 // This custom matrix transformation ignores those components to make projection faster
-function xyTransformMat4(out, a, m) {
+export function xyTransformMat4(out, a, m) {
   const x = a[0];
   const y = a[1];
   out[0] = m[0] * x + m[4] * y + m[12];

package/src/symbol/quads.js

@@ -1,6 +1,5 @@
-const { default: Point } = require('@mapbox/point-geometry');
-
-const { GLYPH_PBF_BORDER } = require('../style/parse_glyph_pbf');
+import Point from '@mapbox/point-geometry';
+import { GLYPH_PBF_BORDER } from '../style/parse_glyph_pbf.js';
 
 /**
  * A textured quad for rendering a single icon or glyph.
@@ -20,9 +19,9 @@ const { GLYPH_PBF_BORDER } = require('../style/parse_glyph_pbf');
  * Create the quads used for rendering an icon.
  * @private
  */
-function getIconQuads(anchor, shapedIcon, layer, alongLine, shapedText, feature) {
+export function getIconQuads(anchor, shapedIcon, layer, alongLine, shapedText, feature) {
   const image = shapedIcon.image;
-  const layout = layer.layout;
+  const layout = layer._layout;
 
   // If you have a 10px icon that isn't perfectly aligned to the pixel grid it will cover 11 actual
   // pixels. The quad needs to be padded to account for this, otherwise they'll look slightly clipped
@@ -71,7 +70,7 @@ function getIconQuads(anchor, shapedIcon, layer, alongLine, shapedText, feature)
     bl = new Point(left, bottom);
   }
 
-  const angle = (layer.layout.get('icon-rotate').evaluate(feature, {}) * Math.PI) / 180;
+  const angle = (layer._layout.get('icon-rotate').evaluate(feature, {}) * Math.PI) / 180;
 
   if (angle) {
     const sin = Math.sin(angle);
@@ -92,10 +91,10 @@ function getIconQuads(anchor, shapedIcon, layer, alongLine, shapedText, feature)
  * Create the quads used for rendering a text label.
  * @private
  */
-function getGlyphQuads(anchor, shaping, layer, alongLine, feature, positions) {
+export function getGlyphQuads(anchor, shaping, layer, alongLine, feature, positions) {
   const oneEm = 24;
-  const textRotate = (layer.layout.get('text-rotate').evaluate(feature, {}) * Math.PI) / 180;
-  const textOffset = layer.layout
+  const textRotate = (layer._layout.get('text-rotate').evaluate(feature, {}) * Math.PI) / 180;
+  const textOffset = layer._layout
     .get('text-offset')
     .evaluate(feature, {})
     .map(t => t * oneEm);
@@ -107,10 +106,14 @@ function getGlyphQuads(anchor, shaping, layer, alongLine, feature, positions) {
     const positionedGlyph = positionedGlyphs[k];
     const glyphPositions = positions[positionedGlyph.fontStack];
     const glyph = glyphPositions?.[positionedGlyph.glyph];
-    if (!glyph) continue;
+    if (!glyph) {
+      continue;
+    }
 
     const rect = glyph.rect;
-    if (!rect) continue;
+    if (!rect) {
+      continue;
+    }
 
     // The rects have an addditional buffer that is not included in their size.
     const glyphPadding = 1.0;
@@ -167,8 +170,3 @@ function getGlyphQuads(anchor, shaping, layer, alongLine, feature, positions) {
 
   return quads;
 }
-
-module.exports = {
-  getIconQuads,
-  getGlyphQuads
-};

package/src/symbol/shaping.js

@@ -1,19 +1,13 @@
-const { charHasUprightVerticalOrientation, charAllowsIdeographicBreaking } = require('../util/script_detection');
-const verticalizePunctuation = require('../util/verticalize_punctuation');
-const { plugin: rtlTextPlugin } = require('../source/rtl_text_plugin');
+import { plugin as rtlTextPlugin } from '../source/rtl_text_plugin.js';
+import { charAllowsIdeographicBreaking, charHasUprightVerticalOrientation } from '../util/script_detection.js';
+import verticalizePunctuation from '../util/verticalize_punctuation.js';
 
-const WritingMode = {
+export const WritingMode = {
   horizontal: 1,
   vertical: 2,
   horizontalOnly: 3
 };
 
-module.exports = {
-  shapeText,
-  shapeIcon,
-  WritingMode
-};
-
 class TaggedString {
   constructor() {
     this.text = '';
@@ -98,7 +92,7 @@ function breakLines(input, lineBreakPoints) {
   return lines;
 }
 
-function shapeText(
+export function shapeText(
   text,
   glyphs,
   defaultFontStack,
@@ -168,7 +162,9 @@ function shapeText(
 
   shapeLines(shaping, glyphs, lines, lineHeight, textAnchor, textJustify, writingMode, spacing, verticalHeight);
 
-  if (!positionedGlyphs.length) return false;
+  if (!positionedGlyphs.length) {
+    return false;
+  }
 
   shaping.text = shaping.text.toString();
   return shaping;
@@ -210,7 +206,9 @@ function determineAverageLineWidth(logicalInput, spacing, maxWidth, glyphMap) {
     const section = logicalInput.getSection(index);
     const positions = glyphMap[section.fontStack];
     const glyph = positions?.[logicalInput.getCharCode(index)];
-    if (!glyph) continue;
+    if (!glyph) {
+      continue;
+    }
     totalWidth += glyph.metrics.advance * section.scale + spacing;
   }
 
@@ -283,9 +281,13 @@ function leastBadBreaks(lastLineBreak) {
 }
 
 function determineLineBreaks(logicalInput, spacing, maxWidth, glyphMap) {
-  if (!maxWidth) return [];
+  if (!maxWidth) {
+    return [];
+  }
 
-  if (!logicalInput) return [];
+  if (!logicalInput) {
+    return [];
+  }
 
   const potentialLineBreaks = [];
   const targetWidth = determineAverageLineWidth(logicalInput, spacing, maxWidth, glyphMap);
@@ -298,7 +300,9 @@ function determineLineBreaks(logicalInput, spacing, maxWidth, glyphMap) {
     const positions = glyphMap[section.fontStack];
     const glyph = positions?.[codePoint];
 
-    if (glyph && !whitespace[codePoint]) currentX += glyph.metrics.advance * section.scale + spacing;
+    if (glyph && !whitespace[codePoint]) {
+      currentX += glyph.metrics.advance * section.scale + spacing;
+    }
 
     // Ideographic characters, spaces, and word-breaking punctuation that often appear without
     // surrounding spaces.
@@ -395,7 +399,9 @@ function shapeLines(
       const positions = glyphMap[section.fontStack];
       const glyph = positions?.[codePoint];
 
-      if (!glyph) continue;
+      if (!glyph) {
+        continue;
+      }
 
       if (!charHasUprightVerticalOrientation(codePoint) || writingMode === WritingMode.horizontal) {
         positionedGlyphs.push({
@@ -446,7 +452,9 @@ function shapeLines(
 
 // justify right = 1, left = 0, center = 0.5
 function justifyLine(positionedGlyphs, glyphMap, start, end, justify) {
-  if (!justify) return;
+  if (!justify) {
+    return;
+  }
 
   const lastPositionedGlyph = positionedGlyphs[end];
   const positions = glyphMap[lastPositionedGlyph.fontStack];
@@ -471,7 +479,7 @@ function align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLin
   }
 }
 
-function shapeIcon(image, iconOffset, iconAnchor) {
+export function shapeIcon(image, iconOffset, iconAnchor) {
   const { horizontalAlign, verticalAlign } = getAnchorAlignment(iconAnchor);
   const dx = iconOffset[0];
   const dy = iconOffset[1];

package/src/symbol/symbol_layout.js

@@ -1,18 +1,17 @@
-const Anchor = require('./anchor');
-
-const { getAnchors, getCenterAnchor } = require('./get_anchors');
-const clipLine = require('./clip_line');
-const { shapeText, shapeIcon, WritingMode } = require('./shaping');
-const { getGlyphQuads, getIconQuads } = require('./quads');
-const CollisionFeature = require('./collision_feature');
-const warn = require('../util/warn');
-const { allowsVerticalWritingMode, allowsLetterSpacing } = require('../util/script_detection');
-const findPoleOfInaccessibility = require('../util/find_pole_of_inaccessibility');
-const classifyRings = require('../util/classify_rings');
-const EXTENT = require('../data/extent');
-const SymbolBucket = require('../data/bucket/symbol_bucket');
-const EvaluationParameters = require('../style/evaluation_parameters');
-const murmur3 = require('murmurhash-js');
+import murmur3 from 'murmurhash-js';
+import SymbolBucket from '../data/bucket/symbol_bucket.js';
+import EXTENT from '../data/extent.js';
+import EvaluationParameters from '../style/evaluation_parameters.js';
+import classifyRings from '../util/classify_rings.js';
+import findPoleOfInaccessibility from '../util/find_pole_of_inaccessibility.js';
+import { allowsLetterSpacing, allowsVerticalWritingMode } from '../util/script_detection.js';
+import warn from '../util/warn.js';
+import Anchor from './anchor.js';
+import clipLine from './clip_line.js';
+import CollisionFeature from './collision_feature.js';
+import { getAnchors, getCenterAnchor } from './get_anchors.js';
+import { getGlyphQuads, getIconQuads } from './quads.js';
+import { shapeIcon, shapeText, WritingMode } from './shaping.js';
 
 // The symbol layout process needs `text-size` evaluated at up to five different zoom levels, and
 // `icon-size` at up to three:
@@ -26,10 +25,10 @@ const murmur3 = require('murmurhash-js');
 //   5.  For composite `*-size` expressions: two zoom levels of curve stops that "cover" the zoom level of the
 //       bucket. These go into a vertex buffer and are used by the shader to interpolate the size at render time.
 //
-// (1) and (2) are stored in `bucket.layers[0].layout`. The remainder are below.
+// (1) and (2) are stored in `bucket.layers[0]._layout`. The remainder are below.
 //
 
-function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePositions, showCollisionBoxes) {
+export function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePositions, showCollisionBoxes) {
   bucket.createArrays();
 
   const tileSize = 512 * bucket.overscaling;
@@ -37,7 +36,7 @@ function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePo
   bucket.compareText = {};
   bucket.iconsNeedLinear = false;
 
-  const layout = bucket.layers[0].layout;
+  const layout = bucket.layers[0]._layout;
   const unevaluatedLayoutValues = bucket.layers[0]._unevaluatedLayout._values;
 
   const sizes = {};
@@ -172,7 +171,7 @@ function addFeature(bucket, feature, shapedTextOrientations, shapedIcon, glyphPo
     textMaxSize = layoutTextSize;
   }
 
-  const layout = bucket.layers[0].layout;
+  const layout = bucket.layers[0]._layout;
   const textOffset = layout.get('text-offset').evaluate(feature, {});
   const iconOffset = layout.get('icon-offset').evaluate(feature, {});
 
@@ -301,7 +300,7 @@ function addTextVertices(
   let textSizeData = null;
 
   if (sizeData.functionType === 'source') {
-    textSizeData = [10 * layer.layout.get('text-size').evaluate(feature, {})];
+    textSizeData = [10 * layer._layout.get('text-size').evaluate(feature, {})];
   } else if (sizeData.functionType === 'composite') {
     textSizeData = [
       10 * sizes.compositeTextSizes[0].evaluate(feature, {}),
@@ -370,7 +369,7 @@ function addSymbol(
   if (shapedTextOrientations.horizontal) {
     // As a collision approximation, we can use either the vertical or the horizontal version of the feature
     // We're counting on the two versions having similar dimensions
-    const textRotate = layer.layout.get('text-rotate').evaluate(feature, {});
+    const textRotate = layer._layout.get('text-rotate').evaluate(feature, {});
     textCollisionFeature = new CollisionFeature(
       collisionBoxArray,
       line,
@@ -430,7 +429,7 @@ function addSymbol(
       shapedTextOrientations.horizontal,
       feature
     );
-    const iconRotate = layer.layout.get('icon-rotate').evaluate(feature, {});
+    const iconRotate = layer._layout.get('icon-rotate').evaluate(feature, {});
     iconCollisionFeature = new CollisionFeature(
       collisionBoxArray,
       line,
@@ -452,7 +451,7 @@ function addSymbol(
     let iconSizeData = null;
 
     if (sizeData.functionType === 'source') {
-      iconSizeData = [10 * layer.layout.get('icon-size').evaluate(feature, {})];
+      iconSizeData = [10 * layer._layout.get('icon-size').evaluate(feature, {})];
     } else if (sizeData.functionType === 'composite') {
       iconSizeData = [
         10 * sizes.compositeIconSizes[0].evaluate(feature, {}),
@@ -477,8 +476,9 @@ function addSymbol(
   const iconBoxStartIndex = iconCollisionFeature ? iconCollisionFeature.boxStartIndex : bucket.collisionBoxArray.length;
   const iconBoxEndIndex = iconCollisionFeature ? iconCollisionFeature.boxEndIndex : bucket.collisionBoxArray.length;
 
-  if (bucket.glyphOffsetArray.length >= SymbolBucket.MAX_GLYPHS)
+  if (bucket.glyphOffsetArray.length >= SymbolBucket.MAX_GLYPHS) {
     warn.once('Too many glyphs being rendered in a tile. See https://github.com/mapbox/mapbox-gl-js/issues/2907');
+  }
 
   bucket.symbolInstances.emplaceBack(
     anchor.x,
@@ -515,7 +515,3 @@ function anchorIsTooClose(bucket, text, repeatDistance, anchor) {
   compareText[text].push(anchor);
   return false;
 }
-
-module.exports = {
-  performSymbolLayout
-};