@mapwhit/tilerenderer 1.0.0 → 1.1.0

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,7 +96,9 @@ 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;
 
@@ -399,17 +401,25 @@ 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 duplicateOpacityState = new JointOpacityState(null, 0, false, false, true);
@@ -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,7 +19,7 @@ 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;
 
@@ -92,7 +91,7 @@ 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
@@ -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:
@@ -29,7 +28,7 @@ const murmur3 = require('murmurhash-js');
 // (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;
@@ -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
-};

package/src/symbol/symbol_size.js

@@ -1,14 +1,11 @@
-const { normalizePropertyExpression } = require('@mapwhit/style-expressions');
-
-const interpolate = require('../util/interpolate');
-const { clamp } = require('../util/util');
-const EvaluationParameters = require('../style/evaluation_parameters');
-
-module.exports = { getSizeData, evaluateSizeForFeature, evaluateSizeForZoom };
+import { normalizePropertyExpression } from '@mapwhit/style-expressions';
+import EvaluationParameters from '../style/evaluation_parameters.js';
+import interpolate from '../util/interpolate.js';
+import { clamp } from '../util/util.js';
 
 // For {text,icon}-size, get the bucket-level data that will be needed by
 // the painter to set symbol-size-related uniforms
-function getSizeData(tileZoom, value) {
+export function getSizeData(tileZoom, value) {
   const { expression } = value;
   if (expression.kind === 'constant') {
     return {
@@ -25,10 +22,14 @@ function getSizeData(tileZoom, value) {
   const levels = expression.zoomStops;
 
   let lower = 0;
-  while (lower < levels.length && levels[lower] <= tileZoom) lower++;
+  while (lower < levels.length && levels[lower] <= tileZoom) {
+    lower++;
+  }
   lower = Math.max(0, lower - 1);
   let upper = lower;
-  while (upper < levels.length && levels[upper] < tileZoom + 1) upper++;
+  while (upper < levels.length && levels[upper] < tileZoom + 1) {
+    upper++;
+  }
   upper = Math.min(levels.length - 1, upper);
 
   const zoomRange = {
@@ -60,7 +61,7 @@ function getSizeData(tileZoom, value) {
   };
 }
 
-function evaluateSizeForFeature(sizeData, partiallyEvaluatedSize, symbol) {
+export function evaluateSizeForFeature(sizeData, partiallyEvaluatedSize, symbol) {
   const part = partiallyEvaluatedSize;
   if (sizeData.functionType === 'source') {
     return symbol.lowerSize / 10;
@@ -71,7 +72,7 @@ function evaluateSizeForFeature(sizeData, partiallyEvaluatedSize, symbol) {
   return part.uSize;
 }
 
-function evaluateSizeForZoom(sizeData, currentZoom, property) {
+export function evaluateSizeForZoom(sizeData, currentZoom, property) {
   if (sizeData.functionType === 'constant') {
     return {
       uSizeT: 0,

package/src/symbol/transform_text.js

@@ -1,4 +1,4 @@
-const { plugin: rtlTextPlugin } = require('../source/rtl_text_plugin');
+import { plugin as rtlTextPlugin } from '../source/rtl_text_plugin.js';
 
 function transformText(text, layer, feature) {
   const transform = layer._layout.get('text-transform').evaluate(feature, {});
@@ -15,9 +15,9 @@ function transformText(text, layer, feature) {
   return text;
 }
 
-module.exports = function (text, layer, feature) {
+export default function (text, layer, feature) {
   text.sections.forEach(section => {
     section.text = transformText(section.text, layer, feature);
   });
   return text;
-};
+}

package/src/ui/camera.js

@@ -1,12 +1,12 @@
-const { deepEqual } = require('../util/object');
-const { clamp, wrap, ease: defaultEasing } = require('../util/util');
-const warn = require('../util/warn');
-const interpolate = require('../util/interpolate');
-const browser = require('../util/browser');
-const LngLat = require('../geo/lng_lat');
-const LngLatBounds = require('../geo/lng_lat_bounds');
-const { default: Point } = require('@mapbox/point-geometry');
-const { Event, Evented } = require('@mapwhit/events');
+import Point from '@mapbox/point-geometry';
+import { Event, Evented } from '@mapwhit/events';
+import LngLat from '../geo/lng_lat.js';
+import LngLatBounds from '../geo/lng_lat_bounds.js';
+import browser from '../util/browser.js';
+import interpolate from '../util/interpolate.js';
+import { deepEqual } from '../util/object.js';
+import { clamp, ease as defaultEasing, wrap } from '../util/util.js';
+import warn from '../util/warn.js';
 
 /**
  * Options common to {@link Map#jumpTo}, {@link Map#easeTo}, and {@link Map#flyTo}, controlling the desired location,
@@ -354,8 +354,12 @@ class Camera extends Evented {
     if (
       !deepEqual(
         Object.keys(options.padding).sort((a, b) => {
-          if (a < b) return -1;
-          if (a > b) return 1;
+          if (a < b) {
+            return -1;
+          }
+          if (a > b) {
+            return 1;
+          }
           return 0;
         }),
         ['bottom', 'left', 'right', 'top']
@@ -429,7 +433,9 @@ class Camera extends Evented {
     const calculatedOptions = this.cameraForBounds(bounds, options);
 
     // cameraForBounds warns + returns undefined if unable to fit:
-    if (!calculatedOptions) return this;
+    if (!calculatedOptions) {
+      return this;
+    }
 
     options = Object.assign(calculatedOptions, options);
 
@@ -542,7 +548,9 @@ class Camera extends Evented {
       ...options
     };
 
-    if (options.animate === false) options.duration = 0;
+    if (options.animate === false) {
+      options.duration = 0;
+    }
 
     const tr = this.transform;
     const startZoom = this.getZoom();
@@ -820,7 +828,9 @@ class Camera extends Evented {
     // When u₀ = u₁, the optimal path doesn’t require both ascent and descent.
     if (Math.abs(u1) < 0.000001 || !Number.isFinite(S)) {
       // Perform a more or less instantaneous transition if the path is too short.
-      if (Math.abs(w0 - w1) < 0.000001) return this.easeTo(options, eventData);
+      if (Math.abs(w0 - w1) < 0.000001) {
+        return this.easeTo(options, eventData);
+      }
 
       const k = w1 < w0 ? -1 : 1;
       S = Math.abs(Math.log(w1 / w0)) / rho;
@@ -932,8 +942,12 @@ class Camera extends Evented {
   _normalizeBearing(bearing, currentBearing) {
     bearing = wrap(bearing, -180, 180);
     const diff = Math.abs(bearing - currentBearing);
-    if (Math.abs(bearing - 360 - currentBearing) < diff) bearing -= 360;
-    if (Math.abs(bearing + 360 - currentBearing) < diff) bearing += 360;
+    if (Math.abs(bearing - 360 - currentBearing) < diff) {
+      bearing -= 360;
+    }
+    if (Math.abs(bearing + 360 - currentBearing) < diff) {
+      bearing += 360;
+    }
     return bearing;
   }
 
@@ -941,11 +955,13 @@ class Camera extends Evented {
   // interpolating between the two endpoints will cross it.
   _normalizeCenter(center) {
     const tr = this.transform;
-    if (!tr.renderWorldCopies || tr.lngRange) return;
+    if (!tr.renderWorldCopies || tr.lngRange) {
+      return;
+    }
 
     const delta = center.lng - tr.center.lng;
     center.lng += delta > 180 ? -360 : delta < -180 ? 360 : 0;
   }
 }
 
-module.exports = Camera;
+export default Camera;