@mapwhit/tilerenderer 1.0.0 → 1.1.1

package/src/style/style_layer/line_style_layer.js

@@ -1,13 +1,12 @@
-const { default: Point } = require('@mapbox/point-geometry');
-
-const StyleLayer = require('../style_layer');
-const LineBucket = require('../../data/bucket/line_bucket');
-const { polygonIntersectsBufferedMultiLine } = require('../../util/intersection_tests');
-const { getMaximumPaintValue, translateDistance, translate } = require('../query_utils');
-const properties = require('./line_style_layer_properties');
-const EvaluationParameters = require('../evaluation_parameters');
-const renderColorRamp = require('../../util/color_ramp');
-const { DataDrivenProperty } = require('../properties');
+import Point from '@mapbox/point-geometry';
+import LineBucket from '../../data/bucket/line_bucket.js';
+import renderColorRamp from '../../util/color_ramp.js';
+import { polygonIntersectsBufferedMultiLine } from '../../util/intersection_tests.js';
+import EvaluationParameters from '../evaluation_parameters.js';
+import { DataDrivenProperty } from '../properties.js';
+import { getMaximumPaintValue, translate, translateDistance } from '../query_utils.js';
+import StyleLayer from '../style_layer.js';
+import properties from './line_style_layer_properties.js';
 
 class LineFloorwidthProperty extends DataDrivenProperty {
   possiblyEvaluate(value, parameters) {
@@ -95,7 +94,7 @@ class LineStyleLayer extends StyleLayer {
   }
 }
 
-module.exports = LineStyleLayer;
+export default LineStyleLayer;
 
 function getLineWidth(lineWidth, lineGapWidth) {
   if (lineGapWidth > 0) {

package/src/style/style_layer/line_style_layer_properties.js

@@ -1,13 +1,13 @@
 // This file is generated. Edit layer-properties.js.ejs, then run `make generate-style-code`.
 
-const {
-  Properties,
+import {
   ColorRampProperty,
   CrossFadedDataDrivenProperty,
   CrossFadedProperty,
   DataConstantProperty,
-  DataDrivenProperty
-} = require('../properties');
+  DataDrivenProperty,
+  Properties
+} from '../properties.js';
 
 const layout = new Properties({
   'line-cap': new DataConstantProperty({
@@ -101,4 +101,4 @@ const paint = new Properties({
   })
 });
 
-module.exports = { paint, layout };
+export default { paint, layout };

package/src/style/style_layer/raster_style_layer.js

@@ -1,6 +1,5 @@
-const StyleLayer = require('../style_layer');
-
-const properties = require('./raster_style_layer_properties');
+import StyleLayer from '../style_layer.js';
+import properties from './raster_style_layer_properties.js';
 
 class RasterStyleLayer extends StyleLayer {
   constructor(layer) {
@@ -8,4 +7,4 @@ class RasterStyleLayer extends StyleLayer {
   }
 }
 
-module.exports = RasterStyleLayer;
+export default RasterStyleLayer;

package/src/style/style_layer/raster_style_layer_properties.js

@@ -1,6 +1,6 @@
 // This file is generated. Edit layer-properties.js.ejs, then run `make generate-style-code`.
 
-const { Properties, DataConstantProperty } = require('../properties');
+import { DataConstantProperty, Properties } from '../properties.js';
 
 const paint = new Properties({
   'raster-opacity': new DataConstantProperty({
@@ -52,4 +52,4 @@ const paint = new Properties({
   })
 });
 
-module.exports = { paint };
+export default { paint };

package/src/style/style_layer/symbol_style_layer.js

@@ -1,10 +1,9 @@
-const StyleLayer = require('../style_layer');
-
-const SymbolBucket = require('../../data/bucket/symbol_bucket');
-const resolveTokens = require('../../util/token');
-const { isExpression } = require('@mapwhit/style-expressions');
-const assert = require('assert');
-const properties = require('./symbol_style_layer_properties');
+import { isExpression } from '@mapwhit/style-expressions';
+import assert from 'assert';
+import SymbolBucket from '../../data/bucket/symbol_bucket.js';
+import resolveTokens from '../../util/token.js';
+import StyleLayer from '../style_layer.js';
+import properties from './symbol_style_layer_properties.js';
 
 class SymbolStyleLayer extends StyleLayer {
   constructor(layer) {
@@ -63,4 +62,4 @@ class SymbolStyleLayer extends StyleLayer {
   }
 }
 
-module.exports = SymbolStyleLayer;
+export default SymbolStyleLayer;

package/src/style/style_layer/symbol_style_layer_properties.js

@@ -1,6 +1,6 @@
 // This file is generated. Edit layer-properties.js.ejs, then run `make generate-style-code`.
 
-const { Properties, DataConstantProperty, DataDrivenProperty } = require('../properties');
+import { DataConstantProperty, DataDrivenProperty, Properties } from '../properties.js';
 
 const layout = new Properties({
   'symbol-placement': new DataConstantProperty({
@@ -291,4 +291,4 @@ const paint = new Properties({
   })
 });
 
-module.exports = { paint, layout };
+export default { paint, layout };

package/src/style/style_layer.js

@@ -1,10 +1,8 @@
-const { filterObject } = require('../util/object');
-
-const { Evented } = require('@mapwhit/events');
-const { Layout, Transitionable, PossiblyEvaluatedPropertyValue } = require('./properties');
-const { supportsPropertyExpression } = require('@mapwhit/style-expressions');
-const featureFilter = require('../style-spec/feature_filter');
-const createKey = require('../util/key');
+import { Evented } from '@mapwhit/events';
+import { supportsPropertyExpression } from '@mapwhit/style-expressions';
+import featureFilter from '../style-spec/feature_filter/index.js';
+import createKey from '../util/key.js';
+import { Layout, PossiblyEvaluatedPropertyValue, Transitionable } from './properties.js';
 
 const keyProperties = ['type', 'minzoom', 'maxzoom', 'filter', 'layout'];
 const TRANSITION_SUFFIX = '-transition';
@@ -160,21 +158,20 @@ class StyleLayer extends Evented {
       this._transitionablePaint.setTransition(name.slice(0, -TRANSITION_SUFFIX.length), value || undefined);
       return false;
     }
-    // if a cross-faded value is changed, we need to make sure the new icons get added to each tile's iconAtlas
-    // so a call to _updateLayer is necessary, and we return true from this function so it gets called in
-    // Style#setPaintProperty
-    const prop = this._transitionablePaint._values[name];
-    const newCrossFadedValue =
-      prop.property.specification['property-type'] === 'cross-faded-data-driven' && !prop.value.value && value;
-    const wasDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
+    const transitionable = this._transitionablePaint._values[name];
+    const isCrossFadedProperty = transitionable.property.specification['property-type'] === 'cross-faded-data-driven';
+    const wasDataDriven = transitionable.value.isDataDriven();
     this._transitionablePaint.setValue(name, value);
-    const isDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
     this._handleSpecialPaintPropertyUpdate(name);
-    if (isDataDriven !== wasDataDriven || (wasDataDriven && isDataDriven)) {
+    const isDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
+    if (isDataDriven !== wasDataDriven || (wasDataDriven && isDataDriven) || isCrossFadedProperty) {
       // reset transitioning in progress
       this._untransitioned(name);
     }
-    return isDataDriven || wasDataDriven || newCrossFadedValue;
+    // if a cross-faded value is changed, we need to make sure the new icons get added to each tile's iconAtlas
+    // so a call to _updateLayer is necessary, and we return true from this function so it gets called in
+    // Style#setPaintProperty
+    return isDataDriven || wasDataDriven || isCrossFadedProperty;
   }
 
   _untransitioned(name) {
@@ -188,8 +185,12 @@ class StyleLayer extends Evented {
   }
 
   isHidden(zoom) {
-    if (this.minzoom && zoom < this.minzoom) return true;
-    if (this.maxzoom && zoom >= this.maxzoom) return true;
+    if (this.minzoom && zoom < this.minzoom) {
+      return true;
+    }
+    if (this.maxzoom && zoom >= this.maxzoom) {
+      return true;
+    }
     return this.visibility === 'none';
   }
 
@@ -253,4 +254,4 @@ class StyleLayer extends Evented {
   }
 }
 
-module.exports = StyleLayer;
+export default StyleLayer;

package/src/style/style_layer_index.js

@@ -1,4 +1,4 @@
-const groupBySource = require('../util/group_layers');
+import groupBySource from '../util/group_layers.js';
 
 class StyleLayerIndex {
   #layers = new Map();
@@ -27,4 +27,4 @@ class StyleLayerIndex {
   }
 }
 
-module.exports = StyleLayerIndex;
+export default StyleLayerIndex;

package/src/style/zoom_history.js

@@ -33,4 +33,4 @@ class ZoomHistory {
   }
 }
 
-module.exports = ZoomHistory;
+export default ZoomHistory;

package/src/style-spec/error/parsing_error.js

@@ -5,4 +5,4 @@ function ParsingError(error) {
   this.line = match ? Number.parseInt(match[1], 10) : 0;
 }
 
-module.exports = ParsingError;
+export default ParsingError;

package/src/style-spec/error/validation_error.js

@@ -1,10 +1,12 @@
-module.exports = class ValidationError {
+export default class ValidationError {
   constructor(key, value, message, identifier) {
     this.message = (key ? `${key}: ` : '') + message;
-    if (identifier) this.identifier = identifier;
+    if (identifier) {
+      this.identifier = identifier;
+    }
 
     if (value?.__line__) {
       this.line = value.__line__;
     }
   }
-};
+}

package/src/style-spec/feature_filter/convert.js

@@ -1,13 +1,11 @@
-const { isExpressionFilter } = require('./index');
-
-module.exports = convertFilter;
+import { isExpressionFilter } from './index.js';
 
 /**
  * Convert the given legacy filter to (the JSON representation of) an
  * equivalent expression
  * @private
  */
-function convertFilter(filter) {
+export default function convertFilter(filter) {
   return _convertFilter(filter, {});
 }
 
@@ -64,9 +62,13 @@ function _convertFilter(filter, expectedTypes) {
     return filter;
   }
 
-  if (!filter) return true;
+  if (!filter) {
+    return true;
+  }
   const op = filter[0];
-  if (filter.length <= 1) return op !== 'any';
+  if (filter.length <= 1) {
+    return op !== 'any';
+  }
 
   let converted;
 
@@ -115,8 +117,12 @@ function runtimeTypeChecks(expectedTypes) {
     const get = property === '$id' ? ['id'] : ['get', property];
     conditions.push(['==', ['typeof', get], expectedTypes[property]]);
   }
-  if (conditions.length === 0) return true;
-  if (conditions.length === 1) return conditions[0];
+  if (conditions.length === 0) {
+    return true;
+  }
+  if (conditions.length === 1) {
+    return conditions[0];
+  }
   return ['all'].concat(conditions);
 }
 
@@ -155,7 +161,9 @@ function convertComparisonOp(property, value, op, expectedTypes) {
 }
 
 function convertInOp(property, values, negate = false) {
-  if (values.length === 0) return negate;
+  if (values.length === 0) {
+    return negate;
+  }
 
   let get;
   if (property === '$type') {

package/src/style-spec/feature_filter/index.js

@@ -1,11 +1,9 @@
-const { createExpression, findGlobalStateRefs } = require('@mapwhit/style-expressions');
-
-module.exports = createFilter;
+import { createExpression, findGlobalStateRefs } from '@mapwhit/style-expressions';
 
 createFilter.isExpressionFilter = isExpressionFilter;
 createFilter.addGlobalStateRefs = addGlobalStateRefs;
 
-function isExpressionFilter(filter) {
+export function isExpressionFilter(filter) {
   if (filter === true || filter === false) {
     return true;
   }
@@ -65,7 +63,7 @@ const filterSpec = {
  * @param {Array} filter mapbox gl filter
  * @returns {Function} filter-evaluating function
  */
-function createFilter(filter) {
+export default function createFilter(filter) {
   if (filter === null || filter === undefined) {
     return addGlobalStateRefs(() => true);
   }
@@ -84,7 +82,7 @@ function createFilter(filter) {
   );
 }
 
-function addGlobalStateRefs(filter, getGlobalStateRefs = () => new Set()) {
+export function addGlobalStateRefs(filter, getGlobalStateRefs = () => new Set()) {
   filter.getGlobalStateRefs = getGlobalStateRefs;
   return filter;
 }
@@ -95,9 +93,13 @@ function compare(a, b) {
 }
 
 function convertFilter(filter) {
-  if (!filter || filter.length === 0) return true;
+  if (!filter || filter.length === 0) {
+    return true;
+  }
   const [op, ...args] = filter;
-  if (filter.length <= 1) return op !== 'any';
+  if (filter.length <= 1) {
+    return op !== 'any';
+  }
   switch (op) {
     case '!=':
       return convertNegation(convertComparisonOp('==', ...args));
@@ -158,7 +160,9 @@ function convertInOp([property, ...values]) {
 }
 
 function isUniformLarge(values) {
-  if (values.length < 200) return false;
+  if (values.length < 200) {
+    return false;
+  }
   const type = typeof values[0];
   return values.every(v => typeof v === type);
 }

package/src/style-spec/util/eval_support.js

@@ -1,8 +1,8 @@
-module.exports = (function () {
+export default (function () {
   try {
     new Function('');
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 })();

package/src/style-spec/util/ref_properties.js

@@ -1 +1 @@
-module.exports = ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'];
+export default ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'];

package/src/symbol/anchor.js

@@ -1,4 +1,4 @@
-const { default: Point } = require('@mapbox/point-geometry');
+import Point from '@mapbox/point-geometry';
 
 class Anchor extends Point {
   constructor(x, y, angle, segment) {
@@ -14,4 +14,4 @@ class Anchor extends Point {
   }
 }
 
-module.exports = Anchor;
+export default Anchor;

package/src/symbol/check_max_angle.js

@@ -1,4 +1,4 @@
-module.exports = checkMaxAngle;
+export default checkMaxAngle;
 
 /**
  * Labels placed around really sharp angles aren't readable. Check if any
@@ -15,7 +15,9 @@ module.exports = checkMaxAngle;
  */
 function checkMaxAngle(line, anchor, labelLength, windowSize, maxAngle) {
   // horizontal labels always pass
-  if (anchor.segment === undefined) return true;
+  if (anchor.segment === undefined) {
+    return true;
+  }
 
   let p = anchor;
   let index = anchor.segment + 1;
@@ -26,7 +28,9 @@ function checkMaxAngle(line, anchor, labelLength, windowSize, maxAngle) {
     index--;
 
     // there isn't enough room for the label after the beginning of the line
-    if (index < 0) return false;
+    if (index < 0) {
+      return false;
+    }
 
     anchorDistance -= line[index].dist(p);
     p = line[index];
@@ -46,7 +50,9 @@ function checkMaxAngle(line, anchor, labelLength, windowSize, maxAngle) {
     const next = line[index + 1];
 
     // there isn't enough room for the label before the end of the line
-    if (!next) return false;
+    if (!next) {
+      return false;
+    }
 
     let angleDelta = prev.angleTo(current) - current.angleTo(next);
     // restrict angle to -pi..pi range
@@ -64,7 +70,9 @@ function checkMaxAngle(line, anchor, labelLength, windowSize, maxAngle) {
     }
 
     // the sum of angles within the window area exceeds the maximum allowed value. check fails.
-    if (recentAngleDelta > maxAngle) return false;
+    if (recentAngleDelta > maxAngle) {
+      return false;
+    }
 
     index++;
     anchorDistance += current.dist(next);

package/src/symbol/clip_line.js

@@ -1,6 +1,5 @@
-const { default: Point } = require('@mapbox/point-geometry');
-
-module.exports = clipLine;
+import Point from '@mapbox/point-geometry';
+export default clipLine;
 
 /**
  * Returns the part of a multiline that intersects with the provided rectangular box.

package/src/symbol/collision_feature.js

@@ -1,4 +1,4 @@
-const { default: Point } = require('@mapbox/point-geometry');
+import Point from '@mapbox/point-geometry';
 
 /**
  * A CollisionFeature represents the area of the tile covered by a single label.
@@ -174,8 +174,12 @@ class CollisionFeature {
       let boxDistanceToAnchor = labelStartDistance + boxOffset;
 
       // make the distance between pitch padding boxes bigger
-      if (boxOffset < 0) boxDistanceToAnchor += boxOffset;
-      if (boxOffset > labelLength) boxDistanceToAnchor += boxOffset - labelLength;
+      if (boxOffset < 0) {
+        boxDistanceToAnchor += boxOffset;
+      }
+      if (boxOffset > labelLength) {
+        boxDistanceToAnchor += boxOffset - labelLength;
+      }
 
       if (boxDistanceToAnchor < anchorDistance) {
         // The line doesn't extend far enough back for this box, skip it
@@ -227,4 +231,4 @@ class CollisionFeature {
   }
 }
 
-module.exports = CollisionFeature;
+export default CollisionFeature;

package/src/symbol/collision_index.js

@@ -1,9 +1,7 @@
-const { default: Point } = require('@mapbox/point-geometry');
-
-const intersectionTests = require('../util/intersection_tests');
-const Grid = require('./grid_index');
-
-const projection = require('../symbol/projection');
+import Point from '@mapbox/point-geometry';
+import * as projection from '../symbol/projection.js';
+import * as intersectionTests from '../util/intersection_tests.js';
+import Grid from './grid_index.js';
 
 // When a symbol crosses the edge that causes it to be included in
 // collision detection, it will cause changes in the symbols around
@@ -382,4 +380,4 @@ function markCollisionCircleUsed(collisionCircles, index, used) {
   collisionCircles[index + 4] = used ? 1 : 0;
 }
 
-module.exports = CollisionIndex;
+export default CollisionIndex;

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;
@@ -269,4 +269,4 @@ class CrossTileSymbolIndex {
   }
 }
 
-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

@@ -14,4 +14,4 @@ class OpacityState {
   }
 }
 
-module.exports = OpacityState;
+export default OpacityState;